Title: [198967] trunk/Source/WebKit2
- Revision
- 198967
- Author
- dba...@webkit.org
- Date
- 2016-04-01 20:21:38 -0700 (Fri, 01 Apr 2016)
Log Message
Attempt to fix the Apple Internal Yosemite and El Capitan builds following
<http://trac.webkit.org/changeset/198933> (https://bugs.webkit.org/show_bug.cgi?id=155455)
<rdar://problem/25502181>
Only check the code signature of the client app if the "user-directory-suffix" sandbox
initialization parameter will not be used. This parameter is only used/passed as an
initialization parameter if the client app is not sandboxed, which seems sufficient
criterion to determine whether it is safe to honor it.
* Shared/mac/ChildProcessMac.mm:
(WebKit::ChildProcess::initializeSandbox):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (198966 => 198967)
--- trunk/Source/WebKit2/ChangeLog 2016-04-02 02:30:14 UTC (rev 198966)
+++ trunk/Source/WebKit2/ChangeLog 2016-04-02 03:21:38 UTC (rev 198967)
@@ -1,3 +1,17 @@
+2016-04-01 Daniel Bates <daba...@apple.com>
+
+ Attempt to fix the Apple Internal Yosemite and El Capitan builds following
+ <http://trac.webkit.org/changeset/198933> (https://bugs.webkit.org/show_bug.cgi?id=155455)
+ <rdar://problem/25502181>
+
+ Only check the code signature of the client app if the "user-directory-suffix" sandbox
+ initialization parameter will not be used. This parameter is only used/passed as an
+ initialization parameter if the client app is not sandboxed, which seems sufficient
+ criterion to determine whether it is safe to honor it.
+
+ * Shared/mac/ChildProcessMac.mm:
+ (WebKit::ChildProcess::initializeSandbox):
+
2016-04-01 Jiewen Tan <jiewen_...@apple.com>
WebKit should dispatchDidFailProvisionalLoad while loading invalid URLs
Modified: trunk/Source/WebKit2/Shared/mac/ChildProcessMac.mm (198966 => 198967)
--- trunk/Source/WebKit2/Shared/mac/ChildProcessMac.mm 2016-04-02 02:30:14 UTC (rev 198966)
+++ trunk/Source/WebKit2/Shared/mac/ChildProcessMac.mm 2016-04-02 03:21:38 UTC (rev 198967)
@@ -208,13 +208,11 @@
exit(EX_NOPERM);
}
+ if (willUseUserDirectorySuffixInitializationParameter)
+ return;
error = noErr;
String clientCodeSigningIdentifier = codeSigningIdentifierForProcess(xpc_connection_get_pid(parameters.connectionIdentifier.xpcConnection.get()), error);
bool isClientCodeSigned = !clientCodeSigningIdentifier.isNull();
- if (isClientCodeSigned && willUseUserDirectorySuffixInitializationParameter) {
- WTFLogAlways("%s: Only unsigned clients can specify parameter user-directory-suffix\n", getprogname());
- exit(EX_NOPERM);
- }
if (isClientCodeSigned && clientCodeSigningIdentifier != parameters.clientIdentifier) {
WTFLogAlways("%s: Code signing identifier of client differs from passed client identifier: %ld\n", getprogname(), static_cast<long>(error));
exit(EX_NOPERM);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
