Merge lp:~mterry/unity8/wrong-password-handling into lp:unity8

[Michael Terry]

Make wrong-password handling much nicer by showing a pretty spinner while we wait for PAM, by improving the prompt text to match designs, by forcing the user to wait five seconds after every five failed attemps, and by supporting (but not yet enabling) an opt-in "factory-reset your phone after X failed attemps" feature.

Make wrong-password handling much nicer by showing a pretty spinner while we wait for PAM, by improving the prompt text to match designs, by forcing the user to wait five seconds after every five failed attemps, and by supporting (but not yet enabling) an opt-in "factory-reset your phone after X failed attemps" feature.

For the spec, see the "passcode incorrect" part of:
https://docs.google.com/a/canonical.com/document/d/1VajNkWbBH61iVixXJAmOvNGiG__GWQTMXGNOZijXWJw

It should go without saying, but BE PREPARED TO HAVE YOUR PHONE WIPED while testing the factory-reset bit (which, if you want to test, you have to manually edit the maxFailedLogins field in the qml).

I've added a tiny plugin for calling the system-image daemon's FactoryReset method. Maybe it will be useful for more things in the future.

I also cleaned up the AccountsService field definitions a bit.

== Using AccountsService to store the failedLogins count ==

I thought this might deserve a few words.

My original thought was to take advantage of our PAM infrastructure and use pam_tally2, which can do fancy tallying, login denial, and timeouts. But (A) that does not give any extra security since we'd need to specify a user-writable tally file as long as we don't have a split greeter, (B) it does not give us any warning when we are about to go over our limit, and (C) does not tell us *when* we are delaying due to too many failed logins, so we can't tell the user.

So we needed to store it ourselves. I could have used gsettings or similar, but we want to keep track of this per-user and stuffing a map into a settings backend isn't always convenient.

While AccountsService is mostly designed for data that can be shared between greeters and user sessions, it seemed like not an awful place to store the data and gives us per-user semantics for free. And we can share the data store with the eventually-split greeter (although that is certainly small potatoes).

== Checklist ==

 * Are there any related MPs required for this MP to build/function as expected? Please list.
 - Yes, greeter-misc-cleanups

 * 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?
 - I'm on the team

 * If you changed the UI, has there been a design review?
 - Olga and Esti are fine with this for now, but the visuals are all being updated. I just wanted to get the backend work in.

[lp:~mterry/unity8/wrong-password-handling]

1015. By Michael Terry on 2014-08-01

Switch to 7 attempts, 5 min lockout

1016. By Michael Terry on 2014-08-01

Handle translated PAM prompts

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1014
http://jenkins.qa.ubuntu.com/job/unity8-ci/3732/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2896/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/734/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/826/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/826/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/826/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4139/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1016
http://jenkins.qa.ubuntu.com/job/unity8-ci/3739/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2924/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/741/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/833/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/833/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/833/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4167/console

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

review: Needs Fixing (continuous-integration)

[lp:~mterry/unity8/wrong-password-handling]

1017. By Michael Terry on 2014-08-04

Merge from trunk

1018. By Michael Terry on 2014-08-04

Fix whitespace

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1018
http://jenkins.qa.ubuntu.com/job/unity8-ci/3744/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2972
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/746
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/838
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/838
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/838/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/838
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3028
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4215
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4215/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10926

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1018
http://jenkins.qa.ubuntu.com/job/unity8-ci/3776/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3071
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/778
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/870
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/870
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/870/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/870
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3111
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4314
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4314/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11044

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Seems like the qmluitests failure may be related to this, no?

review: Needs Fixing

[David Planella (dpm)]

This merge proposal is introducing a few new translatable strings. Could it provide an updated .pot file as well, so that translators can do their job in time? Thanks!

review: Needs Fixing

[Michał Sawicz (saviq)]

Indeed, make pot_file please.

We've a plan for a ~push hook that will warn us if stuff like this happens, but... too many higher priority items...

[lp:~mterry/unity8/wrong-password-handling]

1019. By Michael Terry on 2014-08-06

Update pot file

1020. By Michael Terry on 2014-08-06

Fix mocks to use same prompt string as PAM

[Michael Terry (mterry)]

Updated pot file and fixed the test.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1020
http://jenkins.qa.ubuntu.com/job/unity8-ci/3801/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3124
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/803
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/895
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/895
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/895/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/895
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3160
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4368
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4368/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11108

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

review: Approve (continuous-integration)

[lp:~mterry/unity8/wrong-password-handling]

1021. By Michael Terry on 2014-08-07

Merge from trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1021
http://jenkins.qa.ubuntu.com/job/unity8-ci/3815/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3188
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/817/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/909
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/909
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/909/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/909
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3199
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4433
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4433/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

Please delete tag 7.85+14.10.20140428.2-0ubuntu1 in this branch and any local checkouts you might have.

review: Needs Fixing

[Michael Terry (mterry)]

Deleted that tag.

[Michał Sawicz (saviq)]

review: Abstain

[Michael Zanetti (mzanetti)]

The lockscreen features showInfoPopup(). You should use that one for the wipe warning instead of adding your own Dialog component in order to keep design consistent with the same warning for locking the SIM card etc.

review: Needs Fixing

[Michael Zanetti (mzanetti)]

On the graphical changes, the Spinner in the lockscreen etc, that doesn't match with the new design... I'll probably have to kill/redo that again when merging the new-lockscreen-design branch.

[Michael Zanetti (mzanetti)]

I'm curious if there are any downsides of adding all those plugins with just one method. You think it might make sense to merge the SystemImage plugin with e.g. the Powerd plugin into a single "System" plugin supporting Powerd, SystemImage etc?

[Michael Zanetti (mzanetti)]

some inline comments

[Michael Terry (mterry)]

I can use the existing dialog support, didn't even notice it.

The spinner can go away. Design didn't like it anyway. I was going to wait until I landed the "nodelay" change so PAM feedback is instant, but it can go away now instead, if it makes the other merge easier.

As for the plugin... It's just a bunch more boilerplate. And maybe some extra binary-size overhead? I worry that a generic "System" plugin would be a bit of a dumping place with little cohesion between the pieces. But I'm not a -1, just a +0 on the idea.

OK, working on the dialog and spinner bits, as well as merging with trunk again.

[lp:~mterry/unity8/wrong-password-handling]

1022. By Michael Terry on 2014-08-13

Merge from trunk

1023. By Michael Terry on 2014-08-13

Remove spinner; design didn't like it and it complicates other UI changes down the line

1024. By Michael Terry on 2014-08-13

Use the built-in lockscreen dialog rather than a home-brewn one

[Michael Terry (mterry)]

OK. No spinner and I'm using the built-in lockscreen dialog. Plus merged from trunk.

I didn't address the bevy-of-tiny-plugins issue. How strong did you feel about it?

[Michael Zanetti (mzanetti)]

2 inline comments. You forgot to update some things after the latest changes.

review: Needs Fixing

[lp:~mterry/unity8/wrong-password-handling]

1025. By Michael Terry on 2014-08-13

Update pot

1026. By Michael Terry on 2014-08-13

update object names

[Michael Zanetti (mzanetti)]

there's also some more test failures:

FAIL! : qmltestrunner::ShellWithPin::test_factoryReset() function returned unexpected result
   Actual (): false
   Expected (): true
   Loc: [/home/mzanetti/Development/reviews/wrong-password-handling/tests/qmltests/tst_ShellWithPin.qml(223)]
FAIL! : qmltestrunner::ShellWithPin::test_failedLoginsCount() property showProgress
   Actual (): 1
   Expected (): 0
   Loc: [/home/mzanetti/Development/reviews/wrong-password-handling/tests/qmltests/tst_ShellWithPin.qml(106)]
FAIL! : qmltestrunner::ShellWithPin::test_failedLoginsCount() property failedLogins
   Actual (): 0
   Expected (): 1
   Loc: [/home/mzanetti/Development/reviews/wrong-password-handling/tests/qmltests/tst_ShellWithPin.qml(195)]
FAIL! : qmltestrunner::ShellWithPin::test_login() property showProgress
   Actual (): 1
   Expected (): 0
   Loc: [/home/mzanetti/Development/reviews/wrong-password-handling/tests/qmltests/tst_ShellWithPin.qml(106)]
FAIL! : qmltestrunner::ShellWithPin::test_login() property count
   Actual (): 0
   Expected (): 1
   Loc: [/home/mzanetti/Development/reviews/wrong-password-handling/tests/qmltests/tst_ShellWithPin.qml(128)]
