Changeset 94079 in webkit

Timestamp:

Aug 30, 2011, 9:00:46 AM (15 years ago)

Author:

commit-queue@webkit.org

Message:

Update registerProtocolHandler scheme whitelist to match spec
​https://bugs.webkit.org/show_bug.cgi?id=67104

Patch by Ben Wells <​benwells@chromium.org> on 2011-08-30
Reviewed by Darin Adler.

Source/WebCore:

• page/Navigator.cpp:

(WebCore::initProtocolHandlerWhitelist):

LayoutTests:

• fast/dom/register-protocol-handler-expected.txt:
• fast/dom/register-protocol-handler.html:
• platform/chromium/fast/dom/register-protocol-handler-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/register-protocol-handler-expected.txt (modified) (1 diff)
• LayoutTests/fast/dom/register-protocol-handler.html (modified) (1 diff)
• LayoutTests/platform/chromium/fast/dom/register-protocol-handler-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/Navigator.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-08-30  Ben Wells  <benwells@chromium.org>
+
+        Update registerProtocolHandler scheme whitelist to match spec
+        https://bugs.webkit.org/show_bug.cgi?id=67104
+
+        Reviewed by Darin Adler.
+
+        * fast/dom/register-protocol-handler-expected.txt:
+        * fast/dom/register-protocol-handler.html:
+        * platform/chromium/fast/dom/register-protocol-handler-expected.txt:
+
 2011-08-30  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/LayoutTests/fast/dom/register-protocol-handler-expected.txt

@@ -5 +5 @@
 Fail: Invalid protocol "https" allowed.
 Fail: Invalid protocol "file" allowed.
+Fail: Valid protocol "irc" failed.
+Fail: Valid protocol "mailto" failed.
+Fail: Valid protocol "mms" failed.
+Fail: Valid protocol "news" failed.
+Fail: Valid protocol "nntp" failed.
+Fail: Valid protocol "sms" failed.
+Fail: Valid protocol "smsto" failed.
+Fail: Valid protocol "tel" failed.
+Fail: Valid protocol "urn" failed.
+Fail: Valid protocol "webcal" failed.
 Fail: Invalid url "" allowed.
 Fail: Invalid url "%S" allowed.

trunk/LayoutTests/fast/dom/register-protocol-handler.html

@@ -33 +33 @@
 });
 
+var valid_protocols = ['irc', 'mailto', 'mms', 'news', 'nntp', 'sms', 'smsto', 'tel', 'urn', 'webcal'];
+valid_protocols.forEach(function (protocol) {
+    var succeeded = false;
+    try {
+        window.navigator.registerProtocolHandler(protocol, "valid protocol %s", "title");
+        succeeded = true;
+    } catch (e) {
+        succeeded = false;
+    }
+
+    if (succeeded)
+        debug('Pass: Valid protocol "' + protocol + '" allowed.');
+    else
+        debug('Fail: Valid protocol "' + protocol + '" failed.');
+});
+
 var invalid_urls = ["", "%S"];
 invalid_urls.forEach(function (url) {

trunk/LayoutTests/platform/chromium/fast/dom/register-protocol-handler-expected.txt

@@ -5 +5 @@
 Pass: Invalid protocol "https" threw SECURITY_ERR exception.
 Pass: Invalid protocol "file" threw SECURITY_ERR exception.
+Pass: Valid protocol "irc" allowed.
+Pass: Valid protocol "mailto" allowed.
+Pass: Valid protocol "mms" allowed.
+Pass: Valid protocol "news" allowed.
+Pass: Valid protocol "nntp" allowed.
+Pass: Valid protocol "sms" allowed.
+Pass: Valid protocol "smsto" allowed.
+Pass: Valid protocol "tel" allowed.
+Pass: Valid protocol "urn" allowed.
+Pass: Valid protocol "webcal" allowed.
 Pass: Invalid url "" threw SYNTAX_ERR exception.
 Pass: Invalid url "%S" threw SYNTAX_ERR exception.

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-30  Ben Wells  <benwells@chromium.org>
+
+        Update registerProtocolHandler scheme whitelist to match spec
+        https://bugs.webkit.org/show_bug.cgi?id=67104
+
+        Reviewed by Darin Adler.
+
+        * page/Navigator.cpp:
+        (WebCore::initProtocolHandlerWhitelist):
+
 2011-08-30  Vsevolod Vlasov  <vsevik@chromium.org>
 

trunk/Source/WebCore/page/Navigator.cpp

@@ -191 +191 @@
     protocolWhitelist = new HashSet<String>;
     static const char* protocols[] = {
+        "irc",
         "mailto",
         "mms",
+        "news",
         "nntp",
-        "rtsp",
+        "sms",
+        "smsto",
+        "tel",
+        "urn",
         "webcal",
     };