Merge lp:~mterry/unity8/unlock-via-dbus into lp:unity8

[Michael Terry]

With recent password support, we want to be able to unlock the device even with a password set. And we need to be able to do this once the new adbd lands. So I've added a DBus command to hide the greeter. This should be secure because all apps are constrained and if you're on the local session bus unconstrained, you already have access to anything you want.

With recent password support, we want to be able to unlock the device even with a password set. And we need to be able to do this once the new adbd lands. So I've added a DBus command to hide the greeter. This should be secure because all apps are constrained and if you're on the local session bus unconstrained, you already have access to anything you want.

== 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

[Martin Pitt (pitti)]

Awesome, thanks! I have one diff comment to be future proof.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1206
http://jenkins.qa.ubuntu.com/job/unity8-ci/4142/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4128/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1143
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1236
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1236
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3960/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5380
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5380/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12220

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

review: Needs Fixing (continuous-integration)

[Michael Terry (mterry)]

Updated to look at the adb user's id value for future proofing, thanks pitti!

[lp:~mterry/unity8/unlock-via-dbus]

1207. By Michael Terry on 2014-08-27

Handle future adb user changes

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1207
http://jenkins.qa.ubuntu.com/job/unity8-ci/4146/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4143/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1147
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1240
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1240
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3973/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5395
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5395/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12238

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

review: Needs Fixing (continuous-integration)

[Martin Pitt (pitti)]

Yay, thanks!

review: Approve

[lp:~mterry/unity8/unlock-via-dbus]

1208. By Michael Terry on 2014-08-28

Fix typo

[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? If not, please explain why.
Unrelated issues

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1208
http://jenkins.qa.ubuntu.com/job/unity8-ci/4166/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4201/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1167
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1260
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1260
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4013/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5453
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5453/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12299

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

review: Needs Fixing (continuous-integration)

[lp:~mterry/unity8/unlock-via-dbus]

1209. By Michael Terry on 2014-08-28

Force a delay of 20s to wait for unity8

[Paul Larson (pwlars)]

Doesn't seem to work:
I: Unlock failed, script output: 'Error connecting: Cannot autolaunch D-Bus with'ut X11 $DISPLAY

That was tested on mako, haven't tried krillin yet, but I'm not thinking it would do better there.

[Michael Terry (mterry)]

We tested this, it's because of an incompatibility with new adbd (pitti's suggested change was actually harmful! We need to go through sudo always to get the proper environment)

I'll propose another MP with that fix

[Martin Pitt (pitti)]

Ah, you probably need "su -l" to read /etc/profile.d?

> We need to go through sudo always to get the proper environment)

Not always, that won't work if you are already the "phablet" user. So the "if" condition is right IMHO, you might just need su -l, or sudo to read profile.

[Michael Terry (mterry)]

It actually does work if you're already the phablet user! So that one line works for pre- and post-fix adbd.

[Martin Pitt (pitti)]

Confirmed, this works well even with adb running as phablet:

adb shell "sudo -u phablet -i gdbus call --session --dest com.canonical.UnityGreeter --object-path / --method com.canonical.UnityGreeter.HideGreeter && echo Greeter unlocked"

Thanks!

=== modified file 'plugins/LightDM/DBusGreeter.cpp'
--- plugins/LightDM/DBusGreeter.cpp	2014-06-27 22:08:19 +0000
+++ plugins/LightDM/DBusGreeter.cpp	2014-08-28 20:00:25 +0000
@@ -39,6 +39,11 @@
     return Q_EMIT m_greeter->showGreeter();
 }
 