FAIL! : qmltestrunner::ShellWithPin::test_wrongEntries() property showProgress
   Actual (): 1
   Expected (): 0
   Loc: [/home/mzanetti/Development/reviews/wrong-password-handling/tests/qmltests/tst_ShellWithPin.qml(106)]
FAIL! : qmltestrunner::ShellWithPin::test_wrongEntries() property text
   Actual (): Enter your passcode
   Expected (): Incorrect passcode
Please re-enter
   Loc: [/home/mzanetti/Development/reviews/wrong-password-handling/tests/qmltests/tst_ShellWithPin.qml(208)]
PASS : qmltestrunner::ShellWithPin::cleanupTestCase()
Totals: 6 passed, 7 failed, 0 skipped

review: Needs Fixing

[Michael Terry (mterry)]

Ugh, you're right. I was hasty. Pot updated again, and test fixed.

[Michael Zanetti (mzanetti)]

ok. lookin good now. thanks

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

yes

 * Did CI run pass? If not, please explain why.

waiting on the latest run, but there seem to be general problems with tests atm.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1024
http://jenkins.qa.ubuntu.com/job/unity8-ci/3890/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3499
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/890/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/984
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/984
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/984/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/984
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3397
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4746
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4746/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11421

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

review: Needs Fixing (continuous-integration)

Unmerged revisions

