Merge lp:~unity-team/unity8/lockscreen-password into lp:unity8

[Michael Terry]

WIP

WIP

[lp:~unity-team/unity8/lockscreen-password]

2115. By Michael Terry on 2016-01-13

Add a couple tets and fix build

Unmerged revisions

2115. By Michael Terry on 2016-01-13

Add a couple tets and fix build

2114. By Michael Terry on 2016-01-12

Initial support for a split lockscreen password

=== modified file 'debian/control'
--- debian/control	2016-01-05 09:57:15 +0000
+++ debian/control	2016-01-13 14:35:29 +0000
@@ -184,7 +184,7 @@
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends},
-Depends: accountsservice-ubuntu-schemas (>= 0.0.3),
+Depends: accountsservice-ubuntu-schemas (>= 0.0.5),
          gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),
          libhardware2,
          pay-service,
 
=== modified file 'plugins/AccountsService/AccountsService.cpp'
--- plugins/AccountsService/AccountsService.cpp	2015-10-26 14:05:14 +0000
+++ plugins/AccountsService/AccountsService.cpp	2016-01-13 14:35:29 +0000
@@ -30,7 +30,9 @@
     m_enableLauncherWhileLocked(false),
     m_enableIndicatorsWhileLocked(false),
     m_statsWelcomeScreen(false),
+    m_lockscreenPassword(""),
     m_passwordDisplayHint(Keyboard),
+    m_synthesizedDisplayHint(Keyboard),
     m_failedLogins(0),
     m_hereEnabled(false),
     m_hereLicensePath() // null means not set yet
@@ -59,6 +61,7 @@
     updateEnableIndicatorsWhileLocked(false);
     updateBackgroundFile(false);
     updateStatsWelcomeScreen(false);
+    updateLockscreenPassword(false);
     updatePasswordDisplayHint(false);
     updateFailedLogins(false);
     updateHereEnabled(false);
@@ -102,7 +105,7 @@
 
 AccountsService::PasswordDisplayHint AccountsService::passwordDisplayHint() const
 {
-    return m_passwordDisplayHint;
+    return m_synthesizedDisplayHint;
 }
 
 bool AccountsService::hereEnabled() const
@@ -275,6 +278,56 @@
     }
 }
 
