<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[198933] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/198933">198933</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2016-03-31 18:12:55 -0700 (Thu, 31 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/194660">r194660</a>): Navigating to HTTPS sites may fail with error
https://bugs.webkit.org/show_bug.cgi?id=155455
<rdar://problem/24308793>
Reviewed by Alexey Proskuryakov.
Fixes an issue where navigating to an HTTPS site may fail because the Security Framework uses
a cache directory that it does not have permission to use.
* Shared/mac/ChildProcessMac.mm:
(WebKit::codeSigningIdentifierForProcess): Queries the Security Framework for the code signed
bundle identifier/code signing identifier.
(WebKit::ChildProcess::initializeSandbox): Use the client identifier as part of the user directory
suffix. Verify that the client identifier matches the code signed bundled identifier/code
signing identifier for the code signed app/tool. Fix minor code style issue; use a C++-style cast
instead of a C-style cast when casting an OSStatus to a long.
(WebKit::findSecCodeForProcess): Deleted; incorporated logic into WebKit::codeSigningIdentifierForProcess().</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedmacChildProcessMacmm">trunk/Source/WebKit2/Shared/mac/ChildProcessMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (198932 => 198933)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-04-01 00:24:18 UTC (rev 198932)
+++ trunk/Source/WebKit2/ChangeLog 2016-04-01 01:12:55 UTC (rev 198933)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-03-31 Daniel Bates <dabates@apple.com>
+
+ REGRESSION (r194660): Navigating to HTTPS sites may fail with error
+ https://bugs.webkit.org/show_bug.cgi?id=155455
+ <rdar://problem/24308793>
+
+ Reviewed by Alexey Proskuryakov.
+
+ Fixes an issue where navigating to an HTTPS site may fail because the Security Framework uses
+ a cache directory that it does not have permission to use.
+
+ * Shared/mac/ChildProcessMac.mm:
+ (WebKit::codeSigningIdentifierForProcess): Queries the Security Framework for the code signed
+ bundle identifier/code signing identifier.
+ (WebKit::ChildProcess::initializeSandbox): Use the client identifier as part of the user directory
+ suffix. Verify that the client identifier matches the code signed bundled identifier/code
+ signing identifier for the code signed app/tool. Fix minor code style issue; use a C++-style cast
+ instead of a C-style cast when casting an OSStatus to a long.
+ (WebKit::findSecCodeForProcess): Deleted; incorporated logic into WebKit::codeSigningIdentifierForProcess().
+
</ins><span class="cx"> 2016-03-31 Saam barati <sbarati@apple.com>
</span><span class="cx">
</span><span class="cx"> Revert rewrite const as var workaround
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacChildProcessMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/ChildProcessMac.mm (198932 => 198933)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/ChildProcessMac.mm 2016-04-01 00:24:18 UTC (rev 198932)
+++ trunk/Source/WebKit2/Shared/mac/ChildProcessMac.mm 2016-04-01 01:12:55 UTC (rev 198933)
</span><span class="lines">@@ -78,67 +78,54 @@
</span><span class="cx"> [[NSFileManager defaultManager] changeCurrentDirectoryPath:[[NSBundle mainBundle] bundlePath]];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// FIXME: Remove this macro guard once we fix <rdar://problem/24308793>.
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
-static RetainPtr<SecCodeRef> findSecCodeForProcess(pid_t pid)
</del><ins>+static String codeSigningIdentifierForProcess(pid_t pid, OSStatus& errorCode)
</ins><span class="cx"> {
</span><span class="cx"> RetainPtr<CFNumberRef> pidCFNumber = adoptCF(CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &pid));
</span><span class="cx"> const void* keys[] = { kSecGuestAttributePid };
</span><span class="cx"> const void* values[] = { pidCFNumber.get() };
</span><span class="cx"> RetainPtr<CFDictionaryRef> attributes = adoptCF(CFDictionaryCreate(kCFAllocatorDefault, keys, values, WTF_ARRAY_LENGTH(keys), &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
</span><span class="cx"> SecCodeRef code = nullptr;
</span><del>- if (SecCodeCopyGuestWithAttributes(nullptr, attributes.get(), kSecCSDefaultFlags, &code))
- return nullptr;
- return adoptCF(code);
</del><ins>+ if ((errorCode = SecCodeCopyGuestWithAttributes(nullptr, attributes.get(), kSecCSDefaultFlags, &code)))
+ return String();
+ RetainPtr<SecCodeRef> codePtr = adoptCF(code);
+ RELEASE_ASSERT(codePtr);
+
+ CFStringRef appleSignedOrMacAppStoreSignedOrAppleDeveloperSignedRequirement = CFSTR("(anchor apple) or (anchor apple generic and certificate leaf[field.1.2.840.113635.100.6.1.9]) or (anchor apple generic and certificate 1[field.1.2.840.113635.100.6.2.6] and certificate leaf[field.1.2.840.113635.100.6.1.13])");
+ SecRequirementRef signingRequirement = nullptr;
+ RELEASE_ASSERT(!SecRequirementCreateWithString(appleSignedOrMacAppStoreSignedOrAppleDeveloperSignedRequirement, kSecCSDefaultFlags, &signingRequirement));
+ RetainPtr<SecRequirementRef> signingRequirementPtr = adoptCF(signingRequirement);
+ errorCode = SecCodeCheckValidity(codePtr.get(), kSecCSDefaultFlags, signingRequirementPtr.get());
+ if (errorCode == errSecCSUnsigned || errorCode == errSecCSReqFailed)
+ return String(); // Unsigned or signed by a third-party
+ if (errorCode != errSecSuccess)
+ return emptyString(); // e.g. invalid/malformed signature
+ String codeSigningIdentifier;
+ CFDictionaryRef signingInfo = nullptr;
+ RELEASE_ASSERT(!SecCodeCopySigningInformation(codePtr.get(), kSecCSDefaultFlags, &signingInfo));
+ RetainPtr<CFDictionaryRef> signingInfoPtr = adoptCF(signingInfo);
+ if (CFDictionaryRef plist = dynamic_cf_cast<CFDictionaryRef>(CFDictionaryGetValue(signingInfoPtr.get(), kSecCodeInfoPList)))
+ codeSigningIdentifier = String(dynamic_cf_cast<CFStringRef>(CFDictionaryGetValue(plist, kCFBundleIdentifierKey)));
+ else
+ codeSigningIdentifier = String(dynamic_cf_cast<CFStringRef>(CFDictionaryGetValue(signingInfoPtr.get(), kSecCodeInfoIdentifier)));
+ RELEASE_ASSERT(!codeSigningIdentifier.isEmpty());
+ return codeSigningIdentifier;
</ins><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void ChildProcess::initializeSandbox(const ChildProcessInitializationParameters& parameters, SandboxInitializationParameters& sandboxParameters)
</span><span class="cx"> {
</span><span class="cx"> NSBundle *webkit2Bundle = [NSBundle bundleForClass:NSClassFromString(@"WKView")];
</span><span class="cx"> String defaultProfilePath = [webkit2Bundle pathForResource:[[NSBundle mainBundle] bundleIdentifier] ofType:@"sb"];
</span><span class="cx">
</span><ins>+ bool willUseUserDirectorySuffixInitializationParameter = false;
</ins><span class="cx"> if (sandboxParameters.userDirectorySuffix().isNull()) {
</span><del>- // FIXME: Remove this macro guard once we fix <rdar://problem/24308793>.
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
- if (const OSObjectPtr<xpc_connection_t>& xpcConnection = parameters.connectionIdentifier.xpcConnection) {
- pid_t clientProcessID = xpc_connection_get_pid(xpcConnection.get());
- RetainPtr<SecCodeRef> code = findSecCodeForProcess(clientProcessID);
- RELEASE_ASSERT(code);
-
- CFStringRef appleSignedOrMacAppStoreSignedOrAppleDeveloperSignedRequirement = CFSTR("(anchor apple) or (anchor apple generic and certificate leaf[field.1.2.840.113635.100.6.1.9]) or (anchor apple generic and certificate 1[field.1.2.840.113635.100.6.2.6] and certificate leaf[field.1.2.840.113635.100.6.1.13])");
- SecRequirementRef signingRequirement = nullptr;
- OSStatus status = SecRequirementCreateWithString(appleSignedOrMacAppStoreSignedOrAppleDeveloperSignedRequirement, kSecCSDefaultFlags, &signingRequirement);
- RELEASE_ASSERT(status == errSecSuccess);
-
- status = SecCodeCheckValidity(code.get(), kSecCSDefaultFlags, signingRequirement);
- if (status == errSecSuccess) {
- String clientIdentifierToUse;
- CFDictionaryRef signingInfo = nullptr;
- status = SecCodeCopySigningInformation(code.get(), kSecCSDefaultFlags, &signingInfo);
- RELEASE_ASSERT(status == errSecSuccess);
- if (CFDictionaryRef plist = dynamic_cf_cast<CFDictionaryRef>(CFDictionaryGetValue(signingInfo, kSecCodeInfoPList)))
- clientIdentifierToUse = String(dynamic_cf_cast<CFStringRef>(CFDictionaryGetValue(plist, kCFBundleIdentifierKey)));
- else
- clientIdentifierToUse = String(dynamic_cf_cast<CFStringRef>(CFDictionaryGetValue(signingInfo, kSecCodeInfoIdentifier)));
- CFRelease(signingInfo);
- RELEASE_ASSERT(!clientIdentifierToUse.isEmpty());
- sandboxParameters.setUserDirectorySuffix(makeString(String([[NSBundle mainBundle] bundleIdentifier]), '+', clientIdentifierToUse));
- } else {
- // Unsigned, signed by a third party, or has an invalid/malformed signature
- auto userDirectorySuffix = parameters.extraInitializationData.find("user-directory-suffix");
- if (userDirectorySuffix != parameters.extraInitializationData.end())
- sandboxParameters.setUserDirectorySuffix([makeString(userDirectorySuffix->value, '/', String([[NSBundle mainBundle] bundleIdentifier])) fileSystemRepresentation]);
- sandboxParameters.setUserDirectorySuffix(makeString(String([[NSBundle mainBundle] bundleIdentifier]), '+', parameters.clientIdentifier));
- }
- CFRelease(signingRequirement);
</del><ins>+ auto userDirectorySuffix = parameters.extraInitializationData.find("user-directory-suffix");
+ if (userDirectorySuffix != parameters.extraInitializationData.end()) {
+ willUseUserDirectorySuffixInitializationParameter = true;
+ sandboxParameters.setUserDirectorySuffix([makeString(userDirectorySuffix->value, '/', String([[NSBundle mainBundle] bundleIdentifier])) fileSystemRepresentation]);
</ins><span class="cx"> } else {
</span><del>- // Legacy client
- sandboxParameters.setUserDirectorySuffix(makeString(String([[NSBundle mainBundle] bundleIdentifier]), '+', parameters.clientIdentifier));
</del><ins>+ String defaultUserDirectorySuffix = makeString(String([[NSBundle mainBundle] bundleIdentifier]), '+', parameters.clientIdentifier);
+ sandboxParameters.setUserDirectorySuffix(defaultUserDirectorySuffix);
</ins><span class="cx"> }
</span><del>-#else
- sandboxParameters.setUserDirectorySuffix(makeString(String([[NSBundle mainBundle] bundleIdentifier]), '+', parameters.clientIdentifier));
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Vector<String> osVersionParts;
</span><span class="lines">@@ -217,9 +204,21 @@
</span><span class="cx"> // This will override LSFileQuarantineEnabled from Info.plist unless sandbox quarantine is globally disabled.
</span><span class="cx"> OSStatus error = WKEnableSandboxStyleFileQuarantine();
</span><span class="cx"> if (error) {
</span><del>- WTFLogAlways("%s: Couldn't enable sandbox style file quarantine: %ld\n", getprogname(), (long)error);
</del><ins>+ WTFLogAlways("%s: Couldn't enable sandbox style file quarantine: %ld\n", getprogname(), static_cast<long>(error));
</ins><span class="cx"> exit(EX_NOPERM);
</span><span class="cx"> }
</span><ins>+
+ 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);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
</span></span></pre>
</div>
</div>
</body>
</html>