Changeset 80566 in webkit

Timestamp:

Mar 8, 2011 9:41:13 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-03-08 James Kozianski <​koz@chromium.org>

Reviewed by David Levin.

Expose isValidProtocol() in KURL.h.
​https://bugs.webkit.org/show_bug.cgi?id=54594

This is needed to validate protocols used in calls to
navigator.registerProtocolHandler().

• platform/KURL.cpp:
• platform/KURL.h:
• platform/KURLGoogle.cpp: (WebCore::isValidProtocol):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/KURL.cpp (modified) (1 diff)
• platform/KURL.h (modified) (1 diff)
• platform/KURLGoogle.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-03-08  James Kozianski  <koz@chromium.org>
+
+        Reviewed by David Levin.
+
+        Expose isValidProtocol() in KURL.h.
+        https://bugs.webkit.org/show_bug.cgi?id=54594
+
+        This is needed to validate protocols used in calls to
+        navigator.registerProtocolHandler().
+
+        * platform/KURL.cpp:
+        * platform/KURL.h:
+        * platform/KURLGoogle.cpp:
+        (WebCore::isValidProtocol):
+
 2011-03-08  Adam Roben  <aroben@apple.com>
 

trunk/Source/WebCore/platform/KURL.cpp

@@ -222 +222 @@
 static void encodeRelativeString(const String& rel, const TextEncoding&, CharBuffer& ouput);
 static String substituteBackslashes(const String&);
-static bool isValidProtocol(const String&);
 
 static inline bool isSchemeFirstChar(char c) { return characterClassTable[static_cast<unsigned char>(c)] & SchemeFirstChar; }

trunk/Source/WebCore/platform/KURL.h

@@ -280 +280 @@
 bool portAllowed(const KURL&); // Blacklist ports that should never be used for Web resources.
 
+bool isValidProtocol(const String&);
+
 String mimeTypeFromDataURL(const String& url);
 

trunk/Source/WebCore/platform/KURLGoogle.cpp

@@ -134 +134 @@
 }
 
+bool isValidProtocol(const String& protocol)
+{
+    // NOTE This is a copy of the function in KURL.cpp.
+    // RFC3986: ALPHA *( ALPHA / DIGIT / "+" / "-" / "." )
+    if (protocol.isEmpty())
+        return false;
+    if (!isSchemeFirstChar(protocol[0]))
+        return false;
+    unsigned protocolLength = protocol.length();
+    for (unsigned i = 1; i < protocolLength; i++) {
+        if (!isSchemeChar(protocol[i]))
+            return false;
+    }
+    return true;
+}
+
 
 // KURLGooglePrivate -----------------------------------------------------------