Merge lp:~azzar1/unity/option-lockscreen-account-checking into lp:unity

[Andrea Azzarone]

UnitySettings: Add an option to enable/disable pam account checking.

Add an option to enable/disable pam account checking. A similar solution is used in XScreenSaver.

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

Allright, I'd just move the option into a new .lockscreen section.

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

Let's keep as it is, I think it's fine.

review: Approve

=== modified file 'com.canonical.Unity.gschema.xml'
--- com.canonical.Unity.gschema.xml	2016-06-06 14:05:18 +0000
+++ com.canonical.Unity.gschema.xml	2016-06-17 12:16:43 +0000
@@ -93,6 +93,13 @@
       <summary>List of keycodes that should be processed even if auto-repated.</summary>
       <description>These keycodes are processed even if they are auto-repeated.</description>
     </key>
+    <key type="b" name="pam-check-account-type">
+      <default>false</default>
+      <summary>Enable/Disable PAM account checking</summary>
+      <description>Whether PAM should check the result of account modules
+        when authenticating.  Only do this if you have account
+        configured properly on your system.</description>
+    </key>
   </schema>
   <schema path="/com/canonical/unity/interface/" id="com.canonical.Unity.Interface" gettext-domain="unity">
     <key type="d" name="text-scale-factor">

=== modified file 'lockscreen/UserAuthenticatorPam.cpp'
--- lockscreen/UserAuthenticatorPam.cpp	2014-05-27 07:54:04 +0000
+++ lockscreen/UserAuthenticatorPam.cpp	2016-06-17 12:16:43 +0000
@@ -22,6 +22,7 @@
 // let's just fallcback to lightdm.
 
 #include "UserAuthenticatorPam.h"
+#include "unity-shared/UnitySettings.h"
 
 #include <cstring>
 #include <security/pam_appl.h>
@@ -52,13 +53,21 @@
 
   g_task_run_in_thread(task, [] (GTask* task, gpointer, gpointer data, GCancellable*) {
     auto self = static_cast<UserAuthenticatorPam*>(data);
+
     self->status_ = pam_authenticate(self->pam_handle_, 0);
-    if (self->status_ == PAM_SUCCESS)
-      self->status_ = pam_acct_mgmt(self->pam_handle_, 0);
-    if (self->status_ == PAM_NEW_AUTHTOK_REQD)
-      self->status_ = pam_chauthtok(self->pam_handle_, PAM_CHANGE_EXPIRED_AUTHTOK);
-    if (self->status_ == PAM_SUCCESS)
+
+    if (self->status_ == PAM_SUCCESS)
+    {
+      int status2 = pam_acct_mgmt(self->pam_handle_, 0);
+
+      if (status2 == PAM_NEW_AUTHTOK_REQD)
+        status2 = pam_chauthtok(self->pam_handle_, PAM_CHANGE_EXPIRED_AUTHTOK);
+
+      if (unity::Settings::Instance().pam_check_account_type())
+        self->status_ = status2;
+
       pam_setcred (self->pam_handle_, PAM_REINITIALIZE_CRED);
+    }
   });
 
   return true;

=== modified file 'unity-shared/UnitySettings.cpp'
--- unity-shared/UnitySettings.cpp	2016-06-06 14:05:18 +0000
+++ unity-shared/UnitySettings.cpp	2016-06-17 12:16:43 +0000
@@ -39,6 +39,7 @@
 const std::string FORM_FACTOR = "form-factor";
 const std::string DOUBLE_CLICK_ACTIVATE = "double-click-activate";
 const std::string DESKTOP_TYPE = "desktop-type";
+const std::string PAM_CHECK_ACCOUNT_TYPE = "pam-check-account-type";
 
 const std::string LAUNCHER_SETTINGS = "com.canonical.Unity.Launcher";
 const std::string LAUNCHER_POSITION = "launcher-position";
@@ -109,6 +110,7 @@
     parent_->launcher_position.SetGetterFunction(sigc::mem_fun(this, &Impl::GetLauncherPosition));
     parent_->launcher_position.SetSetterFunction(sigc::mem_fun(this, &Impl::SetLauncherPosition));
     parent_->desktop_type.SetGetterFunction(sigc::mem_fun(this, &Impl::GetDesktopType));
+    parent_->pam_check_account_type.SetGetterFunction(sigc::mem_fun(this, &Impl::GetPamCheckAccountType));
 
     for (unsigned i = 0; i < monitors::MAX; ++i)
       em_converters_.emplace_back(std::make_shared<EMConverter>());
@@ -273,6 +275,11 @@
     return static_cast<DesktopType>(g_settings_get_enum(usettings_, DESKTOP_TYPE.c_str()));
   }
 
+  bool GetPamCheckAccountType() const
+  {
+    return g_settings_get_boolean(usettings_, PAM_CHECK_ACCOUNT_TYPE.c_str());
+  }
+
   int GetFontSize() const
   {
     gint font_size;

=== modified file 'unity-shared/UnitySettings.h'
--- unity-shared/UnitySettings.h	2016-06-06 14:05:18 +0000
+++ unity-shared/UnitySettings.h	2016-06-17 12:16:43 +0000
@@ -64,6 +64,7 @@
   nux::RWProperty<FormFactor> form_factor;
   nux::Property<bool> is_standalone;
   nux::ROProperty<DesktopType> desktop_type;
+  nux::ROProperty<bool> pam_check_account_type;
   nux::ROProperty<bool> double_click_activate;
   nux::Property<unsigned> lim_movement_thresold;
   nux::Property<unsigned> lim_double_click_wait;