Changeset 44044 in vbox for trunk/src/VBox/Additions

Timestamp:

Dec 5, 2012 6:35:32 PM (12 years ago)

Author:

vboxsync

Message:

lightdm-greeter: Only process active sessions and users (>= UID 1000).

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp

@@ -393 +393 @@
                 {
                     VBoxServiceVerbose(4, "ConsoleKit: retrieved %RU16 session(s)\n", cSessions);
-                    AssertPtr(*ppszSessions);
 
                     char **ppszCurSession = ppszSessions;
-                    for (ppszCurSession; *ppszCurSession; ppszCurSession++)
+                    for (ppszCurSession;
+                         ppszCurSession && *ppszCurSession; ppszCurSession++)
                     {
                         VBoxServiceVerbose(4, "ConsoleKit: processing session '%s' ...\n", *ppszCurSession);
+
+                        /* Only respect active sessions .*/
+                        bool fActive = false;
+                        DBusMessage *pMsgSessionActive = dbus_message_new_method_call("org.freedesktop.ConsoleKit",
+                                                                                      *ppszCurSession,
+                                                                                      "org.freedesktop.ConsoleKit.Session",
+                                                                                      "IsActive");
+                        if (   pMsgSessionActive
+                            && dbus_message_get_type(pMsgSessionActive) == DBUS_MESSAGE_TYPE_METHOD_CALL)
+                        {
+                            DBusMessage *pReplySessionActive = dbus_connection_send_with_reply_and_block(pConnection,
+                                                                                                         pMsgSessionActive, 30 * 1000 /* 30s timeout */,
+                                                                                                         &dbErr);
+                            if (   pReplySessionActive
+                                && !dbus_error_is_set(&dbErr))
+                            {
+                                DBusMessageIter itMsg;
+                                if (   dbus_message_iter_init(pReplySessionActive, &itMsg)
+                                    && dbus_message_iter_get_arg_type(&itMsg) == DBUS_TYPE_BOOLEAN)
+                                {
+                                    /* Get uid from message. */
+                                    int val;
+                                    dbus_message_iter_get_basic(&itMsg, &val);
+                                    fActive = val >= 1;
+                                }
+
+                                if (pReplySessionActive)
+                                    dbus_message_unref(pReplySessionActive);
+                            }
+
+                            if (pMsgSessionActive)
+                                dbus_message_unref(pMsgSessionActive);
+                        }
+
+                        VBoxServiceVerbose(4, "ConsoleKit: session '%s' is %s\n", 
+                                           *ppszCurSession, fActive ? "active" : "not active");
 
                         /* *ppszCurSession now contains the object path
@@ -406 +442 @@
                                                                                  "org.freedesktop.ConsoleKit.Session",
                                                                                  "GetUnixUser");
-                        if (   pMsgUnixUser
+                        if (   fActive
+                            && pMsgUnixUser
                             && dbus_message_get_type(pMsgUnixUser) == DBUS_MESSAGE_TYPE_METHOD_CALL)
                         {
@@ -427 +464 @@
                                     struct passwd *ppwEntry = getpwuid(uid);
                                     if (   ppwEntry
+                                        && ppwEntry->pw_uid >= 1000 /* Only respect users, not daemons etc. */
                                         && ppwEntry->pw_name)
                                     {