<!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>[265202] trunk/Source/WebKit</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/265202">265202</a></dd>
<dt>Author</dt> <dd>katherine_cheney@apple.com</dd>
<dt>Date</dt> <dd>2020-08-03 10:13:41 -0700 (Mon, 03 Aug 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>doesParentProcessHaveITPEnabled() check should match behavior in determineITPStateInternal() check
https://bugs.webkit.org/show_bug.cgi?id=215031
<rdar://problem/66384618>

Reviewed by Brent Fulgham.

Checking ITP state from a WebKit child process should have the same
behavior as checking it from the UI process. In order to do this,
we must pass the value of hasRequestedCrossWebsiteTrackingPermission
to the network process to know if an application has included the
NSCrossWebsiteTrackingUsageDescription value in their Info.plist.

* NetworkProcess/NetworkSessionCreationParameters.cpp:
(WebKit::NetworkSessionCreationParameters::encode const):
(WebKit::NetworkSessionCreationParameters::decode):
* NetworkProcess/NetworkSessionCreationParameters.h:
* NetworkProcess/cocoa/NetworkSessionCocoa.mm:
(WebKit::activateSessionCleanup):
* Shared/Cocoa/DefaultWebBrowserChecks.h:
* Shared/Cocoa/DefaultWebBrowserChecks.mm:
(WebKit::hasRequestedCrossWebsiteTrackingPermission):
(WebKit::doesParentProcessHaveITPEnabled):
* UIProcess/Cocoa/WebProcessPoolCocoa.mm:
(WebKit::WebProcessPool::platformInitializeNetworkProcess):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitNetworkProcessNetworkSessionCreationParameterscpp">trunk/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.cpp</a></li>
<li><a href="#trunkSourceWebKitNetworkProcessNetworkSessionCreationParametersh">trunk/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.h</a></li>
<li><a href="#trunkSourceWebKitNetworkProcesscocoaNetworkSessionCocoamm">trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm</a></li>
<li><a href="#trunkSourceWebKitSharedCocoaDefaultWebBrowserChecksh">trunk/Source/WebKit/Shared/Cocoa/DefaultWebBrowserChecks.h</a></li>
<li><a href="#trunkSourceWebKitSharedCocoaDefaultWebBrowserChecksmm">trunk/Source/WebKit/Shared/Cocoa/DefaultWebBrowserChecks.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessCocoaWebProcessPoolCocoamm">trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (265201 => 265202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2020-08-03 16:59:25 UTC (rev 265201)
+++ trunk/Source/WebKit/ChangeLog       2020-08-03 17:13:41 UTC (rev 265202)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2020-08-03  Kate Cheney  <katherine_cheney@apple.com>
+
+        doesParentProcessHaveITPEnabled() check should match behavior in determineITPStateInternal() check
+        https://bugs.webkit.org/show_bug.cgi?id=215031
+        <rdar://problem/66384618>
+
+        Reviewed by Brent Fulgham.
+
+        Checking ITP state from a WebKit child process should have the same
+        behavior as checking it from the UI process. In order to do this,
+        we must pass the value of hasRequestedCrossWebsiteTrackingPermission
+        to the network process to know if an application has included the
+        NSCrossWebsiteTrackingUsageDescription value in their Info.plist.
+
+        * NetworkProcess/NetworkSessionCreationParameters.cpp:
+        (WebKit::NetworkSessionCreationParameters::encode const):
+        (WebKit::NetworkSessionCreationParameters::decode):
+        * NetworkProcess/NetworkSessionCreationParameters.h:
+        * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+        (WebKit::activateSessionCleanup):
+        * Shared/Cocoa/DefaultWebBrowserChecks.h:
+        * Shared/Cocoa/DefaultWebBrowserChecks.mm:
+        (WebKit::hasRequestedCrossWebsiteTrackingPermission):
+        (WebKit::doesParentProcessHaveITPEnabled):
+        * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+        (WebKit::WebProcessPool::platformInitializeNetworkProcess):
+
</ins><span class="cx"> 2020-08-03  Adrian Perez de Castro  <aperez@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         Non-unified build fixes, early August 20202 edition
</span></span></pre></div>
<a id="trunkSourceWebKitNetworkProcessNetworkSessionCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.cpp (265201 => 265202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.cpp  2020-08-03 16:59:25 UTC (rev 265201)
+++ trunk/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.cpp     2020-08-03 17:13:41 UTC (rev 265202)
</span><span class="lines">@@ -80,6 +80,7 @@
</span><span class="cx">     encoder << allowsServerPreconnect;
</span><span class="cx">     encoder << requiresSecureHTTPSProxyConnection;
</span><span class="cx">     encoder << preventsSystemHTTPProxyAuthentication;
</span><ins>+    encoder << appHasRequestedCrossWebsiteTrackingPermission;
</ins><span class="cx">     encoder << resourceLoadStatisticsParameters;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -251,6 +252,11 @@
</span><span class="cx">     decoder >> preventsSystemHTTPProxyAuthentication;
</span><span class="cx">     if (!preventsSystemHTTPProxyAuthentication)
</span><span class="cx">         return WTF::nullopt;
</span><ins>+    
+    Optional<bool> appHasRequestedCrossWebsiteTrackingPermission;
+    decoder >> appHasRequestedCrossWebsiteTrackingPermission;
+    if (!appHasRequestedCrossWebsiteTrackingPermission)
+        return WTF::nullopt;
</ins><span class="cx"> 
</span><span class="cx">     Optional<ResourceLoadStatisticsParameters> resourceLoadStatisticsParameters;
</span><span class="cx">     decoder >> resourceLoadStatisticsParameters;
</span><span class="lines">@@ -298,6 +304,7 @@
</span><span class="cx">         , WTFMove(*allowsServerPreconnect)
</span><span class="cx">         , WTFMove(*requiresSecureHTTPSProxyConnection)
</span><span class="cx">         , WTFMove(*preventsSystemHTTPProxyAuthentication)
</span><ins>+        , WTFMove(*appHasRequestedCrossWebsiteTrackingPermission)
</ins><span class="cx">         , WTFMove(*resourceLoadStatisticsParameters)
</span><span class="cx">     }};
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitNetworkProcessNetworkSessionCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.h (265201 => 265202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.h    2020-08-03 16:59:25 UTC (rev 265201)
+++ trunk/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.h       2020-08-03 17:13:41 UTC (rev 265202)
</span><span class="lines">@@ -93,7 +93,8 @@
</span><span class="cx">     bool allowsServerPreconnect { true };
</span><span class="cx">     bool requiresSecureHTTPSProxyConnection { false };
</span><span class="cx">     bool preventsSystemHTTPProxyAuthentication { false };
</span><del>-    
</del><ins>+    bool appHasRequestedCrossWebsiteTrackingPermission { false };
+
</ins><span class="cx">     ResourceLoadStatisticsParameters resourceLoadStatisticsParameters;
</span><span class="cx"> };
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitNetworkProcesscocoaNetworkSessionCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm (265201 => 265202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm  2020-08-03 16:59:25 UTC (rev 265201)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm     2020-08-03 17:13:41 UTC (rev 265202)
</span><span class="lines">@@ -1164,7 +1164,7 @@
</span><span class="cx">     auto parentAuditToken = session.networkProcess().parentProcessConnection()->getAuditToken();
</span><span class="cx">     RELEASE_ASSERT(parentAuditToken); // This should be impossible.
</span><span class="cx"> 
</span><del>-    bool itpEnabled = doesParentProcessHaveITPEnabled(parentAuditToken);
</del><ins>+    bool itpEnabled = doesParentProcessHaveITPEnabled(parentAuditToken, parameters.appHasRequestedCrossWebsiteTrackingPermission);
</ins><span class="cx">     bool passedEnabledState = session.isResourceLoadStatisticsEnabled();
</span><span class="cx"> 
</span><span class="cx">     if (itpEnabled != passedEnabledState)
</span></span></pre></div>
<a id="trunkSourceWebKitSharedCocoaDefaultWebBrowserChecksh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Shared/Cocoa/DefaultWebBrowserChecks.h (265201 => 265202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Shared/Cocoa/DefaultWebBrowserChecks.h       2020-08-03 16:59:25 UTC (rev 265201)
+++ trunk/Source/WebKit/Shared/Cocoa/DefaultWebBrowserChecks.h  2020-08-03 17:13:41 UTC (rev 265202)
</span><span class="lines">@@ -34,12 +34,13 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebKit {
</span><span class="cx"> 
</span><ins>+bool hasRequestedCrossWebsiteTrackingPermission();
</ins><span class="cx"> bool hasProhibitedUsageStrings();
</span><span class="cx"> Optional<Vector<WebCore::RegistrableDomain>> getAppBoundDomainsTesting(const String&);
</span><span class="cx"> bool shouldBeTreatedAsFullBrowser(const String& bundleID);
</span><span class="cx"> void determineITPState();
</span><span class="cx"> bool doesAppHaveITPEnabled();
</span><del>-bool doesParentProcessHaveITPEnabled(Optional<audit_token_t>);
</del><ins>+bool doesParentProcessHaveITPEnabled(Optional<audit_token_t>, bool);
</ins><span class="cx"> bool isFullWebBrowser();
</span><span class="cx"> bool isParentProcessAFullWebBrowser(Optional<audit_token_t>);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitSharedCocoaDefaultWebBrowserChecksmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Shared/Cocoa/DefaultWebBrowserChecks.mm (265201 => 265202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Shared/Cocoa/DefaultWebBrowserChecks.mm      2020-08-03 16:59:25 UTC (rev 265201)
+++ trunk/Source/WebKit/Shared/Cocoa/DefaultWebBrowserChecks.mm 2020-08-03 17:13:41 UTC (rev 265202)
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> 
</span><span class="cx"> static std::atomic<ITPState> g_currentITPState = ITPState::Uninitialized;
</span><span class="cx"> 
</span><del>-static bool hasRequestedCrossWebsiteTrackingPermission()
</del><ins>+bool hasRequestedCrossWebsiteTrackingPermission()
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(!isInWebKitChildProcess());
</span><span class="cx"> 
</span><span class="lines">@@ -158,12 +158,12 @@
</span><span class="cx">     return isITPEnabled;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool doesParentProcessHaveITPEnabled(Optional<audit_token_t> auditToken)
</del><ins>+bool doesParentProcessHaveITPEnabled(Optional<audit_token_t> auditToken, bool hasRequestedCrossWebsiteTrackingPermissionValue)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(isInWebKitChildProcess());
</span><span class="cx">     ASSERT(RunLoop::isMain());
</span><span class="cx"> 
</span><del>-    if (!isParentProcessAFullWebBrowser(auditToken))
</del><ins>+    if (!isParentProcessAFullWebBrowser(auditToken) && !hasRequestedCrossWebsiteTrackingPermissionValue)
</ins><span class="cx">         return true;
</span><span class="cx"> 
</span><span class="cx">     TCCAccessPreflightResult result = kTCCAccessPreflightDenied;
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessCocoaWebProcessPoolCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (265201 => 265202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm       2020-08-03 16:59:25 UTC (rev 265201)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm  2020-08-03 17:13:41 UTC (rev 265202)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> 
</span><span class="cx"> #import "AccessibilitySupportSPI.h"
</span><span class="cx"> #import "CookieStorageUtilsCF.h"
</span><ins>+#import "DefaultWebBrowserChecks.h"
</ins><span class="cx"> #import "LegacyCustomProtocolManagerClient.h"
</span><span class="cx"> #import "Logging.h"
</span><span class="cx"> #import "NetworkProcessCreationParameters.h"
</span><span class="lines">@@ -513,6 +514,8 @@
</span><span class="cx">         parameters.shouldEnableITPDatabase = m_defaultPageGroup->preferences().isITPDatabaseEnabled();
</span><span class="cx"> 
</span><span class="cx">     parameters.enableAdClickAttributionDebugMode = [defaults boolForKey:[NSString stringWithFormat:@"Experimental%@", WebPreferencesKey::adClickAttributionDebugModeEnabledKey().createCFString().get()]];
</span><ins>+
+    parameters.defaultDataStoreParameters.networkSessionParameters.appHasRequestedCrossWebsiteTrackingPermission = hasRequestedCrossWebsiteTrackingPermission();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void WebProcessPool::platformInvalidateContext()
</span></span></pre>
</div>
</div>

</body>
</html>