Merge lp:~abreu-alexandre/webbrowser-app/fix-popup-url-redirection into lp:webbrowser-app

[Alexandre Abreu]

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.

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.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:490
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/741/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4776/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/4155/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-amd64-ci/243
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-armhf-ci/243
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-armhf-ci/243/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-i386-ci/243
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4126/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4907
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4907/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4357
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4357/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6388/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5941

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

review: Needs Fixing (continuous-integration)

[Olivier Tilloy (osomon)]

A question related to this work (since I didn’t have the chance to review the navigationRequested branch that landed earlier: how does createPopupWindow work on devices? Does it actually open a new window/surface? Is it being seen as a separate app by unity8?

review: Needs Information

[Alexandre Abreu (abreu-alexandre)]

> A question related to this work (since I didn’t have the chance to review the
> navigationRequested branch that landed earlier: how does createPopupWindow
> work on devices? Does it actually open a new window/surface? Is it being seen
> as a separate app by unity8?

no it does nothing on the device,

[Alexandre Abreu (abreu-alexandre)]

(nothing as in = opens in the webbrowser-app)

[lp:~abreu-alexandre/webbrowser-app/fix-popup-url-redirection]

490. By Olivier Tilloy on 2014-04-11

Enable UA overrides for all form factors, each in a separate file.
Add an override for google calendar on desktop.
Clean up the construction of the default UA string for easier reading and maintenance.

491. By Alexandre Abreu on 2014-04-11

Make sure that we dont load unecessary libs (oxide or qtwebkit) correspnding to the webengine that we dont use. Fixes: 1306037

492. By Alexandre Abreu on 2014-04-11

Add a basic set of integration tests for the webapp container

493. By Bill Filler on 2014-04-11

Add support for file upload via content-hub

494. By PS Jenkins bot on 2014-04-11

Releasing 0.23+14.04.20140411.1-0ubuntu1

495. By Launchpad Translations on behalf of phablet-team on 2014-04-12

Launchpad automatic translations update.

496. By Olivier Tilloy on 2014-04-14

Force the page title to be reset to an empty string when the activity view is being hidden. Fixes: 1307420

497. By PS Jenkins bot on 2014-04-14

Releasing 0.23+14.04.20140414-0ubuntu1

[Alberto Mardegan (mardy)]

Works as expected here.

review: Approve

[lp:~abreu-alexandre/webbrowser-app/fix-popup-url-redirection]

498. By PS Jenkins bot on 2014-04-15

Resync trunk

499. By Launchpad Translations on behalf of phablet-team on 2014-04-16

Launchpad automatic translations update.

[Alexandre Abreu (abreu-alexandre)]

I updated the branch w/ some extra fixes

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:491
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/762/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4913
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/4191
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-amd64-ci/264
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-armhf-ci/264
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-armhf-ci/264/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-i386-ci/264
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4243
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5062
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5062/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4494
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4494/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6422
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6141

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:492
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/763/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4914
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/4192/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-amd64-ci/265
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-armhf-ci/265
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-armhf-ci/265/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-i386-ci/265
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4244
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5063
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5063/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4495
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4495/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6423/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6143

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

review: Needs Fixing (continuous-integration)

[lp:~abreu-alexandre/webbrowser-app/fix-popup-url-redirection]

500. By Olivier Tilloy on 2014-04-16

Handle new view requests in the browser. Fixes: 1307735

501. By PS Jenkins bot on 2014-04-16

Releasing 0.23+14.04.20140416-0ubuntu1

[Alberto Mardegan (mardy)]

I re-tried the branch after the latest changes, and it still works fine :-)

[lp:~abreu-alexandre/webbrowser-app/fix-popup-url-redirection]

502. By Alexandre Abreu on 2014-04-18

merge trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:502
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/765/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4947
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/4206
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-amd64-ci/267
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-armhf-ci/267
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-armhf-ci/267/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-i386-ci/267
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4265
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5107
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5107/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4538
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4538/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6432
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6191

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

review: Needs Fixing (continuous-integration)

=== modified file 'src/app/webcontainer/WebViewImplOxide.qml'
--- src/app/webcontainer/WebViewImplOxide.qml	2014-04-15 09:20:01 +0000
+++ src/app/webcontainer/WebViewImplOxide.qml	2014-04-18 15:46:54 +0000
@@ -47,6 +47,10 @@
         }
     }
 
