Merge lp:~sjakthol/unity/fix-1292154 into lp:unity

[Sami Jaktholm]

Session: Don't lock the screen if screen locking is disabled by
org.gnome.desktop.lockdown disable-lock-screen.

To test:
1. Run 'gsettings set org.gnome.desktop.lockdown disable-lock-screen true'
2. Press Super+L

The 'disable-lock-screen' is only ignored when the locking is initiated by Unity (e.g. when using the keybinding specified in Unity or possibly when requests are coming from logind). Normally (e.g. CTRL+ALT+L or session menu) all lock requests are forwarded to Unity by gnome-screensaver which performs the neccesary checks before asking Unity to lock the screen.

These changes should make Unity follow the behavior of gnome-screensaver by ignoring all locking requests if lock screen is disabled.

[Marco Trevisan (Treviño) (3v1n0)]

Hi, thanks for this, just one thing... Imho it's not needed to cache the value in this case, nor to monitor its changes.

So inside GnomeManager::LockScreen, just do something like:

glib::Object<GSettings> lockdown_settings(g_settings_new(GNOME_LOCKDOWN_OPTIONS.c_str()));

if (g_settings_get_boolean(lockdown_settings, DISABLE_LOCKSCREEN_KEY.c_str()))
  return;

[Sami Jaktholm (sjakthol)]

Good point. I'll modify the branch!

[Marco Trevisan (Treviño) (3v1n0)]

Cool, looks good to me. Thanks!

review: Approve

=== modified file 'UnityCore/GnomeSessionManager.cpp'
--- UnityCore/GnomeSessionManager.cpp	2014-03-20 15:42:43 +0000
+++ UnityCore/GnomeSessionManager.cpp	2014-04-06 13:37:22 +0000
@@ -72,6 +72,9 @@
 {
 const std::string SESSION_OPTIONS = "com.canonical.indicator.session";
 const std::string SUPPRESS_DIALOGS_KEY = "suppress-logout-restart-shutdown";
+
+const std::string GNOME_LOCKDOWN_OPTIONS = "org.gnome.desktop.lockdown";
+const std::string DISABLE_LOCKSCREEN_KEY = "disable-lock-screen";
 }
 
 GnomeManager::Impl::Impl(GnomeManager* manager, bool test_mode)
@@ -416,7 +419,12 @@
   impl_->EnsureCancelPendingAction();
 
   // FIXME (andy) we should ask gnome-session to emit the logind signal
-  if (UserName().find("guest-") == 0)
+  glib::Object<GSettings> lockdown_settings(g_settings_new(GNOME_LOCKDOWN_OPTIONS.c_str()));
+
+  if (g_settings_get_boolean(lockdown_settings, DISABLE_LOCKSCREEN_KEY.c_str())) {
+    return;
+  }
+  else if (UserName().find("guest-") == 0)
   {
     LOG_INFO(logger) << "Impossible to lock a guest session";
     return;

=== modified file 'tests/test_gnome_session_manager.cpp'
--- tests/test_gnome_session_manager.cpp	2014-03-21 03:42:28 +0000
+++ tests/test_gnome_session_manager.cpp	2014-04-06 13:37:22 +0000
@@ -44,6 +44,9 @@
 
 const std::string SESSION_OPTIONS = "com.canonical.indicator.session";
 const std::string SUPPRESS_DIALOGS_KEY = "suppress-logout-restart-shutdown";
+
+const std::string GNOME_LOCKDOWN_OPTIONS = "org.gnome.desktop.lockdown";
+const std::string DISABLE_LOCKSCREEN_KEY = "disable-lock-screen";
 }
 
 namespace introspection
@@ -291,6 +294,12 @@
     g_settings_set_boolean(setting, SUPPRESS_DIALOGS_KEY.c_str(), enable ? FALSE : TRUE);
   }
 
+  void DisableScreenLocking(bool disable)
+  {
+    glib::Object<GSettings> setting(g_settings_new(GNOME_LOCKDOWN_OPTIONS.c_str()));
+    g_settings_set_boolean(setting, DISABLE_LOCKSCREEN_KEY.c_str(), disable ? TRUE : FALSE);
+  }
+
   enum class Action : unsigned
   {
     LOGOUT = 0,
@@ -1010,4 +1019,21 @@
   EXPECT_TRUE(unlock_emitted);
 }
 
+TEST_F(TestGnomeSessionManager, NoLockWhenLockingDisabled)
+{
+  bool lock_emitted = false;
+
+  manager->lock_requested.connect([&lock_emitted]()
+  {
+    lock_emitted = true;
+  });
+
+  DisableScreenLocking(true);
+
+  manager->LockScreen();
+  EXPECT_FALSE(lock_emitted);
+
+  DisableScreenLocking(false);
+}
+
 } // Namespace