Changeset 278894 in webkit

Timestamp:

Jun 15, 2021 1:19:05 PM (3 years ago)

Author:

achristensen@apple.com

Message:

Allow legacy SecurityOrigin behavior for x-apple-ql-id2 scheme
​https://bugs.webkit.org/show_bug.cgi?id=226993
Source/WebCore:

<rdar://76474042>

Reviewed by Tim Horton.

Why have one x-apple-ql-id scheme when you can have 2?

• page/SecurityOrigin.cpp:

(WebCore::shouldTreatAsUniqueOrigin):
Also move the linked-on-or-before check to after the hasSpecialScheme check which will be true for most URLs (http, https, file, etc.)

Tools:

Reviewed by Tim Horton.

• TestWebKitAPI/Tests/WebCore/SecurityOrigin.cpp:

(TestWebKitAPI::TEST_F):

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/SecurityOrigin.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebCore/SecurityOrigin.cpp (modified) (6 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-06-15  Alex Christensen  <achristensen@webkit.org>
+
+        Allow legacy SecurityOrigin behavior for x-apple-ql-id2 scheme
+        https://bugs.webkit.org/show_bug.cgi?id=226993
+        <rdar://76474042>
+
+        Reviewed by Tim Horton.
+
+        Why have one x-apple-ql-id scheme when you can have 2?
+
+        * page/SecurityOrigin.cpp:
+        (WebCore::shouldTreatAsUniqueOrigin):
+        Also move the linked-on-or-before check to after the hasSpecialScheme check which will be true for most URLs (http, https, file, etc.)
+
 2021-06-15  Philippe Normand  <pnormand@igalia.com>
 

trunk/Source/WebCore/page/SecurityOrigin.cpp

@@ -111 +111 @@
         return true;
 
-#if PLATFORM(COCOA)
-    if (!linkedOnOrAfter(SDKVersion::FirstWithNullOriginForNonSpecialSchemedURLs))
-        return false;
-#endif
-
     // https://url.spec.whatwg.org/#origin with some additions
     if (url.hasSpecialScheme()
 #if PLATFORM(COCOA)
+        || !linkedOnOrAfter(SDKVersion::FirstWithNullOriginForNonSpecialSchemedURLs)
         || url.protocolIs("applewebdata")
         || url.protocolIs("x-apple-ql-id")
+        || url.protocolIs("x-apple-ql-id2")
         || url.protocolIs("x-apple-ql-magic")
 #endif

trunk/Tools/ChangeLog

@@ +1 @@
+2021-06-15  Alex Christensen  <achristensen@webkit.org>
+
+        Allow legacy SecurityOrigin behavior for x-apple-ql-id2 scheme
+        https://bugs.webkit.org/show_bug.cgi?id=226993
+
+        Reviewed by Tim Horton.
+
+        * TestWebKitAPI/Tests/WebCore/SecurityOrigin.cpp:
+        (TestWebKitAPI::TEST_F):
+
 2021-06-15  Jonathan Bedard  <jbedard@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebCore/SecurityOrigin.cpp

@@ -89 +89 @@
     auto o9 = SecurityOrigin::createFromString("x-apple-ql-id://host");
     auto o10 = SecurityOrigin::createFromString("x-apple-ql-magic://host");
+    auto o11 = SecurityOrigin::createFromString("x-apple-ql-id2://host");
 #endif
 
@@ -102 +103 @@
     EXPECT_EQ(String("x-apple-ql-id"), o9->protocol());
     EXPECT_EQ(String("x-apple-ql-magic"), o10->protocol());
+    EXPECT_EQ(String("x-apple-ql-id2"), o11->protocol());
 #endif
 
@@ -115 +117 @@
     EXPECT_EQ(String("host"), o9->host());
     EXPECT_EQ(String("host"), o10->host());
+    EXPECT_EQ(String("host"), o11->host());
 #endif
 
@@ -128 +131 @@
     EXPECT_FALSE(o9->port());
     EXPECT_FALSE(o10->port());
+    EXPECT_FALSE(o11->port());
 #endif
 
@@ -141 +145 @@
     EXPECT_EQ("x-apple-ql-id://host", o9->toString());
     EXPECT_EQ("x-apple-ql-magic://host", o10->toString());
+    EXPECT_EQ("x-apple-ql-id2://host", o11->toString());
 #endif
 
@@ -153 +158 @@
     EXPECT_FALSE(o1->isSameOriginAs(o9.get()));
     EXPECT_FALSE(o1->isSameOriginAs(o10.get()));
+    EXPECT_FALSE(o1->isSameOriginAs(o11.get()));
 #endif
 }