+void AccountsService::synthesizeDisplayHint()
+{
+    // There are actually two properties that control whether the password
+    // prompt should be shown as a pin entry or passphrase entry and here we
+    // do the math so that the upper layers don't have to.
+
+    PasswordDisplayHint hint;
+    if (m_lockscreenPassword.startsWith(QStringLiteral("pin:"))) {
+        hint = PasswordDisplayHint::Numeric;
+    } else if (m_lockscreenPassword.isEmpty()) {
+        hint = m_passwordDisplayHint;
+    } else {
+        hint = PasswordDisplayHint::Keyboard;
+    }
+
+    if (m_synthesizedDisplayHint != hint) {
+        m_synthesizedDisplayHint = hint;
+        Q_EMIT passwordDisplayHintChanged();
+    }
+}
+
+void AccountsService::updateLockscreenPassword(bool async)
+{
+    QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user,
+                                                                    QStringLiteral("com.ubuntu.AccountsService.SecurityPrivacy"),
+                                                                    QStringLiteral("LockscreenPassword"));
+    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
+
+    connect(watcher, &QDBusPendingCallWatcher::finished,
+            this, [this](QDBusPendingCallWatcher* watcher) {
+
+        QDBusPendingReply<QVariant> reply = *watcher;
+        watcher->deleteLater();
+        if (reply.isError()) {
+            qWarning() << "Failed to get 'LockscreenPassword' property - " << reply.error().message();
+            return;
+        }
+
+        const QString lockscreenPassword = reply.value().toString();
+        if (m_lockscreenPassword != lockscreenPassword) {
+            m_lockscreenPassword = lockscreenPassword;
+            synthesizeDisplayHint();
+        }
+    });
+    if (!async) {
+        watcher->waitForFinished();
+        delete watcher;
+    }
+}
+
 void AccountsService::updatePasswordDisplayHint(bool async)
 {
     QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user,
@@ -295,7 +348,7 @@
         const PasswordDisplayHint passwordDisplayHint = (PasswordDisplayHint)reply.value().toInt();
         if (m_passwordDisplayHint != passwordDisplayHint) {
             m_passwordDisplayHint = passwordDisplayHint;
-            Q_EMIT passwordDisplayHintChanged();
+            synthesizeDisplayHint();
         }
     });
     if (!async) {
@@ -428,6 +481,9 @@
             updateStatsWelcomeScreen();
         }
     } else if (interface == QLatin1String("com.ubuntu.AccountsService.SecurityPrivacy")) {
+        if (changed.contains(QStringLiteral("LockscreenPassword"))) {
+            updateLockscreenPassword();
+        }
         if (changed.contains(QStringLiteral("PasswordDisplayHint"))) {
             updatePasswordDisplayHint();
         }
 
=== modified file 'plugins/AccountsService/AccountsService.h'
--- plugins/AccountsService/AccountsService.h	2015-06-11 23:45:12 +0000
+++ plugins/AccountsService/AccountsService.h	2016-01-13 14:35:29 +0000
@@ -113,11 +113,14 @@
     void updateEnableIndicatorsWhileLocked(bool async = true);
     void updateBackgroundFile(bool async = true);
     void updateStatsWelcomeScreen(bool async = true);
+    void updateLockscreenPassword(bool async = true);
     void updatePasswordDisplayHint(bool async = true);
     void updateFailedLogins(bool async = true);
     void updateHereEnabled(bool async = true);
     void updateHereLicensePath(bool async = true);
 
+    void synthesizeDisplayHint();
+
     AccountsServiceDBusAdaptor *m_service;
     QString m_user;
     bool m_demoEdges;
@@ -125,7 +128,9 @@
     bool m_enableIndicatorsWhileLocked;
     QString m_backgroundFile;
     bool m_statsWelcomeScreen;
+    QString m_lockscreenPassword;
     PasswordDisplayHint m_passwordDisplayHint;
+    PasswordDisplayHint m_synthesizedDisplayHint;
     uint m_failedLogins;
     bool m_hereEnabled;
     QString m_hereLicensePath;
 
=== modified file 'tests/plugins/AccountsService/PropertiesServer.cpp'
--- tests/plugins/AccountsService/PropertiesServer.cpp	2015-10-26 14:05:14 +0000
+++ tests/plugins/AccountsService/PropertiesServer.cpp	2016-01-13 14:35:29 +0000
@@ -84,6 +84,7 @@
     m_properties["com.ubuntu.touch.AccountsService.SecurityPrivacy"]["StatsWelcomeScreen"] = true;
     m_properties["com.ubuntu.AccountsService.SecurityPrivacy"]["EnableLauncherWhileLocked"] = true;
     m_properties["com.ubuntu.AccountsService.SecurityPrivacy"]["EnableIndicatorsWhileLocked"] = true;
+    m_properties["com.ubuntu.AccountsService.SecurityPrivacy"]["LockscreenPassword"] = QStringLiteral("");
     m_properties["com.ubuntu.AccountsService.SecurityPrivacy"]["PasswordDisplayHint"] = AccountsService::Keyboard;
     m_properties["com.ubuntu.location.providers.here.AccountsService"]["LicenseAccepted"] = false;
     m_properties["com.ubuntu.location.providers.here.AccountsService"]["LicenseBasePath"] = "";
 
=== modified file 'tests/plugins/AccountsService/client.cpp'
--- tests/plugins/AccountsService/client.cpp	2015-10-26 14:05:14 +0000
+++ tests/plugins/AccountsService/client.cpp	2016-01-13 14:35:29 +0000
@@ -107,7 +107,7 @@
         QCOMPARE(session.hereEnabled(), true);
     }
 
-    void testAsynchornousChangeForDemoEdges()
+    void testAsynchronousChangeForDemoEdges()
     {
         AccountsService session(this, QTest::currentTestFunction());
 
@@ -119,7 +119,7 @@
         QTRY_COMPARE(session.demoEdges(), true);
     }
 
-    void testAsynchornousChangeForFailedLogins()
+    void testAsynchronousChangeForFailedLogins()
     {
         AccountsService session(this, QTest::currentTestFunction());
 
@@ -131,7 +131,7 @@
         QTRY_COMPARE(session.failedLogins(), (uint)5);
     }
 
-    void testAsynchornousChangeForStatsWelcomeScreen()
+    void testAsynchronousChangeForStatsWelcomeScreen()
     {
         AccountsService session(this, QTest::currentTestFunction());
 
@@ -143,7 +143,7 @@
         QTRY_COMPARE(session.statsWelcomeScreen(), false);
     }
 
