<!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>[286396] branches/safari-612-branch</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/286396">286396</a></dd>
<dt>Author</dt> <dd>repstein@apple.com</dd>
<dt>Date</dt> <dd>2021-12-01 16:18:04 -0800 (Wed, 01 Dec 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Cherry-pick <a href="http://trac.webkit.org/projects/webkit/changeset/285619">r285619</a>. rdar://problem/83941760

    We should not kill all WebContent processes whenever the WebAuthn process crashes
    https://bugs.webkit.org/show_bug.cgi?id=232970
    <rdar://83941760>

    Reviewed by Geoff Garen.

    Source/WebKit:

    We should not kill all WebContent processes whenever the WebAuthn process crashes. This is overly aggressive. We should
    instead do like for the network process and have the WebProcess re-initiate the connection to the WebAuthn process when
    it's gone.

    No new tests, updated existing API test.

    * UIProcess/WebAuthentication/WebAuthnProcessProxy.cpp:
    (WebKit::WebAuthnProcessProxy::webAuthnProcessCrashed):
    Do not terminate all WebProcesses when the WebAuthn process crashes.

    * WebProcess/WebAuthentication/WebAuthnProcessConnection.cpp:
    (WebKit::WebAuthnProcessConnection::didClose):
    Make sure we call WebProcess::webAuthnProcessConnectionClosed() when the WebProcess
    loses its connection to the WebAuthn process. This makes sure we clear m_webAuthnProcessConnection
    and properly re-initiate a new WebAuthn process connection the next time WebProcess::ensureWebAuthnProcessConnection()
    is called.

    Tools:

    Update API test coverage to reflect behavior change.

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

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@285619 268f45cc-cd09-0410-ab3c-d52691b4dbfc</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari612branchSourceWebKitChangeLog">branches/safari-612-branch/Source/WebKit/ChangeLog</a></li>
<li><a href="#branchessafari612branchSourceWebKitUIProcessWebAuthenticationWebAuthnProcessProxycpp">branches/safari-612-branch/Source/WebKit/UIProcess/WebAuthentication/WebAuthnProcessProxy.cpp</a></li>
<li><a href="#branchessafari612branchSourceWebKitWebProcessWebAuthenticationWebAuthnProcessConnectioncpp">branches/safari-612-branch/Source/WebKit/WebProcess/WebAuthentication/WebAuthnProcessConnection.cpp</a></li>
<li><a href="#branchessafari612branchToolsChangeLog">branches/safari-612-branch/Tools/ChangeLog</a></li>
<li><a href="#branchessafari612branchToolsTestWebKitAPITestsWebKitCocoa_WKWebAuthenticationPanelmm">branches/safari-612-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/_WKWebAuthenticationPanel.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari612branchSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/WebKit/ChangeLog (286395 => 286396)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/WebKit/ChangeLog       2021-12-02 00:18:00 UTC (rev 286395)
+++ branches/safari-612-branch/Source/WebKit/ChangeLog  2021-12-02 00:18:04 UTC (rev 286396)
</span><span class="lines">@@ -1,5 +1,69 @@
</span><span class="cx"> 2021-12-01  Alan Coon  <alancoon@apple.com>
</span><span class="cx"> 
</span><ins>+        Cherry-pick r285619. rdar://problem/83941760
+
+    We should not kill all WebContent processes whenever the WebAuthn process crashes
+    https://bugs.webkit.org/show_bug.cgi?id=232970
+    <rdar://83941760>
+    
+    Reviewed by Geoff Garen.
+    
+    Source/WebKit:
+    
+    We should not kill all WebContent processes whenever the WebAuthn process crashes. This is overly aggressive. We should
+    instead do like for the network process and have the WebProcess re-initiate the connection to the WebAuthn process when
+    it's gone.
+    
+    No new tests, updated existing API test.
+    
+    * UIProcess/WebAuthentication/WebAuthnProcessProxy.cpp:
+    (WebKit::WebAuthnProcessProxy::webAuthnProcessCrashed):
+    Do not terminate all WebProcesses when the WebAuthn process crashes.
+    
+    * WebProcess/WebAuthentication/WebAuthnProcessConnection.cpp:
+    (WebKit::WebAuthnProcessConnection::didClose):
+    Make sure we call WebProcess::webAuthnProcessConnectionClosed() when the WebProcess
+    loses its connection to the WebAuthn process. This makes sure we clear m_webAuthnProcessConnection
+    and properly re-initiate a new WebAuthn process connection the next time WebProcess::ensureWebAuthnProcessConnection()
+    is called.
+    
+    Tools:
+    
+    Update API test coverage to reflect behavior change.
+    
+    * TestWebKitAPI/Tests/WebKitCocoa/_WKWebAuthenticationPanel.mm:
+    (TestWebKitAPI::TEST):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@285619 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-11-10  Chris Dumez  <cdumez@apple.com>
+
+            We should not kill all WebContent processes whenever the WebAuthn process crashes
+            https://bugs.webkit.org/show_bug.cgi?id=232970
+            <rdar://83941760>
+
+            Reviewed by Geoff Garen.
+
+            We should not kill all WebContent processes whenever the WebAuthn process crashes. This is overly aggressive. We should
+            instead do like for the network process and have the WebProcess re-initiate the connection to the WebAuthn process when
+            it's gone.
+
+            No new tests, updated existing API test.
+
+            * UIProcess/WebAuthentication/WebAuthnProcessProxy.cpp:
+            (WebKit::WebAuthnProcessProxy::webAuthnProcessCrashed):
+            Do not terminate all WebProcesses when the WebAuthn process crashes.
+
+            * WebProcess/WebAuthentication/WebAuthnProcessConnection.cpp:
+            (WebKit::WebAuthnProcessConnection::didClose):
+            Make sure we call WebProcess::webAuthnProcessConnectionClosed() when the WebProcess
+            loses its connection to the WebAuthn process. This makes sure we clear m_webAuthnProcessConnection
+            and properly re-initiate a new WebAuthn process connection the next time WebProcess::ensureWebAuthnProcessConnection()
+            is called.
+
+2021-12-01  Alan Coon  <alancoon@apple.com>
+
</ins><span class="cx">         Cherry-pick r285138. rdar://problem/75139294
</span><span class="cx"> 
</span><span class="cx">     Avoid heap-allocating ImportanceAssertion
</span></span></pre></div>
<a id="branchessafari612branchSourceWebKitUIProcessWebAuthenticationWebAuthnProcessProxycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/WebKit/UIProcess/WebAuthentication/WebAuthnProcessProxy.cpp (286395 => 286396)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/WebKit/UIProcess/WebAuthentication/WebAuthnProcessProxy.cpp    2021-12-02 00:18:00 UTC (rev 286395)
+++ branches/safari-612-branch/Source/WebKit/UIProcess/WebAuthentication/WebAuthnProcessProxy.cpp       2021-12-02 00:18:04 UTC (rev 286396)
</span><span class="lines">@@ -122,8 +122,6 @@
</span><span class="cx"> 
</span><span class="cx"> void WebAuthnProcessProxy::webAuthnProcessCrashed()
</span><span class="cx"> {
</span><del>-    for (auto& processPool : WebProcessPool::allProcessPools())
-        processPool->terminateAllWebContentProcesses();
</del><span class="cx">     sharedProcess() = nullptr;
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari612branchSourceWebKitWebProcessWebAuthenticationWebAuthnProcessConnectioncpp"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/WebKit/WebProcess/WebAuthentication/WebAuthnProcessConnection.cpp (286395 => 286396)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/WebKit/WebProcess/WebAuthentication/WebAuthnProcessConnection.cpp      2021-12-02 00:18:00 UTC (rev 286395)
+++ branches/safari-612-branch/Source/WebKit/WebProcess/WebAuthentication/WebAuthnProcessConnection.cpp 2021-12-02 00:18:04 UTC (rev 286396)
</span><span class="lines">@@ -48,6 +48,7 @@
</span><span class="cx"> 
</span><span class="cx"> void WebAuthnProcessConnection::didClose(IPC::Connection&)
</span><span class="cx"> {
</span><ins>+    WebProcess::singleton().webAuthnProcessConnectionClosed(this);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void WebAuthnProcessConnection::didReceiveInvalidMessage(IPC::Connection&, IPC::MessageName)
</span></span></pre></div>
<a id="branchessafari612branchToolsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Tools/ChangeLog (286395 => 286396)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Tools/ChangeLog       2021-12-02 00:18:00 UTC (rev 286395)
+++ branches/safari-612-branch/Tools/ChangeLog  2021-12-02 00:18:04 UTC (rev 286396)
</span><span class="lines">@@ -1,3 +1,55 @@
</span><ins>+2021-12-01  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r285619. rdar://problem/83941760
+
+    We should not kill all WebContent processes whenever the WebAuthn process crashes
+    https://bugs.webkit.org/show_bug.cgi?id=232970
+    <rdar://83941760>
+    
+    Reviewed by Geoff Garen.
+    
+    Source/WebKit:
+    
+    We should not kill all WebContent processes whenever the WebAuthn process crashes. This is overly aggressive. We should
+    instead do like for the network process and have the WebProcess re-initiate the connection to the WebAuthn process when
+    it's gone.
+    
+    No new tests, updated existing API test.
+    
+    * UIProcess/WebAuthentication/WebAuthnProcessProxy.cpp:
+    (WebKit::WebAuthnProcessProxy::webAuthnProcessCrashed):
+    Do not terminate all WebProcesses when the WebAuthn process crashes.
+    
+    * WebProcess/WebAuthentication/WebAuthnProcessConnection.cpp:
+    (WebKit::WebAuthnProcessConnection::didClose):
+    Make sure we call WebProcess::webAuthnProcessConnectionClosed() when the WebProcess
+    loses its connection to the WebAuthn process. This makes sure we clear m_webAuthnProcessConnection
+    and properly re-initiate a new WebAuthn process connection the next time WebProcess::ensureWebAuthnProcessConnection()
+    is called.
+    
+    Tools:
+    
+    Update API test coverage to reflect behavior change.
+    
+    * TestWebKitAPI/Tests/WebKitCocoa/_WKWebAuthenticationPanel.mm:
+    (TestWebKitAPI::TEST):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@285619 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-11-10  Chris Dumez  <cdumez@apple.com>
+
+            We should not kill all WebContent processes whenever the WebAuthn process crashes
+            https://bugs.webkit.org/show_bug.cgi?id=232970
+            <rdar://83941760>
+
+            Reviewed by Geoff Garen.
+
+            Update API test coverage to reflect behavior change.
+
+            * TestWebKitAPI/Tests/WebKitCocoa/_WKWebAuthenticationPanel.mm:
+            (TestWebKitAPI::TEST):
+
</ins><span class="cx"> 2021-11-08  Kocsen Chung  <kocsen_chung@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Cherry-pick r285208. rdar://problem/84824703
</span></span></pre></div>
<a id="branchessafari612branchToolsTestWebKitAPITestsWebKitCocoa_WKWebAuthenticationPanelmm"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/_WKWebAuthenticationPanel.mm (286395 => 286396)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/_WKWebAuthenticationPanel.mm    2021-12-02 00:18:00 UTC (rev 286395)
+++ branches/safari-612-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/_WKWebAuthenticationPanel.mm       2021-12-02 00:18:04 UTC (rev 286396)
</span><span class="lines">@@ -2119,6 +2119,10 @@
</span><span class="cx"> 
</span><span class="cx"> TEST(WebAuthenticationPanel, RecoverAfterAuthNProcessCrash)
</span><span class="cx"> {
</span><ins>+    TestWebKitAPI::HTTPServer server({
+        { "/", { "FOO"_str } }
+    });
+
</ins><span class="cx">     auto *configuration = [WKWebViewConfiguration _test_configurationWithTestPlugInClassName:@"WebProcessPlugInWithInternals" configureJSCForTesting:YES];
</span><span class="cx">     [[configuration preferences] _setEnabled:YES forExperimentalFeature:webAuthenticationExperimentalFeature()];
</span><span class="cx">     [[configuration preferences] _setEnabled:YES forExperimentalFeature:webAuthenticationModernExperimentalFeature()];
</span><span class="lines">@@ -2125,6 +2129,10 @@
</span><span class="cx"> 
</span><span class="cx">     auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSZeroRect configuration:configuration]);
</span><span class="cx">     EXPECT_EQ([WKProcessPool _webAuthnProcessIdentifier], 0);
</span><ins>+
+    [webView synchronouslyLoadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"http://localhost:%d/", server.port()]]]];
+    [webView focus];
+
</ins><span class="cx">     [webView objectByEvaluatingJavaScript:@"internals.setMockWebAuthenticationConfiguration({ })"];
</span><span class="cx">     auto firstWebPID = [webView _webProcessIdentifier];
</span><span class="cx">     auto firstWebAuthnPID = [WKProcessPool _webAuthnProcessIdentifier];
</span><span class="lines">@@ -2132,15 +2140,32 @@
</span><span class="cx">     EXPECT_NE(firstWebAuthnPID, 0);
</span><span class="cx"> 
</span><span class="cx">     kill(firstWebAuthnPID, SIGKILL);
</span><del>-    while ([WKProcessPool _webAuthnProcessIdentifier] || [webView _webProcessIdentifier])
</del><ins>+    while ([WKProcessPool _webAuthnProcessIdentifier])
</ins><span class="cx">         Util::spinRunLoop();
</span><del>-    [webView objectByEvaluatingJavaScript:@"internals.setMockWebAuthenticationConfiguration({ })"];
-    auto secondWebPID = [webView _webProcessIdentifier];
</del><ins>+
+    [webView objectByEvaluatingJavaScript:@"internals.setMockWebAuthenticationConfiguration({ hid: { stage: 'request', subStage: 'msg', error: 'success', isU2f: true, payloadBase64: ['AQAAADswRAIge94KUqwfTIsn4AOjcM1mpMcRjdItVEeDX0W5nGhCP/cCIDxRe0eHf4V4LeEAhqeD0effTjY553H19q+jWq1Tc4WOkAA='] } });"];
+
+    while (![WKProcessPool _webAuthnProcessIdentifier])
+        Util::spinRunLoop();
+
</ins><span class="cx">     auto secondWebAuthnPID = [WKProcessPool _webAuthnProcessIdentifier];
</span><del>-    EXPECT_NE(secondWebAuthnPID, 0);
</del><span class="cx">     EXPECT_NE(secondWebAuthnPID, firstWebAuthnPID);
</span><del>-    EXPECT_NE(secondWebPID, 0);
-    EXPECT_NE(secondWebPID, firstWebPID);
</del><ins>+    EXPECT_EQ([webView _webProcessIdentifier], firstWebPID);
+
+    __block bool gotMessage = false;
+    [webView performAfterReceivingAnyMessage:^(NSString *message) {
+        EXPECT_WK_STREQ(@"public-key", message);
+        gotMessage = true;
+    }];
+
+    __block bool executedScript = false;
+    [webView evaluateJavaScript:@"navigator.credentials.get({ publicKey: { challenge: new Uint8Array([49, 50, 51, 52, 53, 54]), allowCredentials: [{ type: 'public-key', id: new Uint8Array(Array.prototype.map.call(atob('Pr2Jv3fsUJdV7pwmNe+qrHsrnFzvFzbDcX2khTTIxrZU1/+UX1C1zE54BVvdOWtk942ixfliAMzUFc0I/kIAOA'), function (c) { return c.charCodeAt(0) })) }], timeout: 100 } }).then(credential => { webkit.messageHandlers.testHandler.postMessage(credential.type); }, e => { webkit.messageHandlers.testHandler.postMessage('' + e); }) && true" completionHandler:^(id result, NSError *error) {
+        ASSERT_FALSE(error);
+        executedScript = true;
+    }];
+    Util::run(&executedScript);
+
+    Util::run(&gotMessage);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> } // namespace TestWebKitAPI
</span></span></pre>
</div>
</div>

</body>
</html>