+    function shouldOpenPopupsInDefaultBrowser() {
+        return formFactor !== "desktop";
+    }
+
     function isRunningAsANamedWebapp() {
         return webview.webappName && typeof(webview.webappName) === 'string' && webview.webappName.length != 0
     }
@@ -55,6 +59,11 @@
         return webappUrlPatterns && webappUrlPatterns.length !== 0
     }
 
+    function isNewForegroundWebViewDisposition(disposition) {
+        return disposition === NavigationRequest.DispositionNewPopup ||
+               disposition === NavigationRequest.DispositionNewForegroundTab;
+    }
+
     function shouldAllowNavigationTo(url) {
         // The list of url patterns defined by the webapp takes precedence over command line
         if (isRunningAsANamedWebapp()) {
@@ -80,6 +89,27 @@
     }
 
     function navigationRequestedDelegate(request) {
+        var newForegroundPageRequest = isNewForegroundWebViewDisposition(request.disposition)
+        var url = request.url.toString()
+
+        // Covers some edge cases corresponding to the default window.open() behavior.
+        // When it is being called, the targetted URL will not load right away but
+        // will first round trip to an "about:blank".
+        // See https://developer.mozilla.org/en-US/docs/Web/API/Window.open
+        if (newForegroundPageRequest && url == 'about:blank') {
+            console.log('Accepting a new window request to navigate to "about:blank"')
+            request.action = NavigationRequest.ActionAccept
+            return;
+        }
+
+        if (newForegroundPageRequest && shouldOpenPopupsInDefaultBrowser()) {
+            console.debug('Opening: popup window ' + url + ' in the browser window.')
+
+            request.action = NavigationRequest.ActionReject
+            Qt.openUrlExternally(url);
+            return;
+        }
+
         // Pass-through if we are not running as a named webapp (--webapp='Gmail')
         // or if we dont have a list of url patterns specified to filter the
         // browsing actions
@@ -88,27 +118,10 @@
             return
         }
 
-        var url = request.url.toString()
-
-        // Covers some edge cases corresponding to current Oxide potential issues (to be
-        // confirmed) that for e.g GooglePlus when a window.open() happens (or equivalent)
-        // the url that we are given (for the corresponding window.open() is 'about:blank')
-        if (url == 'about:blank') {
-            console.log('Ignoring the request to navigate to "about:blank"')
-            request.action = NavigationRequest.ActionReject
-            return;
-        }
-
         request.action = NavigationRequest.ActionReject
         if (webview.shouldAllowNavigationTo(url))
             request.action = NavigationRequest.ActionAccept
 
-        if ( ! webview.isRunningAsANamedWebapp() && request.disposition === NavigationRequest.DispositionNewPopup) {
-            console.debug('Opening: popup window ' + url + ' in the browser window.')
-            Qt.openUrlExternally(url);
-            return;
-        }
-
         if (request.action === NavigationRequest.ActionReject) {
             console.debug('Opening: ' + url + ' in the browser window.')
             Qt.openUrlExternally(url)
@@ -132,8 +145,9 @@
                     var url = request.url.toString()
 
                     // If we are to browse in the popup to a place where we are not allows
-                    if (request.disposition !== NavigationRequest.DispositionNewPopup &&
+                    if ( ! isNewForegroundWebViewDisposition(request.disposition) &&
                             ! webview.shouldAllowNavigationTo(url)) {
+                        request.action = NavigationRequest.ActionReject
                         Qt.openUrlExternally(url);
                         popup.close()
                         return;
@@ -144,6 +158,30 @@
                 }
 
                 onNewViewRequested: webview.createPopupWindow(request)
+
+                // 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 changed in popups & also
+                // filter there.
+                onUrlChanged: {
+                    var _url = url.toString();
+                    if (_url.trim().length === 0)
+                        return;
+
+                    if (_url != 'about:blank' && ! webview.shouldAllowNavigationTo(_url)) {
+                        Qt.openUrlExternally(_url);
+                        popup.close()
+                    }
+                }
             }
             Component.onCompleted: popup.show()
         }