Diff
Modified: trunk/LayoutTests/ChangeLog (257533 => 257534)
--- trunk/LayoutTests/ChangeLog 2020-02-27 00:42:56 UTC (rev 257533)
+++ trunk/LayoutTests/ChangeLog 2020-02-27 00:47:11 UTC (rev 257534)
@@ -1,3 +1,16 @@
+2020-02-26 Jacob Uphoff <[email protected]>
+
+ Unreviewed, rolling out r257508.
+
+ This commit broke the watchos build
+
+ Reverted changeset:
+
+ "[iOS] Issue mach sandbox extensions to the WebContent process
+ for a set of specific services"
+ https://bugs.webkit.org/show_bug.cgi?id=208146
+ https://trac.webkit.org/changeset/257508
+
2020-02-26 Jason Lawrence <[email protected]>
[ Mac wk2 ] media/modern-media-controls/pip-support/pip-support-click.html is flaky timing out.
Modified: trunk/LayoutTests/fast/sandbox/ios/sandbox-mach-lookup-mail-expected.txt (257533 => 257534)
--- trunk/LayoutTests/fast/sandbox/ios/sandbox-mach-lookup-mail-expected.txt 2020-02-27 00:42:56 UTC (rev 257533)
+++ trunk/LayoutTests/fast/sandbox/ios/sandbox-mach-lookup-mail-expected.txt 2020-02-27 00:47:11 UTC (rev 257534)
@@ -4,7 +4,4 @@
PASS internals.hasSandboxMachLookupAccessToGlobalName("com.apple.WebKit.WebContent", "com.apple.lsd.open") is true
-PASS internals.hasSandboxMachLookupAccessToGlobalName("com.apple.WebKit.WebContent", "com.apple.mobileassetd") is true
-PASS internals.hasSandboxMachLookupAccessToGlobalName("com.apple.WebKit.WebContent", "com.apple.iconservices") is true
-PASS internals.hasSandboxMachLookupAccessToGlobalName("com.apple.WebKit.WebContent", "com.apple.PowerManagement.control") is true
-PASS internals.hasSandboxMachLookupAccessToGlobalName("com.apple.WebKit.WebContent", ""com.apple.frontboard.systemappservices"") is true
+
Modified: trunk/LayoutTests/fast/sandbox/ios/sandbox-mach-lookup-mail.html (257533 => 257534)
--- trunk/LayoutTests/fast/sandbox/ios/sandbox-mach-lookup-mail.html 2020-02-27 00:42:56 UTC (rev 257533)
+++ trunk/LayoutTests/fast/sandbox/ios/sandbox-mach-lookup-mail.html 2020-02-27 00:47:11 UTC (rev 257534)
@@ -7,10 +7,6 @@
if (window.internals) {
shouldBeTrue("internals.hasSandboxMachLookupAccessToGlobalName(\"com.apple.WebKit.WebContent\", \"com.apple.lsd.open\")");
- shouldBeTrue("internals.hasSandboxMachLookupAccessToGlobalName(\"com.apple.WebKit.WebContent\", \"com.apple.mobileassetd\")");
- shouldBeTrue("internals.hasSandboxMachLookupAccessToGlobalName(\"com.apple.WebKit.WebContent\", \"com.apple.iconservices\")");
- shouldBeTrue("internals.hasSandboxMachLookupAccessToGlobalName(\"com.apple.WebKit.WebContent\", \"com.apple.PowerManagement.control\")");
- shouldBeTrue("internals.hasSandboxMachLookupAccessToGlobalName(\"com.apple.WebKit.WebContent\", \"com.apple.frontboard.systemappservices\")");
}
</script>
</head>
Modified: trunk/Source/WebKit/ChangeLog (257533 => 257534)
--- trunk/Source/WebKit/ChangeLog 2020-02-27 00:42:56 UTC (rev 257533)
+++ trunk/Source/WebKit/ChangeLog 2020-02-27 00:47:11 UTC (rev 257534)
@@ -1,3 +1,16 @@
+2020-02-26 Jacob Uphoff <[email protected]>
+
+ Unreviewed, rolling out r257508.
+
+ This commit broke the watchos build
+
+ Reverted changeset:
+
+ "[iOS] Issue mach sandbox extensions to the WebContent process
+ for a set of specific services"
+ https://bugs.webkit.org/show_bug.cgi?id=208146
+ https://trac.webkit.org/changeset/257508
+
2020-02-26 Alex Christensen <[email protected]>
Add SPI to query WKFrameInfos in a WKWebView
Modified: trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb (257533 => 257534)
--- trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb 2020-02-27 00:42:56 UTC (rev 257533)
+++ trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb 2020-02-27 00:47:11 UTC (rev 257534)
@@ -847,7 +847,7 @@
(allow mach-lookup
(require-all
(extension "com.apple.webkit.extension.mach")
- (global-name "com.apple.iphone.axserver-systemwide" "com.apple.tccd" "com.apple.nehelper" "com.apple.nesessionmanager.content-filter" "com.apple.uikit.viewservice.com.apple.WebContentFilter.remoteUI" "com.apple.diagnosticd" "com.apple.lsd.open" "com.apple.mobileassetd" "com.apple.mobileassetd.v2" "com.apple.frontboard.systemappservices" "com.apple.iconservices" "com.apple.webinspector" "com.apple.PowerManagement.control"
+ (global-name "com.apple.iphone.axserver-systemwide" "com.apple.tccd" "com.apple.nehelper" "com.apple.nesessionmanager.content-filter" "com.apple.uikit.viewservice.com.apple.WebContentFilter.remoteUI" "com.apple.diagnosticd" "com.apple.lsd.open" "com.apple.mobileassetd" "com.apple.mobileassetd.v2" "com.apple.frontboard.systemappservices" "com.apple.iconservices" "com.apple.webinspector"
;;; FIXME(207716): The following should be removed when the GPU process is complete
"com.apple.airplay.apsynccontroller.xpc" "com.apple.audio.AURemoteIOServer" "com.apple.audio.AudioComponentRegistrar"
Modified: trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp (257533 => 257534)
--- trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp 2020-02-27 00:42:56 UTC (rev 257533)
+++ trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp 2020-02-27 00:47:11 UTC (rev 257534)
@@ -159,13 +159,10 @@
#if PLATFORM(IOS)
encoder << compilerServiceExtensionHandle;
encoder << contentFilterExtensionHandle;
-#endif
-
-#if PLATFORM(IOS_FAMILY)
+ encoder << launchServicesOpenExtensionHandle;
encoder << diagnosticsExtensionHandle;
- encoder << dynamicMachExtensionHandles;
#endif
-
+
#if PLATFORM(COCOA)
encoder << neHelperExtensionHandle;
encoder << neSessionManagerExtensionHandle;
@@ -420,20 +417,18 @@
if (!contentFilterExtensionHandle)
return false;
parameters.contentFilterExtensionHandle = WTFMove(*contentFilterExtensionHandle);
-#endif
-#if PLATFORM(IOS_FAMILY)
+ Optional<Optional<SandboxExtension::Handle>> launchServicesOpenExtensionHandle;
+ decoder >> launchServicesOpenExtensionHandle;
+ if (!launchServicesOpenExtensionHandle)
+ return false;
+ parameters.launchServicesOpenExtensionHandle = WTFMove(*launchServicesOpenExtensionHandle);
+
Optional<Optional<SandboxExtension::Handle>> diagnosticsExtensionHandle;
decoder >> diagnosticsExtensionHandle;
if (!diagnosticsExtensionHandle)
return false;
parameters.diagnosticsExtensionHandle = WTFMove(*diagnosticsExtensionHandle);
-
- Optional<SandboxExtension::HandleArray> dynamicMachExtensionHandles;
- decoder >> dynamicMachExtensionHandles;
- if (!dynamicMachExtensionHandles)
- return false;
- parameters.dynamicMachExtensionHandles = WTFMove(*dynamicMachExtensionHandles);
#endif
#if PLATFORM(COCOA)
Modified: trunk/Source/WebKit/Shared/WebProcessCreationParameters.h (257533 => 257534)
--- trunk/Source/WebKit/Shared/WebProcessCreationParameters.h 2020-02-27 00:42:56 UTC (rev 257533)
+++ trunk/Source/WebKit/Shared/WebProcessCreationParameters.h 2020-02-27 00:47:11 UTC (rev 257534)
@@ -201,11 +201,8 @@
#if PLATFORM(IOS)
Optional<SandboxExtension::Handle> compilerServiceExtensionHandle;
Optional<SandboxExtension::Handle> contentFilterExtensionHandle;
-#endif
-
-#if PLATFORM(IOS_FAMILY)
+ Optional<SandboxExtension::Handle> launchServicesOpenExtensionHandle;
Optional<SandboxExtension::Handle> diagnosticsExtensionHandle;
- SandboxExtension::HandleArray dynamicMachExtensionHandles;
#endif
#if PLATFORM(COCOA)
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (257533 => 257534)
--- trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2020-02-27 00:42:56 UTC (rev 257533)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2020-02-27 00:47:11 UTC (rev 257534)
@@ -366,21 +366,11 @@
SandboxExtension::createHandleForMachLookup("com.apple.AGXCompilerService", WTF::nullopt, compilerServiceExtensionHandle);
parameters.compilerServiceExtensionHandle = WTFMove(compilerServiceExtensionHandle);
}
-#endif
-#if PLATFORM(IOS_FAMILY)
- if (!isSafari) {
- static const char* services[] = {
- "com.apple.lsd.open",
- "com.apple.mobileassetd",
- "com.apple.iconservices",
- "com.apple.PowerManagement.control",
- "com.apple.frontboard.systemappservices"
- };
- auto size = WTF_ARRAY_LENGTH(services);
- parameters.dynamicMachExtensionHandles.allocate(size);
- for (size_t i = 0; i < size; ++i)
- SandboxExtension::createHandleForMachLookup(services[i], WTF::nullopt, parameters.dynamicMachExtensionHandles[i]);
+ if (WebCore::IOSApplication::isMobileMail()) {
+ SandboxExtension::Handle launchServicesOpenExtensionHandle;
+ SandboxExtension::createHandleForMachLookup("com.apple.lsd.open", WTF::nullopt, launchServicesOpenExtensionHandle);
+ parameters.launchServicesOpenExtensionHandle = WTFMove(launchServicesOpenExtensionHandle);
}
if (isInternalInstall()) {
Modified: trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm (257533 => 257534)
--- trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm 2020-02-27 00:42:56 UTC (rev 257533)
+++ trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm 2020-02-27 00:47:11 UTC (rev 257534)
@@ -251,17 +251,15 @@
if (parameters.compilerServiceExtensionHandle)
SandboxExtension::consumePermanently(*parameters.compilerServiceExtensionHandle);
- if (parameters.contentFilterExtensionHandle)
- SandboxExtension::consumePermanently(*parameters.contentFilterExtensionHandle);
- ParentalControlsContentFilter::setHasConsumedSandboxExtension(parameters.contentFilterExtensionHandle.hasValue());
-#endif
+ if (parameters.launchServicesOpenExtensionHandle)
+ SandboxExtension::consumePermanently(*parameters.launchServicesOpenExtensionHandle);
-#if PLATFORM(IOS_FAMILY)
if (parameters.diagnosticsExtensionHandle)
SandboxExtension::consumePermanently(*parameters.diagnosticsExtensionHandle);
- for (size_t i = 0, size = parameters.dynamicMachExtensionHandles.size(); i < size; ++i)
- SandboxExtension::consumePermanently(parameters.dynamicMachExtensionHandles[i]);
+ if (parameters.contentFilterExtensionHandle)
+ SandboxExtension::consumePermanently(*parameters.contentFilterExtensionHandle);
+ ParentalControlsContentFilter::setHasConsumedSandboxExtension(parameters.contentFilterExtensionHandle.hasValue());
#endif
#if PLATFORM(COCOA)
