webbrowser-app

Merge lp://staging/~justinmcp/webbrowser-app/handle-cc-tld into lp://staging/webbrowser-app

  1. handle-cc-tld
  2. Merge into trunk
Proposed by Justin McPherson
Status: Rejected
Rejected by: Olivier Tilloy
Proposed branch: lp://staging/~justinmcp/webbrowser-app/handle-cc-tld
Merge into: lp://staging/webbrowser-app
Diff against target: 38 lines (+6/-4)
2 files modified
src/app/webcontainer/url-pattern-utils.cpp (+5/-3)
tests/unittests/container-url-patterns/tst_ContainerUrlPatterns.cpp (+1/-1)
To merge this branch: bzr merge lp://staging/~justinmcp/webbrowser-app/handle-cc-tld
Reviewer Review Type Date Requested Status
Alexandre Abreu (community) Disapprove
PS Jenkins bot continuous-integration Approve
Review via email: mp+213189@code.staging.launchpad.net

Commit message

Handle Google redirects through "extended" tlds.

Description of the change

Following the convention of (some) cc tlds, Google will designate the domain type before the cc.

Example; authorisation in .au would not occur through accounts.google.au, but rather accounts.google.com.au

This patch enables matching for this condition.

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

PASSED: Continuous integration, rev:473
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/668/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4332
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3931
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-amd64-ci/170
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-armhf-ci/170
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-armhf-ci/170/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-i386-ci/170
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3755
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4431
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4431/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3933
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3933/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6212
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5345

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

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

I dont really like the idea, since it goes against the initial idea (to prevent google.com to being redirected to google.com.evil) and is way not restrictive enough in the allowed domains.

It was initially accessed that in some (discrete) cases the current approach would not be convenient (think .co.uk) and that for those specific cases instead of opening the matching regexp and increasing the risks, it would be acceptable to have those explicitly listed.

Revision history for this message
Alexandre Abreu (abreu-alexandre) :
review: Disapprove

Unmerged revisions

473. By Justin McPherson

Handle google redirects to cc tlds.

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: