Merge lp:~azzar1/unity/lock-autologin into lp:unity

[Andrea Azzarone]

Keep the screen locked if rebooting with autologin.

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

Nice work, some stuff to cleanup...

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

review: Needs Fixing

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

Hey, could you please clean this up?

[Andrea Azzarone (azzar1)]

Done.

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

Thanks!

review: Approve

=== modified file 'UnityCore/GnomeSessionManager.cpp'
--- UnityCore/GnomeSessionManager.cpp	2016-11-02 16:38:47 +0000
+++ UnityCore/GnomeSessionManager.cpp	2017-01-04 17:49:42 +0000
@@ -575,13 +575,53 @@
   auto group = getgrnam(group_name.c_str());
 
   if (group && group->gr_mem)
+  {
     for (int i = 0; group->gr_mem[i]; ++i)
+    {
       if (g_strcmp0(group->gr_mem[i], user_name.c_str()) == 0)
         return true;
+    }
+  }
 
   return false;
 }
 
+bool GnomeManager::Impl::AutomaticLogin()
+{
+  glib::Error error;
+  glib::Object<GDBusConnection> bus(g_bus_get_sync(G_BUS_TYPE_SYSTEM, nullptr, &error));
+
+  if (error)
+  {
+    LOG_ERROR(logger) << "Impossible to get the system bus to know if auto-login is enabled: " << error;
+    return false;
+  }
+
+  glib::Variant user_path(g_dbus_connection_call_sync(bus, "org.freedesktop.Accounts",
+                                                      "/org/freedesktop/Accounts", "org.freedesktop.Accounts",
+                                                      "FindUserByName", g_variant_new("(s)",g_get_user_name()), nullptr,
+                                                      G_DBUS_CALL_FLAGS_NONE, 500, nullptr, &error));
+
+  if (error)
+  {
+    LOG_ERROR(logger) << "Impossible to get the user path: " << error;
+    return false;
+  }
+
+  glib::Variant autologin(g_dbus_connection_call_sync(bus, "org.freedesktop.Accounts",
+                                                      user_path.GetObjectPath().c_str(), "org.freedesktop.DBus.Properties",
+                                                      "Get", g_variant_new("(ss)", "org.freedesktop.Accounts.User", "AutomaticLogin"), nullptr,
+                                                      G_DBUS_CALL_FLAGS_NONE, 500, nullptr, &error));
+
+  if (error)
+  {
+    LOG_ERROR(logger) << "Impossible to get the AutomaticLogin property: " << error;
+    return false;
+  }
+
+  return autologin.GetBool();
+}
+
 // Public implementation
 
 GnomeManager::GnomeManager()
@@ -620,6 +660,11 @@
   impl_->UserIconFile(callback);
 }
 