-    void testAsynchornousChangeForStatsEnableLauncherWhileLocked()
+    void testAsynchronousChangeForEnableLauncherWhileLocked()
     {
         AccountsService session(this, QTest::currentTestFunction());
 
@@ -155,7 +155,7 @@
         QTRY_COMPARE(session.enableLauncherWhileLocked(), false);
     }
 
-    void testAsynchornousChangeForStatsEnableIndicatorsWhileLocked()
+    void testAsynchronousChangeForEnableIndicatorsWhileLocked()
     {
         AccountsService session(this, QTest::currentTestFunction());
 
@@ -167,19 +167,50 @@
         QTRY_COMPARE(session.enableIndicatorsWhileLocked(), false);
     }
 
-    void testAsynchornousChangeForStatsPasswordDisplayHint()
-    {
-        AccountsService session(this, QTest::currentTestFunction());
-
-        QCOMPARE(session.passwordDisplayHint(), AccountsService::Keyboard);
-        ASSERT_DBUS_CALL(m_userInterface->asyncCall("Set",
-                                                    "com.ubuntu.AccountsService.SecurityPrivacy",
-                                                    "PasswordDisplayHint",
-                                                    dbusVariant(AccountsService::Numeric)));
-        QTRY_COMPARE(session.passwordDisplayHint(), AccountsService::Numeric);
-    }
-
-    void testAsynchornousChangeForStatsLicenseAccepted()
+    void testAsynchronousChangeForPasswordDisplayHint()
+    {
+        AccountsService session(this, QTest::currentTestFunction());
+
+        QCOMPARE(session.passwordDisplayHint(), AccountsService::Keyboard);
+        ASSERT_DBUS_CALL(m_userInterface->asyncCall("Set",
+                                                    "com.ubuntu.AccountsService.SecurityPrivacy",
+                                                    "PasswordDisplayHint",
+                                                    dbusVariant(AccountsService::Numeric)));
+        QTRY_COMPARE(session.passwordDisplayHint(), AccountsService::Numeric);
+    }
+
+    void testAsynchronousChangeForLockscreenPassword()
+    {
+        AccountsService session(this, QTest::currentTestFunction());
+
+        QCOMPARE(session.passwordDisplayHint(), AccountsService::Keyboard);
+        ASSERT_DBUS_CALL(m_userInterface->asyncCall("Set",
+                                                    "com.ubuntu.AccountsService.SecurityPrivacy",
+                                                    "LockscreenPassword",
+                                                    dbusVariant("pin:cryptedpassword")));
+        QTRY_COMPARE(session.passwordDisplayHint(), AccountsService::Numeric);
+    }
+
+    void testLockscreenPasswordOverridesDisplayHint()
+    {
+        AccountsService session(this, QTest::currentTestFunction());
+
+        QCOMPARE(session.passwordDisplayHint(), AccountsService::Keyboard);
+
+        ASSERT_DBUS_CALL(m_userInterface->asyncCall("Set",
+                                                    "com.ubuntu.AccountsService.SecurityPrivacy",
+                                                    "PasswordDisplayHint",
+                                                    dbusVariant(AccountsService::Numeric)));
+        QTRY_COMPARE(session.passwordDisplayHint(), AccountsService::Numeric);
+
+        ASSERT_DBUS_CALL(m_userInterface->asyncCall("Set",
+                                                    "com.ubuntu.AccountsService.SecurityPrivacy",
+                                                    "LockscreenPassword",
+                                                    dbusVariant("system")));
+        QTRY_COMPARE(session.passwordDisplayHint(), AccountsService::Keyboard);
+    }
+
+    void testAsynchronousChangeForLicenseAccepted()
     {
         AccountsService session(this, QTest::currentTestFunction());
 
@@ -191,7 +222,7 @@
         QTRY_COMPARE(session.hereEnabled(), true);
     }
 
-    void testAsynchornousChangeForLicenseBasePath()
+    void testAsynchronousChangeForLicenseBasePath()
     {
         AccountsService session(this, QTest::currentTestFunction());
 
@@ -203,7 +234,7 @@
         QTRY_COMPARE(session.hereLicensePath(), QString("/"));
     }
 
-    void testAsynchornousChangeForStatsBackgroundFile()
+    void testAsynchronousChangeForBackgroundFile()
     {
         AccountsService session(this, QTest::currentTestFunction());