Title: [290971] trunk/Source/WebKit
- Revision
- 290971
- Author
- bfulg...@apple.com
- Date
- 2022-03-07 19:07:25 -0800 (Mon, 07 Mar 2022)
Log Message
Remove remnants of WebKit.Plugin.64.xpc service
https://bugs.webkit.org/show_bug.cgi?id=237555
<rdar://84485232>
Reviewed by Alexey Proskuryakov.
Although plugins have been disabled for a number of years, the actual code behind this
feature was only removed this cycle (see Bugs 232462, 234354, and 234379). I noticed a few
remaining bits of the removed plugin process that should also be cleaned up.
* Scripts/process-entitlements.sh:
* Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm:
(WebKit::XPCServiceEventHandler):
* Shared/mac/AuxiliaryProcessMac.mm:
(WebKit::sandboxDirectory):
(WebKit::applySandbox):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (290970 => 290971)
--- trunk/Source/WebKit/ChangeLog 2022-03-08 03:00:21 UTC (rev 290970)
+++ trunk/Source/WebKit/ChangeLog 2022-03-08 03:07:25 UTC (rev 290971)
@@ -1,3 +1,22 @@
+2022-03-07 Brent Fulgham <bfulg...@apple.com>
+
+ Remove remnants of WebKit.Plugin.64.xpc service
+ https://bugs.webkit.org/show_bug.cgi?id=237555
+ <rdar://84485232>
+
+ Reviewed by Alexey Proskuryakov.
+
+ Although plugins have been disabled for a number of years, the actual code behind this
+ feature was only removed this cycle (see Bugs 232462, 234354, and 234379). I noticed a few
+ remaining bits of the removed plugin process that should also be cleaned up.
+
+ * Scripts/process-entitlements.sh:
+ * Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm:
+ (WebKit::XPCServiceEventHandler):
+ * Shared/mac/AuxiliaryProcessMac.mm:
+ (WebKit::sandboxDirectory):
+ (WebKit::applySandbox):
+
2022-03-07 Per Arne Vollan <pvol...@apple.com>
Preconnecting after process swap is a page load time improvement on some devices
Modified: trunk/Source/WebKit/Scripts/process-entitlements.sh (290970 => 290971)
--- trunk/Source/WebKit/Scripts/process-entitlements.sh 2022-03-08 03:00:21 UTC (rev 290970)
+++ trunk/Source/WebKit/Scripts/process-entitlements.sh 2022-03-08 03:07:25 UTC (rev 290971)
@@ -38,7 +38,7 @@
fi
fi
- mac_process_webcontent_or_plugin_entitlements
+ mac_process_webcontent_shared_entitlements
}
function mac_process_webcontent_captiveportal_entitlements()
@@ -75,7 +75,7 @@
fi
fi
- mac_process_webcontent_or_plugin_entitlements
+ mac_process_webcontent_shared_entitlements
}
function mac_process_gpu_entitlements()
@@ -175,19 +175,8 @@
fi
}
-function mac_process_plugin_entitlements()
+function mac_process_webcontent_shared_entitlements()
{
- plistbuddy Add :com.apple.security.cs.allow-jit bool YES
- plistbuddy Add :com.apple.security.cs.allow-unsigned-executable-memory bool YES
- plistbuddy Add :com.apple.security.cs.disable-library-validation bool YES
- plistbuddy Add :com.apple.security.files.user-selected.read-write bool YES
- plistbuddy Add :com.apple.security.print bool YES
-
- mac_process_webcontent_or_plugin_entitlements
-}
-
-function mac_process_webcontent_or_plugin_entitlements()
-{
if [[ "${WK_USE_RESTRICTED_ENTITLEMENTS}" == YES ]]
then
if (( "${TARGET_MAC_OS_X_VERSION_MAJOR}" >= 101400 ))
@@ -334,30 +323,6 @@
fi
}
-function maccatalyst_process_plugin_entitlements()
-{
- plistbuddy Add :com.apple.security.cs.allow-jit bool YES
- plistbuddy Add :com.apple.security.cs.allow-unsigned-executable-memory bool YES
- plistbuddy Add :com.apple.security.cs.disable-library-validation bool YES
- plistbuddy Add :com.apple.security.files.user-selected.read-write bool YES
- plistbuddy Add :com.apple.security.print bool YES
-
- if [[ "${WK_USE_RESTRICTED_ENTITLEMENTS}" == YES ]]
- then
- if (( "${TARGET_MAC_OS_X_VERSION_MAJOR}" >= 110000 ))
- then
- plistbuddy Add :com.apple.security.cs.jit-write-allowlist bool YES
- fi
- fi
-
- if (( "${TARGET_MAC_OS_X_VERSION_MAJOR}" >= 120000 ))
- then
- plistbuddy Add :com.apple.private.verified-jit bool YES
- plistbuddy Add :com.apple.security.cs.single-jit bool YES
- fi
-}
-
-
# ========================================
# iOS Family entitlements
# ========================================
@@ -534,17 +499,6 @@
plistbuddy Add :com.apple.symptom_analytics.configure bool YES
}
-function ios_family_process_plugin_entitlements()
-{
- plistbuddy Add :com.apple.private.verified-jit bool YES
- plistbuddy Add :com.apple.security.cs.allow-jit bool YES
- plistbuddy Add :com.apple.security.cs.allow-unsigned-executable-memory bool YES
- plistbuddy Add :com.apple.security.cs.disable-library-validation bool YES
- plistbuddy Add :com.apple.security.files.user-selected.read-write bool YES
- plistbuddy Add :com.apple.security.print bool YES
-}
-
-
rm -f "${WK_PROCESSED_XCENT_FILE}"
plistbuddy Clear dict
@@ -562,7 +516,6 @@
elif [[ "${PRODUCT_NAME}" == com.apple.WebKit.WebContent ]]; then mac_process_webcontent_entitlements
elif [[ "${PRODUCT_NAME}" == com.apple.WebKit.WebContent.CaptivePortal ]]; then mac_process_webcontent_captiveportal_entitlements
elif [[ "${PRODUCT_NAME}" == com.apple.WebKit.Networking ]]; then mac_process_network_entitlements
- elif [[ "${PRODUCT_NAME}" == com.apple.WebKit.Plugin.64 ]]; then mac_process_plugin_entitlements
elif [[ "${PRODUCT_NAME}" == com.apple.WebKit.GPU ]]; then mac_process_gpu_entitlements
elif [[ "${PRODUCT_NAME}" == com.apple.WebKit.WebAuthn ]]; then mac_process_webauthn_entitlements
elif [[ "${PRODUCT_NAME}" == webpushd ]]; then mac_process_webpushd_entitlements
@@ -570,13 +523,12 @@
fi
elif [[ "${WK_PLATFORM_NAME}" == maccatalyst || "${WK_PLATFORM_NAME}" == iosmac ]]
then
- [[ "${RC_XBS}" != YES && ( "${PRODUCT_NAME}" == com.apple.WebKit.WebContent.Development || "${PRODUCT_NAME}" == com.apple.WebKit.Plugin.64 ) ]] && plistbuddy Add :com.apple.security.get-task-allow bool YES
+ [[ "${RC_XBS}" != YES && ( "${PRODUCT_NAME}" == com.apple.WebKit.WebContent.Development ) ]] && plistbuddy Add :com.apple.security.get-task-allow bool YES
if [[ "${PRODUCT_NAME}" == com.apple.WebKit.WebContent.Development ]]; then maccatalyst_process_webcontent_entitlements
elif [[ "${PRODUCT_NAME}" == com.apple.WebKit.WebContent ]]; then maccatalyst_process_webcontent_entitlements
elif [[ "${PRODUCT_NAME}" == com.apple.WebKit.WebContent.CaptivePortal ]]; then maccatalyst_process_webcontent_captiveportal_entitlements
elif [[ "${PRODUCT_NAME}" == com.apple.WebKit.Networking ]]; then maccatalyst_process_network_entitlements
- elif [[ "${PRODUCT_NAME}" == com.apple.WebKit.Plugin.64 ]]; then maccatalyst_process_plugin_entitlements
elif [[ "${PRODUCT_NAME}" == com.apple.WebKit.GPU ]]; then maccatalyst_process_gpu_entitlements
else echo "Unsupported/unknown product: ${PRODUCT_NAME}"
fi
@@ -588,7 +540,6 @@
elif [[ "${PRODUCT_NAME}" == com.apple.WebKit.WebContent ]]; then ios_family_process_webcontent_entitlements
elif [[ "${PRODUCT_NAME}" == com.apple.WebKit.WebContent.CaptivePortal ]]; then ios_family_process_webcontent_captiveportal_entitlements
elif [[ "${PRODUCT_NAME}" == com.apple.WebKit.Networking ]]; then ios_family_process_network_entitlements
- elif [[ "${PRODUCT_NAME}" == com.apple.WebKit.Plugin.64 ]]; then ios_family_process_plugin_entitlements
elif [[ "${PRODUCT_NAME}" == com.apple.WebKit.GPU ]]; then ios_family_process_gpu_entitlements
elif [[ "${PRODUCT_NAME}" == com.apple.WebKit.WebAuthn ]]; then ios_family_process_webauthn_entitlements
elif [[ "${PRODUCT_NAME}" == adattributiond ]]; then
Modified: trunk/Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm (290970 => 290971)
--- trunk/Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm 2022-03-08 03:00:21 UTC (rev 290970)
+++ trunk/Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm 2022-03-08 03:07:25 UTC (rev 290971)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013-2020 Apple Inc. All rights reserved.
+ * Copyright (C) 2013-2022 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -103,8 +103,6 @@
entryPointFunctionName = CFSTR(STRINGIZE_VALUE_OF(WEBCONTENT_SERVICE_INITIALIZER));
else if (!strcmp(serviceName, "com.apple.WebKit.Networking"))
entryPointFunctionName = CFSTR(STRINGIZE_VALUE_OF(NETWORK_SERVICE_INITIALIZER));
- else if (!strcmp(serviceName, "com.apple.WebKit.Plugin.64"))
- entryPointFunctionName = CFSTR(STRINGIZE_VALUE_OF(PLUGIN_SERVICE_INITIALIZER));
else if (!strcmp(serviceName, "com.apple.WebKit.GPU"))
entryPointFunctionName = CFSTR(STRINGIZE_VALUE_OF(GPU_SERVICE_INITIALIZER));
else if (!strcmp(serviceName, "com.apple.WebKit.WebAuthn"))
Modified: trunk/Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm (290970 => 290971)
--- trunk/Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm 2022-03-08 03:00:21 UTC (rev 290970)
+++ trunk/Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm 2022-03-08 03:07:25 UTC (rev 290971)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2020 Apple Inc. All rights reserved.
+ * Copyright (C) 2012-2022 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -297,7 +297,8 @@
directory.append("/com.apple.WebKit.Networking.Sandbox");
break;
case WebCore::AuxiliaryProcessType::Plugin:
- directory.append("/com.apple.WebKit.Plugin.Sandbox");
+ WTFLogAlways("sandboxDirectory: Unexpected Plugin process initialization.");
+ CRASH();
break;
#if ENABLE(GPU_PROCESS)
case WebCore::AuxiliaryProcessType::GPU:
@@ -587,8 +588,10 @@
#if USE(CACHE_COMPILED_SANDBOX)
// The plugin process's DARWIN_USER_TEMP_DIR and DARWIN_USER_CACHE_DIR sandbox parameters are randomized so
// so the compiled sandbox should not be cached because it won't be reused.
- if (parameters.processType == WebCore::AuxiliaryProcessType::Plugin)
- return compileAndApplySandboxSlowCase(profileOrProfilePath, isProfilePath, sandboxInitializationParameters);
+ if (parameters.processType == WebCore::AuxiliaryProcessType::Plugin) {
+ WTFLogAlways("applySandbox: Unexpected Plugin process initialization.");
+ CRASH();
+ }
SandboxParametersPtr sandboxParameters { sandbox_create_params() };
if (!sandboxParameters) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
