Merge lp:~osomon/webbrowser-app/http-auth into lp:webbrowser-app

[Olivier Tilloy]

Handle HTTP authentication requests by showing an authentication dialog.

This bumps the build dependency as well as runtime dependency of webbrowser-app and qtdeclarative5-ubuntu-web-plugin on liboxideqt-qmlplugin to 1.9.

Note: this supersedes https://code.launchpad.net/~uriboni/webbrowser-app/basic-auth/+merge/261491.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1009
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1944/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3347/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/701/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/701/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/701/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3345/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1944/rebuild

review: Needs Fixing (continuous-integration)

[Riccardo Padovani (rpadovani)]

I tested with http://studiare.unife.it and works very well \o/
I hope it lands with OTA-5, I need to be able to take a look to my uni website when I'm on the phone, so thank you very much :-)

The only thing that could be improved it's the support for the 'tab' key to switch between fields. Anyway, this isn't prioritary, so it's a green light for me!

(as usual, I didn't review tests, they looks good but you know I don't know python)

review: Approve

[Olivier Tilloy (osomon)]

Unfortunately no it won’t land in OTA-5, as it depends on oxide 1.9, to be released in ~ 6 weeks from now.

[lp:~osomon/webbrowser-app/http-auth]

1010. By Olivier Tilloy on 2015-08-12

Merge the latest changes from trunk and resolve a few minor conflicts.

1011. By Olivier Tilloy on 2015-08-12

Update imports.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1011
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2078/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3676/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/832/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/832/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/832/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3673/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2078/rebuild

review: Needs Fixing (continuous-integration)

[lp:~osomon/webbrowser-app/http-auth]

1012. By Olivier Tilloy on 2015-09-01

Merge the latest changes from trunk and resolve a few conflicts.

1013. By Olivier Tilloy on 2015-09-01

Factor out common code in autopilot tests.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1013
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2147/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3915/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/900/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/901/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/901/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3912/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2147/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1013
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2202/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4071/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/956/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/956
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/956/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/956/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3327/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4068
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4068/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23145

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2202/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1013
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2204/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4074/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/958
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/958
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/958/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/958
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3329/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4071
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4071/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23162

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2204/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2015-08-25 13:56:58 +0000
+++ debian/control	2015-09-01 07:19:36 +0000
@@ -6,7 +6,7 @@
                debhelper (>= 9),
                dh-translations,
                hardening-wrapper,
-               liboxideqt-qmlplugin (>= 1.8),
+               liboxideqt-qmlplugin (>= 1.9),
                libqt5sql5-sqlite,
                python3-all,
                python3-flake8,
@@ -35,7 +35,7 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          fonts-liberation,
-         liboxideqt-qmlplugin (>= 1.8),
+         liboxideqt-qmlplugin (>= 1.9),
          libqt5sql5-sqlite,
          qml-module-qt-labs-folderlistmodel,
          qml-module-qt-labs-settings,
@@ -97,7 +97,7 @@
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         liboxideqt-qmlplugin (>= 1.8),
+         liboxideqt-qmlplugin (>= 1.9),
          qml-module-qtquick2 (>= 5.4),
          qml-module-qtquick-window2 (>= 5.3),
          qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3),

=== modified file 'src/Ubuntu/Web/UbuntuWebView02.qml'
--- src/Ubuntu/Web/UbuntuWebView02.qml	2015-08-27 11:36:25 +0000
+++ src/Ubuntu/Web/UbuntuWebView02.qml	2015-09-01 07:19:36 +0000
@@ -18,7 +18,7 @@
 
 import QtQuick 2.4
 import QtQuick.Window 2.2
-import com.canonical.Oxide 1.8 as Oxide
+import com.canonical.Oxide 1.9 as Oxide
 import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.3
 import "." // QTBUG-34418

=== added file 'src/app/HttpAuthenticationDialog.qml'
--- src/app/HttpAuthenticationDialog.qml	1970-01-01 00:00:00 +0000
+++ src/app/HttpAuthenticationDialog.qml	2015-09-01 07:19:36 +0000
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app 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.
+ *
+ * webbrowser-app 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/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3 as Popups
+
+Popups.Dialog {
+    id: dialog
+    title: i18n.tr("Authentication required.")
+    // TRANSLATORS: %1 refers to the URL of the current website and %2 is a string that the website sends with more information about the authentication challenge (technically called "realm")
+    text: request ? i18n.tr('The website at %1 requires authentication. The website says "%2"').arg(request.host).arg(request.realm) : ""
+
+    property QtObject request: null
+
+    Connections {
+        target: request
+        onCancelled: PopupUtils.close(dialog)
+    }
+
+    TextField {
+        id: usernameInput
+        objectName: "username"
+        placeholderText: i18n.tr("Username")
+        onAccepted: {
+            request.allow(usernameInput.text, passwordInput.text)
+            PopupUtils.close(dialog)
+        }
+    }
+
+    TextField {
+        id: passwordInput
+        objectName: "password"
+        placeholderText: i18n.tr("Password")
+        echoMode: TextInput.Password
+        onAccepted: {
+            request.allow(usernameInput.text, passwordInput.text)
+            PopupUtils.close(dialog)
+        }
+    }
+
+    Button {
+        objectName: "allow"
+        text: i18n.tr("OK")
+        color: UbuntuColors.green
+        onClicked: {
+            request.allow(usernameInput.text, passwordInput.text)
+            PopupUtils.close(dialog)
+        }
+    }
+
+    Button {
+        objectName: "deny"
+        text: i18n.tr("Cancel")
+        color: UbuntuColors.coolGrey
+        onClicked: {
+            request.deny()
+            PopupUtils.close(dialog)
+        }
+    }
+}

