Restructure session code so the PAM authentication is run in its own process.

1 files changed, 11 insertions, 132 deletions

diff --git a/src/xsession.c b/src/xsession.c
index 1b61e4a2..0c0b99df 100644
--- a/src/xsession.c
+++ b/src/xsession.c
@@ -22,11 +22,6 @@ struct XSessionPrivate
 {
     /* X server connected to */
     XServer *xserver;
-
-    /* X Authority */
-    gboolean authority_in_system_dir;
-    XAuthority *authority;
-    GFile *authority_file;
 };
 
 G_DEFINE_TYPE (XSession, xsession, SESSION_TYPE);
@@ -34,128 +29,21 @@ G_DEFINE_TYPE (XSession, xsession, SESSION_TYPE);
 XSession *
 xsession_new (XServer *xserver)
 {
-    XSession *session = g_object_new (XSESSION_TYPE, NULL);
+    XSession *session;
+    XAuthority *authority;
 
+    session = g_object_new (XSESSION_TYPE, NULL);
     session->priv->xserver = g_object_ref (xserver);
 
-    return session;
-}
-
-static gboolean
-xsession_start (Session *session)
-{
-    XSession *xsession = XSESSION (session);
-    PAMSession *authentication;
-    gchar *hostname;
-
-    authentication = session_get_authentication (session);
-    pam_session_set_item (authentication, PAM_TTY, xserver_get_address (xsession->priv->xserver));
-
-    session_set_console_kit_parameter (session, "x11-display", g_variant_new_string (xserver_get_address (xsession->priv->xserver)));
-    hostname = xserver_get_hostname (xsession->priv->xserver);
-    if (hostname)
-    {
-        session_set_console_kit_parameter (session, "remote-host-name", g_variant_new_string (hostname));
-        session_set_console_kit_parameter (session, "is-local", g_variant_new_boolean (FALSE));
-    }
-
-    session_set_env (session, "DISPLAY", xserver_get_address (xsession->priv->xserver));
-
-    return SESSION_CLASS (xsession_parent_class)->start (session);
-}
-
-static gboolean
-xsession_setup (Session *session)
-{
-    XSession *xsession = XSESSION (session);
-
-    if (xserver_get_authority (xsession->priv->xserver))
-    {
-        gchar *path;
-        gboolean drop_privileges, result;
-        GError *error = NULL;
-
-        xsession->priv->authority = g_object_ref (xserver_get_authority (xsession->priv->xserver));
-      
-        xsession->priv->authority_in_system_dir = config_get_boolean (config_get_instance (), "LightDM", "user-authority-in-system-dir");
-        if (xsession->priv->authority_in_system_dir)
-        {
-            gchar *run_dir, *dir;
-
-            run_dir = config_get_string (config_get_instance (), "LightDM", "run-directory");          
-            dir = g_build_filename (run_dir, user_get_name (session_get_user (session)), NULL);
-            g_free (run_dir);
-
-            g_mkdir_with_parents (dir, S_IRWXU);
-            if (getuid () == 0)
-            {
-                if (chown (dir, user_get_uid (session_get_user (session)), user_get_gid (session_get_user (session))) < 0)
-                    g_warning ("Failed to set ownership of user authority dir: %s", strerror (errno));
-            }
-
-            path = g_build_filename (dir, "xauthority", NULL);
-            g_free (dir);
-        }
-        else
-            path = g_build_filename (user_get_home_directory (session_get_user (session)), ".Xauthority", NULL);
-
-        session_set_env (session, "XAUTHORITY", path);
-        xsession->priv->authority_file = g_file_new_for_path (path);
-
-        drop_privileges = geteuid () == 0;
-        if (drop_privileges)
-            privileges_drop (session_get_user (SESSION (session)));
-        g_debug ("Adding session authority to %s", path);
-        result = xauth_write (xsession->priv->authority, XAUTH_WRITE_MODE_REPLACE, xsession->priv->authority_file, &error);
-        if (drop_privileges)
-            privileges_reclaim ();
-        if (error)
-            g_warning ("Failed to write authority: %s", error->message);
-        g_clear_error (&error); 
-        g_free (path);
-
-        if (!result)
-            return FALSE;
-    }
-
-    return SESSION_CLASS (xsession_parent_class)->setup (session);  
-}
+    session_set_env (SESSION (session), "DISPLAY", xserver_get_address (xserver));
+    session_set_tty (SESSION (session), xserver_get_address (xserver));
+    session_set_xdisplay (SESSION (session), xserver_get_address (xserver));
+    authority = xserver_get_authority (xserver);
+    if (authority)
+        session_set_xauthority (SESSION (session), authority, config_get_boolean (config_get_instance (), "LightDM", "user-authority-in-system-dir"));
+    session_set_log_file (SESSION (session), ".xsession-errors");
 
-static void
-xsession_remove_authority (XSession *session)
-{
-    if (session->priv->authority_file)
-    {
-        gboolean drop_privileges;
-        gchar *path;
-      
-        drop_privileges = geteuid () == 0;
-        if (drop_privileges)
-            privileges_drop (session_get_user (SESSION (session)));
-
-        path = g_file_get_path (session->priv->authority_file);
-        g_debug ("Removing session authority from %s", path);
-        g_free (path);
-        xauth_write (session->priv->authority, XAUTH_WRITE_MODE_REMOVE, session->priv->authority_file, NULL);
-
-        if (drop_privileges)
-            privileges_reclaim ();
-
-        g_object_unref (session->priv->authority_file);
-        session->priv->authority_file = NULL;
-    }
-    if (session->priv->authority)
-    {
-        g_object_unref (session->priv->authority);
-        session->priv->authority = NULL;
-    }
-}
-
-static void
-xsession_cleanup (Session *session)
-{
-    xsession_remove_authority (XSESSION (session));
-    SESSION_CLASS (xsession_parent_class)->cleanup (session);
+    return session;
 }
 
 static void
@@ -171,13 +59,8 @@ xsession_finalize (GObject *object)
 
     self = XSESSION (object);
 
-    xsession_remove_authority (self);
     if (self->priv->xserver)
         g_object_unref (self->priv->xserver);
-    if (self->priv->authority)
-        g_object_unref (self->priv->authority);
-    if (self->priv->authority_file)
-        g_object_unref (self->priv->authority_file);
 
     G_OBJECT_CLASS (xsession_parent_class)->finalize (object);
 }
@@ -186,11 +69,7 @@ static void
 xsession_class_init (XSessionClass *klass)
 {
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
-    SessionClass *session_class = SESSION_CLASS (klass);
 
-    session_class->start = xsession_start;
-    session_class->setup = xsession_setup;
-    session_class->cleanup = xsession_cleanup;
     object_class->finalize = xsession_finalize;
 
     g_type_class_add_private (klass, sizeof (XSessionPrivate));