Merge lp:~azzar1/unity/lp-1552537 into lp:unity

[Andrea Azzarone]

LockscreenController: Don't use SetActivate(False) for gnome-screensaver to prevent unlocking on tty switch.
It will not only deactivate the screensaver but also unlock the screen.

LockscreenController: Don't use SetActivate(False) for gnome-screensaver to prevent unlocking on tty switch.
It will not only deactivate the screensaver but also unlock the screen.

[lp:~azzar1/unity/lp-1552537]

4096. By Andrea Azzarone on 2016-04-05

Don't use SetActivate from gnome-screensaver as it will not only deactivate the screensaver but also unlock the escreensaver.

4097. By Andrea Azzarone on 2016-04-05

Don't call SetActive only if activate is FALSE.

4098. By Andrea Azzarone on 2016-04-05

Add comment.

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

Bella lì!

review: Approve

=== modified file 'lockscreen/LockScreenController.cpp'
--- lockscreen/LockScreenController.cpp	2016-03-31 09:59:30 +0000
+++ lockscreen/LockScreenController.cpp	2016-04-05 17:16:44 +0000
@@ -426,8 +426,12 @@
 {
   if (Settings::Instance().use_legacy())
   {
-    auto proxy = std::make_shared<glib::DBusProxy>("org.gnome.ScreenSaver", "/org/gnome/ScreenSaver", "org.gnome.ScreenSaver");
-    proxy->CallBegin("SetActive", g_variant_new("(b)", activate != FALSE), [proxy] (GVariant*, glib::Error const&) {});
+    // SetActive(FALSE) will unlock the screen. This used to cause security issues (see lp:1552537).
+    if (activate)
+    {
+      auto proxy = std::make_shared<glib::DBusProxy>("org.gnome.ScreenSaver", "/org/gnome/ScreenSaver", "org.gnome.ScreenSaver");
+      proxy->CallBegin("SetActive", g_variant_new("(b)", TRUE), [proxy] (GVariant*, glib::Error const&) {});
+    }
     return;
   }