- Revision
- 265202
- Author
- [email protected]
- Date
- 2020-08-03 10:13:41 -0700 (Mon, 03 Aug 2020)
Log Message
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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (265201 => 265202)
--- 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)
@@ -1,3 +1,30 @@
+2020-08-03 Kate Cheney <[email protected]>
+
+ 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):
+
2020-08-03 Adrian Perez de Castro <[email protected]>
Non-unified build fixes, early August 20202 edition
Modified: trunk/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.cpp (265201 => 265202)
--- 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)
@@ -80,6 +80,7 @@
encoder << allowsServerPreconnect;
encoder << requiresSecureHTTPSProxyConnection;
encoder << preventsSystemHTTPProxyAuthentication;
+ encoder << appHasRequestedCrossWebsiteTrackingPermission;
encoder << resourceLoadStatisticsParameters;
}
@@ -251,6 +252,11 @@
decoder >> preventsSystemHTTPProxyAuthentication;
if (!preventsSystemHTTPProxyAuthentication)
return WTF::nullopt;
+
+ Optional<bool> appHasRequestedCrossWebsiteTrackingPermission;
+ decoder >> appHasRequestedCrossWebsiteTrackingPermission;
+ if (!appHasRequestedCrossWebsiteTrackingPermission)
+ return WTF::nullopt;
Optional<ResourceLoadStatisticsParameters> resourceLoadStatisticsParameters;
decoder >> resourceLoadStatisticsParameters;
@@ -298,6 +304,7 @@
, WTFMove(*allowsServerPreconnect)
, WTFMove(*requiresSecureHTTPSProxyConnection)
, WTFMove(*preventsSystemHTTPProxyAuthentication)
+ , WTFMove(*appHasRequestedCrossWebsiteTrackingPermission)
, WTFMove(*resourceLoadStatisticsParameters)
}};
}
Modified: trunk/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.h (265201 => 265202)
--- 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)
@@ -93,7 +93,8 @@
bool allowsServerPreconnect { true };
bool requiresSecureHTTPSProxyConnection { false };
bool preventsSystemHTTPProxyAuthentication { false };
-
+ bool appHasRequestedCrossWebsiteTrackingPermission { false };
+
ResourceLoadStatisticsParameters resourceLoadStatisticsParameters;
};
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm (265201 => 265202)
--- 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)
@@ -1164,7 +1164,7 @@
auto parentAuditToken = session.networkProcess().parentProcessConnection()->getAuditToken();
RELEASE_ASSERT(parentAuditToken); // This should be impossible.
- bool itpEnabled = doesParentProcessHaveITPEnabled(parentAuditToken);
+ bool itpEnabled = doesParentProcessHaveITPEnabled(parentAuditToken, parameters.appHasRequestedCrossWebsiteTrackingPermission);
bool passedEnabledState = session.isResourceLoadStatisticsEnabled();
if (itpEnabled != passedEnabledState)
Modified: trunk/Source/WebKit/Shared/Cocoa/DefaultWebBrowserChecks.h (265201 => 265202)
--- 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)
@@ -34,12 +34,13 @@
namespace WebKit {
+bool hasRequestedCrossWebsiteTrackingPermission();
bool hasProhibitedUsageStrings();
Optional<Vector<WebCore::RegistrableDomain>> getAppBoundDomainsTesting(const String&);
bool shouldBeTreatedAsFullBrowser(const String& bundleID);
void determineITPState();
bool doesAppHaveITPEnabled();
-bool doesParentProcessHaveITPEnabled(Optional<audit_token_t>);
+bool doesParentProcessHaveITPEnabled(Optional<audit_token_t>, bool);
bool isFullWebBrowser();
bool isParentProcessAFullWebBrowser(Optional<audit_token_t>);
Modified: trunk/Source/WebKit/Shared/Cocoa/DefaultWebBrowserChecks.mm (265201 => 265202)
--- 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)
@@ -93,7 +93,7 @@
static std::atomic<ITPState> g_currentITPState = ITPState::Uninitialized;
-static bool hasRequestedCrossWebsiteTrackingPermission()
+bool hasRequestedCrossWebsiteTrackingPermission()
{
ASSERT(!isInWebKitChildProcess());
@@ -158,12 +158,12 @@
return isITPEnabled;
}
-bool doesParentProcessHaveITPEnabled(Optional<audit_token_t> auditToken)
+bool doesParentProcessHaveITPEnabled(Optional<audit_token_t> auditToken, bool hasRequestedCrossWebsiteTrackingPermissionValue)
{
ASSERT(isInWebKitChildProcess());
ASSERT(RunLoop::isMain());
- if (!isParentProcessAFullWebBrowser(auditToken))
+ if (!isParentProcessAFullWebBrowser(auditToken) && !hasRequestedCrossWebsiteTrackingPermissionValue)
return true;
TCCAccessPreflightResult result = kTCCAccessPreflightDenied;
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (265201 => 265202)
--- 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)
@@ -28,6 +28,7 @@
#import "AccessibilitySupportSPI.h"
#import "CookieStorageUtilsCF.h"
+#import "DefaultWebBrowserChecks.h"
#import "LegacyCustomProtocolManagerClient.h"
#import "Logging.h"
#import "NetworkProcessCreationParameters.h"
@@ -513,6 +514,8 @@
parameters.shouldEnableITPDatabase = m_defaultPageGroup->preferences().isITPDatabaseEnabled();
parameters.enableAdClickAttributionDebugMode = [defaults boolForKey:[NSString stringWithFormat:@"Experimental%@", WebPreferencesKey::adClickAttributionDebugModeEnabledKey().createCFString().get()]];
+
+ parameters.defaultDataStoreParameters.networkSessionParameters.appHasRequestedCrossWebsiteTrackingPermission = hasRequestedCrossWebsiteTrackingPermission();
}
void WebProcessPool::platformInvalidateContext()