Merge lp:~mterry/unity8/lockout-timer into lp:unity8

[Michael Terry]

When we are locking the user out from too many login failures, notice when time passes even if the device is suspended. (LP: #1396817)

When we are locking the user out from too many login failures, notice when time passes even if the device is suspended. (LP: #1396817)

Note when testing that you have to be unplugged from USB to truly suspend the device.

== Checklist ==

 * Are there any related MPs required for this MP to build/function as expected? Please list.
 No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
 Yes

 * Did you make sure that your branch does not contain spurious tags?
 Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
 NA

 * If you changed the UI, has there been a design review?
 NA

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1642
http://jenkins.qa.ubuntu.com/job/unity8-ci/5379/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1610
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/543
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/544
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/544
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1429
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1608
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1608/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18485

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5379/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes

 * Did CI run pass?
Autopilot is why not

 * Did you make sure that the branch does not contain spurious tags?
Yes

review: Approve

=== modified file 'qml/Greeter/Greeter.qml'
--- qml/Greeter/Greeter.qml	2015-02-23 15:43:41 +0000
+++ qml/Greeter/Greeter.qml	2015-03-02 21:35:34 +0000
@@ -51,7 +51,7 @@
 
     property int maxFailedLogins: -1 // disabled by default for now, will enable via settings in future
     property int failedLoginsDelayAttempts: 7 // number of failed logins
-    property int failedLoginsDelayMinutes: 5 // minutes of forced waiting
+    property real failedLoginsDelayMinutes: 5 // minutes of forced waiting
 
     signal tease()
     signal sessionStarted()
@@ -110,7 +110,6 @@
 
         readonly property bool multiUser: LightDM.Users.count > 1
         property int currentIndex
-        property int delayMinutes
         property bool waiting
 
         // We want 'launcherOffset' to animate down to zero.  But not to animate
@@ -185,13 +184,29 @@
 
     Timer {
         id: forcedDelayTimer
-        interval: 1000 * 60
+
+        // We use a short interval and check against the system wall clock
+        // because we have to consider the case that the system is suspended
+        // for a few minutes.  When we wake up, we want to quickly be correct.
+        interval: 500
+
+        property var delayTarget;
+        property int delayMinutes;
+
+        function forceDelay(delay /* in minutes */) {
+            delayTarget = new Date();
+            delayTarget.setTime(delayTarget.getTime() + delay * 60000);
+            delayMinutes = Math.ceil(delay);
+            start();
+        }
+
         onTriggered: {
-            if (d.delayMinutes > 0) {
-                d.delayMinutes -= 1;
-                if (d.delayMinutes > 0) {
-                    start(); // go again
-                }
+            var diff = delayTarget - new Date();
+            if (diff > 0) {
+                delayMinutes = Math.ceil(diff / 60000);
+                start(); // go again
+            } else {
+                delayMinutes = 0;
             }
         }
     }
@@ -262,7 +277,7 @@
         Binding {
             target: loader.item
             property: "delayMinutes"
-            value: d.delayMinutes
+            value: forcedDelayTimer.delayMinutes
         }
 
         Binding {
@@ -363,9 +378,10 @@
                 }
 
                 // Check if we should initiate a forced login delay
-                if (failedLoginsDelayAttempts > 0 && AccountsService.failedLogins % failedLoginsDelayAttempts == 0) {
-                    d.delayMinutes = failedLoginsDelayMinutes;
-                    forcedDelayTimer.start();
+                if (failedLoginsDelayAttempts > 0
+                        && AccountsService.failedLogins > 0
+                        && AccountsService.failedLogins % failedLoginsDelayAttempts == 0) {
+                    forcedDelayTimer.forceDelay(failedLoginsDelayMinutes);
                 }
 
                 loader.item.notifyAuthenticationFailed();

=== modified file 'tests/qmltests/Greeter/tst_Greeter.qml'
--- tests/qmltests/Greeter/tst_Greeter.qml	2015-02-23 15:43:41 +0000
+++ tests/qmltests/Greeter/tst_Greeter.qml	2015-03-02 21:35:34 +0000
@@ -146,6 +146,8 @@
             tryCompare(greeter, "waiting", false);
             view = findChild(greeter, "testView");
             verifySelected(LightDM.Users.data(0, LightDM.UserRoles.NameRole));
+            greeter.failedLoginsDelayAttempts = 7;
+            greeter.failedLoginsDelayMinutes = 5;
         }
 
         function cleanup() {
@@ -429,6 +431,19 @@
             compare(LightDM.Infographic.username, "has-password");
         }
 
+        function test_forcedDelay() {
+            greeter.failedLoginsDelayAttempts = 1;
+            greeter.failedLoginsDelayMinutes = 0.001; // make delay very short
+
+            selectUser("has-password");
+            tryCompare(viewShowPromptSpy, "count", 1);
+
+            compare(view.delayMinutes, 0);
+            view.responded("wr0ng p4ssw0rd");
+            tryCompare(view, "delayMinutes", 1);
+            tryCompare(view, "delayMinutes", 0);
+        }
+
         function test_dbusRequestAuthenticationUser() {
             selectUser("no-password");
             LightDM.Greeter.requestAuthenticationUser("has-password");