/* The last session set to active */
Session *active_session;
+ /* The session belonging to the active greeter user */
+ Session *next_session;
+
/* The session to set active when it starts */
Session *session_to_activate;
static GHashTable *seat_modules = NULL;
// FIXME: Make a get_display_server() that re-uses display servers if supported
-static DisplayServer *create_display_server (Seat *seat, const gchar *session_type);
+static DisplayServer *create_display_server (Seat *seat, const gchar *session_type, gboolean is_greeter);
static Greeter *create_greeter_session (Seat *seat);
static void start_session (Seat *seat, Session *session);
return SEAT_GET_CLASS (seat)->get_active_session (seat);
}
+Session *
+seat_get_next_session (Seat *seat)
+{
+ g_return_val_if_fail (seat != NULL, NULL);
+ return seat->priv->next_session;
+}
+
gboolean
seat_get_can_switch (Seat *seat)
{
{
DisplayServer *display_server;
- display_server = create_display_server (seat, session_get_session_type (session));
+ display_server = create_display_server (seat, session_get_session_type (session), TRUE);
if (!display_server_start (display_server))
{
l_debug (seat, "Failed to start display server for greeter");
}
}
+static Session *
+find_user_session (Seat *seat, const gchar *username, Session *ignore_session)
+{
+ GList *link;
+
+ if (!username)
+ return NULL;
+
+ for (link = seat->priv->sessions; link; link = link->next)
+ {
+ Session *session = link->data;
+
+ if (session == ignore_session)
+ continue;
+
+ if (!session_get_is_stopping (session) && g_strcmp0 (session_get_username (session), username) == 0)
+ return session;
+ }
+
+ return NULL;
+}
+
+static void
+greeter_active_username_changed_cb (Greeter *greeter, GParamSpec *pspec, Seat *seat)
+{
+ Session *session;
+
+ session = find_user_session (seat, greeter_get_active_username (greeter), seat->priv->active_session);
+
+ if (seat->priv->next_session)
+ g_object_unref (seat->priv->next_session);
+ seat->priv->next_session = session ? g_object_ref (session) : NULL;
+
+ SEAT_GET_CLASS (seat)->set_next_session (seat, session);
+}
+
static void
session_authentication_complete_cb (Session *session, Seat *seat)
{
if (session_get_is_authenticated (session))
{
- l_debug (seat, "Session authenticated, running command");
- run_session (seat, session);
+ Session *s;
+
+ s = find_user_session (seat, session_get_username (session), session);
+ if (s)
+ {
+ l_debug (seat, "Session authenticated, switching to existing user session");
+ seat_set_active_session (seat, s);
+ session_stop (session);
+ }
+ else
+ {
+ l_debug (seat, "Session authenticated, running command");
+ run_session (seat, session);
+ }
}
else if (!IS_GREETER (session))
{
g_object_unref (seat->priv->active_session);
seat->priv->active_session = NULL;
}
+ if (session == seat->priv->next_session)
+ {
+ g_object_unref (seat->priv->next_session);
+ seat->priv->next_session = NULL;
+ }
if (session == seat->priv->session_to_activate)
{
g_object_unref (seat->priv->session_to_activate);
return session_config;
}
+static void
+configure_session (Session *session, SessionConfig *config, const gchar *session_name, const gchar *language)
+{
+ const gchar *desktop_name;
+
+ session_set_session_type (session, session_config_get_session_type (config));
+ session_set_env (session, "DESKTOP_SESSION", session_name);
+ session_set_env (session, "GDMSESSION", session_name);
+ desktop_name = session_config_get_desktop_name (config);
+ if (desktop_name)
+ session_set_env (session, "XDG_CURRENT_DESKTOP", desktop_name);
+ if (language && language[0] != '\0')
+ {
+ session_set_env (session, "LANG", language);
+ session_set_env (session, "GDM_LANG", language);
+ }
+}
+
static Session *
-create_user_session (Seat *seat, const gchar *username)
+create_user_session (Seat *seat, const gchar *username, gboolean autostart)
{
User *user;
gchar *sessions_dir;
g_free (sessions_dir);
if (session_config)
{
- const gchar *desktop_name;
gchar **argv;
- session = create_session (seat, TRUE);
- session_set_session_type (session, session_config_get_session_type (session_config));
- session_set_env (session, "DESKTOP_SESSION", session_name);
- session_set_env (session, "GDMSESSION", session_name);
- desktop_name = session_config_get_desktop_name (session_config);
- if (desktop_name)
- session_set_env (session, "XDG_CURRENT_DESKTOP", desktop_name);
- if (language && language[0] != '\0')
- {
- session_set_env (session, "LANG", language);
- session_set_env (session, "GDM_LANG", language);
- }
- session_set_pam_service (session, AUTOLOGIN_SERVICE);
+ session = create_session (seat, autostart);
+ configure_session (session, session_config, session_name, language);
session_set_username (session, username);
session_set_do_authenticate (session, TRUE);
argv = get_session_argv (seat, session_config, seat_get_string_property (seat, "session-wrapper"));
session_set_argv (session, argv);
g_strfreev (argv);
-
g_object_unref (session_config);
}
else
l_debug (seat, "Can't find session '%s'", seat_get_string_property (seat, "user-session"));
-
g_object_unref (user);
return session;
static Session *
create_guest_session (Seat *seat)
{
+ const gchar *session_name;
gchar *sessions_dir, **argv;
SessionConfig *session_config;
Session *session;
+ session_name = seat_get_string_property (seat, "user-session");
sessions_dir = config_get_string (config_get_instance (), "LightDM", "sessions-directory");
- session_config = find_session_config (seat, sessions_dir, seat_get_string_property (seat, "user-session"));
+ session_config = find_session_config (seat, sessions_dir, session_name);
g_free (sessions_dir);
if (!session_config)
{
}
session = create_session (seat, TRUE);
- session_set_session_type (session, session_config_get_session_type (session_config));
+ configure_session (session, session_config, session_name, NULL);
session_set_do_authenticate (session, TRUE);
session_set_is_guest (session, TRUE);
argv = get_session_argv (seat, session_config, seat_get_string_property (seat, "session-wrapper"));
- g_object_unref (session_config);
session_set_argv (session, argv);
g_strfreev (argv);
+ g_object_unref (session_config);
return session;
}
*argv = new_argv;
}
-static Session *
-find_user_session (Seat *seat, const gchar *username)
-{
- GList *link;
-
- if (!username)
- return NULL;
-
- for (link = seat->priv->sessions; link; link = link->next)
- {
- Session *session = link->data;
-
- if (!session_get_is_stopping (session) && strcmp (session_get_username (session), username) == 0)
- return session;
- }
-
- return NULL;
-}
-
static gboolean
greeter_start_session_cb (Greeter *greeter, SessionType type, const gchar *session_name, Seat *seat)
{
/* Return to existing session if it is open */
username = session_get_username (session);
- existing_session = find_user_session (seat, username);
+ existing_session = find_user_session (seat, username, NULL);
if (existing_session && session != existing_session)
{
l_debug (seat, "Returning to existing user session %s", username);
return FALSE;
}
- session_set_session_type (session, session_config_get_session_type (session_config));
+ configure_session (session, session_config, session_name, language);
argv = get_session_argv (seat, session_config, seat_get_string_property (seat, "session-wrapper"));
session_set_argv (session, argv);
g_strfreev (argv);
- session_set_env (session, "DESKTOP_SESSION", session_name);
- session_set_env (session, "GDMSESSION", session_name);
- if (language && language[0] != '\0')
- {
- session_set_env (session, "LANG", language);
- session_set_env (session, "GDM_LANG", language);
- }
-
g_object_unref (session_config);
/* If can re-use the display server, stop the greeter first */
/* Otherwise start a new display server for this session */
else
{
- display_server = create_display_server (seat, session_get_session_type (session));
+ display_server = create_display_server (seat, session_get_session_type (session), FALSE);
session_set_display_server (session, display_server);
if (!display_server_start (display_server))
{
gchar *sessions_dir, **argv;
SessionConfig *session_config;
Greeter *greeter_session;
- gchar *greeter_user;
const gchar *greeter_wrapper;
l_debug (seat, "Creating greeter session");
greeter_session = SEAT_GET_CLASS (seat)->create_greeter_session (seat);
session_set_session_type (SESSION (greeter_session), session_config_get_session_type (session_config));
seat->priv->sessions = g_list_append (seat->priv->sessions, SESSION (greeter_session));
+ g_signal_connect (greeter_session, "notify::active-username", G_CALLBACK (greeter_active_username_changed_cb), seat);
g_signal_connect (greeter_session, "authentication-complete", G_CALLBACK (session_authentication_complete_cb), seat);
g_signal_connect (greeter_session, "stopped", G_CALLBACK (session_stopped_cb), seat);
set_session_env (SESSION (greeter_session));
session_set_pam_service (SESSION (greeter_session), GREETER_SERVICE);
- greeter_user = config_get_string (config_get_instance (), "LightDM", "greeter-user");
- session_set_username (SESSION (greeter_session), greeter_user);
- g_free (greeter_user);
+ if (getuid () == 0)
+ {
+ gchar *greeter_user;
+ greeter_user = config_get_string (config_get_instance (), "LightDM", "greeter-user");
+ session_set_username (SESSION (greeter_session), greeter_user);
+ g_free (greeter_user);
+ }
+ else
+ {
+ /* In test mode run the greeter as ourself */
+ session_set_username (SESSION (greeter_session), user_get_name (accounts_get_current_user ()));
+ }
session_set_argv (SESSION (greeter_session), argv);
g_strfreev (argv);
}
static DisplayServer *
-create_display_server (Seat *seat, const gchar *session_type)
+create_display_server (Seat *seat, const gchar *session_type, gboolean is_greeter)
{
DisplayServer *display_server;
l_debug (seat, "Creating display server of type %s", session_type);
- display_server = SEAT_GET_CLASS (seat)->create_display_server (seat, session_type);
+ display_server = SEAT_GET_CLASS (seat)->create_display_server (seat, session_type, is_greeter);
if (!display_server)
return NULL;
g_object_unref (seat->priv->session_to_activate);
seat->priv->session_to_activate = g_object_ref (greeter_session);
- display_server = create_display_server (seat, session_get_session_type (SESSION (greeter_session)));
+ display_server = create_display_server (seat, session_get_session_type (SESSION (greeter_session)), TRUE);
session_set_display_server (SESSION (greeter_session), display_server);
if (!display_server_start (display_server))
return FALSE;
return TRUE;
}
+static void
+switch_authentication_complete_cb (Session *session, Seat *seat)
+{
+ Greeter *greeter_session;
+ DisplayServer *display_server;
+
+ /* If authenticated, then unlock existing session or start new one */
+ if (session_get_is_authenticated (session))
+ {
+ Session *s;
+
+ s = find_user_session (seat, session_get_username (session), session);
+ if (s)
+ {
+ l_debug (seat, "Session authenticated, switching to existing user session");
+ session_unlock (s);
+ seat_set_active_session (seat, s);
+ session_stop (session);
+ }
+ else
+ {
+ l_debug (seat, "Session authenticated, starting display server");
+ if (seat->priv->session_to_activate)
+ g_object_unref (seat->priv->session_to_activate);
+ seat->priv->session_to_activate = g_object_ref (session);
+ display_server = create_display_server (seat, session_get_session_type (session), FALSE);
+ session_set_display_server (session, display_server);
+ display_server_start (display_server);
+ }
+
+ return;
+ }
+
+ l_debug (seat, "Switching to greeter to authenticate session");
+
+ session_stop (session);
+
+ greeter_session = create_greeter_session (seat);
+ if (session_get_is_guest (session))
+ greeter_set_hint (greeter_session, "select-guest", "true");
+ else
+ greeter_set_hint (greeter_session, "select-user", session_get_username (session));
+ if (seat->priv->session_to_activate)
+ g_object_unref (seat->priv->session_to_activate);
+ seat->priv->session_to_activate = g_object_ref (greeter_session);
+
+ display_server = create_display_server (seat, session_get_session_type (SESSION (greeter_session)), TRUE);
+ session_set_display_server (SESSION (greeter_session), display_server);
+ display_server_start (display_server);
+}
+
gboolean
seat_switch_to_user (Seat *seat, const gchar *username, const gchar *session_name)
{
Session *session;
- DisplayServer *display_server;
g_return_val_if_fail (seat != NULL, FALSE);
g_return_val_if_fail (username != NULL, FALSE);
if (!seat->priv->can_switch)
return FALSE;
- l_debug (seat, "Switching to user %s", username);
-
- session = find_user_session (seat, username);
- if (session)
- {
- l_debug (seat, "Switching to existing user session %s", username);
- seat_set_active_session (seat, session);
+ /* If we're already on this session, then ignore */
+ session = find_user_session (seat, username, NULL);
+ if (session && session == seat->priv->active_session)
return TRUE;
- }
- session = create_user_session (seat, username);
- if (!session)
- return FALSE;
- if (seat->priv->session_to_activate)
- g_object_unref (seat->priv->session_to_activate);
- seat->priv->session_to_activate = g_object_ref (session);
- session_set_pam_service (session, USER_SERVICE);
+ l_debug (seat, "Switching to user %s", username);
- display_server = create_display_server (seat, session_get_session_type (session));
- session_set_display_server (session, display_server);
- if (!display_server_start (display_server))
- return FALSE;
+ /* Attempt to authenticate them */
+ session = create_user_session (seat, username, FALSE);
+ g_signal_connect (session, "authentication-complete", G_CALLBACK (switch_authentication_complete_cb), seat);
+ session_set_pam_service (session, USER_SERVICE);
+ session_start (session);
return FALSE;
}
if (!session)
return FALSE;
- display_server = create_display_server (seat, session_get_session_type (session));
+ display_server = create_display_server (seat, session_get_session_type (session), FALSE);
if (!display_server_start (display_server))
return FALSE;
if (!greeter_session)
return FALSE;
- display_server = create_display_server (seat, session_get_session_type (SESSION (greeter_session)));
+ display_server = create_display_server (seat, session_get_session_type (SESSION (greeter_session)), TRUE);
if (!display_server_start (display_server))
return FALSE;
if (!get_start_local_sessions (seat))
{
DisplayServer *display_server;
- display_server = create_display_server (seat, "x"); // FIXME: Not necessarily an X seat, but not sure what to put here
+ display_server = create_display_server (seat, "x", FALSE); // FIXME: Not necessarily an X seat, but not sure what to put here
return display_server_start (display_server);
}
if (autologin_guest)
session = create_guest_session (seat);
else if (autologin_username != NULL)
- session = create_user_session (seat, autologin_username);
+ session = create_user_session (seat, autologin_username, TRUE);
if (session)
session_set_pam_service (session, AUTOLOGIN_SERVICE);
g_object_unref (seat->priv->session_to_activate);
seat->priv->session_to_activate = g_object_ref (session);
- display_server = create_display_server (seat, session_get_session_type (session));
+ display_server = create_display_server (seat, session_get_session_type (session), FALSE);
session_set_display_server (session, display_server);
if (!display_server || !display_server_start (display_server))
{
greeter_set_hint (greeter_session, "autologin-guest", "true");
}
- display_server = create_display_server (seat, session_get_session_type (session));
+ display_server = create_display_server (seat, session_get_session_type (session), TRUE);
session_set_display_server (session, display_server);
if (!display_server || !display_server_start (display_server))
{
{
DisplayServer *background_display_server;
- background_display_server = create_display_server (seat, session_get_session_type (background_session));
+ background_display_server = create_display_server (seat, session_get_session_type (background_session), FALSE);
session_set_display_server (background_session, background_display_server);
if (!display_server_start (background_display_server))
l_warning (seat, "Failed to start display server for background session");
{
}
+static void
+seat_real_set_next_session (Seat *seat, Session *session)
+{
+}
+
static Session *
seat_real_get_active_session (Seat *seat)
{
g_list_free_full (self->priv->sessions, g_object_unref);
if (self->priv->active_session)
g_object_unref (self->priv->active_session);
+ if (self->priv->next_session)
+ g_object_unref (self->priv->next_session);
if (self->priv->session_to_activate)
g_object_unref (self->priv->session_to_activate);
klass->create_session = seat_real_create_session;
klass->set_active_session = seat_real_set_active_session;
klass->get_active_session = seat_real_get_active_session;
+ klass->set_next_session = seat_real_set_next_session;
klass->run_script = seat_real_run_script;
klass->stop = seat_real_stop;
projects / sojka / lightdm.git / blobdiff