<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[281965] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/281965">281965</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2021-09-02 16:25:16 -0700 (Thu, 02 Sep 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Gracefully recover from WebAuthnProcess crashes
https://bugs.webkit.org/show_bug.cgi?id=229828
Source/WebKit:

<rdar://82682650>

Patch by Alex Christensen <achristensen@webkit.org> on 2021-09-02
Reviewed by Chris Dumez.

When a WebAuthn process closes, it can't be connected with again, which causes persistent web process "crashes".
Let's start a new process when this happens instead.

* UIProcess/API/Cocoa/WKProcessPool.mm:
(+[WKProcessPool _webAuthnProcessIdentifier]):
* UIProcess/API/Cocoa/WKProcessPoolPrivate.h:
* UIProcess/WebAuthentication/WebAuthnProcessProxy.cpp:
(WebKit::sharedProcess):
(WebKit::WebAuthnProcessProxy::singleton):
(WebKit::WebAuthnProcessProxy::webAuthnProcessCrashed):

Tools:

Patch by Alex Christensen <achristensen@webkit.org> on 2021-09-02
Reviewed by Chris Dumez.

* TestWebKitAPI/Tests/WebKitCocoa/_WKWebAuthenticationPanel.mm:
(TestWebKitAPI::TEST):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPICocoaWKProcessPoolmm">trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPICocoaWKProcessPoolPrivateh">trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPoolPrivate.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessWebAuthenticationWebAuthnProcessProxycpp">trunk/Source/WebKit/UIProcess/WebAuthentication/WebAuthnProcessProxy.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitCocoa_WKWebAuthenticationPanelmm">trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/_WKWebAuthenticationPanel.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (281964 => 281965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2021-09-02 23:21:24 UTC (rev 281964)
+++ trunk/Source/WebKit/ChangeLog       2021-09-02 23:25:16 UTC (rev 281965)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2021-09-02  Alex Christensen  <achristensen@webkit.org>
+
+        Gracefully recover from WebAuthnProcess crashes
+        https://bugs.webkit.org/show_bug.cgi?id=229828
+        <rdar://82682650>
+
+        Reviewed by Chris Dumez.
+
+        When a WebAuthn process closes, it can't be connected with again, which causes persistent web process "crashes".
+        Let's start a new process when this happens instead.
+
+        * UIProcess/API/Cocoa/WKProcessPool.mm:
+        (+[WKProcessPool _webAuthnProcessIdentifier]):
+        * UIProcess/API/Cocoa/WKProcessPoolPrivate.h:
+        * UIProcess/WebAuthentication/WebAuthnProcessProxy.cpp:
+        (WebKit::sharedProcess):
+        (WebKit::WebAuthnProcessProxy::singleton):
+        (WebKit::WebAuthnProcessProxy::webAuthnProcessCrashed):
+
</ins><span class="cx"> 2021-09-02  Chris Dumez  <cdumez@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [ BigSur arm64 Debug EWS ] ASSERTION FAILED: m_uncommittedState.state == State::Provisional
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPICocoaWKProcessPoolmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm (281964 => 281965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm 2021-09-02 23:21:24 UTC (rev 281964)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm    2021-09-02 23:25:16 UTC (rev 281965)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> #import "WKObject.h"
</span><span class="cx"> #import "WKWebViewInternal.h"
</span><span class="cx"> #import "WKWebsiteDataStoreInternal.h"
</span><ins>+#import "WebAuthnProcessProxy.h"
</ins><span class="cx"> #import "WebBackForwardCache.h"
</span><span class="cx"> #import "WebCertificateInfo.h"
</span><span class="cx"> #import "WebCookieManagerProxy.h"
</span><span class="lines">@@ -196,6 +197,15 @@
</span><span class="cx">     return [url URLByAppendingPathComponent:@"WebsiteData" isDirectory:YES];
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>++ (pid_t)_webAuthnProcessIdentifier
+{
+#if ENABLE(WEB_AUTHN)
+    return WebKit::WebAuthnProcessProxy::singleton().processIdentifier();
+#else
+    return 0;
+#endif
+}
+
</ins><span class="cx"> - (void)_setAllowsSpecificHTTPSCertificate:(NSArray *)certificateChain forHost:(NSString *)host
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPICocoaWKProcessPoolPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPoolPrivate.h (281964 => 281965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPoolPrivate.h   2021-09-02 23:21:24 UTC (rev 281964)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPoolPrivate.h      2021-09-02 23:25:16 UTC (rev 281965)
</span><span class="lines">@@ -71,6 +71,7 @@
</span><span class="cx"> 
</span><span class="cx"> + (NSURL *)_websiteDataURLForContainerWithURL:(NSURL *)containerURL;
</span><span class="cx"> + (NSURL *)_websiteDataURLForContainerWithURL:(NSURL *)containerURL bundleIdentifierIfNotInContainer:(NSString *)bundleIdentifier;
</span><ins>++ (pid_t)_webAuthnProcessIdentifier WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
</ins><span class="cx"> 
</span><span class="cx"> - (void)_warmInitialProcess WK_API_AVAILABLE(macos(10.12), ios(10.0));
</span><span class="cx"> - (void)_automationCapabilitiesDidChange WK_API_AVAILABLE(macos(10.12), ios(10.0));
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessWebAuthenticationWebAuthnProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/WebAuthentication/WebAuthnProcessProxy.cpp (281964 => 281965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/WebAuthentication/WebAuthnProcessProxy.cpp 2021-09-02 23:21:24 UTC (rev 281964)
+++ trunk/Source/WebKit/UIProcess/WebAuthentication/WebAuthnProcessProxy.cpp    2021-09-02 23:25:16 UTC (rev 281965)
</span><span class="lines">@@ -51,24 +51,30 @@
</span><span class="cx"> namespace WebKit {
</span><span class="cx"> using namespace WebCore;
</span><span class="cx"> 
</span><ins>+static RefPtr<WebAuthnProcessProxy>& sharedProcess()
+{
+    static NeverDestroyed<RefPtr<WebAuthnProcessProxy>> process;
+    return process.get();
+}
+
</ins><span class="cx"> WebAuthnProcessProxy& WebAuthnProcessProxy::singleton()
</span><span class="cx"> {
</span><span class="cx">     ASSERT(RunLoop::isMain());
</span><span class="cx"> 
</span><del>-    static std::once_flag onceFlag;
-    static LazyNeverDestroyed<Ref<WebAuthnProcessProxy>> webAuthnProcess;
</del><ins>+    auto createAndInitializeNewProcess = [] {
+        auto webAuthnProcess = adoptRef(*new WebAuthnProcessProxy);
</ins><span class="cx"> 
</span><del>-    std::call_once(onceFlag, [] {
-        webAuthnProcess.construct(adoptRef(*new WebAuthnProcessProxy));
-
</del><span class="cx">         WebAuthnProcessCreationParameters parameters;
</span><span class="cx"> 
</span><span class="cx">         // Initialize the WebAuthn process.
</span><del>-        webAuthnProcess.get()->send(Messages::WebAuthnProcess::InitializeWebAuthnProcess(parameters), 0);
-        webAuthnProcess.get()->updateProcessAssertion();
-    });
</del><ins>+        webAuthnProcess->send(Messages::WebAuthnProcess::InitializeWebAuthnProcess(parameters), 0);
+        webAuthnProcess->updateProcessAssertion();
+        return webAuthnProcess;
+    };
</ins><span class="cx"> 
</span><del>-    return webAuthnProcess.get();
</del><ins>+    if (!sharedProcess())
+        sharedProcess() = createAndInitializeNewProcess();
+    return *sharedProcess();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> WebAuthnProcessProxy::WebAuthnProcessProxy()
</span><span class="lines">@@ -118,6 +124,7 @@
</span><span class="cx"> {
</span><span class="cx">     for (auto& processPool : WebProcessPool::allProcessPools())
</span><span class="cx">         processPool->terminateAllWebContentProcesses();
</span><ins>+    sharedProcess() = nullptr;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void WebAuthnProcessProxy::didClose(IPC::Connection&)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (281964 => 281965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2021-09-02 23:21:24 UTC (rev 281964)
+++ trunk/Tools/ChangeLog       2021-09-02 23:25:16 UTC (rev 281965)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2021-09-02  Alex Christensen  <achristensen@webkit.org>
</span><span class="cx"> 
</span><ins>+        Gracefully recover from WebAuthnProcess crashes
+        https://bugs.webkit.org/show_bug.cgi?id=229828
+
+        Reviewed by Chris Dumez.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/_WKWebAuthenticationPanel.mm:
+        (TestWebKitAPI::TEST):
+
+2021-09-02  Alex Christensen  <achristensen@webkit.org>
+
</ins><span class="cx">         Reject non-IPv4 hostnames that end in numbers
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=228826
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitCocoa_WKWebAuthenticationPanelmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/_WKWebAuthenticationPanel.mm (281964 => 281965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/_WKWebAuthenticationPanel.mm 2021-09-02 23:21:24 UTC (rev 281964)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/_WKWebAuthenticationPanel.mm    2021-09-02 23:25:16 UTC (rev 281965)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> #import <WebCore/PublicKeyCredentialCreationOptions.h>
</span><span class="cx"> #import <WebCore/PublicKeyCredentialRequestOptions.h>
</span><span class="cx"> #import <WebKit/WKPreferencesPrivate.h>
</span><ins>+#import <WebKit/WKProcessPoolPrivate.h>
</ins><span class="cx"> #import <WebKit/WKUIDelegatePrivate.h>
</span><span class="cx"> #import <WebKit/_WKAuthenticationExtensionsClientInputs.h>
</span><span class="cx"> #import <WebKit/_WKAuthenticationExtensionsClientOutputs.h>
</span><span class="lines">@@ -2057,6 +2058,32 @@
</span><span class="cx"> }
</span><span class="cx"> #endif // USE(APPLE_INTERNAL_SDK) || PLATFORM(IOS)
</span><span class="cx"> 
</span><ins>+TEST(WebAuthenticationPanel, RecoverAfterAuthNProcessCrash)
+{
+    auto *configuration = [WKWebViewConfiguration _test_configurationWithTestPlugInClassName:@"WebProcessPlugInWithInternals" configureJSCForTesting:YES];
+    [[configuration preferences] _setEnabled:YES forExperimentalFeature:webAuthenticationExperimentalFeature()];
+    [[configuration preferences] _setEnabled:YES forExperimentalFeature:webAuthenticationModernExperimentalFeature()];
+
+    auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSZeroRect configuration:configuration]);
+    EXPECT_EQ([WKProcessPool _webAuthnProcessIdentifier], 0);
+    [webView objectByEvaluatingJavaScript:@"internals.setMockWebAuthenticationConfiguration({ })"];
+    auto firstWebPID = [webView _webProcessIdentifier];
+    auto firstWebAuthnPID = [WKProcessPool _webAuthnProcessIdentifier];
+    EXPECT_NE(firstWebPID, 0);
+    EXPECT_NE(firstWebAuthnPID, 0);
+
+    kill(firstWebAuthnPID, SIGKILL);
+    while ([WKProcessPool _webAuthnProcessIdentifier] || [webView _webProcessIdentifier])
+        Util::spinRunLoop();
+    [webView objectByEvaluatingJavaScript:@"internals.setMockWebAuthenticationConfiguration({ })"];
+    auto secondWebPID = [webView _webProcessIdentifier];
+    auto secondWebAuthnPID = [WKProcessPool _webAuthnProcessIdentifier];
+    EXPECT_NE(secondWebAuthnPID, 0);
+    EXPECT_NE(secondWebAuthnPID, firstWebAuthnPID);
+    EXPECT_NE(secondWebPID, 0);
+    EXPECT_NE(secondWebPID, firstWebPID);
+}
+
</ins><span class="cx"> } // namespace TestWebKitAPI
</span><span class="cx"> 
</span><span class="cx"> #endif // ENABLE(WEB_AUTHN)
</span></span></pre>
</div>
</div>

</body>
</html>