=== modified file 'cmake/modules/QmlTest.cmake'
--- cmake/modules/QmlTest.cmake	2014-08-06 12:59:59 +0000
+++ cmake/modules/QmlTest.cmake	2014-08-13 18:12:02 +0000
@@ -103,7 +103,7 @@
     endif()
 
     set(qmltest_command
-        env ${qmltest_ENVIRONMENT}
+        env ${qmltest_ENVIRONMENT} UNITY_TESTING=1
         ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
             ${qmltestrunner_imports}
             ${ITERATIONS_STRING}
@@ -117,7 +117,7 @@
         set(LD_PRELOAD_PATH "LD_PRELOAD=/usr/lib/${ARCH_TRIPLET}/mesa/libGL.so.1")
     endif()
     set(qmltest_xvfb_command
-        env ${qmltest_ENVIRONMENT} ${LD_PRELOAD_PATH}
+        env ${qmltest_ENVIRONMENT} ${LD_PRELOAD_PATH} UNITY_TESTING=1
         xvfb-run --server-args "-screen 0 1024x768x24" --auto-servernum
         ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
         ${qmltestrunner_imports}
 
=== modified file 'cmake/modules/autopilot.cmake'
--- cmake/modules/autopilot.cmake	2014-03-17 14:27:05 +0000
+++ cmake/modules/autopilot.cmake	2014-08-13 18:12:02 +0000
@@ -2,7 +2,7 @@
 
 function(declare_autopilot_test TEST_NAME TEST_SUITE WORKING_DIR)
     add_custom_target(autopilot-${TEST_NAME}
-        COMMAND LANG=C QML2_IMPORT_PATH=${SHELL_INSTALL_QML}/mocks python3 -m autopilot.run run ${TEST_SUITE}
+        COMMAND UNITY_TESTING=1 LANG=C QML2_IMPORT_PATH=${SHELL_INSTALL_QML}/mocks python3 -m autopilot.run run ${TEST_SUITE}
         WORKING_DIRECTORY ${WORKING_DIR}
         DEPENDS fake_install
     )
@@ -14,7 +14,7 @@
     add_dependencies(autopilot autopilot-${TEST_NAME})
 
     add_custom_target(autopilot2-${TEST_NAME}
-        COMMAND LANG=C QML2_IMPORT_PATH=${SHELL_INSTALL_QML}/mocks python2 -m autopilot.run run ${TEST_SUITE}
+        COMMAND UNITY_TESTING=1 LANG=C QML2_IMPORT_PATH=${SHELL_INSTALL_QML}/mocks python2 -m autopilot.run run ${TEST_SUITE}
         WORKING_DIRECTORY ${WORKING_DIR}
         DEPENDS fake_install
     )
 
=== modified file 'debian/control'
--- debian/control	2014-08-11 19:02:49 +0000
+++ debian/control	2014-08-13 18:12:02 +0000
@@ -165,7 +165,8 @@
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends},
-Depends: gsettings-ubuntu-schemas,
+Depends: accountsservice-ubuntu-schemas,
+         gsettings-ubuntu-schemas,
          libhardware2,
          libunity-core-6.0-9,
          pay-service,
 
=== modified file 'debian/unity8-private.install'
--- debian/unity8-private.install	2014-06-27 20:48:38 +0000
+++ debian/unity8-private.install	2014-08-13 18:12:02 +0000
@@ -10,5 +10,3 @@
 usr/lib/*/unity8/qml/Utils
 usr/share/accountsservice/interfaces
 usr/share/dbus-1/interfaces
-usr/share/polkit-1
-var/lib/polkit-1
 
=== removed file 'plugins/AccountsService/50-com.canonical.unity.AccountsService.pkla'
--- plugins/AccountsService/50-com.canonical.unity.AccountsService.pkla	2013-08-12 18:41:45 +0000
+++ plugins/AccountsService/50-com.canonical.unity.AccountsService.pkla	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-[Allow LightDM to set Unity AccountsService fields]
-Identity=unix-user:lightdm
-Action=com.canonical.unity.AccountsService.ModifyAnyUser
-ResultActive=yes
-ResultInactive=yes
-ResultAny=yes
 
=== modified file 'plugins/AccountsService/AccountsService.cpp'
--- plugins/AccountsService/AccountsService.cpp	2014-07-02 16:17:14 +0000
+++ plugins/AccountsService/AccountsService.cpp	2014-08-13 18:12:02 +0000
@@ -27,7 +27,8 @@
     m_user(qgetenv("USER")),
     m_demoEdges(false),
     m_statsWelcomeScreen(false),
-    m_passwordDisplayHint(Keyboard)
+    m_passwordDisplayHint(Keyboard),
+    m_failedLogins(0)
 {
     connect(m_service, SIGNAL(propertiesChanged(const QString &, const QString &, const QStringList &)),
             this, SLOT(propertiesChanged(const QString &, const QString &, const QStringList &)));
@@ -49,6 +50,7 @@
     updateBackgroundFile();
     updateStatsWelcomeScreen();
     updatePasswordDisplayHint();
+    updateFailedLogins();
 }
 
 bool AccountsService::demoEdges() const
@@ -113,6 +115,26 @@
     }
 }
 
+void AccountsService::updateFailedLogins()
+{
+    uint failedLogins = m_service->getUserProperty(m_user, "com.canonical.unity.AccountsService.Private", "FailedLogins").toUInt();
+    if (m_failedLogins != failedLogins) {
+        m_failedLogins = failedLogins;
+        Q_EMIT failedLoginsChanged();
+    }
+}
+
+uint AccountsService::failedLogins() const
+{
+    return m_failedLogins;
+}
+
+void AccountsService::setFailedLogins(uint failedLogins)
+{
+    m_failedLogins = failedLogins;
+    m_service->setUserProperty(m_user, "com.canonical.unity.AccountsService.Private", "FailedLogins", failedLogins);
+}
+
 void AccountsService::propertiesChanged(const QString &user, const QString &interface, const QStringList &changed)
 {
     if (m_user != user) {
@@ -123,6 +145,10 @@
         if (changed.contains("demo-edges")) {
             updateDemoEdges();
         }
+    } else if (interface == "com.canonical.unity.AccountsService.Private") {
+        if (changed.contains("FailedLogins")) {
+            updateFailedLogins();
+        }
     } else if (interface == "com.ubuntu.touch.AccountsService.SecurityPrivacy") {
         if (changed.contains("StatsWelcomeScreen")) {
             updateStatsWelcomeScreen();
 
=== modified file 'plugins/AccountsService/AccountsService.h'
--- plugins/AccountsService/AccountsService.h	2014-07-02 16:17:14 +0000
+++ plugins/AccountsService/AccountsService.h	2014-08-13 18:12:02 +0000
@@ -45,6 +45,10 @@
     Q_PROPERTY (PasswordDisplayHint passwordDisplayHint
                 READ passwordDisplayHint
                 NOTIFY passwordDisplayHintChanged)
+    Q_PROPERTY (uint failedLogins
+                READ failedLogins
+                WRITE setFailedLogins
+                NOTIFY failedLoginsChanged)
 
 public:
     enum PasswordDisplayHint {
@@ -61,6 +65,8 @@
     QString backgroundFile() const;
     bool statsWelcomeScreen() const;
     PasswordDisplayHint passwordDisplayHint() const;
+    uint failedLogins() const;
+    void setFailedLogins(uint failedLogins);
 
 Q_SIGNALS:
     void userChanged();
@@ -68,6 +74,7 @@
     void backgroundFileChanged();
     void statsWelcomeScreenChanged();
     void passwordDisplayHintChanged();
+    void failedLoginsChanged();
 
 private Q_SLOTS:
     void propertiesChanged(const QString &user, const QString &interface, const QStringList &changed);
@@ -78,6 +85,7 @@
     void updateBackgroundFile();
     void updateStatsWelcomeScreen();
     void updatePasswordDisplayHint();
+    void updateFailedLogins();
 
     AccountsServiceDBusAdaptor *m_service;
     QString m_user;
@@ -85,6 +93,7 @@
     QString m_backgroundFile;
     bool m_statsWelcomeScreen;
     PasswordDisplayHint m_passwordDisplayHint;
+    uint m_failedLogins;
 };
 
 #endif
 
=== modified file 'plugins/AccountsService/CMakeLists.txt'
--- plugins/AccountsService/CMakeLists.txt	2014-05-02 22:57:00 +0000
+++ plugins/AccountsService/CMakeLists.txt	2014-08-13 18:12:02 +0000
@@ -10,8 +10,6 @@
 
 add_unity8_plugin(AccountsService 0.1 AccountsService TARGETS AccountsService-qml)
 
-set(POLKIT_LIB_DIR "${CMAKE_INSTALL_LOCALSTATEDIR}/lib/polkit-1")
-set(POLKIT_DATA_DIR "${CMAKE_INSTALL_PREFIX}/share/polkit-1")
 set(DBUS_IFACE_DIR "${CMAKE_INSTALL_PREFIX}/share/dbus-1/interfaces")
 set(ACCOUNTS_IFACE_DIR "${CMAKE_INSTALL_PREFIX}/share/accountsservice/interfaces")
 
@@ -24,11 +22,3 @@
 execute_process(COMMAND mkdir -p \"\$ENV{DESTDIR}${ACCOUNTS_IFACE_DIR}\")
 execute_process(COMMAND ln -sf ../../dbus-1/interfaces/com.canonical.unity.AccountsService.xml \"\$ENV{DESTDIR}${ACCOUNTS_IFACE_DIR}\")
     ")
-
-install(FILES com.canonical.unity.AccountsService.policy
-        DESTINATION "${POLKIT_DATA_DIR}/actions"
-    )
-
-install(FILES 50-com.canonical.unity.AccountsService.pkla
-        DESTINATION "${POLKIT_LIB_DIR}/localauthority/10-vendor.d"
-    )
 
=== removed file 'plugins/AccountsService/com.canonical.unity.AccountsService.policy'
--- plugins/AccountsService/com.canonical.unity.AccountsService.policy	2013-08-12 18:41:45 +0000
+++ plugins/AccountsService/com.canonical.unity.AccountsService.policy	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<policyconfig>
-        <action id="com.canonical.unity.AccountsService.ModifyOwnUser">
-                <description>Set properties of own user</description>
-                <message>Authentication is required to set one's own unity properties.</message>
-                <defaults>
-                        <allow_any>yes</allow_any>
-                        <allow_inactive>yes</allow_inactive>
-                        <allow_active>yes</allow_active>
-                </defaults>
-        </action>
-
-        <action id="com.canonical.unity.AccountsService.ModifyAnyUser">
-                <description>Set properties of any user</description>
-                <message>Authentication is required to set another user's unity
-properties.</message>
-                <defaults>
-                        <allow_any>no</allow_any>
-                        <allow_inactive>no</allow_inactive>
-                        <allow_active>no</allow_active>
-                </defaults>
-        </action>
-</policyconfig>
 
=== modified file 'plugins/AccountsService/com.canonical.unity.AccountsService.xml'
--- plugins/AccountsService/com.canonical.unity.AccountsService.xml	2013-08-23 19:49:18 +0000
+++ plugins/AccountsService/com.canonical.unity.AccountsService.xml	2014-08-13 18:12:02 +0000
@@ -3,22 +3,45 @@
 
     <annotation name="org.freedesktop.Accounts.VendorExtension" value="true"/>
 
-    <annotation name="org.freedesktop.Accounts.Authentication.ChangeOwn"
-                value="com.canonical.unity.AccountsService.ModifyOwnUser"/>
-
     <annotation name="org.freedesktop.Accounts.Authentication.ReadAny"
-                value="com.canonical.unity.AccountsService.ModifyAnyUser"/>
+                value="com.ubuntu.AccountsService.GreeterReadAny"/>
 
     <annotation name="org.freedesktop.Accounts.Authentication.ChangeAny"
-                value="com.canonical.unity.AccountsService.ModifyAnyUser"/>
+                value="com.ubuntu.AccountsService.GreeterChangeAny"/>
 
+    <!-- Should have been named DemoEdges, sorry folks. -mterry -->
     <property name="demo-edges" type="b" access="readwrite">
       <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
     </property>
 
+    <!-- Should have been named LauncherItems, sorry folks. -mterry -->
     <property name="launcher-items" type="aa{sv}" access="readwrite">
       <annotation name="org.freedesktop.Accounts.DefaultValue" value="[{'defaults': <true>}]"/>
     </property>
 
   </interface>
+
+  <!-- This interface is for bits of data that the greeter wants to track
+       per-user in a persistent way, but that users shouldn't be able to edit
+       in an ideal world.
+
+       This interface is identical in permissions to the above one for now,
+       but once we stop running the greeter in user-space, we should
+       disallow org.freedesktop.Accounts.Authentication.ChangeOwn from the
+       Private inteface.  -->
+  <interface name="com.canonical.unity.AccountsService.Private">
+
+    <annotation name="org.freedesktop.Accounts.VendorExtension" value="true"/>
+
+    <annotation name="org.freedesktop.Accounts.Authentication.ReadAny"
+                value="com.ubuntu.AccountsService.GreeterReadAny"/>
+
+    <annotation name="org.freedesktop.Accounts.Authentication.ChangeAny"
+                value="com.ubuntu.AccountsService.GreeterChangeAny"/>
+
+    <property name="FailedLogins" type="u" access="readwrite">
+      <annotation name="org.freedesktop.Accounts.DefaultValue" value="0"/>
+    </property>
+
+  </interface>
 </node>
 
=== modified file 'plugins/LightDM/Greeter.cpp'
--- plugins/LightDM/Greeter.cpp	2014-06-18 19:49:22 +0000
+++ plugins/LightDM/Greeter.cpp	2014-08-13 18:12:02 +0000
@@ -17,6 +17,7 @@
  */
 
 #include "Greeter.h"
+#include <libintl.h>
 #include <QLightDM/Greeter>
 
 class GreeterPrivate
@@ -125,13 +126,15 @@
     Q_D(Greeter);
     d->wasPrompted = true;
 
+    bool isDefaultPrompt = (text == dgettext("Linux-PAM", "Password: "));
+
     // Strip prompt of any colons at the end
     QString trimmedText = text.trimmed();
     if (trimmedText.endsWith(":") || trimmedText.endsWith("：")) {
         trimmedText.chop(1);
     }
 
-    Q_EMIT showPrompt(trimmedText, type == QLightDM::Greeter::PromptTypeSecret);
+    Q_EMIT showPrompt(trimmedText, type == QLightDM::Greeter::PromptTypeSecret, isDefaultPrompt);
 }
 
 void Greeter::showMessageFilter(const QString &text, QLightDM::Greeter::MessageType type)
 
=== modified file 'plugins/LightDM/Greeter.h'
--- plugins/LightDM/Greeter.h	2014-06-27 22:08:19 +0000
+++ plugins/LightDM/Greeter.h	2014-08-13 18:12:02 +0000
@@ -55,7 +55,7 @@
 
 Q_SIGNALS:
     void showMessage(const QString &text, bool isError);
-    void showPrompt(const QString &text, bool isSecret);
+    void showPrompt(const QString &text, bool isSecret, bool isDefaultPrompt);
     void authenticationComplete();
     void authenticationUserChanged(const QString &user);
     void isActiveChanged();
 
=== modified file 'plugins/Ubuntu/CMakeLists.txt'
--- plugins/Ubuntu/CMakeLists.txt	2014-05-29 14:36:21 +0000
+++ plugins/Ubuntu/CMakeLists.txt	2014-08-13 18:12:02 +0000
@@ -1,3 +1,4 @@
 add_subdirectory(Gestures)
 add_subdirectory(DownloadDaemonListener)
 add_subdirectory(Payments)
+add_subdirectory(SystemImage)
 
