Changeset 259770 in webkit

Timestamp:

Apr 8, 2020, 5:38:51 PM (6 years ago)

Author:

commit-queue@webkit.org

Message:

WKWebViews should behave as if they had loaded something after restoring session state
​https://bugs.webkit.org/show_bug.cgi?id=210097
<rdar://problem/58778490>

Patch by Alex Christensen <​achristensen@webkit.org> on 2020-04-08
Reviewed by Chris Dumez.

Source/WebKit:

Specifically, we don't want to close a WKWebView after restoring the session state into another
WKWebView into it then navigating to a phishing page. We want to be at the previous page after
the user clicks "Go back".

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::restoreFromSessionState):

Tools:

• TestWebKitAPI/Tests/WebKitCocoa/SafeBrowsing.mm:

(TEST):

Location:

trunk

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/WebPageProxy.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKitCocoa/SafeBrowsing.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-04-08  Alex Christensen  <achristensen@webkit.org>
+
+        WKWebViews should behave as if they had loaded something after restoring session state
+        https://bugs.webkit.org/show_bug.cgi?id=210097
+        <rdar://problem/58778490>
+
+        Reviewed by Chris Dumez.
+
+        Specifically, we don't want to close a WKWebView after restoring the session state into another
+        WKWebView into it then navigating to a phishing page.  We want to be at the previous page after
+        the user clicks "Go back".
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::restoreFromSessionState):
+
 2020-04-08  Kate Cheney  <katherine_cheney@apple.com>
 

trunk/Source/WebKit/UIProcess/WebPageProxy.cpp

@@ -5137 +5137 @@
             }
 
-            m_pageClient->showSafeBrowsingWarning(*safeBrowsingWarning, [protectedThis = WTFMove(protectedThis), completionHandler = WTFMove(completionHandler), policyAction] (auto&& result) mutable {
+            m_pageClient->showSafeBrowsingWarning(*safeBrowsingWarning, [this, protectedThis = WTFMove(protectedThis), completionHandler = WTFMove(completionHandler), policyAction] (auto&& result) mutable {
                 switchOn(result, [&] (const URL& url) {
                     completionHandler(PolicyAction::Ignore);
-                    protectedThis->loadRequest({ url });
+                    loadRequest({ url });
                 }, [&] (ContinueUnsafeLoad continueUnsafeLoad) {
                     switch (continueUnsafeLoad) {
                     case ContinueUnsafeLoad::No:
-                        if (!protectedThis->hasCommittedAnyProvisionalLoads())
-                            protectedThis->m_uiClient->close(protectedThis.ptr());
+                        if (!hasCommittedAnyProvisionalLoads() && !m_sessionStateWasRestoredByAPIRequest)
+                            m_uiClient->close(protectedThis.ptr());
                         completionHandler(PolicyAction::Ignore);
                         break;

trunk/Tools/ChangeLog

@@ +1 @@
+2020-04-08  Alex Christensen  <achristensen@webkit.org>
+
+        WKWebViews should behave as if they had loaded something after restoring session state
+        https://bugs.webkit.org/show_bug.cgi?id=210097
+        <rdar://problem/58778490>
+
+        Reviewed by Chris Dumez.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/SafeBrowsing.mm:
+        (TEST):
+
 2020-04-08  Ross Kirsling  <ross.kirsling@sony.com>
 

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

@@ -240 +240 @@
 }
 
+TEST(SafeBrowsing, GoBackAfterRestoreFromSessionState)
+{
+    auto webView1 = adoptNS([WKWebView new]);
+    [webView1 loadRequest:[NSURLRequest requestWithURL:[[NSBundle mainBundle] URLForResource:@"simple" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"]]];
+    [webView1 _test_waitForDidFinishNavigation];
+    _WKSessionState *state = [webView1 _sessionState];
+
+    ClassMethodSwizzler swizzler(objc_getClass("SSBLookupContext"), @selector(sharedLookupContext), [TestLookupContext methodForSelector:@selector(sharedLookupContext)]);
+
+    auto delegate = adoptNS([SafeBrowsingNavigationDelegate new]);
+    auto webView2 = adoptNS([WKWebView new]);
+    [webView2 configuration].preferences.fraudulentWebsiteWarningEnabled = YES;
+    [webView2 setNavigationDelegate:delegate.get()];
+    [webView2 setUIDelegate:delegate.get()];
+    [webView2 _restoreSessionState:state andNavigate:YES];
+    EXPECT_FALSE(warningShown);
+    while (![webView2 _safeBrowsingWarning])
+        TestWebKitAPI::Util::spinRunLoop();
+    EXPECT_TRUE(warningShown);
+#if !PLATFORM(MAC)
+    [[webView2 _safeBrowsingWarning] didMoveToWindow];
+#endif
+    EXPECT_FALSE(didCloseCalled);
+    goBack([webView2 _safeBrowsingWarning]);
+    EXPECT_FALSE(didCloseCalled);
+    WKBackForwardList *list = [webView2 backForwardList];
+    EXPECT_FALSE(!!list.backItem);
+    EXPECT_FALSE(!!list.forwardItem);
+    EXPECT_TRUE([list.currentItem.URL.path hasSuffix:@"/simple.html"]);
+}
+
 template<typename ViewType> void visitUnsafeSite(ViewType *view)
 {