+bool GnomeManager::AutomaticLogin() const
+{
+  return impl_->AutomaticLogin();
+}
+
 void GnomeManager::ScreenSaverActivate()
 {
   screensaver_requested.emit(true);
 
=== modified file 'UnityCore/GnomeSessionManager.h'
--- UnityCore/GnomeSessionManager.h	2015-12-03 05:57:00 +0000
+++ UnityCore/GnomeSessionManager.h	2017-01-04 17:49:42 +0000
@@ -37,6 +37,7 @@
   std::string UserName() const;
   std::string HostName() const;
   void UserIconFile(std::function<void(std::string const&)> const&) const;
+  bool AutomaticLogin() const;
 
   void ScreenSaverActivate();
   void ScreenSaverDeactivate();
 
=== modified file 'UnityCore/GnomeSessionManagerImpl.h'
--- UnityCore/GnomeSessionManagerImpl.h	2016-11-02 16:38:47 +0000
+++ UnityCore/GnomeSessionManagerImpl.h	2017-01-04 17:49:42 +0000
@@ -69,6 +69,7 @@
   void UpdateHaveOtherOpenSessions();
 
   bool IsUserInGroup(std::string const& user_name, std::string const& group_name);
+  bool AutomaticLogin();
 
   GnomeManager* manager_;
   bool test_mode_;
 
=== modified file 'UnityCore/SessionManager.h'
--- UnityCore/SessionManager.h	2016-03-31 09:51:33 +0000
+++ UnityCore/SessionManager.h	2017-01-04 17:49:42 +0000
@@ -46,6 +46,7 @@
   virtual std::string UserName() const = 0;
   virtual std::string HostName() const = 0;
   virtual void UserIconFile(std::function<void(std::string const&)> const&) const = 0;
+  virtual bool AutomaticLogin() const = 0;
 
   virtual void ScreenSaverActivate() = 0;
   virtual void ScreenSaverDeactivate() = 0;
 
=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2016-11-28 23:40:15 +0000
+++ plugins/unityshell/src/unityshell.cpp	2017-01-04 17:49:42 +0000
@@ -197,6 +197,7 @@
   , menus_(std::make_shared<menu::Manager>(std::make_shared<indicator::DBusIndicators>(), std::make_shared<key::GnomeGrabber>()))
   , deco_manager_(std::make_shared<decoration::Manager>(menus_))
   , debugger_(this)
+  , session_(std::make_shared<session::GnomeManager>())
   , needsRelayout(false)
   , super_keypressed_(false)
   , newFocusedWindow(nullptr)
@@ -515,7 +516,10 @@
   unity_a11y_finalize();
   QuicklistManager::Destroy();
   decoration::DataPool::Reset();
-  SaveLockStamp(false);
+
+  if (!session_->AutomaticLogin())
+    SaveLockStamp(false);
+
   reset_glib_logging();
 
   screen->addSupportedAtomsSetEnabled(this, false);
@@ -4005,17 +4009,32 @@
   UpdateGesturesSupport();
 }
 