=== added directory 'plugins/Ubuntu/SystemImage'
=== added file 'plugins/Ubuntu/SystemImage/CMakeLists.txt'
--- plugins/Ubuntu/SystemImage/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/SystemImage/CMakeLists.txt	2014-08-13 18:12:02 +0000
@@ -0,0 +1,10 @@
+set(SYSTEMIMAGE_SOURCES
+    plugin.cpp
+    SystemImage.cpp
+)
+
+add_library(SystemImage MODULE ${SYSTEMIMAGE_SOURCES})
+
+qt5_use_modules(SystemImage Qml DBus Core)
+
+add_unity8_plugin(Ubuntu.SystemImage 0.1 Ubuntu/SystemImage TARGETS SystemImage)
 
=== added file 'plugins/Ubuntu/SystemImage/SystemImage.cpp'
--- plugins/Ubuntu/SystemImage/SystemImage.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/SystemImage/SystemImage.cpp	2014-08-13 18:12:02 +0000
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "SystemImage.h"
+#include <QDBusConnection>
+#include <QDBusInterface>
+
+SystemImage::SystemImage(QObject *parent)
+    : QObject(parent),
+      m_interface(new QDBusInterface("com.canonical.SystemImage",
+                                     "/Service",
+                                     "com.canonical.SystemImage",
+                                     QDBusConnection::systemBus(),
+                                     this))
+{
+}
+
+void SystemImage::factoryReset()
+{
+    m_interface->call("FactoryReset");
+}
 
=== added file 'plugins/Ubuntu/SystemImage/SystemImage.h'
--- plugins/Ubuntu/SystemImage/SystemImage.h	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/SystemImage/SystemImage.h	2014-08-13 18:12:02 +0000
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef SYSTEMIMAGE_H
+#define SYSTEMIMAGE_H
+
+#include <QObject>
+
+class QDBusInterface;
+
+class SystemImage : public QObject
+{
+    Q_OBJECT
+    Q_DISABLE_COPY(SystemImage)
+
+public:
+    explicit SystemImage(QObject *parent = 0);
+
+    Q_INVOKABLE void factoryReset();
+
+private:
+    QDBusInterface *m_interface;
+};
+
+#endif // SYSTEMIMAGE_H
 
=== added file 'plugins/Ubuntu/SystemImage/SystemImage.qmltypes'
--- plugins/Ubuntu/SystemImage/SystemImage.qmltypes	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/SystemImage/SystemImage.qmltypes	2014-08-13 18:12:02 +0000
@@ -0,0 +1,17 @@
+import QtQuick.tooling 1.1
+
+// This file describes the plugin-supplied types contained in the library.
+// It is used for QML tooling purposes only.
+//
+// This file was auto-generated by:
+// 'qmlplugindump -notrelocatable Ubuntu.SystemImage 0.1 plugins'
+
+Module {
+    Component {
+        name: "SystemImage"
+        prototype: "QObject"
+        exports: ["Ubuntu.SystemImage/SystemImage 0.1"]
+        exportMetaObjectRevisions: [0]
+        Method { name: "factoryReset" }
+    }
+}
 
=== added file 'plugins/Ubuntu/SystemImage/plugin.cpp'
--- plugins/Ubuntu/SystemImage/plugin.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/SystemImage/plugin.cpp	2014-08-13 18:12:02 +0000
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "plugin.h"
+#include "SystemImage.h"
+
+#include <QtQml>
+
+static QObject *service_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
+{
+    Q_UNUSED(engine)
+    Q_UNUSED(scriptEngine)
+    return new SystemImage();
+}
+
+void BackendPlugin::registerTypes(const char *uri)
+{
+    Q_ASSERT(uri == QLatin1String("Ubuntu.SystemImage"));
+
+    qmlRegisterSingletonType<SystemImage>(uri, 0, 1, "SystemImage", service_provider);
+}
 
=== added file 'plugins/Ubuntu/SystemImage/plugin.h'
--- plugins/Ubuntu/SystemImage/plugin.h	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/SystemImage/plugin.h	2014-08-13 18:12:02 +0000
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef SYSTEMIMAGE_PLUGIN_H
+#define SYSTEMIMAGE_PLUGIN_H
+
+#include <QQmlExtensionPlugin>
+
+class BackendPlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+
+public:
+    void registerTypes(const char *uri);
+};
+
+#endif // SYSTEMIMAGE_PLUGIN_H
 
=== added file 'plugins/Ubuntu/SystemImage/qmldir'
--- plugins/Ubuntu/SystemImage/qmldir	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/SystemImage/qmldir	2014-08-13 18:12:02 +0000
@@ -0,0 +1,3 @@
+module Ubuntu.SystemImage
+plugin SystemImage
+typeinfo SystemImage.qmltypes
 
=== modified file 'po/unity8.pot'
--- po/unity8.pot	2014-08-08 09:17:29 +0000
+++ po/unity8.pot	2014-08-13 18:12:02 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: unity8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-08 11:17+0200\n"
+"POT-Creation-Date: 2014-08-13 14:09-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,6 +17,10 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: plugins/LightDM/Greeter.cpp:129
+msgid "Password: "
+msgstr ""
+
 #: plugins/Unity/Launcher/launcheritem.cpp:43
 #: plugins/Unity/Launcher/launcheritem.cpp:73
 msgid "Pin shortcut"
@@ -88,39 +92,51 @@
 "phone<br><br>Tap on the screen to start"
 msgstr ""
 
-#: qml/Components/Lockscreen.qml:220
+#: qml/Components/Lockscreen.qml:161
+msgid "Too many incorrect attempts"
+msgstr ""
+
+#: qml/Components/Lockscreen.qml:163
+msgid "Please wait"
+msgstr ""
+
+#: qml/Components/Lockscreen.qml:245
 msgid "Emergency Call"
 msgstr ""
 
-#: qml/Components/Lockscreen.qml:243
+#: qml/Components/Lockscreen.qml:268
 msgid "OK"
 msgstr ""
 
-#: qml/Components/PassphraseLockscreen.qml:62
+#: qml/Components/PassphraseLockscreen.qml:61
 #, qt-format
 msgid "Hello %1"
 msgstr ""
 
-#: qml/Components/PassphraseLockscreen.qml:62
+#: qml/Components/PassphraseLockscreen.qml:61
 msgid "Hello"
 msgstr ""
 
-#: qml/Components/PinLockscreen.qml:198
+#: qml/Components/PinLockscreen.qml:197
 msgid "CANCEL"
 msgstr ""
 
-#: qml/Components/PinLockscreen.qml:216
+#: qml/Components/PinLockscreen.qml:215
 msgid "DONE"
 msgstr ""
 
-#: qml/Dash/GenericScopeView.qml:358
+#: qml/Dash/GenericScopeView.qml:360
 msgid "See less"
 msgstr ""
 
-#: qml/Dash/GenericScopeView.qml:358
+#: qml/Dash/GenericScopeView.qml:360
 msgid "See all"
 msgstr ""
 
+#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
+msgid "Search"
+msgstr ""
+
 #: qml/Dash/Previews/PreviewActionCombo.qml:34
 msgid "More..."
 msgstr ""
@@ -141,15 +157,15 @@
 msgid "Send"
 msgstr ""
 
-#: qml/Dash/ScopesOverview.qml:200
+#: qml/Dash/ScopesOverview.qml:201
 msgid "Manage Dash"
 msgstr ""
 
-#: qml/Dash/ScopesOverview.qml:405
+#: qml/Dash/ScopesOverview.qml:408
 msgid "Done"
 msgstr ""
 
-#: qml/Dash/ScopesOverview.qml:431
+#: qml/Dash/ScopesOverview.qml:434
 msgid "Store"
 msgstr ""
 
@@ -233,11 +249,48 @@
 msgid "Roaming"
 msgstr ""
 
-#: qml/Panel/SearchIndicator.qml:27
-msgid "Search"
-msgstr ""
-
-#: qml/Shell.qml:256
-#, qt-format
-msgid "Please enter %1"
+#: qml/Shell.qml:267
+msgid "passphrase"
+msgstr ""
+
+#: qml/Shell.qml:267
+msgid "passcode"
+msgstr ""
+
+#: qml/Shell.qml:269
+#, qt-format
+msgid "Enter your %1"
+msgstr ""
+
+#: qml/Shell.qml:270
+#, qt-format
+msgid "Incorrect %1"
+msgstr ""
+
+#: qml/Shell.qml:272
+msgid "Please re-enter"
+msgstr ""
+
+#: qml/Shell.qml:306
+msgid "Sorry, incorrect passphrase."
+msgstr ""
+
+#: qml/Shell.qml:307
+msgid "Sorry, incorrect passcode."
+msgstr ""
+
+#: qml/Shell.qml:308
+msgid "This will be your last attempt."
+msgstr ""
+
+#: qml/Shell.qml:310
+msgid ""
+"If passphrase is entered incorrectly, your phone will conduct a factory "
+"reset and all personal data will be deleted."
+msgstr ""
+
+#: qml/Shell.qml:311
+msgid ""
+"If passcode is entered incorrectly, your phone will conduct a factory reset "
+"and all personal data will be deleted."
 msgstr ""
 