=== modified file 'src/app/WebViewImpl.qml'
--- src/app/WebViewImpl.qml	2015-08-27 14:00:49 +0000
+++ src/app/WebViewImpl.qml	2015-09-01 07:19:36 +0000
@@ -29,7 +29,6 @@
     property var currentWebview: webview
 
     /*experimental.certificateVerificationDialog: CertificateVerificationDialog {}
-    experimental.authenticationDialog: AuthenticationDialog {}
     experimental.proxyAuthenticationDialog: ProxyAuthenticationDialog {}*/
     alertDialog: AlertDialog {}
     confirmDialog: ConfirmDialog {}
@@ -82,6 +81,11 @@
         }
     }
 
+    onHttpAuthenticationRequested: {
+        PopupUtils.open(Qt.resolvedUrl("HttpAuthenticationDialog.qml"),
+                        webview.currentWebview, {"request": request})
+    }
+
     Loader {
         id: filePickerLoader
         source: formFactor == "desktop" ? "FilePickerDialog.qml" : "ContentPickerDialog.qml"

=== modified file 'tests/autopilot/webbrowser_app/emulators/browser.py'
--- tests/autopilot/webbrowser_app/emulators/browser.py	2015-08-25 13:56:58 +0000
+++ tests/autopilot/webbrowser_app/emulators/browser.py	2015-09-01 07:19:36 +0000
@@ -115,6 +115,9 @@
     def get_geolocation_dialog(self):
         return self.wait_select_single(GeolocationPermissionRequest)
 
+    def get_http_auth_dialog(self):
+        return self.wait_select_single(HttpAuthenticationDialog)
+
     def get_tabs_view(self):
         return self.wait_select_single(TabsList, visible=True)
 
@@ -323,6 +326,21 @@
         return self.select_single("Button", objectName="allow")
 
 
+class HttpAuthenticationDialog(uitk.UbuntuUIToolkitCustomProxyObjectBase):
+
+    def get_deny_button(self):
+        return self.select_single("Button", objectName="deny")
+
+    def get_allow_button(self):
+        return self.select_single("Button", objectName="allow")
+
+    def get_username_field(self):
+        return self.select_single("TextField", objectName="username")
+
+    def get_password_field(self):
+        return self.select_single("TextField", objectName="password")
+
+
 class TabPreview(uitk.UbuntuUIToolkitCustomProxyObjectBase):
 
     @autopilot.logging.log_action(logger.info)

=== modified file 'tests/autopilot/webbrowser_app/tests/http_server.py'
--- tests/autopilot/webbrowser_app/tests/http_server.py	2015-08-24 09:27:53 +0000
+++ tests/autopilot/webbrowser_app/tests/http_server.py	2015-09-01 07:19:36 +0000
@@ -6,6 +6,7 @@
 # under the terms of the GNU General Public License version 3, as published
 # by the Free Software Foundation.
 
+from base64 import b64decode
 import http.server as http
 import json
 import logging
@@ -37,6 +38,12 @@
         self.end_headers()
         self.wfile.write(html.encode())
 
+    def send_auth_request(self):
+        self.send_response(401)
+        self.send_header("WWW-Authenticate", "Basic realm=\"Enter Password\"")
+        self.end_headers()
+        self.send_html("Not Authorized")
+
     def do_GET(self):
         if self.path == "/ping":
             self.send_response(200)
@@ -183,6 +190,19 @@
             self.send_response(200)
             name = self.path[len("/tab/"):]
             self.send_html('<html><body>' + name + '</body></html>')
+        elif self.path.startswith("/basicauth"):
+            login = "user"
+            password = "pass"
+            if "Authorization" in self.headers:
+                header = self.headers.get("Authorization")
+                credentials = str(b64decode(header[len("Basic "):])).split(":")
+                if credentials[0] == login and credentials[1] == password:
+                    self.send_response(200)
+                    self.send_html("Authentication Successful !")
+                else:
+                    self.send_auth_request()
+            else:
+                self.send_auth_request()
         else:
             self.send_error(404)
 

=== added file 'tests/autopilot/webbrowser_app/tests/test_basic_authentication.py'
--- tests/autopilot/webbrowser_app/tests/test_basic_authentication.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/webbrowser_app/tests/test_basic_authentication.py	2015-09-01 07:19:36 +0000
@@ -0,0 +1,49 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright 2015 Canonical
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# 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/>.
+
+from webbrowser_app.tests import StartOpenRemotePageTestCaseBase
+
+
+class TestBasicAuthentication(StartOpenRemotePageTestCaseBase):
+
+    def setUp(self):
+        super(TestBasicAuthentication, self).setUp()
+        self.main_window.go_to_url(self.base_url + "/basicauth")
+        self.dialog = self.main_window.get_http_auth_dialog()
+        self.username = "user"
+        self.password = "pass"
+
+    def test_cancel(self):
+        self.pointing_device.click_object(self.dialog.get_deny_button())
+        self.dialog.wait_until_destroyed()
+
+    def test_right_credentials(self):
+        username = self.dialog.get_username_field()
+        username.write(self.username)
+        password = self.dialog.get_password_field()
+        password.write(self.password)
+        self.pointing_device.click_object(self.dialog.get_allow_button())
+        self.dialog.wait_until_destroyed()
+
+    def test_wrong_credentials(self):
+        username = self.dialog.get_username_field()
+        username.write("x")
+        password = self.dialog.get_password_field()
+        password.write("x")
+        self.pointing_device.click_object(self.dialog.get_allow_button())
+        self.dialog.wait_until_destroyed()
+        # verify that a new dialog has been displayed
+        self.main_window.get_http_auth_dialog()