Merge lp:~abreu-alexandre/webbrowser-app/enhance-google-url-patterns into lp:webbrowser-app

[Alexandre Abreu]

Enhance google.com specific patterns to enable co.* & com.* patterns

Enhance google.com specific patterns to enable co.* & com.* patterns

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1278
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2483/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5274
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1237
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1237
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1237/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1237
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4184
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5294
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5294/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25285

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

review: Approve (continuous-integration)

[Olivier Tilloy (osomon)]

LGTM. Note that with this, "http://google.com.com" becomes valid, but it’s obviously not a valid google domain. Does that matter?

review: Approve

=== modified file 'src/app/webcontainer/url-pattern-utils.cpp'
--- src/app/webcontainer/url-pattern-utils.cpp	2014-11-19 14:38:16 +0000
+++ src/app/webcontainer/url-pattern-utils.cpp	2015-11-19 15:45:20 +0000
@@ -63,7 +63,9 @@
  * <url-pattern> := <scheme>://<host><path>
  * <scheme> := 'http' | 'https'
  * <host> := <any char except '/', '*', '?' and '.'>+ '.google' <hostpart>
- * <hostpart> := '.' <any char except '/', '?' and '.'>+
+ * <hostpart> := '.' ( <restricted-sld-part> | <tld-part> )
+ * <restricted-sld-part> := ('com' | 'co') '.' <tld-part>
+ * <tld-part> := <any char except '/', '?' and '.'>+
  * <path> := '/' <any chars>
  *
  * So for example we allow 'https://accounts.google.* /' but not 'https://*.google.* /'
@@ -72,12 +74,16 @@
  * IMPORTAN NOTE: the '*' wildcard in the TLD position is not a REAL wildcard in the
  * sense that it corresponds to [^\\./], so it wont match ('google.com.evildomain') as usual.
  *
+ * The <restricted-sld-part> non-terminal in the grammar above comes from:
+ *
+ * https://en.wikipedia.org/wiki/List_of_Google_domains
+ *
  * @param pattern pattern that is to be tested for validity
  * @return true if the url is valid, false otherwise
  */
 bool isValidGoogleUrlPattern(const QString& pattern)
 {
-    static QRegularExpression grammar("^http(s|s\\?)?://[^\\.\\?\\*]+\\.google\\.[^\\.\\?]+/.*$");
+    static QRegularExpression grammar("^http(s|s\\?)?://[^\\.\\?\\*]+\\.google\\.((com|co)\\.)?[^\\.\\?]+/.*$");
     return grammar.match(pattern).hasMatch();
 }
 

=== modified file 'tests/unittests/container-url-patterns/tst_ContainerUrlPatternsTests.cpp'
--- tests/unittests/container-url-patterns/tst_ContainerUrlPatternsTests.cpp	2014-09-12 17:58:10 +0000
+++ tests/unittests/container-url-patterns/tst_ContainerUrlPatternsTests.cpp	2015-11-19 15:45:20 +0000
@@ -83,6 +83,14 @@
                 << "https?://mail.google.*/*"
                 << "https?://mail.google.[^\\./]*/[^\\s]*" << true;
 
+        QTest::newRow("Valid Google com SLD pattern")
+                << "https?://mail.google.com.*/*"
+                << "https?://mail.google.com.[^\\./]*/[^\\s]*" << true;
+
+        QTest::newRow("Valid Google co SLD pattern")
+                << "https?://mail.google.co.*/*"
+                << "https?://mail.google.co.[^\\./]*/[^\\s]*" << true;
+
         QTest::newRow("Valid non Google pattern")
                 << "https://*.google.com/*"
                 << "https://[^\\./]*.google.com/[^\\s]*" << true;
@@ -100,6 +108,7 @@
         WEBAPP_INVALID_GOOGLE_URL_PATTERN_TEST(6, "https://se*rv?ice.goo*gle.com/*");
         WEBAPP_INVALID_GOOGLE_URL_PATTERN_TEST(7, "https://se*rvice.goo*gle.com/*");
         WEBAPP_INVALID_GOOGLE_URL_PATTERN_TEST(8, "https://se*rvice.goo*gle.*/*");
+        WEBAPP_INVALID_GOOGLE_URL_PATTERN_TEST(8, "https://service.google.kom.*/*");
     }
 
     void transformedUrlPatterns()