=== modified file 'qml/Components/Lockscreen.qml'
--- qml/Components/Lockscreen.qml	2014-07-22 14:46:01 +0000
+++ qml/Components/Lockscreen.qml	2014-08-13 18:12:02 +0000
@@ -57,10 +57,15 @@
 
     onRequiredChanged: {
         if (required && pinPadLoader.item) {
-            pinPadLoader.item.clear(false);
+            clear(false)
         }
     }
 
+    function forceDelay(delay) {
+        forcedDelayTimer.interval = delay
+        forcedDelayTimer.start()
+    }
+
     function reset() {
         // This causes the loader below to destry and recreate the source
         pinPadLoader.resetting = true;
@@ -68,13 +73,22 @@
     }
 
     function clear(showAnimation) {
-        pinPadLoader.item.clear(showAnimation);
+        if (pinPadLoader.item) {
+            pinPadLoader.item.clear(showAnimation);
+        }
+        pinPadLoader.showWrongText = showAnimation
+        pinPadLoader.waiting = false
     }
 
     function showInfoPopup(title, text) {
         PopupUtils.open(infoPopupComponent, root, {title: title, text: text})
     }
 
+    Timer {
+        id: forcedDelayTimer
+        onTriggered: pinPadLoader.showWrongText = false
+    }
+
     Rectangle {
         // In case background fails to load or is undefined
         id: backgroundBackup
@@ -131,8 +145,6 @@
         }
     }
 
-
-
     Loader {
         id: pinPadLoader
         objectName: "pinPadLoader"
@@ -143,13 +155,24 @@
             verticalCenterOffset: root.alphaNumeric ? -units.gu(10) : -units.gu(4)
         }
         property bool resetting: false
+        property bool waiting: false
+        property bool showWrongText: false
+
+        readonly property string forcedDelayText: i18n.tr("Too many incorrect attempts") +
+                                                  "\n" +
+                                                  i18n.tr("Please wait")
 
         source: (!resetting && root.required) ? (root.alphaNumeric ? "PassphraseLockscreen.qml" : "PinLockscreen.qml") : ""
+        onSourceChanged: {
+            waiting = false
+            showWrongText = false
+        }
 
         Connections {
             target: pinPadLoader.item
 
             onEntered: {
+                pinPadLoader.waiting = true
                 root.entered(passphrase);
             }
 
@@ -171,18 +194,20 @@
         Binding {
             target: pinPadLoader.item
             property: "placeholderText"
-            value: root.placeholderText
-        }
-        Binding {
-            target: pinPadLoader.item
-            property: "wrongPlaceholderText"
-            value: root.wrongPlaceholderText
+            value: forcedDelayTimer.running ? pinPadLoader.forcedDelayText :
+                   (pinPadLoader.showWrongText ? root.wrongPlaceholderText :
+                    root.placeholderText)
         }
         Binding {
             target: pinPadLoader.item
             property: "username"
             value: root.username
         }
+        Binding {
+            target: pinPadLoader.item
+            property: "entryEnabled"
+            value: !pinPadLoader.waiting && !forcedDelayTimer.running
+        }
     }
 
     Column {
 
=== modified file 'qml/Components/PassphraseLockscreen.qml'
--- qml/Components/PassphraseLockscreen.qml	2014-07-02 18:40:30 +0000
+++ qml/Components/PassphraseLockscreen.qml	2014-08-13 18:12:02 +0000
@@ -23,15 +23,14 @@
     height: highlightItem.height
 
     property string placeholderText
-    property string wrongPlaceholderText
     property string username: ""
+    property bool entryEnabled: true
 
     signal entered(string passphrase)
     signal cancel()
 
     function clear(playAnimation) {
         pinentryField.text = "";
-        pinentryField.enabled = true
         if (playAnimation) {
             wrongPasswordAnimation.start();
             pinentryField.forceActiveFocus();
@@ -76,11 +75,11 @@
             echoMode: TextInput.Password
             opacity: 0.9
             hasClearButton: false
-            placeholderText: wrongPasswordAnimation.running ? root.wrongPlaceholderText : root.placeholderText
+            enabled: entryEnabled
+            placeholderText: root.placeholderText
 
             onAccepted: {
                 if (pinentryField.text) {
-                    pinentryField.enabled = false;
                     root.entered(pinentryField.text);
                 }
             }
 
=== modified file 'qml/Components/PinLockscreen.qml'
--- qml/Components/PinLockscreen.qml	2014-06-06 11:37:55 +0000
+++ qml/Components/PinLockscreen.qml	2014-08-13 18:12:02 +0000
@@ -25,7 +25,6 @@
     spacing: units.gu(3.5)
 
     property alias placeholderText: pinentryField.placeholderText
-    property alias wrongPlaceholderText: pinentryField.wrongPlaceholderText
     property int padWidth: units.gu(34)
     property int padHeight: units.gu(28)
     property int minPinLength: -1
@@ -58,7 +57,6 @@
         radius: "medium"
         property string text: ""
         property string placeholderText: ""
-        property string wrongPlaceholderText: ""
 
         function appendChar(character) {
             if (root.maxPinLength == -1 || pinentryField.text.length < root.maxPinLength) {
@@ -90,9 +88,10 @@
             id: pinentryFieldPlaceHolder
             objectName: "pinentryFieldPlaceHolder"
             anchors.centerIn: parent
+            horizontalAlignment: Text.AlignHCenter
             color: "#f3f3e7"
             opacity: 0.6
-            text: wrongPasswordAnimation.running ? parent.wrongPlaceholderText : parent.placeholderText
+            text: parent.placeholderText
             visible: pinentryFieldLabel.text.length == 0
         }
 
@@ -107,7 +106,7 @@
                 bottom: parent.bottom
                 bottomMargin: units.gu(1)
             }
-            visible: !priv.autoConfirm
+            visible: entryEnabled && !priv.autoConfirm
             width: height
             name: "erase"
             color: "#f3f3e7"
 
=== modified file 'qml/Notifications/NotificationMenuItemFactory.qml'
--- qml/Notifications/NotificationMenuItemFactory.qml	2014-07-22 12:13:02 +0000
+++ qml/Notifications/NotificationMenuItemFactory.qml	2014-08-13 18:12:02 +0000
@@ -117,7 +117,6 @@
 
             onEntered: {
                 menuModel.changeState(menuIndex, passphrase);
-                entryEnabled = false;
             }
 
             onCancel: {
 
=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2014-08-11 19:02:49 +0000
+++ qml/Shell.qml	2014-08-13 18:12:02 +0000
@@ -19,7 +19,9 @@
 import GSettings 1.0
 import Unity.Application 0.1
 import Ubuntu.Components 0.1
+import Ubuntu.Components.Popups 1.0
 import Ubuntu.Gestures 0.1
+import Ubuntu.SystemImage 0.1
 import Unity.Launcher 0.1
 import Utils 0.1
 import LightDM 0.1 as LightDM
@@ -53,6 +55,10 @@
     property bool sideStageEnabled: shell.width >= units.gu(100)
     readonly property string focusedApplicationId: ApplicationManager.focusedApplicationId
 
+    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 failedLoginsDelaySeconds: 5 * 60 // seconds of forced waiting
+
     function activateApplication(appId) {
         if (ApplicationManager.findApplication(appId)) {
             ApplicationManager.requestFocusApplication(appId);
@@ -255,13 +261,21 @@
 
         onShowPrompt: {
             if (greeter.narrowMode) {
-                lockscreen.placeholderText = i18n.tr("Please enter %1").arg(text.toLowerCase());
+                var promptText = text.toLowerCase()
+                if (isDefaultPrompt) {
+                    promptText = lockscreen.alphaNumeric ?
+                                 i18n.tr("passphrase") : i18n.tr("passcode")
+                }
+                lockscreen.placeholderText = i18n.tr("Enter your %1").arg(promptText)
+                lockscreen.wrongPlaceholderText = i18n.tr("Incorrect %1").arg(promptText) +
+                                                  "\n" +
+                                                  i18n.tr("Please re-enter")
                 lockscreen.show();
             }
         }
 
         onPromptlessChanged: {
-            if (LightDM.Greeter.promptless) {
+            if (LightDM.Greeter.promptless && LightDM.Greeter.authenticated) {
                 lockscreen.hide()
             } else {
                 lockscreen.reset();
@@ -270,13 +284,40 @@
         }
 
         onAuthenticationComplete: {
+            if (LightDM.Greeter.authenticated) {
+                AccountsService.failedLogins = 0
+            }
+            // Else only penalize user for a failed login if they actually were
+            // prompted for a password.  We do this below after the promptless
+            // early exit.
+
             if (LightDM.Greeter.promptless) {
                 return;
             }
+
             if (LightDM.Greeter.authenticated) {
                 lockscreen.hide();
                 greeter.login();
             } else {
+                AccountsService.failedLogins++
+                if (maxFailedLogins >= 2) { // require at least a warning
+                    if (AccountsService.failedLogins === maxFailedLogins - 1) {
+                        var title = lockscreen.alphaNumeric ?
+                                    i18n.tr("Sorry, incorrect passphrase.") :
+                                    i18n.tr("Sorry, incorrect passcode.")
+                        var text = i18n.tr("This will be your last attempt.") + " " +
+                                   (lockscreen.alphaNumeric ?
+                                    i18n.tr("If passphrase is entered incorrectly, your phone will conduct a factory reset and all personal data will be deleted.") :
+                                    i18n.tr("If passcode is entered incorrectly, your phone will conduct a factory reset and all personal data will be deleted."))
+                        lockscreen.showInfoPopup(title, text)
+                    } else if (AccountsService.failedLogins >= maxFailedLogins) {
+                        SystemImage.factoryReset() // Ouch!
+                    }
+                }
+                if (failedLoginsDelayAttempts > 0 && AccountsService.failedLogins % failedLoginsDelayAttempts == 0) {
+                    lockscreen.forceDelay(failedLoginsDelaySeconds * 1000)
+                }
+
                 lockscreen.clear(true);
                 if (greeter.narrowMode) {
                     LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole))
@@ -311,8 +352,16 @@
         }
 
         property bool fullyShown: showProgress === 1.0
+        onFullyShownChanged: {
+            // Wait until the greeter is completely covering lockscreen before resetting it.
+            if (fullyShown && !LightDM.Greeter.authenticated) {
+                lockscreen.reset();
+                lockscreen.show();
+            }
+        }
+
         readonly property real showProgress: MathUtils.clamp((1 - x/width) + greeter.showProgress - 1, 0, 1)
-        onShowProgressChanged: if (LightDM.Greeter.promptless && showProgress === 0) greeter.login()
+        onShowProgressChanged: if (LightDM.Greeter.authenticated && showProgress === 0) greeter.login()
 
         Greeter {
             id: greeter
@@ -350,10 +399,6 @@
                     if (greeter.narrowMode) {
                         LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole));
                     }
-                    if (!LightDM.Greeter.promptless) {
-                        lockscreen.reset();
-                        lockscreen.show();
-                    }
                     greeter.fakeActiveForApp = "";
                     greeter.forceActiveFocus();
                 }
@@ -403,7 +448,7 @@
         }
 
         if (LightDM.Greeter.active) {
-            if (!LightDM.Greeter.promptless) {
+            if (!LightDM.Greeter.authenticated) {
                 lockscreen.show()
             }
             greeter.hide()
 
=== modified file 'run.sh'
--- run.sh	2014-07-16 14:37:21 +0000
+++ run.sh	2014-08-13 18:12:02 +0000
@@ -18,6 +18,7 @@
     echo " -f, --fake Force use of fake Qml modules." >&2
     echo " -p, --pinlock Use a pin protected user." >&2
     echo " -k, --keylock Use a passphrase protected user." >&2
+    echo " -l, --lightdm Use the specified lightdm mock." >&2
     echo " -g, --gdb Run through gdb." >&2
     echo " -h, --help Show this help." >&2
     echo " -m, --nomousetouch Run without -mousetouch argument." >&2
@@ -25,16 +26,20 @@
     exit 1
 }
 
-ARGS=`getopt -n$0 -u -a --longoptions="fake,pinlock,keylock,gdb,help,nomousetouch" -o "fpkghm" -- "$@"`
+ARGS=`getopt -n$0 -u -a --longoptions="fake,pinlock,keylock,gdb,help,lightdm:,nomousetouch" -o "fpkl:ghm" -- "$@"`
 [ $? -ne 0 ] && usage
 eval set -- "$ARGS"
 
 while [ $# -gt 0 ]
 do
     case "$1" in
-       -f|--fake)  FAKE=true; USE_MOCKS=true;;
-       -p|--pinlock)  PINLOCK=true; USE_MOCKS=true;;
-       -k|--keylock)  KEYLOCK=true; USE_MOCKS=true;;
+       -f|--fake)     USE_MOCKS=true;;
+       -p|--pinlock)  USE_MOCKS=true; LIGHTDM_MOCK=single-pin;;
+       -k|--keylock)  USE_MOCKS=true; LIGHTDM_MOCK=single-passphrase;;
+       -l|--lightdm)  LIGHTDM_MOCK=$2; shift;
+                      if [ -z "$LIGHTDM_MOCK" ]; then
+                        echo "Please specify an argument to --lightdm"
+                      fi;;
        -g|--gdb)   GDB=true;;
        -h|--help)  usage;;
        -m|--nomousetouch)  MOUSE_TOUCH=false;;
