<!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>[277628] 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/277628">277628</a></dd>
<dt>Author</dt> <dd>katherine_cheney@apple.com</dd>
<dt>Date</dt> <dd>2021-05-17 18:52:15 -0700 (Mon, 17 May 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>WebFrameLoaderClient::dispatchWillSendRequest sometimes resets app-bound value
https://bugs.webkit.org/show_bug.cgi?id=225829
<rdar://problem/78034595>

Reviewed by Alex Christensen.

Source/WebKit:

webPage->injectedBundleResourceLoadClient().willSendRequestForFrame
can sometimes return a completely new request. We should make sure the
app-bound value is kept when this happens.

* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::dispatchWillSendRequest):

Tools:

API test coverage.

* TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
* TestWebKitAPI/Tests/WebKitCocoa/InAppBrowserPrivacy.mm:
* TestWebKitAPI/Tests/WebKitCocoa/InAppBrowserPrivacyPlugIn.mm: Added.
(-[InAppBrowserPrivacyPlugIn webProcessPlugIn:didCreateBrowserContextController:]):
(-[InAppBrowserPrivacyPlugIn webProcessPlugInBrowserContextController:frame:willSendRequestForResource:request:redirectResponse:]):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebProcessWebCoreSupportWebFrameLoaderClientcpp">trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestWebKitAPIxcodeprojprojectpbxproj">trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitCocoaInAppBrowserPrivacymm">trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/InAppBrowserPrivacy.mm</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitCocoaInAppBrowserPrivacyPlugInmm">trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/InAppBrowserPrivacyPlugIn.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (277627 => 277628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2021-05-18 01:33:52 UTC (rev 277627)
+++ trunk/Source/WebKit/ChangeLog       2021-05-18 01:52:15 UTC (rev 277628)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2021-05-17  Kate Cheney  <katherine_cheney@apple.com>
+
+        WebFrameLoaderClient::dispatchWillSendRequest sometimes resets app-bound value
+        https://bugs.webkit.org/show_bug.cgi?id=225829
+        <rdar://problem/78034595>
+
+        Reviewed by Alex Christensen.
+
+        webPage->injectedBundleResourceLoadClient().willSendRequestForFrame
+        can sometimes return a completely new request. We should make sure the
+        app-bound value is kept when this happens.
+
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebKit::WebFrameLoaderClient::dispatchWillSendRequest):
+
</ins><span class="cx"> 2021-05-17  Alex Christensen  <achristensen@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         Unreviewed, reverting r277605.
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (277627 => 277628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp   2021-05-18 01:33:52 UTC (rev 277627)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp      2021-05-18 01:52:15 UTC (rev 277628)
</span><span class="lines">@@ -243,9 +243,12 @@
</span><span class="cx">     // The API can return a completely new request. We should ensure that at least the requester
</span><span class="cx">     // is kept, so that if this is a main resource load it's still considered as such.
</span><span class="cx">     auto requester = request.requester();
</span><ins>+    auto appBoundValue = request.isAppBound();
</ins><span class="cx">     webPage->injectedBundleResourceLoadClient().willSendRequestForFrame(*webPage, m_frame, identifier, request, redirectResponse);
</span><del>-    if (!request.isNull())
</del><ins>+    if (!request.isNull()) {
</ins><span class="cx">         request.setRequester(requester);
</span><ins>+        request.setIsAppBound(appBoundValue);
+    }
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> bool WebFrameLoaderClient::shouldUseCredentialStorage(DocumentLoader*, unsigned long identifier)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (277627 => 277628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2021-05-18 01:33:52 UTC (rev 277627)
+++ trunk/Tools/ChangeLog       2021-05-18 01:52:15 UTC (rev 277628)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2021-05-17  Kate Cheney  <katherine_cheney@apple.com>
+
+        WebFrameLoaderClient::dispatchWillSendRequest sometimes resets app-bound value
+        https://bugs.webkit.org/show_bug.cgi?id=225829
+        <rdar://problem/78034595>
+
+        Reviewed by Alex Christensen.
+
+        API test coverage.
+
+        * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+        * TestWebKitAPI/Tests/WebKitCocoa/InAppBrowserPrivacy.mm:
+        * TestWebKitAPI/Tests/WebKitCocoa/InAppBrowserPrivacyPlugIn.mm: Added.
+        (-[InAppBrowserPrivacyPlugIn webProcessPlugIn:didCreateBrowserContextController:]):
+        (-[InAppBrowserPrivacyPlugIn webProcessPlugInBrowserContextController:frame:willSendRequestForResource:request:redirectResponse:]):
+
</ins><span class="cx"> 2021-05-17  Alex Christensen  <achristensen@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         Unreviewed, reverting r277605.
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestWebKitAPIxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (277627 => 277628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj        2021-05-18 01:33:52 UTC (rev 277627)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj   2021-05-18 01:52:15 UTC (rev 277628)
</span><span class="lines">@@ -289,6 +289,7 @@
</span><span class="cx">          46FACF7423E8842300A9EBC6 /* beforeunload-slow.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 46FACF7323E883EE00A9EBC6 /* beforeunload-slow.html */; };
</span><span class="cx">          4908C71126094E41000B1B2F /* PrivateClickMeasurement.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4908C70F26094E16000B1B2F /* PrivateClickMeasurement.mm */; };
</span><span class="cx">          4909EE3A2D09480C88982D56 /* Markable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EC79F168BE454E579E417B05 /* Markable.cpp */; };
</span><ins>+               491AEEF82652E33500D530A8 /* InAppBrowserPrivacyPlugIn.mm in Sources */ = {isa = PBXBuildFile; fileRef = 491AEEF42652DDD000D530A8 /* InAppBrowserPrivacyPlugIn.mm */; };
</ins><span class="cx">           491F3D5226027E53000E31F7 /* pcmWithoutFraudPreventionDatabase.db in Copy Resources */ = {isa = PBXBuildFile; fileRef = 491F3D4F26027CFE000E31F7 /* pcmWithoutFraudPreventionDatabase.db */; };
</span><span class="cx">          491F3D5326027E53000E31F7 /* pcmWithoutFraudPreventionDatabase.db-shm in Copy Resources */ = {isa = PBXBuildFile; fileRef = 491F3D5026027CFE000E31F7 /* pcmWithoutFraudPreventionDatabase.db-shm */; };
</span><span class="cx">          491F3D5426027E53000E31F7 /* pcmWithoutFraudPreventionDatabase.db-wal in Copy Resources */ = {isa = PBXBuildFile; fileRef = 491F3D5126027CFE000E31F7 /* pcmWithoutFraudPreventionDatabase.db-wal */; };
</span><span class="lines">@@ -2096,6 +2097,7 @@
</span><span class="cx">          46FA2FED23846C9A000CCB0C /* HTTPHeaderMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTTPHeaderMap.cpp; sourceTree = "<group>"; };
</span><span class="cx">          46FACF7323E883EE00A9EBC6 /* beforeunload-slow.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "beforeunload-slow.html"; sourceTree = "<group>"; };
</span><span class="cx">          4908C70F26094E16000B1B2F /* PrivateClickMeasurement.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PrivateClickMeasurement.mm; sourceTree = "<group>"; };
</span><ins>+               491AEEF42652DDD000D530A8 /* InAppBrowserPrivacyPlugIn.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = InAppBrowserPrivacyPlugIn.mm; sourceTree = "<group>"; };
</ins><span class="cx">           491F3D4F26027CFE000E31F7 /* pcmWithoutFraudPreventionDatabase.db */ = {isa = PBXFileReference; lastKnownFileType = file; path = pcmWithoutFraudPreventionDatabase.db; sourceTree = "<group>"; };
</span><span class="cx">          491F3D5026027CFE000E31F7 /* pcmWithoutFraudPreventionDatabase.db-shm */ = {isa = PBXFileReference; lastKnownFileType = file; path = "pcmWithoutFraudPreventionDatabase.db-shm"; sourceTree = "<group>"; };
</span><span class="cx">          491F3D5126027CFE000E31F7 /* pcmWithoutFraudPreventionDatabase.db-wal */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "pcmWithoutFraudPreventionDatabase.db-wal"; sourceTree = "<group>"; };
</span><span class="lines">@@ -3440,6 +3442,7 @@
</span><span class="cx">                          5110FCEF1E01CBAA006F8D0B /* IDBIndexUpgradeToV2.mm */,
</span><span class="cx">                          93BCBC8023CC6EE800CA2221 /* IDBObjectStoreInfoUpgradeToV2.mm */,
</span><span class="cx">                          49AEEF6B2407358600C87E4C /* InAppBrowserPrivacy.mm */,
</span><ins>+                               491AEEF42652DDD000D530A8 /* InAppBrowserPrivacyPlugIn.mm */,
</ins><span class="cx">                           51A587841D272EF3004BA9AF /* IndexedDBDatabaseProcessKill.mm */,
</span><span class="cx">                          CAB0FF5422332C3A006CA5B0 /* IndexedDBFileName.mm */,
</span><span class="cx">                          9399BA01237110AE008392BF /* IndexedDBInPageCache.mm */,
</span><span class="lines">@@ -5921,6 +5924,7 @@
</span><span class="cx">                          F4B0168425AE08F800E445C4 /* DisableSpellcheckPlugIn.mm in Sources */,
</span><span class="cx">                          518EE51920A78CE500E024F3 /* DoubleDefersLoadingPlugin.mm in Sources */,
</span><span class="cx">                          5CB5B3C21FFC55CF00C27BB0 /* FrameHandleSerialization.mm in Sources */,
</span><ins>+                               491AEEF82652E33500D530A8 /* InAppBrowserPrivacyPlugIn.mm in Sources */,
</ins><span class="cx">                           F460F65B261119580064F2B6 /* InjectedBundleHitTestPlugIn.mm in Sources */,
</span><span class="cx">                          0E404A8C2166DE0A008271BA /* InjectedBundleNodeHandleIsSelectElement.mm in Sources */,
</span><span class="cx">                          79C5D431209D768300F1E7CA /* InjectedBundleNodeHandleIsTextField.mm in Sources */,
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitCocoaInAppBrowserPrivacymm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/InAppBrowserPrivacy.mm (277627 => 277628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/InAppBrowserPrivacy.mm       2021-05-18 01:33:52 UTC (rev 277627)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/InAppBrowserPrivacy.mm  2021-05-18 01:52:15 UTC (rev 277628)
</span><span class="lines">@@ -1838,4 +1838,43 @@
</span><span class="cx"> {
</span><span class="cx">     softUpdateTest(IsAppBound::No);
</span><span class="cx"> }
</span><ins>+
+static void runWebProcessPlugInTest(IsAppBound isAppBound)
+{
+    WKWebViewConfiguration *configuration = [WKWebViewConfiguration _test_configurationWithTestPlugInClassName:@"InAppBrowserPrivacyPlugIn"];
+    auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:CGRectMake(0, 0, 320, 500) configuration:configuration]);
+
+    NSString *url = @"https://webkit.org";
+
+    __block bool isDone = false;
+    NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:url]];
+    if (isAppBound == IsAppBound::No) {
+        NSMutableURLRequest *nonAppBoundRequest = request;
+        APP_BOUND_REQUEST_ADDITIONS
+        request = nonAppBoundRequest;
+    }
+
+    [webView loadRequest:request];
+    [webView _test_waitForDidFinishNavigation];
+
+    isDone = false;
+    bool expectingAppBoundRequests = isAppBound == IsAppBound::Yes ? true : false;
+    [webView _appBoundNavigationData:^(struct WKAppBoundNavigationTestingData data) {
+        EXPECT_EQ(data.hasLoadedAppBoundRequestTesting, expectingAppBoundRequests);
+        EXPECT_EQ(data.hasLoadedNonAppBoundRequestTesting, !expectingAppBoundRequests);
+        isDone = true;
+    }];
+
+    TestWebKitAPI::Util::run(&isDone);
+}
+
+TEST(InAppBrowserPrivacy, WebProcessPluginTestAppBound)
+{
+    runWebProcessPlugInTest(IsAppBound::Yes);
+}
+
+TEST(InAppBrowserPrivacy, WebProcessPluginTestNonAppBound)
+{
+    runWebProcessPlugInTest(IsAppBound::No);
+}
</ins><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitCocoaInAppBrowserPrivacyPlugInmm"></a>
<div class="addfile"><h4>Added: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/InAppBrowserPrivacyPlugIn.mm (0 => 277628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/InAppBrowserPrivacyPlugIn.mm                         (rev 0)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/InAppBrowserPrivacyPlugIn.mm    2021-05-18 01:52:15 UTC (rev 277628)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+/*
+ * Copyright (C) 2021 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "config.h"
+
+#import "PlatformUtilities.h"
+#import <WebKit/WKWebProcessPlugIn.h>
+#import <WebKit/WKWebProcessPlugInLoadDelegate.h>
+#import <wtf/RetainPtr.h>
+
+@interface InAppBrowserPrivacyPlugIn : NSObject <WKWebProcessPlugIn, WKWebProcessPlugInLoadDelegate>
+@end
+
+@implementation InAppBrowserPrivacyPlugIn { }
+
+- (NSURLRequest *)webProcessPlugInBrowserContextController:(WKWebProcessPlugInBrowserContextController *)controller frame:(WKWebProcessPlugInFrame *)frame willSendRequestForResource:(uint64_t)resource request:(NSURLRequest *)request redirectResponse:(NSURLResponse *)redirectResponse
+{
+    return adoptNS([[NSURLRequest alloc] initWithURL:request.URL]).autorelease();
+}
+
+@end
</ins></span></pre>
</div>
</div>

</body>
</html>