+void DBusGreeter::HideGreeter()
+{
+    return Q_EMIT m_greeter->hideGreeter();
+}
+
 void DBusGreeter::isActiveChangedHandler()
 {
     notifyPropertyChanged("IsActive", isActive());

=== modified file 'plugins/LightDM/DBusGreeter.h'
--- plugins/LightDM/DBusGreeter.h	2014-06-27 22:08:19 +0000
+++ plugins/LightDM/DBusGreeter.h	2014-08-28 20:00:25 +0000
@@ -38,6 +38,7 @@
 
     bool isActive() const;
     Q_SCRIPTABLE void ShowGreeter(); // temporary, until we split the greeter again
+    Q_SCRIPTABLE void HideGreeter(); // temporary, until we split the greeter again
 
 Q_SIGNALS:
     void isActiveChanged();

=== modified file 'plugins/LightDM/Greeter.h'
--- plugins/LightDM/Greeter.h	2014-08-15 20:23:54 +0000
+++ plugins/LightDM/Greeter.h	2014-08-28 20:00:25 +0000
@@ -62,6 +62,7 @@
     void isAuthenticatedChanged();
     void promptlessChanged();
     void showGreeter();
+    void hideGreeter();
 
     // This signal is emitted by external agents like indicators, and the UI
     // should switch to this user if possible.

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2014-08-26 16:27:42 +0000
+++ qml/Shell.qml	2014-08-28 20:00:25 +0000
@@ -271,6 +271,7 @@
         target: LightDM.Greeter
 
         onShowGreeter: greeter.show()
+        onHideGreeter: greeter.login()
 
         onShowPrompt: {
             if (greeter.narrowMode) {
@@ -313,7 +314,6 @@
             }
 
             if (LightDM.Greeter.authenticated) {
-                lockscreen.hide();
                 greeter.login();
             } else {
                 AccountsService.failedLogins++

=== modified file 'tests/qmltests/tst_Shell.qml'
--- tests/qmltests/tst_Shell.qml	2014-08-25 13:10:38 +0000
+++ tests/qmltests/tst_Shell.qml	2014-08-28 20:00:25 +0000
@@ -389,13 +389,14 @@
             tryCompare(indicators, "fullyClosed", true);
         }
 
-
-        function test_showGreeterDBusCall() {
+        function test_showAndHideGreeterDBusCalls() {
             var greeter = findChild(shell, "greeter")
             tryCompare(greeter, "showProgress", 0)
             waitForRendering(greeter);
             LightDM.Greeter.showGreeter()
             tryCompare(greeter, "showProgress", 1)
+            LightDM.Greeter.hideGreeter()
+            tryCompare(greeter, "showProgress", 0)
         }
 
         function test_login() {

=== modified file 'tools/unlock-device'
--- tools/unlock-device	2014-06-11 15:36:51 +0000
+++ tools/unlock-device	2014-08-28 20:00:25 +0000
@@ -4,7 +4,7 @@
 # Our goal here is to get an Ubuntu Touch device into a testable unlocked state.
 # This will include a reboot.
 
-WAIT_COMMAND="adb reboot; sleep 5; adb wait-for-device; sleep 20"
+WAIT_COMMAND="adb reboot; sleep 5; adb wait-for-device"
 
 while getopts s:w: opt; do
         case $opt in
@@ -17,20 +17,15 @@
         esac
 done
 
-UNLOCK_SCRIPT='
-import dbus, logging;
-from unity8 import process_helpers as helpers;
-logging.basicConfig(level=logging.INFO);
-bus = dbus.SystemBus().get_object("com.canonical.powerd", "/com/canonical/powerd");
-cookie = bus.requestSysState("unlock-device-hold", 1, dbus_interface="com.canonical.powerd");
-helpers.restart_unity_with_testability();
-bus.clearSysState(cookie, dbus_interface="com.canonical.powerd");
-helpers.unlock_unity()
-'
-
 eval "$WAIT_COMMAND"
 
-UNLOCK_OUTPUT=$(adb shell "sudo -u phablet -i python3 -c '$UNLOCK_SCRIPT'" 2>&1)
+# Force a sleep of twenty no matter what, since we may need to wait for unity8
+# to finish coming up (it's hard to tell when the greeter is actually rendered)
+sleep 20
+
+GDBUS_CMD="gdbus call --session --dest com.canonical.UnityGreeter --object-path / --method com.canonical.UnityGreeter.HideGreeter && echo Greeter unlocked"
+
+UNLOCK_OUTPUT=$(adb shell "if [ \"\$(id -u)\" = 0 ]; then sudo -u phablet -i $GDBUS_CMD; else $GDBUS_CMD; fi" 2>&1)
 if echo "$UNLOCK_OUTPUT" | grep 'Greeter unlocked' >/dev/null; then
     echo "I: Unlock passed"
     exit 0