@@ -43,27 +48,23 @@
     shift
 done
 
-if $FAKE; then
-  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics:$PWD/builddir/tests/mocks/LightDM/single
-fi
-
-if $PINLOCK; then
-  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics:$PWD/builddir/tests/mocks/LightDM/single-pin
-fi
-
-if $KEYLOCK; then
-  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics:$PWD/builddir/tests/mocks/LightDM/single-passphrase
-fi
+if [ -z "$LIGHTDM_MOCK" ]; then
+  LIGHTDM_MOCK=single
+fi
+
+# Even without USE_MOCKS set, we want to fake our lightdm backend, because it's
+# annoying to be prompted for your password when testing.  To get the same
+# backend used in production, pass '--lightdm=demo'.
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/LightDM/$LIGHTDM_MOCK
 
 if $USE_MOCKS; then
   rm -f $PWD/builddir/nonmirplugins/LightDM # undo symlink (from below) for cleanliness
   export QML2_IMPORT_PATH=$QML2_IMPORT_PATH:$PWD/builddir/tests/mocks:$PWD/builddir/plugins:$PWD/builddir/modules
+  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics
 else
-  # Still fake no-login user for convenience (it's annoying to be prompted for your password when testing)
-  # And in particular, just link our LightDM mock into the nonmirplugins folder.  We don't want the rest of
-  # our plugins to be used.
-  ln -s $PWD/builddir/tests/mocks/LightDM $PWD/builddir/nonmirplugins/
-  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/LightDM/single
+  # Just link our LightDM mock into the nonmirplugins folder.  We don't want
+  # the rest of our plugins to be used.
+  ln -sf $PWD/builddir/tests/mocks/LightDM $PWD/builddir/nonmirplugins/
 fi
 
 QML_PHONE_SHELL_ARGS=""
 
=== modified file 'tests/mocks/AccountsService/AccountsService.cpp'
--- tests/mocks/AccountsService/AccountsService.cpp	2014-07-02 16:17:14 +0000
+++ tests/mocks/AccountsService/AccountsService.cpp	2014-08-13 18:12:02 +0000
@@ -23,7 +23,8 @@
 AccountsService::AccountsService(QObject* parent)
   : QObject(parent),
     m_backgroundFile(qmlDirectory() + "graphics/phone_background.jpg"),
-    m_statsWelcomeScreen(true)
+    m_statsWelcomeScreen(true),
+    m_failedLogins(0)
 {
 }
 
@@ -78,3 +79,14 @@
     else
         return PasswordDisplayHint::Keyboard;
 }
+
+uint AccountsService::failedLogins() const
+{
+    return m_failedLogins;
+}
+
+void AccountsService::setFailedLogins(uint failedLogins)
+{
+    m_failedLogins = failedLogins;
+    failedLoginsChanged();
+}
 
=== modified file 'tests/mocks/AccountsService/AccountsService.h'
--- tests/mocks/AccountsService/AccountsService.h	2014-07-02 16:17:14 +0000
+++ tests/mocks/AccountsService/AccountsService.h	2014-08-13 18:12:02 +0000
@@ -47,6 +47,10 @@
     Q_PROPERTY (PasswordDisplayHint passwordDisplayHint
                 READ passwordDisplayHint
                 NOTIFY passwordDisplayHintChanged)
