Merge lp:~robert-ancell/indicator-session/lockdown-settings into lp:indicator-session/14.10

[Robert Ancell]

Hide relevant items from session indicator when org.gnome.desktop.lockdown disable-lock-screen or disable-user-switching are set to match 12.04 LTS behaviour

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:449
http://jenkins.qa.ubuntu.com/job/indicator-session-ci/139/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-utopic-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-utopic-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/indicator-session-utopic-armhf-ci/3/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-session-ci/139/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

LGTM.

It's crazy how many special cases there are for how to show / whether to show a single menuitem... :)

review: Approve

=== modified file 'src/service.c'
--- src/service.c	2014-04-02 15:02:59 +0000
+++ src/service.c	2014-07-11 01:21:24 +0000
@@ -537,7 +537,7 @@
 create_switch_section (IndicatorSessionService * self, int profile)
 {
   GMenu * menu;
-  GMenuItem * item;
+  GMenuItem * item = NULL;
   gboolean want_accel;
   guint i;
   gpointer guser;
@@ -559,32 +559,47 @@
            indicator_session_guest_is_active (p->backend_guest))
     {
       const char * action = "indicator.switch-to-greeter";
-      item = g_menu_item_new (ellipsis ? _("Switch Account…")
-                                       : _("Switch Account"), action);
+      if (indicator_session_actions_can_switch (p->backend_actions))
+        item = g_menu_item_new (ellipsis ? _("Switch Account…")
+                                         : _("Switch Account"), action);
       want_accel = FALSE;
     }
   else
     {
-      const char * action = "indicator.switch-to-screensaver";
+      const char * lock_switch_action = "indicator.switch-to-screensaver";
+      const char * switch_action = "indicator.switch-to-greeter";
 
-      if (g_hash_table_size (p->users) == 1)
-        item = g_menu_item_new (_("Lock"), action);
-      else
-        item = g_menu_item_new (ellipsis ? _("Lock/Switch Account…")
-                                         : _("Lock/Switch Account"), action);
+      if (g_hash_table_size (p->users) > 1 &&
+          indicator_session_actions_can_switch (p->backend_actions))
+        {
+          if (indicator_session_actions_can_lock (p->backend_actions))
+            item = g_menu_item_new (ellipsis ? _("Lock/Switch Account…")
+                                             : _("Lock/Switch Account"), lock_switch_action);
+          else
+            item = g_menu_item_new (ellipsis ? _("Switch Account…")
+                                             : _("Switch Account"), switch_action);
+        }
+      else if (indicator_session_actions_can_lock (p->backend_actions))
+          item = g_menu_item_new (_("Lock"), lock_switch_action);
 
       want_accel = TRUE;
     }
 
-  if (want_accel)
+  if (item)
     {
-      gchar * str = g_settings_get_string (p->keybinding_settings, "screensaver");
-      g_menu_item_set_attribute (item, "accel", "s", str);
-      g_free (str);
+      if (want_accel)
+        {
+          gchar * str = g_settings_get_string (p->keybinding_settings, "screensaver");
+          g_menu_item_set_attribute (item, "accel", "s", str);
+          g_free (str);
+        }
+
+      g_menu_append_item (menu, item);
+      g_object_unref (item);
     }
 
-  g_menu_append_item (menu, item);
-  g_object_unref (item);
+  if (!indicator_session_actions_can_switch (p->backend_actions))
+    return G_MENU_MODEL (menu);
 
   if (indicator_session_guest_is_allowed (p->backend_guest))
     {

=== modified file 'tests/test-service.cc'
--- tests/test-service.cc	2014-03-24 10:19:00 +0000
+++ tests/test-service.cc	2014-07-11 01:21:24 +0000
@@ -503,6 +503,19 @@
   bool confirm_disabled = g_settings_get_boolean (indicator_settings, confirm_disabled_key);
   bool confirm = confirm_supported && !confirm_disabled;
 
+  // Add users so switch options are shown
+  IndicatorSessionUser * u = g_new0 (IndicatorSessionUser, 1);
+  u->uid = 100;
+  u->user_name = g_strdup ("thing1");
+  u->real_name = g_strdup (" ");
+  indicator_session_users_mock_add_user (INDICATOR_SESSION_USERS_MOCK(mock_users), u);
+  u = g_new0 (IndicatorSessionUser, 1);
+  u->uid = 101;
+  u->user_name = g_strdup ("thing2");
+  u->real_name = g_strdup (" ");
+  indicator_session_users_mock_add_user (INDICATOR_SESSION_USERS_MOCK(mock_users), u);
+  wait_for_menu_resync ();
+
   // confirm that the ellipsis are correct
   ASSERT_EQ (confirm, action_menuitem_label_is_ellipsized ("indicator.switch-to-screensaver"));
   ASSERT_EQ (confirm, action_menuitem_label_is_ellipsized ("indicator.logout"));
@@ -537,6 +550,19 @@
   bool confirm_disabled = g_settings_get_boolean (indicator_settings, confirm_disabled_key);
   bool confirm = confirm_supported && !confirm_disabled;
 
+  // Add users so switch options are shown
+  IndicatorSessionUser * u = g_new0 (IndicatorSessionUser, 1);
+  u->uid = 100;
+  u->user_name = g_strdup ("thing1");
+  u->real_name = g_strdup (" ");
+  indicator_session_users_mock_add_user (INDICATOR_SESSION_USERS_MOCK(mock_users), u);
+  u = g_new0 (IndicatorSessionUser, 1);
+  u->uid = 101;
+  u->user_name = g_strdup ("thing2");
+  u->real_name = g_strdup (" ");
+  indicator_session_users_mock_add_user (INDICATOR_SESSION_USERS_MOCK(mock_users), u);
+  wait_for_menu_resync ();
+
   // confirm that the ellipsis are correct
   ASSERT_EQ (confirm, action_menuitem_label_is_ellipsized ("indicator.switch-to-screensaver"));
   ASSERT_EQ (confirm, action_menuitem_label_is_ellipsized ("indicator.logout"));
@@ -562,6 +588,105 @@
   g_settings_reset (indicator_settings, confirm_disabled_key);
 }
 
