Changeset 238293 in webkit

Timestamp:

Nov 16, 2018 11:59:45 AM (5 years ago)

Author:

achristensen@apple.com

Message:

Add API to disable safe browsing checks
​https://bugs.webkit.org/show_bug.cgi?id=191610

Reviewed by Dean Jackson.

Source/WebKit:

• UIProcess/API/Cocoa/WKPreferences.h:
• UIProcess/API/Cocoa/WKPreferences.mm:

(-[WKPreferences setSafeBrowsingEnabled:]):
(-[WKPreferences isSafeBrowsingEnabled]):
(-[WKPreferences _setSafeBrowsingEnabled:]): Deleted.
(-[WKPreferences _safeBrowsingEnabled]): Deleted.

• UIProcess/API/Cocoa/WKPreferencesPrivate.h:

Tools:

• TestWebKitAPI/Tests/WebKitCocoa/SafeBrowsing.mm:

(resourceURL):
(TEST):
(safeBrowsingView):
(simpleURL): Deleted.

Location:

trunk

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/API/Cocoa/WKPreferences.h (modified) (1 diff)
• Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm (modified) (1 diff)
• Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKitCocoa/SafeBrowsing.mm (modified) (3 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-11-16  Alex Christensen  <achristensen@webkit.org>
+
+        Add API to disable safe browsing checks
+        https://bugs.webkit.org/show_bug.cgi?id=191610
+
+        Reviewed by Dean Jackson.
+
+        * UIProcess/API/Cocoa/WKPreferences.h:
+        * UIProcess/API/Cocoa/WKPreferences.mm:
+        (-[WKPreferences setSafeBrowsingEnabled:]):
+        (-[WKPreferences isSafeBrowsingEnabled]):
+        (-[WKPreferences _setSafeBrowsingEnabled:]): Deleted.
+        (-[WKPreferences _safeBrowsingEnabled]): Deleted.
+        * UIProcess/API/Cocoa/WKPreferencesPrivate.h:
+
 2018-11-16  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.h

@@ -54 +54 @@
 @property (nonatomic) BOOL javaScriptCanOpenWindowsAutomatically;
 
+/*! @abstract A Boolean value indicating whether warnings should be
+ shown for suspected unsafe content such as phishing or malware.
+ @discussion The default value is YES.
+ */
+@property (nonatomic, getter=isSafeBrowsingEnabled) BOOL safeBrowsingEnabled WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
+
 #if !TARGET_OS_IPHONE
 /*! @abstract A Boolean value indicating whether Java is enabled.

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

@@ -698 +698 @@
 }
 
-- (void)_setSafeBrowsingEnabled:(BOOL)enabled
+- (void)setSafeBrowsingEnabled:(BOOL)enabled
 {
     _preferences->setSafeBrowsingEnabled(enabled);
 }
 
-- (BOOL)_safeBrowsingEnabled
+- (BOOL)isSafeBrowsingEnabled
 {
     return _preferences->safeBrowsingEnabled();

trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h

@@ -122 +122 @@
 @property (nonatomic, setter=_setWebRTCLegacyAPIEnabled:) BOOL _webRTCLegacyAPIEnabled WK_API_AVAILABLE(macosx(10.13), ios(11.0));
 @property (nonatomic, setter=_setInactiveMediaCaptureSteamRepromptIntervalInMinutes:) double _inactiveMediaCaptureSteamRepromptIntervalInMinutes WK_API_AVAILABLE(macosx(10.13.4), ios(11.3));
-@property (nonatomic, setter=_setSafeBrowsingEnabled:) BOOL _safeBrowsingEnabled WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
 
 @property (nonatomic, setter=_setJavaScriptCanAccessClipboard:) BOOL _javaScriptCanAccessClipboard WK_API_AVAILABLE(macosx(10.13), ios(11.0));

trunk/Tools/ChangeLog

@@ +1 @@
+2018-11-16  Alex Christensen  <achristensen@webkit.org>
+
+        Add API to disable safe browsing checks
+        https://bugs.webkit.org/show_bug.cgi?id=191610
+
+        Reviewed by Dean Jackson.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/SafeBrowsing.mm:
+        (resourceURL):
+        (TEST):
+        (safeBrowsingView):
+        (simpleURL): Deleted.
+
 2018-11-16  Zalan Bujtas  <zalan@apple.com>
 

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

@@ -30 +30 @@
 #import "ClassMethodSwizzler.h"
 #import "PlatformUtilities.h"
+#import "TestNavigationDelegate.h"
 #import "TestWKWebView.h"
 #import <WebKit/WKNavigationDelegate.h>
@@ -138 +139 @@
 @end
 
-static NSURL *simpleURL()
-{
-    return [[NSBundle mainBundle] URLForResource:@"simple" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"];
+static NSURL *resourceURL(NSString *resource)
+{
+    return [[NSBundle mainBundle] URLForResource:resource withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"];
+}
+
+TEST(SafeBrowsing, Preference)
+{
+    TestWebKitAPI::ClassMethodSwizzler swizzler(objc_getClass("SSBLookupContext"), @selector(sharedLookupContext), [TestLookupContext methodForSelector:@selector(sharedLookupContext)]);
+
+    __block bool done = false;
+    auto delegate = adoptNS([TestNavigationDelegate new]);
+    delegate.get().didStartProvisionalNavigation = ^(WKWebView *, WKNavigation *) {
+        done = true;
+    };
+
+    auto webView = adoptNS([WKWebView new]);
+    [webView setNavigationDelegate:delegate.get()];
+    EXPECT_TRUE([webView configuration].preferences.safeBrowsingEnabled);
+    [webView loadRequest:[NSURLRequest requestWithURL:resourceURL(@"simple")]];
+    while (![webView _safeBrowsingWarningForTesting])
+        TestWebKitAPI::Util::spinRunLoop();
+    [webView configuration].preferences.safeBrowsingEnabled = NO;
+    [webView loadRequest:[NSURLRequest requestWithURL:resourceURL(@"simple2")]];
+    TestWebKitAPI::Util::run(&done);
+    EXPECT_FALSE([webView configuration].preferences.safeBrowsingEnabled);
+    EXPECT_FALSE([webView _safeBrowsingWarningForTesting]);
 }
 
@@ -150 +174 @@
     auto webView = adoptNS([WKWebView new]);
     [webView setNavigationDelegate:delegate.get()];
-    [webView loadRequest:[NSURLRequest requestWithURL:simpleURL()]];
+    [webView loadRequest:[NSURLRequest requestWithURL:resourceURL(@"simple")]];
     while (![webView _safeBrowsingWarningForTesting])
         TestWebKitAPI::Util::spinRunLoop();