+    Q_PROPERTY (uint failedLogins
+                READ failedLogins
+                WRITE setFailedLogins
+                NOTIFY failedLoginsChanged)
 
 public:
     enum PasswordDisplayHint {
@@ -65,6 +69,8 @@
     bool statsWelcomeScreen() const;
     void setStatsWelcomeScreen(bool statsWelcomeScreen);
     PasswordDisplayHint passwordDisplayHint() const;
+    uint failedLogins() const;
+    void setFailedLogins(uint failedLogins);
 
 Q_SIGNALS:
     void userChanged();
@@ -72,11 +78,13 @@
     void backgroundFileChanged();
     void statsWelcomeScreenChanged();
     void passwordDisplayHintChanged();
+    void failedLoginsChanged();
 
 private:
     QString m_backgroundFile;
     QString m_user;
     bool m_statsWelcomeScreen;
+    uint m_failedLogins;
 };
 
 #endif
 
=== modified file 'tests/mocks/LightDM/Greeter.cpp'
--- tests/mocks/LightDM/Greeter.cpp	2014-06-11 15:36:51 +0000
+++ tests/mocks/LightDM/Greeter.cpp	2014-08-13 18:12:02 +0000
@@ -19,6 +19,7 @@
 #include "Greeter.h"
 #include "GreeterPrivate.h"
 #include <QtCore/QCoreApplication>
+#include <QTimer>
 
 namespace QLightDM
 {
@@ -164,4 +165,14 @@
     d->handleRespond(response);
 }
 
+void Greeter::sendAuthenticationComplete()
+{
+    if (qgetenv("UNITY_TESTING").isEmpty()) {
+        // simulate PAM's delay
+        QTimer::singleShot(1000, this, SIGNAL(authenticationComplete()));
+    } else {
+        Q_EMIT authenticationComplete();
+    }
+}
+
 }
 
=== modified file 'tests/mocks/LightDM/Greeter.h'
--- tests/mocks/LightDM/Greeter.h	2014-06-11 15:36:51 +0000
+++ tests/mocks/LightDM/Greeter.h	2014-08-13 18:12:02 +0000
@@ -96,6 +96,9 @@
     void authenticationComplete();
     void autologinTimerExpired();
 
+protected:
+    void sendAuthenticationComplete();
+
 private:
     GreeterPrivate *d_ptr;
     Q_DECLARE_PRIVATE(Greeter)
 
=== modified file 'tests/mocks/LightDM/demo/CMakeLists.txt'
--- tests/mocks/LightDM/demo/CMakeLists.txt	2014-07-01 20:21:23 +0000
+++ tests/mocks/LightDM/demo/CMakeLists.txt	2014-08-13 18:12:02 +0000
@@ -9,6 +9,7 @@
     )
 
 add_library(MockLightDM-demo STATIC ${LibLightDM_SOURCES})
+add_library(MockLightDM-demo-shared SHARED ${LibLightDM_SOURCES})
 
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
@@ -19,5 +20,17 @@
     ${LIBUSERMETRICSOUTPUT_LDFLAGS}
     -lpam
 )
+target_link_libraries(MockLightDM-demo-shared
+    ${LIBUSERMETRICSOUTPUT_LDFLAGS}
+    -lpam
+)
 
 qt5_use_modules(MockLightDM-demo Concurrent Gui)
+qt5_use_modules(MockLightDM-demo-shared Concurrent Gui)
+
+set_target_properties(MockLightDM-demo-shared PROPERTIES
+                      OUTPUT_NAME lightdm-qt5-2)
+
+install(TARGETS MockLightDM-demo-shared
+    DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM/demo
+    )
 
=== modified file 'tests/mocks/LightDM/full/GreeterPrivate.cpp'
--- tests/mocks/LightDM/full/GreeterPrivate.cpp	2014-07-02 16:17:14 +0000
+++ tests/mocks/LightDM/full/GreeterPrivate.cpp	2014-08-13 18:12:02 +0000
@@ -54,7 +54,7 @@
         authenticated = true;
         Q_EMIT q->authenticationComplete();
     } else if (authenticationUser == "has-pin"){
-        Q_EMIT q->showPrompt("Password:", Greeter::PromptTypeSecret);
+        Q_EMIT q->showPrompt("Password: ", Greeter::PromptTypeSecret);
     } else if (authenticationUser == "auth-error") {
         authenticated = false;
         Q_EMIT q->authenticationComplete();
@@ -78,11 +78,11 @@
                 Q_EMIT q->showPrompt("otp", Greeter::PromptTypeQuestion);
             } else {
                 authenticated = false;
-                Q_EMIT q->authenticationComplete();
+                q->sendAuthenticationComplete();
             }
         } else {
             authenticated = (response == "otp");
-            Q_EMIT q->authenticationComplete();
+            q->sendAuthenticationComplete();
         }
         return;
     }
@@ -92,7 +92,7 @@
     } else {
         authenticated = (response == "password");
     }
-    Q_EMIT q->authenticationComplete();
+    q->sendAuthenticationComplete();
 }
 
 }
 
=== modified file 'tests/mocks/LightDM/single-passphrase/GreeterPrivate.cpp'
--- tests/mocks/LightDM/single-passphrase/GreeterPrivate.cpp	2013-06-06 12:18:34 +0000
+++ tests/mocks/LightDM/single-passphrase/GreeterPrivate.cpp	2014-08-13 18:12:02 +0000
@@ -19,8 +19,6 @@
 #include "../Greeter.h"
 #include "../GreeterPrivate.h"
 
-#include <QDebug>
-
 namespace QLightDM
 {
 
@@ -34,20 +32,15 @@
 void GreeterPrivate::handleAuthenticate()
 {
     Q_Q(Greeter);
-
-    qDebug() << "handleAuthentication called!" << authenticationUser;
-
-    Q_EMIT q->showPrompt("Password:", Greeter::PromptTypeSecret);
+    Q_EMIT q->showPrompt("Password: ", Greeter::PromptTypeSecret);
 }
 
 void GreeterPrivate::handleRespond(const QString &response)
 {
     Q_Q(Greeter);
 
-
     authenticated = (response == "password");
-    qDebug() << "responding" << response << authenticated;
-    Q_EMIT q->authenticationComplete();
+    q->sendAuthenticationComplete();
 }
 
 }
 
=== modified file 'tests/mocks/LightDM/single-pin/GreeterPrivate.cpp'
--- tests/mocks/LightDM/single-pin/GreeterPrivate.cpp	2014-07-02 16:17:14 +0000
+++ tests/mocks/LightDM/single-pin/GreeterPrivate.cpp	2014-08-13 18:12:02 +0000
@@ -32,14 +32,15 @@
 void GreeterPrivate::handleAuthenticate()
 {
     Q_Q(Greeter);
-    Q_EMIT q->showPrompt("Password:", Greeter::PromptTypeSecret);
+    Q_EMIT q->showPrompt("Password: ", Greeter::PromptTypeSecret);
 }
 
 void GreeterPrivate::handleRespond(const QString &response)
 {
     Q_Q(Greeter);
+
     authenticated = (response == "1234");
-    Q_EMIT q->authenticationComplete();
+    q->sendAuthenticationComplete();
 }
 
 }
 
=== modified file 'tests/mocks/Ubuntu/CMakeLists.txt'
--- tests/mocks/Ubuntu/CMakeLists.txt	2014-07-07 08:51:33 +0000
+++ tests/mocks/Ubuntu/CMakeLists.txt	2014-08-13 18:12:02 +0000
@@ -1,4 +1,5 @@
 add_subdirectory(DownloadDaemonListener)
 add_subdirectory(Payments)
+add_subdirectory(SystemImage)
 add_subdirectory(Telephony)
 add_subdirectory(Thumbnailer)
 
=== added directory 'tests/mocks/Ubuntu/SystemImage'
=== added file 'tests/mocks/Ubuntu/SystemImage/CMakeLists.txt'
--- tests/mocks/Ubuntu/SystemImage/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/mocks/Ubuntu/SystemImage/CMakeLists.txt	2014-08-13 18:12:02 +0000
@@ -0,0 +1,10 @@
+set(MOCK_SYSTEMIMAGE_SOURCES
+    plugin.cpp
+    MockSystemImage.cpp
+)
+
+add_library(MockSystemImage MODULE ${MOCK_SYSTEMIMAGE_SOURCES})
+
+qt5_use_modules(MockSystemImage Qml Quick Core)
+
+add_unity8_mock(Ubuntu.SystemImage 0.1 Ubuntu/SystemImage TARGETS MockSystemImage)
 