+std::string UnityScreen::GetLockStampFile() const
+{
+  std::string cache_dir;
+
+  if (session_->AutomaticLogin())
+    cache_dir = DesktopUtilities::GetUserCacheDirectory();
+  else
+    cache_dir = DesktopUtilities::GetUserRuntimeDirectory();
+
+  if (cache_dir.empty())
+    return std::string();
+
+  return cache_dir+local::LOCKED_STAMP;
+}
+
 void UnityScreen::SaveLockStamp(bool save)
 {
-  auto const& cache_dir = DesktopUtilities::GetUserRuntimeDirectory();
+  std::string file_path = GetLockStampFile();
 
-  if (cache_dir.empty())
+  if (file_path.empty())
     return;
 
   if (save)
   {
     glib::Error error;
-    g_file_set_contents((cache_dir+local::LOCKED_STAMP).c_str(), "", 0, &error);
+    g_file_set_contents(file_path.c_str(), "", 0, &error);
 
     if (error)
     {
@@ -4024,7 +4043,7 @@
   }
   else
   {
-    if (g_unlink((cache_dir+local::LOCKED_STAMP).c_str()) < 0)
+    if (g_unlink(file_path.c_str()) < 0)
     {
       LOG_ERROR(logger) << "Impossible to delete the unity locked stamp file";
     }
@@ -4100,24 +4119,23 @@
   ShowFirstRunHints();
 
   // Setup Session Controller
-  auto session = std::make_shared<session::GnomeManager>();
-  session->lock_requested.connect(sigc::mem_fun(this, &UnityScreen::OnLockScreenRequested));
-  session->prompt_lock_requested.connect(sigc::mem_fun(this, &UnityScreen::OnLockScreenRequested));
-  session->locked.connect(sigc::mem_fun(this, &UnityScreen::OnScreenLocked));
-  session->unlocked.connect(sigc::mem_fun(this, &UnityScreen::OnScreenUnlocked));
-  session_dbus_manager_ = std::make_shared<session::DBusManager>(session);
-  session_controller_ = std::make_shared<session::Controller>(session);
+  session_->lock_requested.connect(sigc::mem_fun(this, &UnityScreen::OnLockScreenRequested));
+  session_->prompt_lock_requested.connect(sigc::mem_fun(this, &UnityScreen::OnLockScreenRequested));
+  session_->locked.connect(sigc::mem_fun(this, &UnityScreen::OnScreenLocked));
+  session_->unlocked.connect(sigc::mem_fun(this, &UnityScreen::OnScreenUnlocked));
+  session_dbus_manager_ = std::make_shared<session::DBusManager>(session_);
+  session_controller_ = std::make_shared<session::Controller>(session_);
   LOG_INFO(logger) << "InitUnityComponents-Session " << timer.ElapsedSeconds() << "s";
   Introspectable::AddChild(session_controller_.get());
 
   // Setup Lockscreen Controller
-  screensaver_dbus_manager_ = std::make_shared<lockscreen::DBusManager>(session);
-  lockscreen_controller_ = std::make_shared<lockscreen::Controller>(screensaver_dbus_manager_, session, menus_->KeyGrabber());
+  screensaver_dbus_manager_ = std::make_shared<lockscreen::DBusManager>(session_);
+  lockscreen_controller_ = std::make_shared<lockscreen::Controller>(screensaver_dbus_manager_, session_, menus_->KeyGrabber());
   UpdateActivateIndicatorsKey();
   LOG_INFO(logger) << "InitUnityComponents-Lockscreen " << timer.ElapsedSeconds() << "s";
 
-  if (g_file_test((DesktopUtilities::GetUserRuntimeDirectory()+local::LOCKED_STAMP).c_str(), G_FILE_TEST_EXISTS))
-    session->PromptLockScreen();
+  if (g_file_test(GetLockStampFile().c_str(), G_FILE_TEST_EXISTS))
+    session_->PromptLockScreen();
 
   auto on_launcher_size_changed = [this] (nux::Area* area, int w, int h) {
     /* The launcher geometry includes 1px used to draw the right/top margin
 
=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h	2016-09-01 23:56:24 +0000
+++ plugins/unityshell/src/unityshell.h	2017-01-04 17:49:42 +0000
@@ -76,6 +76,7 @@
 #include "UnityShowdesktopHandler.h"
 #include "ThumbnailGenerator.h"
 #include "MenuManager.h"
+#include "UnityCore/SessionManager.h"
 
 #include "compizminimizedwindowhandler.h"
 #include "BGHash.h"
@@ -231,6 +232,7 @@
   void OnScreenLocked();
   void OnScreenUnlocked();
   void SaveLockStamp(bool);
+  std::string GetLockStampFile() const;
 
   bool DoesPointIntersectUnityGeos(nux::Point const& pt);
 
@@ -344,6 +346,8 @@
   std::unique_ptr<BGHash>   bghash_;
   spread::Widgets::Ptr      spread_widgets_;
 
+  session::Manager::Ptr session_;
+
   /* Subscription for gestures that manipulate Unity launcher */
   std::unique_ptr<nux::GesturesSubscription> gestures_sub_launcher_;
 
 
=== modified file 'shutdown/StandaloneSession.cpp'
--- shutdown/StandaloneSession.cpp	2015-12-03 05:57:00 +0000
+++ shutdown/StandaloneSession.cpp	2017-01-04 17:49:42 +0000
@@ -40,6 +40,7 @@
   std::string UserName() const { return "marco"; }
   std::string HostName() const { return "tricky"; }
   void UserIconFile(std::function<void(std::string const&)> const&) const { std::cout << "UserIconFile" << std::endl; }
+  bool AutomaticLogin() const { return false; }
 
   void ScreenSaverActivate() { std::cout << "ScreenSaverActivate" << std::endl; }
   void ScreenSaverDeactivate() { std::cout << "ScreenSaverDeactivate" << std::endl; }
 
=== modified file 'tests/test_mock_session_manager.h'
--- tests/test_mock_session_manager.h	2016-03-31 09:51:33 +0000
+++ tests/test_mock_session_manager.h	2017-01-04 17:49:42 +0000
@@ -34,6 +34,7 @@
   MOCK_CONST_METHOD0(UserName, std::string());
   MOCK_CONST_METHOD0(HostName, std::string());
   MOCK_CONST_METHOD1(UserIconFile, void(ReplyCallback const&));
+  MOCK_CONST_METHOD0(AutomaticLogin, bool());
 
   MOCK_METHOD0(ScreenSaverActivate, void());
   MOCK_METHOD0(ScreenSaverDeactivate, void());