+TEST_F (ServiceTest, LockdownUserSwitching)
+{
+  const char * const can_switch_key = "can-switch-sessions";
+
+  // Add users so switch options are shown
+  IndicatorSessionUser * u = g_new0 (IndicatorSessionUser, 1);
+  u->uid = 100;
+  u->user_name = g_strdup ("thing1");
+  u->real_name = g_strdup (" ");
+  indicator_session_users_mock_add_user (INDICATOR_SESSION_USERS_MOCK(mock_users), u);
+  u = g_new0 (IndicatorSessionUser, 1);
+  u->uid = 101;
+  u->user_name = g_strdup ("thing2");
+  u->real_name = g_strdup (" ");
+  indicator_session_users_mock_add_user (INDICATOR_SESSION_USERS_MOCK(mock_users), u);
+  wait_for_menu_resync ();
+
+  // Check can enable screensaver lock
+  ASSERT_TRUE (action_menuitem_exists ("indicator.switch-to-screensaver"));
+  ASSERT_FALSE (action_menuitem_exists ("indicator.switch-to-greeter"));
+
+  g_settings_set_boolean (mock_settings, can_switch_key, FALSE);
+  wait_for_menu_resync ();
+
+  // Check can still enable screensaver (though it can't switch)
+  ASSERT_TRUE (action_menuitem_exists ("indicator.switch-to-screensaver"));
+  ASSERT_FALSE (action_menuitem_exists ("indicator.switch-to-greeter"));
+
+  // cleanup
+  g_settings_reset (mock_settings, can_switch_key);
+}
+
+TEST_F (ServiceTest, LockdownLockScreen)
+{
+  const char * const can_lock_key = "can-lock";
+
+  // Add users so switch options are shown
+  IndicatorSessionUser * u = g_new0 (IndicatorSessionUser, 1);
+  u->uid = 100;
+  u->user_name = g_strdup ("thing1");
+  u->real_name = g_strdup (" ");
+  indicator_session_users_mock_add_user (INDICATOR_SESSION_USERS_MOCK(mock_users), u);
+  u = g_new0 (IndicatorSessionUser, 1);
+  u->uid = 101;
+  u->user_name = g_strdup ("thing2");
+  u->real_name = g_strdup (" ");
+  indicator_session_users_mock_add_user (INDICATOR_SESSION_USERS_MOCK(mock_users), u);
+  wait_for_menu_resync ();
+
+  // Check can enable screensaver lock
+  ASSERT_TRUE (action_menuitem_exists ("indicator.switch-to-screensaver"));
+  ASSERT_FALSE (action_menuitem_exists ("indicator.switch-to-greeter"));
+
+  g_settings_set_boolean (mock_settings, can_lock_key, FALSE);
+  wait_for_menu_resync ();
+
+  // Check can't enable screensaver - just go to greeter
+  ASSERT_FALSE (action_menuitem_exists ("indicator.switch-to-screensaver"));
+  ASSERT_TRUE (action_menuitem_exists ("indicator.switch-to-greeter"));
+
+  // cleanup
+  g_settings_reset (mock_settings, can_lock_key);
+}
+
+TEST_F (ServiceTest, LockdownUserSwitchingAndLockScreen)
+{
+  const char * const can_switch_key = "can-switch-sessions";
+  const char * const can_lock_key = "can-lock";
+
+  // Add users so switch options are shown
+  IndicatorSessionUser * u = g_new0 (IndicatorSessionUser, 1);
+  u->uid = 100;
+  u->user_name = g_strdup ("thing1");
+  u->real_name = g_strdup (" ");
+  indicator_session_users_mock_add_user (INDICATOR_SESSION_USERS_MOCK(mock_users), u);
+  u = g_new0 (IndicatorSessionUser, 1);
+  u->uid = 101;
+  u->user_name = g_strdup ("thing2");
+  u->real_name = g_strdup (" ");
+  indicator_session_users_mock_add_user (INDICATOR_SESSION_USERS_MOCK(mock_users), u);
+  wait_for_menu_resync ();
+
+  // Check can enable screensaver lock
+  ASSERT_TRUE (action_menuitem_exists ("indicator.switch-to-screensaver"));
+  ASSERT_FALSE (action_menuitem_exists ("indicator.switch-to-greeter"));
+
+  g_settings_set_boolean (mock_settings, can_switch_key, FALSE);
+  g_settings_set_boolean (mock_settings, can_lock_key, FALSE);
+  wait_for_menu_resync ();
+
+  // Check can't enable screensaver or go to greeter
+  ASSERT_FALSE (action_menuitem_exists ("indicator.switch-to-screensaver"));
+  ASSERT_FALSE (action_menuitem_exists ("indicator.switch-to-greeter"));
+
+  // cleanup
+  g_settings_reset (mock_settings, can_switch_key);
+  g_settings_reset (mock_settings, can_lock_key);
+}
+
 /**
  * Check that the default menu has items for each of these actions
  */