=== added file 'tests/mocks/Ubuntu/SystemImage/MockSystemImage.cpp'
--- tests/mocks/Ubuntu/SystemImage/MockSystemImage.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/Ubuntu/SystemImage/MockSystemImage.cpp	2014-08-13 18:12:02 +0000
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "MockSystemImage.h"
+
+MockSystemImage::MockSystemImage(QObject *parent)
+    : QObject(parent)
+{
+}
+
+void MockSystemImage::factoryReset()
+{
+    Q_EMIT resettingDevice();
+}
 
=== added file 'tests/mocks/Ubuntu/SystemImage/MockSystemImage.h'
--- tests/mocks/Ubuntu/SystemImage/MockSystemImage.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/Ubuntu/SystemImage/MockSystemImage.h	2014-08-13 18:12:02 +0000
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef MOCK_SYSTEMIMAGE_H
+#define MOCK_SYSTEMIMAGE_H
+
+#include <QObject>
+
+class MockSystemImage : public QObject
+{
+    Q_OBJECT
+    Q_DISABLE_COPY(MockSystemImage)
+
+public:
+    explicit MockSystemImage(QObject *parent = 0);
+
+    Q_INVOKABLE void factoryReset();
+
+Q_SIGNALS:
+    void resettingDevice(); // only for mock
+};
+
+#endif // MOCK_SYSTEMIMAGE_H
 
=== added file 'tests/mocks/Ubuntu/SystemImage/SystemImage.qmltypes'
--- tests/mocks/Ubuntu/SystemImage/SystemImage.qmltypes	1970-01-01 00:00:00 +0000
+++ tests/mocks/Ubuntu/SystemImage/SystemImage.qmltypes	2014-08-13 18:12:02 +0000
@@ -0,0 +1,18 @@
+import QtQuick.tooling 1.1
+
+// This file describes the plugin-supplied types contained in the library.
+// It is used for QML tooling purposes only.
+//
+// This file was auto-generated by:
+// 'qmlplugindump -notrelocatable Ubuntu.SystemImage 0.1 plugins'
+
+Module {
+    Component {
+        name: "MockSystemImage"
+        prototype: "QObject"
+        exports: ["Ubuntu.SystemImage/SystemImage 0.1"]
+        exportMetaObjectRevisions: [0]
+        Signal { name: "resettingDevice" }
+        Method { name: "factoryReset" }
+    }
+}
 
=== added file 'tests/mocks/Ubuntu/SystemImage/plugin.cpp'
--- tests/mocks/Ubuntu/SystemImage/plugin.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/Ubuntu/SystemImage/plugin.cpp	2014-08-13 18:12:02 +0000
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "plugin.h"
+#include "MockSystemImage.h"
+
+#include <QtQml>
+
+static QObject *service_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
+{
+    Q_UNUSED(engine)
+    Q_UNUSED(scriptEngine)
+    return new MockSystemImage();
+}
+
+void BackendPlugin::registerTypes(const char *uri)
+{
+    Q_ASSERT(uri == QLatin1String("Ubuntu.SystemImage"));
+
+    qmlRegisterSingletonType<MockSystemImage>(uri, 0, 1, "SystemImage", service_provider);
+}
 
=== added file 'tests/mocks/Ubuntu/SystemImage/plugin.h'
--- tests/mocks/Ubuntu/SystemImage/plugin.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/Ubuntu/SystemImage/plugin.h	2014-08-13 18:12:02 +0000
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef MOCK_SYSTEMIMAGE_PLUGIN_H
+#define MOCK_SYSTEMIMAGE_PLUGIN_H
+
+#include <QQmlExtensionPlugin>
+
+class BackendPlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+
+public:
+    void registerTypes(const char *uri);
+};
+
+#endif // MOCK_SYSTEMIMAGE_PLUGIN_H
 
=== added file 'tests/mocks/Ubuntu/SystemImage/qmldir'
--- tests/mocks/Ubuntu/SystemImage/qmldir	1970-01-01 00:00:00 +0000
+++ tests/mocks/Ubuntu/SystemImage/qmldir	2014-08-13 18:12:02 +0000
@@ -0,0 +1,3 @@
+module Ubuntu.SystemImage
+plugin MockSystemImage
+typeinfo SystemImage.qmltypes
 
=== modified file 'tests/qmltests/Greeter/tst_Lockscreen.qml'
--- tests/qmltests/Greeter/tst_Lockscreen.qml	2014-07-02 16:17:14 +0000
+++ tests/qmltests/Greeter/tst_Lockscreen.qml	2014-08-13 18:12:02 +0000
@@ -319,11 +319,9 @@
             if (data.animation) {
                 if (data.alphanumeric) {
                     tryCompare(inputField, "placeholderText", lockscreen.wrongPlaceholderText)
-                    tryCompare(inputField, "placeholderText", lockscreen.placeholderText)
                 } else {
                     var label = findChild(lockscreen, "pinentryFieldPlaceHolder");
                     tryCompare(label, "text", lockscreen.wrongPlaceholderText)
-                    tryCompare(label, "text", lockscreen.placeholderText)
                 }
             }
 
 
=== modified file 'tests/qmltests/tst_ShellWithPin.qml'
--- tests/qmltests/tst_ShellWithPin.qml	2014-08-05 18:18:09 +0000
+++ tests/qmltests/tst_ShellWithPin.qml	2014-08-13 18:12:02 +0000
@@ -16,8 +16,10 @@
 
 import QtQuick 2.0
 import QtTest 1.0
+import AccountsService 0.1
 import GSettings 1.0
 import LightDM 0.1 as LightDM
+import Ubuntu.SystemImage 0.1
 import Unity.Application 0.1
 import Unity.Test 0.1 as UT
 import Powerd 0.1
@@ -25,6 +27,7 @@
 import "../../qml"
 
 Item {
+    id: root
     width: shell.width
     height: shell.height
 
@@ -53,6 +56,12 @@
         signalName: "sessionStarted"
     }
 
+    SignalSpy {
+        id: resetSpy
+        target: SystemImage
+        signalName: "resettingDevice"
+    }
+
     UT.UnityTestCase {
         name: "ShellWithPin"
         when: windowShown
@@ -64,6 +73,8 @@
 
         function init() {
             swipeAwayGreeter()
+            shell.failedLoginsDelayAttempts = -1
+            shell.maxFailedLogins = -1
         }
 
         function cleanup() {
@@ -111,6 +122,7 @@
         }
 
         function test_login() {
+            sessionSpy.clear()
             tryCompare(sessionSpy, "count", 0)
             enterPin("1234")
             tryCompare(sessionSpy, "count", 1)
@@ -175,5 +187,49 @@
             ApplicationManager.startApplication("gallery-app", ApplicationManager.NoFlag)
             tryCompare(lockscreen, "shown", true)
         }
+
+        function test_failedLoginsCount() {
+            AccountsService.failedLogins = 0
+
+            enterPin("1111")
+            tryCompare(AccountsService, "failedLogins", 1)
+
+            enterPin("1234")
+            tryCompare(AccountsService, "failedLogins", 0)
+        }
+
+        function test_wrongEntries() {
+            shell.failedLoginsDelayAttempts = 3
+
+            var placeHolder = findChild(shell, "pinentryFieldPlaceHolder")
+            tryCompare(placeHolder, "text", "Enter your passcode")
+
+            enterPin("1111")
+            tryCompare(placeHolder, "text", "Incorrect passcode\nPlease re-enter")
+
+            enterPin("1111")
+            tryCompare(placeHolder, "text", "Incorrect passcode\nPlease re-enter")
+
+            enterPin("1111")
+            tryCompare(placeHolder, "text", "Too many incorrect attempts\nPlease wait")
+        }
+
+        function test_factoryReset() {
+            shell.maxFailedLogins = 3
+            resetSpy.clear()
+
+            enterPin("1111")
+            enterPin("1111")
+            tryCompareFunction(function() {return findChild(root, "infoPopup") !== null}, true)
+
+            var dialog = findChild(root, "infoPopup")
+            var button = findChild(dialog, "infoPopupOkButton")
+            mouseClick(button, units.gu(1), units.gu(1))
+            tryCompareFunction(function() {return findChild(root, "infoPopup")}, null)
+
+            tryCompare(resetSpy, "count", 0)
+            enterPin("1111")
+            tryCompare(resetSpy, "count", 1)
+        }
     }
 }