Diff
Modified: trunk/Source/WebKit/ChangeLog (263306 => 263307)
--- trunk/Source/WebKit/ChangeLog 2020-06-20 01:04:35 UTC (rev 263306)
+++ trunk/Source/WebKit/ChangeLog 2020-06-20 01:07:52 UTC (rev 263307)
@@ -1,3 +1,15 @@
+2020-06-19 Ryan Haddad <ryanhad...@apple.com>
+
+ Unreviewed, reverting r263287.
+
+ Caused tests to exit early with crashes on Catalina.
+
+ Reverted changeset:
+
+ "[iOS, macOS] Allow access to the container manager to support Mail InjectedBundle"
+ https://bugs.webkit.org/show_bug.cgi?id=213357
+ https://trac.webkit.org/changeset/263287
+
2020-06-19 Chris Dumez <cdu...@apple.com>
Crash under WebKit::ProcessAndUIAssertion::updateRunInBackgroundCount()
Modified: trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb (263306 => 263307)
--- trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb 2020-06-20 01:04:35 UTC (rev 263306)
+++ trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb 2020-06-20 01:07:52 UTC (rev 263307)
@@ -940,10 +940,6 @@
(home-subpath "/Library/Preferences/")
(with no-log))
-(deny mach-lookup (with telemetry-backtrace)
- (global-name "com.apple.containermanagerd")
-)
-
(allow mach-lookup
(require-all
(extension "com.apple.webkit.extension.mach")
@@ -950,7 +946,6 @@
(global-name
"com.apple.cfprefsd.agent"
"com.apple.cfprefsd.daemon"
- "com.apple.containermanagerd"
"com.apple.diagnosticd"
"com.apple.iphone.axserver-systemwide"
"com.apple.lsd.mapdb"
Modified: trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp (263306 => 263307)
--- trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp 2020-06-20 01:04:35 UTC (rev 263306)
+++ trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp 2020-06-20 01:07:52 UTC (rev 263307)
@@ -161,8 +161,6 @@
encoder << frontboardServiceExtensionHandle;
#endif
- encoder << containerManagerExtensionHandle;
-
#if PLATFORM(IOS_FAMILY)
encoder << diagnosticsExtensionHandles;
encoder << dynamicMachExtensionHandles;
@@ -437,12 +435,6 @@
parameters.frontboardServiceExtensionHandle = WTFMove(*frontboardServiceExtensionHandle);
#endif
- Optional<Optional<SandboxExtension::Handle>> containerManagerExtensionHandle;
- decoder >> containerManagerExtensionHandle;
- if (!containerManagerExtensionHandle)
- return false;
- parameters.containerManagerExtensionHandle = WTFMove(*containerManagerExtensionHandle);
-
#if PLATFORM(IOS_FAMILY)
Optional<SandboxExtension::HandleArray> diagnosticsExtensionHandles;
decoder >> diagnosticsExtensionHandles;
Modified: trunk/Source/WebKit/Shared/WebProcessCreationParameters.h (263306 => 263307)
--- trunk/Source/WebKit/Shared/WebProcessCreationParameters.h 2020-06-20 01:04:35 UTC (rev 263306)
+++ trunk/Source/WebKit/Shared/WebProcessCreationParameters.h 2020-06-20 01:07:52 UTC (rev 263307)
@@ -205,8 +205,6 @@
Optional<SandboxExtension::Handle> frontboardServiceExtensionHandle;
#endif
- Optional<SandboxExtension::Handle> containerManagerExtensionHandle;
-
#if PLATFORM(IOS_FAMILY)
SandboxExtension::HandleArray diagnosticsExtensionHandles;
SandboxExtension::HandleArray dynamicMachExtensionHandles;
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (263306 => 263307)
--- trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2020-06-20 01:04:35 UTC (rev 263306)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2020-06-20 01:07:52 UTC (rev 263307)
@@ -292,18 +292,6 @@
#endif
-static bool requiresContainerManagerAccess()
-{
-#if PLATFORM(MAC)
- return WebCore::MacApplication::isAppleMail();
-#elif PLATFORM(IOS)
- return WebCore::IOSApplication::isMobileMail();
-#else
- return false;
-#endif
-}
-
-
void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process, WebProcessCreationParameters& parameters)
{
parameters.mediaMIMETypes = process.mediaMIMETypes();
@@ -450,12 +438,6 @@
parameters.frontboardServiceExtensionHandle = WTFMove(frontboardServiceExtensionHandle);
}
#endif
-
- if (requiresContainerManagerAccess()) {
- SandboxExtension::Handle handle;
- SandboxExtension::createHandleForMachLookup("com.apple.containermanagerd"_s, WTF::nullopt, handle);
- parameters.containerManagerExtensionHandle = WTFMove(handle);
- }
#if PLATFORM(IOS_FAMILY)
parameters.currentUserInterfaceIdiomIsPad = currentUserInterfaceIdiomIsPad();
Modified: trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm (263306 => 263307)
--- trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm 2020-06-20 01:04:35 UTC (rev 263306)
+++ trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm 2020-06-20 01:07:52 UTC (rev 263307)
@@ -281,9 +281,6 @@
SandboxExtension::consumePermanently(*parameters.frontboardServiceExtensionHandle);
#endif
- if (parameters.containerManagerExtensionHandle)
- SandboxExtension::consumePermanently(*parameters.containerManagerExtensionHandle);
-
#if PLATFORM(IOS_FAMILY)
SandboxExtension::consumePermanently(parameters.diagnosticsExtensionHandles);
SandboxExtension::consumePermanently(parameters.dynamicMachExtensionHandles);
Modified: trunk/Source/WebKit/WebProcess/com.apple.WebProcess.sb.in (263306 => 263307)
--- trunk/Source/WebKit/WebProcess/com.apple.WebProcess.sb.in 2020-06-20 01:04:35 UTC (rev 263306)
+++ trunk/Source/WebKit/WebProcess/com.apple.WebProcess.sb.in 2020-06-20 01:07:52 UTC (rev 263307)
@@ -898,12 +898,6 @@
(home-subpath "/Library/Preferences/")
(with no-log))
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500
-(deny mach-lookup (with telemetry-backtrace)
- (global-name "com.apple.containermanagerd")
-)
-#endif
-
(allow mach-lookup
(require-all
(extension "com.apple.webkit.extension.mach")
@@ -917,7 +911,6 @@
"com.apple.webinspector"
"com.apple.cfprefsd.agent"
"com.apple.cfprefsd.daemon"
- "com.apple.containermanagerd"
"com.apple.tccd"
"com.apple.lsd.mapdb"
"com.apple.BluetoothServices"
