Title: [259322] trunk
Revision
259322
Author
[email protected]
Date
2020-03-31 16:58:47 -0700 (Tue, 31 Mar 2020)

Log Message

Allow WKAppBoundDomains to be initialized with eTLD+1 only (no protocol)
https://bugs.webkit.org/show_bug.cgi?id=209839
<rdar://problem/61129400>

Reviewed by Darin Adler.

Source/WebKit:

Create a convenience mode for WKAppBoundDomains that assumes https if the user does
not supply the full URL. This doesn't effect the behavior of the app-bound domains
because we only deal in RegistrableDomains.

Tested by TestWebKitAPI.

* UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm:
(WebKit::WebsiteDataStore::initializeAppBoundDomains): If the protocol is missing from
a domain supplied by WKAppBoundDomains, assume it was https.

Tools:

* TestWebKitAPI/Info.plist:

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (259321 => 259322)


--- trunk/Source/WebKit/ChangeLog	2020-03-31 23:47:47 UTC (rev 259321)
+++ trunk/Source/WebKit/ChangeLog	2020-03-31 23:58:47 UTC (rev 259322)
@@ -1,5 +1,23 @@
 2020-03-31  Brent Fulgham  <[email protected]>
 
+        Allow WKAppBoundDomains to be initialized with eTLD+1 only (no protocol)
+        https://bugs.webkit.org/show_bug.cgi?id=209839
+        <rdar://problem/61129400>
+
+        Reviewed by Darin Adler.
+
+        Create a convenience mode for WKAppBoundDomains that assumes https if the user does
+        not supply the full URL. This doesn't effect the behavior of the app-bound domains
+        because we only deal in RegistrableDomains.
+
+        Tested by TestWebKitAPI.
+
+        * UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm:
+        (WebKit::WebsiteDataStore::initializeAppBoundDomains): If the protocol is missing from
+        a domain supplied by WKAppBoundDomains, assume it was https.
+
+2020-03-31  Brent Fulgham  <[email protected]>
+
         [macOS] Update sandbox rules for correct sanitizer paths in current OS releases
         https://bugs.webkit.org/show_bug.cgi?id=209818
         <rdar://problem/58422996>

Modified: trunk/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm (259321 => 259322)


--- trunk/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm	2020-03-31 23:47:47 UTC (rev 259321)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm	2020-03-31 23:58:47 UTC (rev 259322)
@@ -486,6 +486,8 @@
 
             for (NSString *domain in domains.get()) {
                 URL url { URL(), domain };
+                if (url.protocol().isEmpty())
+                    url.setProtocol("https"_s);
                 if (!url.isValid())
                     continue;
                 WebCore::RegistrableDomain appBoundDomain { url };

Modified: trunk/Tools/ChangeLog (259321 => 259322)


--- trunk/Tools/ChangeLog	2020-03-31 23:47:47 UTC (rev 259321)
+++ trunk/Tools/ChangeLog	2020-03-31 23:58:47 UTC (rev 259322)
@@ -1,3 +1,13 @@
+2020-03-31  Brent Fulgham  <[email protected]>
+
+        Allow WKAppBoundDomains to be initialized with eTLD+1 only (no protocol)
+        https://bugs.webkit.org/show_bug.cgi?id=209839
+        <rdar://problem/61129400>
+
+        Reviewed by Darin Adler.
+
+        * TestWebKitAPI/Info.plist:
+
 2020-03-31  Alex Christensen  <[email protected]>
 
         Add SPI WKWebpagePreferences._userContentController

Modified: trunk/Tools/TestWebKitAPI/Info.plist (259321 => 259322)


--- trunk/Tools/TestWebKitAPI/Info.plist	2020-03-31 23:47:47 UTC (rev 259321)
+++ trunk/Tools/TestWebKitAPI/Info.plist	2020-03-31 23:58:47 UTC (rev 259322)
@@ -5,10 +5,11 @@
 	<key>WKAppBoundDomains</key>
 	<array>
 		<string>testDomain1</string>
-		<string>https://sub.domain.webkit.org/road/to/nowhere/</string>
-		<string>https://webkit.org</string>
-		<string>https://localhost:8000</string>
-		<string>http://localhost/road/to/nowhere/</string>
+		<string>apple.com</string>
+		<string>sub.domain.webkit.org/road/to/nowhere/</string>
+		<string>webkit.org</string>
+		<string>localhost:8000</string>
+		<string>localhost/road/to/nowhere/</string>
 		<string>file:///some/file</string>
 		<string>127.0.0.1</string>
 		<string></string>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to