Changeset 285873 in webkit

Timestamp:

Nov 16, 2021, 10:27:57 AM (5 years ago)

Author:

Chris Dumez

Message:

[iOS] Do not require the web browser entitlement to opt into captive portal mode
​https://bugs.webkit.org/show_bug.cgi?id=233191

Reviewed by Brent Fulgham.

Source/WebKit:

Do not require the web browser entitlement to opt into captive portal mode on iOS, only require
it to opt out.

• UIProcess/API/Cocoa/WKWebpagePreferences.mm:

(-[WKWebpagePreferences _setCaptivePortalModeEnabled:]):

Tools:

Update API test coverage accordingly.

• TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:

Location:

trunk

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/API/Cocoa/WKWebpagePreferences.mm (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-11-16  Chris Dumez  <cdumez@apple.com>
+
+        [iOS] Do not require the web browser entitlement to opt into captive portal mode
+        https://bugs.webkit.org/show_bug.cgi?id=233191
+
+        Reviewed by Brent Fulgham.
+
+        Do not require the web browser entitlement to opt into captive portal mode on iOS, only require
+        it to opt out.
+
+        * UIProcess/API/Cocoa/WKWebpagePreferences.mm:
+        (-[WKWebpagePreferences _setCaptivePortalModeEnabled:]):
+
 2021-11-16  Per Arne Vollan <pvollan@apple.com>
 

trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebpagePreferences.mm

@@ -394 +394 @@
 - (void)_setCaptivePortalModeEnabled:(BOOL)captivePortalModeEnabled
 {
+    if (_websitePolicies->captivePortalModeEnabled() == captivePortalModeEnabled)
+        return;
+
 #if PLATFORM(IOS_FAMILY)
-    if (!WTF::processHasEntitlement("com.apple.developer.web-browser"))
-        return;
-#endif
+    // On iOS, the web browser entitlement is required to disable captive portal mode.
+    if (!captivePortalModeEnabled && !WTF::processHasEntitlement("com.apple.developer.web-browser"))
+        [NSException raise:NSInternalInconsistencyException format:@"The 'com.apple.developer.web-browser' restricted entitlement is required to disable captive portal mode"];
+#endif
+
     _websitePolicies->setCaptivePortalModeEnabled(!!captivePortalModeEnabled);
 }

trunk/Tools/ChangeLog

@@ +1 @@
+2021-11-16  Chris Dumez  <cdumez@apple.com>
+
+        [iOS] Do not require the web browser entitlement to opt into captive portal mode
+        https://bugs.webkit.org/show_bug.cgi?id=233191
+
+        Reviewed by Brent Fulgham.
+
+        Update API test coverage accordingly.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:
+
 2021-11-16  Andres Gonzalez  <andresg_22@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm

@@ -7627 +7627 @@
 }
 
-// On iOS, toggling the captive portal mode requires the browser entitlement, which TestWebKit API doesn't have.
-// Also, some API tests rely on the browser entitlement not being present.
-#if !PLATFORM(IOS)
-
 static bool isJITEnabled(WKWebView *webView)
 {
@@ -7724 +7720 @@
 }
 
+#if PLATFORM(IOS)
+
+TEST(ProcessSwap, CannotDisableCaptivePortalModeWithoutBrowserEntitlement)
+{
+    auto webViewConfiguration = adoptNS([WKWebViewConfiguration new]);
+    EXPECT_FALSE(webViewConfiguration.get().defaultWebpagePreferences._captivePortalModeEnabled);
+    [webViewConfiguration.get().defaultWebpagePreferences _setCaptivePortalModeEnabled:YES];
+    [webViewConfiguration.get().preferences _setMediaDevicesEnabled:YES];
+    webViewConfiguration.get().preferences._mediaCaptureRequiresSecureConnection = NO;
+
+    auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:webViewConfiguration.get()]);
+    auto delegate = adoptNS([TestNavigationDelegate new]);
+    [webView setNavigationDelegate:delegate.get()];
+
+    EXPECT_FALSE(isJITEnabled(webView.get()));
+    checkSettingsControlledByCaptivePortalMode(webView.get(), ShouldBeEnabled::No, IsShowingInitialEmptyDocument::Yes);
+    pid_t pid1 = [webView _webProcessIdentifier];
+
+    __block bool finishedNavigation = false;
+    delegate.get().didFinishNavigation = ^(WKWebView *, WKNavigation *) {
+        finishedNavigation = true;
+    };
+
+    delegate.get().decidePolicyForNavigationActionWithPreferences = ^(WKNavigationAction *action, WKWebpagePreferences *preferences, void (^completionHandler)(WKNavigationActionPolicy, WKWebpagePreferences *)) {
+        EXPECT_TRUE(preferences._captivePortalModeEnabled);
+        bool didThrowWhenTryingToDisableCaptivePortalMode = false;
+        // TestWebKitAPI doesn't have the web browser entitlement and thus shouldn't be able to disable captive portal mode.
+        @try {
+            [preferences _setCaptivePortalModeEnabled:NO];
+        } @catch (NSException *exception) {
+            didThrowWhenTryingToDisableCaptivePortalMode = true;
+        }
+        EXPECT_TRUE(didThrowWhenTryingToDisableCaptivePortalMode);
+        completionHandler(WKNavigationActionPolicyAllow, preferences);
+    };
+
+    NSURL *url = [[NSBundle mainBundle] URLForResource:@"simple" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"];
+    [webView loadRequest:[NSURLRequest requestWithURL:url]];
+    TestWebKitAPI::Util::run(&finishedNavigation);
+
+    EXPECT_EQ(pid1, [webView _webProcessIdentifier]); // Shouldn't have process-swapped since we're staying in captive portal mode.
+    EXPECT_FALSE(isJITEnabled(webView.get()));
+    checkSettingsControlledByCaptivePortalMode(webView.get(), ShouldBeEnabled::No);
+}
+
+#else
+
 TEST(ProcessSwap, CaptivePortalModeEnabledByDefaultThenOptOut)
 {