Diff
Modified: trunk/LayoutTests/ChangeLog (258893 => 258894)
--- trunk/LayoutTests/ChangeLog 2020-03-24 01:22:34 UTC (rev 258893)
+++ trunk/LayoutTests/ChangeLog 2020-03-24 01:31:38 UTC (rev 258894)
@@ -1,3 +1,17 @@
+2020-03-23 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, reverting r258891.
+ https://bugs.webkit.org/show_bug.cgi?id=209459
+
+ Introduced layout test failures (Requested by perarne on
+ #webkit).
+
+ Reverted changeset:
+
+ "[Cocoa] Deny access to database mapping service"
+ https://bugs.webkit.org/show_bug.cgi?id=209339
+ https://trac.webkit.org/changeset/258891
+
2020-03-23 David Kilzer <ddkil...@apple.com>
[Win] http/tests/misc/last-modified-parsing.html always fails on Windows EWS
Modified: trunk/LayoutTests/fast/sandbox/ios/sandbox-mach-lookup-expected.txt (258893 => 258894)
--- trunk/LayoutTests/fast/sandbox/ios/sandbox-mach-lookup-expected.txt 2020-03-24 01:22:34 UTC (rev 258893)
+++ trunk/LayoutTests/fast/sandbox/ios/sandbox-mach-lookup-expected.txt 2020-03-24 01:31:38 UTC (rev 258894)
@@ -25,4 +25,3 @@
PASS internals.hasSandboxMachLookupAccessToGlobalName("com.apple.WebKit.WebContent", "com.apple.mobileassetd") is false
PASS internals.hasSandboxMachLookupAccessToGlobalName("com.apple.WebKit.WebContent", "com.apple.mobileassetd.v2") is false
PASS internals.hasSandboxMachLookupAccessToGlobalName("com.apple.WebKit.WebContent", "com.apple.iconservices") is false
-PASS internals.hasSandboxMachLookupAccessToGlobalName("com.apple.WebKit.WebContent", "com.apple.lsd.mapdb") is false
Modified: trunk/LayoutTests/fast/sandbox/ios/sandbox-mach-lookup.html (258893 => 258894)
--- trunk/LayoutTests/fast/sandbox/ios/sandbox-mach-lookup.html 2020-03-24 01:22:34 UTC (rev 258893)
+++ trunk/LayoutTests/fast/sandbox/ios/sandbox-mach-lookup.html 2020-03-24 01:31:38 UTC (rev 258894)
@@ -28,7 +28,6 @@
shouldBeFalse("internals.hasSandboxMachLookupAccessToGlobalName(\"com.apple.WebKit.WebContent\", \"com.apple.mobileassetd\")");
shouldBeFalse("internals.hasSandboxMachLookupAccessToGlobalName(\"com.apple.WebKit.WebContent\", \"com.apple.mobileassetd.v2\")");
shouldBeFalse("internals.hasSandboxMachLookupAccessToGlobalName(\"com.apple.WebKit.WebContent\", \"com.apple.iconservices\")");
- shouldBeFalse("internals.hasSandboxMachLookupAccessToGlobalName(\"com.apple.WebKit.WebContent\", \"com.apple.lsd.mapdb\")");
}
</script>
</head>
Modified: trunk/Source/WTF/ChangeLog (258893 => 258894)
--- trunk/Source/WTF/ChangeLog 2020-03-24 01:22:34 UTC (rev 258893)
+++ trunk/Source/WTF/ChangeLog 2020-03-24 01:31:38 UTC (rev 258894)
@@ -1,3 +1,17 @@
+2020-03-23 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, reverting r258891.
+ https://bugs.webkit.org/show_bug.cgi?id=209459
+
+ Introduced layout test failures (Requested by perarne on
+ #webkit).
+
+ Reverted changeset:
+
+ "[Cocoa] Deny access to database mapping service"
+ https://bugs.webkit.org/show_bug.cgi?id=209339
+ https://trac.webkit.org/changeset/258891
+
2020-03-23 Per Arne Vollan <pvol...@apple.com>
[Cocoa] Deny access to database mapping service
Modified: trunk/Source/WTF/wtf/PlatformUse.h (258893 => 258894)
--- trunk/Source/WTF/wtf/PlatformUse.h 2020-03-24 01:22:34 UTC (rev 258893)
+++ trunk/Source/WTF/wtf/PlatformUse.h 2020-03-24 01:31:38 UTC (rev 258894)
@@ -321,4 +321,6 @@
#define USE_CTFONTTRANSFORMGLYPHSWITHLANGUAGE 1
#endif
-#define USE_UTTYPE_SWIZZLER 0
+#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000
+#define USE_UTTYPE_SWIZZLER 1
+#endif
Modified: trunk/Source/WebKit/ChangeLog (258893 => 258894)
--- trunk/Source/WebKit/ChangeLog 2020-03-24 01:22:34 UTC (rev 258893)
+++ trunk/Source/WebKit/ChangeLog 2020-03-24 01:31:38 UTC (rev 258894)
@@ -1,3 +1,17 @@
+2020-03-23 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, reverting r258891.
+ https://bugs.webkit.org/show_bug.cgi?id=209459
+
+ Introduced layout test failures (Requested by perarne on
+ #webkit).
+
+ Reverted changeset:
+
+ "[Cocoa] Deny access to database mapping service"
+ https://bugs.webkit.org/show_bug.cgi?id=209339
+ https://trac.webkit.org/changeset/258891
+
2020-03-23 Per Arne Vollan <pvol...@apple.com>
[Cocoa] Deny access to database mapping service
Modified: trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb (258893 => 258894)
--- trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb 2020-03-24 01:22:34 UTC (rev 258893)
+++ trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb 2020-03-24 01:31:38 UTC (rev 258894)
@@ -537,13 +537,13 @@
(global-name "com.apple.cfprefsd.daemon")
)
-(deny mach-lookup (with telemetry-backtrace)
+(deny mach-lookup (with telemetry)
(global-name "com.apple.distributed_notifications@1v3"))
(allow ipc-posix-shm-read*
(ipc-posix-name-prefix "apple.cfprefs."))
-(deny mach-lookup (with telemetry-backtrace)
+(allow mach-lookup (with telemetry-backtrace)
(global-name "com.apple.lsd.mapdb"))
;; <rdar://problem/12413942>
Modified: trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp (258893 => 258894)
--- trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp 2020-03-24 01:22:34 UTC (rev 258893)
+++ trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp 2020-03-24 01:31:38 UTC (rev 258894)
@@ -169,7 +169,6 @@
#if PLATFORM(COCOA)
encoder << neHelperExtensionHandle;
encoder << neSessionManagerExtensionHandle;
- encoder << mapDBExtensionHandle;
encoder << systemHasBattery;
encoder << mimeTypesMap;
encoder << mapUTIFromMIMEType;
@@ -457,12 +456,6 @@
return false;
parameters.neSessionManagerExtensionHandle = WTFMove(*neSessionManagerExtensionHandle);
- Optional<Optional<SandboxExtension::Handle>> mapDBExtensionHandle;
- decoder >> mapDBExtensionHandle;
- if (!mapDBExtensionHandle)
- return false;
- parameters.mapDBExtensionHandle = WTFMove(*mapDBExtensionHandle);
-
Optional<bool> systemHasBattery;
decoder >> systemHasBattery;
if (!systemHasBattery)
Modified: trunk/Source/WebKit/Shared/WebProcessCreationParameters.h (258893 => 258894)
--- trunk/Source/WebKit/Shared/WebProcessCreationParameters.h 2020-03-24 01:22:34 UTC (rev 258893)
+++ trunk/Source/WebKit/Shared/WebProcessCreationParameters.h 2020-03-24 01:31:38 UTC (rev 258894)
@@ -213,7 +213,6 @@
#if PLATFORM(COCOA)
Optional<SandboxExtension::Handle> neHelperExtensionHandle;
Optional<SandboxExtension::Handle> neSessionManagerExtensionHandle;
- Optional<SandboxExtension::Handle> mapDBExtensionHandle;
bool systemHasBattery { false };
Optional<HashMap<String, Vector<String>, ASCIICaseInsensitiveHash>> mimeTypesMap;
HashMap<String, String> mapUTIFromMIMEType;
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (258893 => 258894)
--- trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2020-03-24 01:22:34 UTC (rev 258893)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2020-03-24 01:31:38 UTC (rev 258894)
@@ -380,6 +380,7 @@
if (!WebCore::IOSApplication::isMobileSafari() || _AXSApplicationAccessibilityEnabled()) {
static const char* services[] = {
"com.apple.lsd.open",
+ "com.apple.lsd.mapdb",
"com.apple.mobileassetd",
"com.apple.iconservices",
"com.apple.PowerManagement.control",
@@ -414,10 +415,6 @@
parameters.systemHasBattery = systemHasBattery();
parameters.mimeTypesMap = commonMimeTypesMap();
parameters.mapUTIFromMIMEType = createUTIFromMIMETypeMap();
-
- SandboxExtension::Handle mapDBHandle;
- SandboxExtension::createHandleForMachLookup("com.apple.lsd.mapdb", WTF::nullopt, mapDBHandle, SandboxExtension::Flags::NoReport);
- parameters.mapDBExtensionHandle = WTFMove(mapDBHandle);
#endif
#if PLATFORM(IOS)
Modified: trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm (258893 => 258894)
--- trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm 2020-03-24 01:22:34 UTC (rev 258893)
+++ trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm 2020-03-24 01:31:38 UTC (rev 258894)
@@ -104,7 +104,6 @@
#import "RunningBoardServicesSPI.h"
#import "UserInterfaceIdiom.h"
#import "WKAccessibilityWebPageObjectIOS.h"
-#import <MobileCoreServices/MobileCoreServices.h>
#import <UIKit/UIAccessibility.h>
#import <WebCore/UTTypeRecordSwizzler.h>
#import <pal/spi/ios/GraphicsServicesSPI.h>
@@ -275,18 +274,6 @@
if (parameters.neSessionManagerExtensionHandle)
SandboxExtension::consumePermanently(*parameters.neSessionManagerExtensionHandle);
NetworkExtensionContentFilter::setHasConsumedSandboxExtensions(parameters.neHelperExtensionHandle.hasValue() && parameters.neSessionManagerExtensionHandle.hasValue());
-
- if (parameters.mapDBExtensionHandle) {
- auto extension = SandboxExtension::create(WTFMove(*parameters.mapDBExtensionHandle));
- bool ok = extension->consume();
- ASSERT_UNUSED(ok, ok);
- // Perform API calls which will communicate with the database mapping service, and map the database.
- auto uti = adoptCF(UTTypeCreatePreferredIdentifierForTag(kUTTagClassMIMEType, CFSTR("text/html"), 0));
- auto mimeType = adoptCF(UTTypeCopyPreferredTagWithClass(CFSTR("public.png"), kUTTagClassMIMEType));
- ok = extension->revoke();
- ASSERT_UNUSED(ok, ok);
- }
-
setSystemHasBattery(parameters.systemHasBattery);
if (parameters.mimeTypesMap)
Modified: trunk/Source/WebKit/WebProcess/com.apple.WebProcess.sb.in (258893 => 258894)
--- trunk/Source/WebKit/WebProcess/com.apple.WebProcess.sb.in 2020-03-24 01:22:34 UTC (rev 258893)
+++ trunk/Source/WebKit/WebProcess/com.apple.WebProcess.sb.in 2020-03-24 01:31:38 UTC (rev 258894)
@@ -679,6 +679,7 @@
(global-name "com.apple.PowerManagement.control")
(global-name "com.apple.cfprefsd.daemon")
(global-name "com.apple.coreservices.launchservicesd")
+ (global-name "com.apple.lsd.mapdb")
(global-name "com.apple.trustd.agent")
)
@@ -886,7 +887,6 @@
"com.apple.webinspector"
"com.apple.cfprefsd.daemon"
"com.apple.tccd"
- "com.apple.lsd.mapdb"
;;; FIXME(207716): The following should be removed when the GPU process is complete
"com.apple.audio.AudioComponentRegistrar" "com.apple.coremedia.endpoint.xpc" "com.apple.coremedia.endpointstream.xpc"
