Attachment 79584 Details for Bug 64769 – lib: notice when account changes from system acount to normal account

[patch] lib: notice when account changes from system acount to normal account

0004-lib-notice-when-account-changes-from-system-acount-t.patch (text/plain), 9.57 KB, created by Ray Strode [halfline] on 2013-05-20 19:15:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ray Strode [halfline]

Created: 2013-05-20 19:15:52 UTC

Size: 9.57 KB

patch

obsolete

>From b90a1597083c9d54bc36d8d983955b23f43b8420 Mon Sep 17 00:00:00 2001
>From: Ray Strode <rstrode@redhat.com>
>Date: Mon, 20 May 2013 14:48:00 -0400
>Subject: [PATCH 4/8] lib: notice when account changes from system acount to
> normal account
>
>We currently don't show system users (e.g. 'mysql') in the
>control-center user list.  Occasionally a system user gets promoted to
>a normal user account. When that happens, we fail to notice.
>
>This commit fixes that.
>
>https://bugs.freedesktop.org/show_bug.cgi?id=64769
>---
> src/libaccountsservice/act-user-manager.c | 38 +++++++++++++++++++++++++++++++
> 1 file changed, 38 insertions(+)
>
>diff --git a/src/libaccountsservice/act-user-manager.c b/src/libaccountsservice/act-user-manager.c
>index d637890..7be5bbf 100644
>--- a/src/libaccountsservice/act-user-manager.c
>+++ b/src/libaccountsservice/act-user-manager.c
>@@ -214,60 +214,62 @@ enum {
>         USER_ADDED,
>         USER_REMOVED,
>         USER_IS_LOGGED_IN_CHANGED,
>         USER_CHANGED,
>         LAST_SIGNAL
> };
> 
> static guint signals [LAST_SIGNAL] = { 0, };
> 
> static void     act_user_manager_class_init (ActUserManagerClass *klass);
> static void     act_user_manager_init       (ActUserManager      *user_manager);
> static void     act_user_manager_finalize   (GObject             *object);
> 
> static gboolean load_seat_incrementally     (ActUserManager *manager);
> static void     unload_seat                 (ActUserManager *manager);
> static void     load_users                  (ActUserManager *manager);
> static void     act_user_manager_queue_load (ActUserManager *manager);
> static void     queue_load_seat_and_users   (ActUserManager *manager);
> 
> static void     load_new_session_incrementally (ActUserManagerNewSession *new_session);
> static void     set_is_loaded (ActUserManager *manager, gboolean is_loaded);
> 
> static void     on_new_user_loaded (ActUser        *user,
>                                     GParamSpec     *pspec,
>                                     ActUserManager *manager);
> static void     give_up (ActUserManager                 *manager,
>                          ActUserManagerFetchUserRequest *request);
> static void     fetch_user_incrementally       (ActUserManagerFetchUserRequest *request);
> 
> static void     maybe_set_is_loaded            (ActUserManager *manager);
>+static void     update_user                    (ActUserManager *manager,
>+                                                ActUser        *user);
> static gpointer user_manager_object = NULL;
> 
> G_DEFINE_TYPE (ActUserManager, act_user_manager, G_TYPE_OBJECT)
> 
> static const GDBusErrorEntry error_entries[] = {
>         { ACT_USER_MANAGER_ERROR_FAILED,              "org.freedesktop.Accounts.Error.Failed" },
>         { ACT_USER_MANAGER_ERROR_USER_EXISTS,         "org.freedesktop.Accounts.Error.UserExists" },
>         { ACT_USER_MANAGER_ERROR_USER_DOES_NOT_EXIST, "org.freedesktop.Accounts.Error.UserDoesNotExist" },
>         { ACT_USER_MANAGER_ERROR_PERMISSION_DENIED,   "org.freedesktop.Accounts.Error.PermissionDenied" },
>         { ACT_USER_MANAGER_ERROR_NOT_SUPPORTED,       "org.freedesktop.Accounts.Error.NotSupported" }
> };
> 
> GQuark
> act_user_manager_error_quark (void)
> {
>         static volatile gsize ret = 0;
>         if (ret == 0) {
>                 g_dbus_error_register_error_domain ("act_user_manager_error",
>                                                     &ret,
>                                                     error_entries,
>                                                     G_N_ELEMENTS (error_entries));
>         }
> 
>         return (GQuark) ret;
> }
> 
> static gboolean
> activate_console_kit_session_id (ActUserManager *manager,
>                                  const char     *seat_id,
>                                  const char     *session_id)
>@@ -607,60 +609,62 @@ on_user_sessions_changed (ActUser        *user,
> {
>         guint nsessions;
> 
>         if (! manager->priv->is_loaded) {
>                 return;
>         }
> 
>         nsessions = act_user_get_num_sessions (user);
> 
>         g_debug ("ActUserManager: sessions changed (%s) num=%d",
>                  describe_user (user),
>                  nsessions);
> 
>         /* only signal on zero and one */
>         if (nsessions > 1) {
>                 return;
>         }
> 
>         g_signal_emit (manager, signals [USER_IS_LOGGED_IN_CHANGED], 0, user);
> }
> 
> static void
> on_user_changed (ActUser        *user,
>                  ActUserManager *manager)
> {
>         if (manager->priv->is_loaded) {
>                 g_debug ("ActUserManager: %s changed",
>                          describe_user (user));
> 
>                 g_signal_emit (manager, signals[USER_CHANGED], 0, user);
>+
>+                update_user (manager, user);
>         }
> }
> 
> static void
> queue_load_seat_incrementally (ActUserManager *manager)
> {
>         if (manager->priv->seat.load_idle_id == 0) {
>             manager->priv->seat.load_idle_id = g_idle_add ((GSourceFunc) load_seat_incrementally, manager);
>         }
> }
> 
> static void
> on_get_seat_id_finished (GObject        *object,
>                          GAsyncResult   *result,
>                          gpointer        data)
> {
>         ConsoleKitSession *proxy = CONSOLE_KIT_SESSION (object);
>         ActUserManager    *manager = data;
>         GError            *error = NULL;
>         char              *seat_id;
> 
>         if (!console_kit_session_call_get_seat_id_finish (proxy, &seat_id, result, &error)) {
>                 if (error != NULL) {
>                         g_debug ("Failed to identify the seat of the "
>                                  "current session: %s",
>                                  error->message);
>                         g_error_free (error);
>                 } else {
>                         g_debug ("Failed to identify the seat of the "
>                                  "current session");
>@@ -842,60 +846,94 @@ remove_user (ActUserManager *manager,
>                  act_user_get_user_name (user),
>                  act_user_get_object_path (user));
> 
>         g_object_ref (user);
> 
>         g_signal_handlers_disconnect_by_func (user, on_user_changed, manager);
>         g_signal_handlers_disconnect_by_func (user, on_user_sessions_changed, manager);
>         if (act_user_get_object_path (user) != NULL) {
>                 g_hash_table_remove (manager->priv->users_by_object_path, act_user_get_object_path (user));
>         }
>         if (act_user_get_user_name (user) != NULL) {
>                 g_hash_table_remove (manager->priv->normal_users_by_name, act_user_get_user_name (user));
>                 g_hash_table_remove (manager->priv->system_users_by_name, act_user_get_user_name (user));
> 
>         }
> 
>         if (manager->priv->is_loaded) {
>                 g_debug ("ActUserManager: loaded, so emitting user-removed signal");
>                 g_signal_emit (manager, signals[USER_REMOVED], 0, user);
>         } else {
>                 g_debug ("ActUserManager: not yet loaded, so not emitting user-removed signal");
>         }
> 
>         g_object_unref (user);
> 
>         if (g_hash_table_size (manager->priv->normal_users_by_name) <= 1) {
>                 set_has_multiple_users (manager, FALSE);
>         }
> }
> 
>+static void
>+update_user (ActUserManager *manager,
>+             ActUser        *user)
>+{
>+        const char *username;
>+
>+        username = act_user_get_user_name (user);
>+        if (g_hash_table_lookup (manager->priv->system_users_by_name, username) != NULL) {
>+                if (!act_user_is_system_account (user)) {
>+                        g_hash_table_insert (manager->priv->normal_users_by_name,
>+                                             g_strdup (act_user_get_user_name (user)),
>+                                             g_object_ref (user));
>+                        g_hash_table_remove (manager->priv->system_users_by_name, username);
>+                        g_signal_emit (manager, signals[USER_ADDED], 0, user);
>+
>+                        if (g_hash_table_size (manager->priv->normal_users_by_name) > 1) {
>+                                set_has_multiple_users (manager, TRUE);
>+                        }
>+                }
>+        } else {
>+                if (act_user_is_system_account (user)) {
>+                        g_hash_table_insert (manager->priv->system_users_by_name,
>+                                             g_strdup (act_user_get_user_name (user)),
>+                                             g_object_ref (user));
>+                        g_hash_table_remove (manager->priv->normal_users_by_name, username);
>+                        g_signal_emit (manager, signals[USER_REMOVED], 0, user);
>+
>+                        if (g_hash_table_size (manager->priv->normal_users_by_name) <= 1) {
>+                                set_has_multiple_users (manager, FALSE);
>+                        }
>+                }
>+        }
>+}
>+
> static ActUser *
> lookup_user_by_name (ActUserManager *manager,
>                      const char     *username)
> {
>         ActUser *user;
> 
>         user = g_hash_table_lookup (manager->priv->normal_users_by_name, username);
> 
>         if (user == NULL) {
>                 user = g_hash_table_lookup (manager->priv->system_users_by_name, username);
>         }
> 
>         return user;
> }
> 
> static void
> on_new_user_loaded (ActUser        *user,
>                     GParamSpec     *pspec,
>                     ActUserManager *manager)
> {
>         const char *username;
>         ActUser *old_user;
> 
>         if (!act_user_is_loaded (user)) {
>                 g_debug ("ActUserManager: %s loaded function called when not loaded",
>                          describe_user (user));
>                 return;
>         }
>         g_signal_handlers_disconnect_by_func (user, on_new_user_loaded, manager);
> 
>-- 
>1.8.2.1
>

Actions: View | Splinter Review

Attachments on bug 64769: 79581 | 79582 | 79583 | 79584 | 79585 | 79586 | 79587 | 79588

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.