Merge lp:~abreu-alexandre/webbrowser-app/enable-per-app-ua-override into lp:webbrowser-app

[Alexandre Abreu]

Add capability for single webapps to have specific UA overrides for the website that they serve

Add capability for single webapps to have specific UA overrides for the website that they serve,

Needs to be landed with this one:

https://code.launchpad.net/~abreu-alexandre/unity-webapps-qml/cleanup-and-fix-bindee-init/+merge/216750

[lp:~abreu-alexandre/webbrowser-app/enable-per-app-ua-override]

502. By Alexandre Abreu on 2014-04-22

Fix the network dialog reload Fixes: 1309138

503. By Alexandre Abreu on 2014-04-22

Oxide (and Chromium) does not inform of non user driven navigations (or more specifically redirects that would be part of an popup/webview load (after its been granted). Quite a few sites (e.g. Youtube), create popups when clicking on links (or following a window.open()) with proper youtube.com address but w/ redirection params, e.g.:
 http://www.youtube.com/redirect?q=http%3A%2F%2Fgodzillamovie.com%2F&redir_token=b8WPI1pq9FHXeHm2bN3KVLAJSfp8MTM5NzI2NDg3NEAxMzk3MTc4NDc0

In this instance the popup & navigation is granted, but then a redirect happens inside the popup to the real target url (here http://godzillamovie.com) which is not trapped by a navigation requested and therefore not filtered. The only way to do it atm is to listen to url changes in popups & also filter there. Fixes: 1294279

504. By PS Jenkins bot on 2014-04-22

Releasing 0.23+14.04.20140422-0ubuntu1

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:498
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/766/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4964
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/4221/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-amd64-ci/268
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-armhf-ci/268
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-armhf-ci/268/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-i386-ci/268
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4281
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5138
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5138/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4564
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4564/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6446/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6245

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

review: Needs Fixing (continuous-integration)

[Olivier Tilloy (osomon)]

119 +#include <QJsonDocument>
120 +#include <QJsonObject>

This looks unrelated (and unneeded), can it be removed?

[Olivier Tilloy (osomon)]

30 + property string localUserAgentOverride
63 + property string localUserAgentOverride
79 + property string localUserAgentOverride

Can the default value of this property be explicitly set to "" ?
It would make sense, given that the getUAString function checks its length (and I’m not sure what the default value of a property is in QML if not explicitly defined, but in any case we shouldn’t rely on a behaviour that might change).

[Olivier Tilloy (osomon)]

line 38 of the diff: s/overrided/overridden/

[Alexandre Abreu (abreu-alexandre)]

all done

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:499
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/772/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/5028
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/4242
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-amd64-ci/274
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-armhf-ci/274
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-armhf-ci/274/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-i386-ci/274
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4328
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5216
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5216/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4647
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4647/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6466
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6362

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

review: Needs Fixing (continuous-integration)

[Olivier Tilloy (osomon)]

LGTM.

review: Approve

[lp:~abreu-alexandre/webbrowser-app/enable-per-app-ua-override]

505. By PS Jenkins bot on 2014-04-25

Resync trunk

506. By Launchpad Translations on behalf of phablet-team on 2014-04-26

Launchpad automatic translations update.

507. By Alexandre Abreu on 2014-04-30

merge trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:507
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/785/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/5137
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/4265
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-amd64-ci/287
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-armhf-ci/287
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-armhf-ci/287/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-i386-ci/287
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4414
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5340
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5340/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4779
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4779/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6492
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6540

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:507
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/796/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/5220/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/4299
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-amd64-ci/298
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-armhf-ci/298
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-armhf-ci/298/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-i386-ci/298
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4487/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5445
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5445/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4885
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4885/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6527
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6725

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

review: Needs Fixing (continuous-integration)

=== modified file 'src/app/webcontainer/WebApp.qml'
--- src/app/webcontainer/WebApp.qml	2014-04-17 18:29:00 +0000
+++ src/app/webcontainer/WebApp.qml	2014-04-30 01:44:12 +0000
@@ -76,6 +76,8 @@
             }
             height: parent.height - osk.height
             developerExtrasEnabled: webapp.developerExtrasEnabled
+            localUserAgentOverride: webappName && unityWebapps.model.exists(webappName) ?
+                                      unityWebapps.model.userAgentOverrideFor(webappName) : ""
         }
 
         ErrorSheet {
@@ -91,7 +93,7 @@
 
     PanelLoader {
         id: panel
-	objectName: "panel"
+        objectName: "panel"
 
         currentWebview: webview.currentWebview
         chromeless: webapp.chromeless

=== modified file 'src/app/webcontainer/WebViewImplOxide.qml'
--- src/app/webcontainer/WebViewImplOxide.qml	2014-04-18 15:46:34 +0000
+++ src/app/webcontainer/WebViewImplOxide.qml	2014-04-30 01:44:12 +0000
@@ -32,6 +32,7 @@
     property bool developerExtrasEnabled: false
     property var toolbar: null
     property string webappName: ""
+    property string localUserAgentOverride: ""
     property var webappUrlPatterns: null
 
     currentWebview: webview
@@ -51,6 +52,11 @@
         return formFactor !== "desktop";
     }
 
+    // Function defined by the UbuntuWebView and overridden here to handle potential webapp defined UA overrides
+    function getUAString() {
+        return webview.localUserAgentOverride.length === 0 ? undefined : webview.localUserAgentOverride
+    }
+
     function isRunningAsANamedWebapp() {
         return webview.webappName && typeof(webview.webappName) === 'string' && webview.webappName.length != 0
     }
@@ -76,7 +82,7 @@
         // We still take the possible additional patterns specified in the command line
         // (the in the case of finer grained ones specifically for the container and not
         // as an 'install source' for the webapp).
-        if (webappUrlPatterns && webappUrlPatterns.length !== 0) {
+        if (haveValidUrlPatterns()) {
             for (var i = 0; i < webappUrlPatterns.length; ++i) {
                 var pattern = webappUrlPatterns[i]
                 if (url.match(pattern)) {

=== modified file 'src/app/webcontainer/WebViewImplWebkit.qml'
--- src/app/webcontainer/WebViewImplWebkit.qml	2014-03-28 15:42:34 +0000
+++ src/app/webcontainer/WebViewImplWebkit.qml	2014-04-30 01:44:12 +0000
@@ -34,6 +34,11 @@
     property var toolbar: null
     property string webappName: ""
     property var webappUrlPatterns: null
+    property string localUserAgentOverride: ""
+
+    function getUAString() {
+        return webview.localUserAgentOverride.length === 0 ? undefined : webview.localUserAgentOverride
+    }
 
     experimental.certificateVerificationDialog: CertificateVerificationDialog {}
     experimental.authenticationDialog: AuthenticationDialog {}

=== modified file 'src/app/webcontainer/WebappContainerWebview.qml'
--- src/app/webcontainer/WebappContainerWebview.qml	2014-04-10 18:45:42 +0000
+++ src/app/webcontainer/WebappContainerWebview.qml	2014-04-30 01:44:12 +0000
@@ -33,17 +33,27 @@
     property var currentWebview: webappContainerWebViewLoader.item
     property var toolbar: null
     property var webappUrlPatterns
+    property string localUserAgentOverride: ""
 
     Loader {
         id: webappContainerWebViewLoader
         anchors.fill: parent
-        source: withOxide ? Qt.resolvedUrl("WebViewImplOxide.qml") : Qt.resolvedUrl("WebViewImplWebkit.qml")
-        onLoaded: {
-            webappContainerWebViewLoader.item.toolbar = containerWebview.toolbar
-            webappContainerWebViewLoader.item.url = containerWebview.url
-            webappContainerWebViewLoader.item.webappName = containerWebview.webappName
-            webappContainerWebViewLoader.item.webappUrlPatterns = containerWebview.webappUrlPatterns
-            webappContainerWebViewLoader.item.developerExtrasEnabled = containerWebview.developerExtrasEnabled
-        }
+    }
+
+    Component.onCompleted: {
+        var webappEngineSource =
+                withOxide ?
+                    Qt.resolvedUrl("WebViewImplOxide.qml")
+                  : Qt.resolvedUrl("WebViewImplWebkit.qml");
+
+        webappContainerWebViewLoader.setSource(
+                    webappEngineSource,
+                    { toolbar: containerWebview.toolbar
+                    , localUserAgentOverride: containerWebview.localUserAgentOverride
+                    , url: containerWebview.url
+                    , webappName: containerWebview.webappName
+                    , webappUrlPatterns: containerWebview.webappUrlPatterns
+                    , developerExtrasEnabled: containerWebview.developerExtrasEnabled})
     }
 }
+

=== modified file 'src/app/webcontainer/webapp-container.cpp'
--- src/app/webcontainer/webapp-container.cpp	2014-04-11 15:53:37 +0000
+++ src/app/webcontainer/webapp-container.cpp	2014-04-30 01:44:12 +0000
@@ -118,8 +118,8 @@
             if (!urls.isEmpty()) {
                 m_window->setProperty("url", urls.first());
             } else {
-	        return false;
-	    }
+                return false;
+            }
         }
 
         m_component->completeCreate();
@@ -157,10 +157,10 @@
     out << "  --webapp=name                       try to match the webapp by name with an installed integration script" << endl;
     out << "  --webappModelSearchPath=PATH        alter the search path for installed webapps and set it to PATH. PATH can be an absolute or path relative to CWD" << endl;
     out << "  --webappUrlPatterns=URL_PATTERNS    list of comma-separated url patterns (wildcard based) that the webapp is allowed to navigate to" << endl;
+    out << "  --store-session-cookies             store session cookies on disk" << endl;
     out << "Chrome options (if none specified, no chrome is shown by default):" << endl;
     out << "  --enable-back-forward               enable the display of the back and forward buttons" << endl;
     out << "  --enable-addressbar                 enable the display of the address bar" << endl;
-    out << "  --store-session-cookies             store session cookies on disk" << endl;
 }
 
 void WebappContainer::parseCommandLine()