Merge lp://qastaging/~mardy/webbrowser-app/lp1302780 into lp://qastaging/webbrowser-app

Proposed by Alberto Mardegan
Status: Merged
Merge reported by: Olivier Tilloy
Merged at revision: not available
Proposed branch: lp://qastaging/~mardy/webbrowser-app/lp1302780
Merge into: lp://qastaging/webbrowser-app
Diff against target: 29 lines (+19/-0)
1 file modified
src/app/webcontainer/WebViewImplOxide.qml (+19/-0)
To merge this branch: bzr merge lp://qastaging/~mardy/webbrowser-app/lp1302780
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Alexandre Abreu (community) Approve
Review via email: mp+216876@code.qastaging.launchpad.net

Commit message

Webapps: let SAML requests through

SAML requests are used for instance by Google Apps for your domain; they are implemented as a HTTP redirect to a URL containing the query parameter called "SAMLRequest".
Besides letting the request through, we must also add the SAML domain to the list of the allowed hosts.

Description of the change

Webapps: let SAML requests through

SAML requests are used for instance by Google Apps for your domain; they are implemented as a HTTP redirect to a URL containing the query parameter called "SAMLRequest".
Besides letting the request through, we must also add the SAML domain to the list of the allowed hosts.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:502
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/769/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/5002
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/4231/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-amd64-ci/271
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-armhf-ci/271
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-armhf-ci/271/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-i386-ci/271
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4310
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5182
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5182/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4611
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4611/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6455/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6305

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

review: Needs Fixing (continuous-integration)
503. By Alberto Mardegan

Merge from trunk

[ Ubuntu daily release ]
* New rebuild forced
[ Alexandre Abreu ]
* Fix the network dialog reload (LP: #1309138)
* 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. (LP:
  #1294279)

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:503
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/780/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/5086
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/4255/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-amd64-ci/282
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-armhf-ci/282
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-armhf-ci/282/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-i386-ci/282
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4375
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5279
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5279/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4719
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4719/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6479/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6446

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Alexandre Abreu (abreu-alexandre) wrote :

A few comments:
- could you make sure that it works also for other schemes than http ? although quite unlikely (bc of the "SAMLRequest") it would fail if it happens,
- The "SAMLRequest" string index is searched in the whole URL not in the query param, which is open door to any website w/ a link to e.g. http://www.blabla.SAMLRequest/* to be whitelisted

504. By Alberto Mardegan

Make detection of SAML requests more robust

Ensure that the SAMLrequest string is found in the query string, and don't take
any action if the regular expression doesn't match.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Alexandre Abreu (abreu-alexandre) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes: