Merge lp:~osomon/webbrowser-app/userAgentOverrides into lp:webbrowser-app

[Olivier Tilloy]

Use the new WebContext.userAgentOverrides API (new in Oxide 1.9).

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1141
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2108/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3751/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/862/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/862/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/862/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3748/console

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

review: Needs Fixing (continuous-integration)

[Alexandre Abreu (abreu-alexandre)]

review: Needs Information

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1142
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2109/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3752/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/863/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/863/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/863/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3749/console

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

review: Needs Fixing (continuous-integration)

[Olivier Tilloy (osomon)]

> temp.overrides being left unchecked type wise, could it cause an issue
> with userAgentOverrides if it is not of the expected type (or null) ?

It won’t cause issues because strict checks are implemented in oxide. I verified that by messing with the contents of ua-overrides-desktop.js on my desktop machine.
If I set overrides to be a string instead of an array, I get the following error message:

  UbuntuWebContext.qml:88: Error: Cannot assign QString to QVariantList

If I keep overrides an array but mess with its contents, I get the following error message from oxide:

  OxideQQuickWebContext::userAgentOverride: Each entry must be a list of size 2, with the first item being a valid regular expression for URL matching and the second item being the user agent string

[lp:~osomon/webbrowser-app/userAgentOverrides]

1143. By Olivier Tilloy on 2015-08-17

Bump build dependency on oxide to 1.9.

[Alexandre Abreu (abreu-alexandre)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1143
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2112/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3758/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/866/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/866/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/866/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3755/console

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

review: Needs Fixing (continuous-integration)

[lp:~osomon/webbrowser-app/userAgentOverrides]

1144. By Olivier Tilloy on 2015-09-01

Merge the latest changes from trunk and resolve a minor conflict.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1144
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2203/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4072/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/957/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/957
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/957/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/957/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3328/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4069
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4069/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23146

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1144
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2205/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4075/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/959
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/959
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/959/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/959
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3330/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4072
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4072/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23163

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2205/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:22:19 +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,
@@ -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),

=== removed symlink 'src/Ubuntu/Components/Extras/Browser/ua-override-worker.js'
=== target was u'../../../Web/ua-override-worker.js'
=== modified file 'src/Ubuntu/Web/UbuntuWebContext.qml'
--- src/Ubuntu/Web/UbuntuWebContext.qml	2015-08-10 15:22:00 +0000
+++ src/Ubuntu/Web/UbuntuWebContext.qml	2015-09-01 07:22:19 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import com.canonical.Oxide 1.6 as Oxide
+import com.canonical.Oxide 1.9 as Oxide
 
 Oxide.WebContext {
     readonly property string defaultUserAgent: __ua.defaultUA
@@ -29,27 +29,6 @@
 
     userAgent: defaultUserAgent
 
-    networkRequestDelegate: Oxide.WebContextDelegateWorker {
-        source: Qt.resolvedUrl("ua-override-worker.js")
-        // Disable this log message since it outputs sensitive content when
-        // in private mode. (See  http://pad.lv/1457925)
-        //onMessage: console.log("Overriden UA for", message.url, ":", message.override)
-        Component.onCompleted: {
-            var script = "ua-overrides-%1.js".arg(formFactor)
-            var temp = null
-            try {
-                temp = Qt.createQmlObject('import QtQml 2.0; import "%1" as Overrides; QtObject { readonly property var overrides: Overrides.overrides }'.arg(script), this)
-            } catch (e) {
-                console.error("No overrides found for", formFactor)
-            }
-            if (temp !== null) {
-                console.log("Loaded %1 UA override(s) from %2".arg(temp.overrides.length).arg(Qt.resolvedUrl(script)))
-                sendMessage({overrides: temp.overrides})
-                temp.destroy()
-            }
-        }
-    }
-    userAgentOverrideDelegate: networkRequestDelegate
     sessionCookieMode: {
         if (typeof webContextSessionCookieMode !== 'undefined') {
             if (webContextSessionCookieMode === "persistent") {
@@ -60,6 +39,7 @@
         }
         return Oxide.WebContext.SessionCookieModeEphemeral
     }
+
     userScripts: [
         Oxide.UserScript {
             context: "oxide://smartbanners/"
@@ -94,4 +74,19 @@
     devtoolsIp: webviewDevtoolsDebugHost
 
     hostMappingRules: webviewHostMappingRules
+
+    Component.onCompleted: {
+        var script = "ua-overrides-%1.js".arg(formFactor)
+        var temp = null
+        try {
+            temp = Qt.createQmlObject('import QtQml 2.0; import "%1" as Overrides; QtObject { readonly property var overrides: Overrides.overrides }'.arg(script), this)
+        } catch (e) {
+            console.error("No overrides found for", formFactor)
+        }
+        if (temp !== null) {
+            console.log("Loaded %1 UA override(s) from %2".arg(temp.overrides.length).arg(Qt.resolvedUrl(script)))
+            userAgentOverrides = temp.overrides
+            temp.destroy()
+        }
+    }
 }

=== removed file 'src/Ubuntu/Web/ua-override-worker.js'
--- src/Ubuntu/Web/ua-override-worker.js	2015-05-25 21:22:58 +0000
+++ src/Ubuntu/Web/ua-override-worker.js	1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-/*
- * Copyright 2014-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/>.
- */
-
-var overrides = [];
-
-oxide.onMessage = function(msg) {
-    if ("overrides" in msg) {
-        var o = msg["overrides"];
-        for (var i in o) {
-            var r = o[i];
-            overrides.push([new RegExp(r[0]), r[1]]);
-        }
-    }
-}
-
-function getUAoverride(url) {
-    for (var i = 0; i < overrides.length; i++) {
-        var override = overrides[i];
-        if (override[0].test(url)) {
-            return override[1];
-        }
-    }
-    return null;
-}
-
-exports.onBeforeSendHeaders = function(event) {
-    var override = getUAoverride(event.url);
-    if (override !== null) {
-        event.setHeader("User-Agent", override);
-        oxide.sendMessage({url: event.url, override: override});
-    }
-}
-
-exports.onGetUserAgentOverride = function(event) {
-    var override = getUAoverride(event.url);
-    if (override !== null) {
-        event.userAgentOverride = override;
-    }
-}