<!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>[175270] 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/175270">175270</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2014-10-28 13:01:47 -0700 (Tue, 28 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Cocoa] REGERESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/171801">r171801</a>): Client certificate authentication is failing
https://bugs.webkit.org/show_bug.cgi?id=138144
Reviewed by Alexey Proskuryakov.
NSURLCredential’s implementation of NSSecureCoding fails to encode identity-based
credentials properly. Work around that by encoding the identity, certificate, and
persistence individually.
* Shared/mac/WebCoreArgumentCodersMac.mm:
(IPC::ArgumentCoder<Credential>::encodePlatformData):
(IPC::ArgumentCoder<Credential>::decodePlatformData):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedmacWebCoreArgumentCodersMacmm">trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (175269 => 175270)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-10-28 19:57:55 UTC (rev 175269)
+++ trunk/Source/WebKit2/ChangeLog 2014-10-28 20:01:47 UTC (rev 175270)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-10-28 Dan Bernstein <mitz@apple.com>
+
+ [Cocoa] REGERESSION (r171801): Client certificate authentication is failing
+ https://bugs.webkit.org/show_bug.cgi?id=138144
+
+ Reviewed by Alexey Proskuryakov.
+
+ NSURLCredential’s implementation of NSSecureCoding fails to encode identity-based
+ credentials properly. Work around that by encoding the identity, certificate, and
+ persistence individually.
+
+ * Shared/mac/WebCoreArgumentCodersMac.mm:
+ (IPC::ArgumentCoder<Credential>::encodePlatformData):
+ (IPC::ArgumentCoder<Credential>::decodePlatformData):
+
</ins><span class="cx"> 2014-10-28 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] iPhone should not allow selecting <optgroup> in <select multiple>
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacWebCoreArgumentCodersMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm (175269 => 175270)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm 2014-10-28 19:57:55 UTC (rev 175269)
+++ trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm 2014-10-28 20:01:47 UTC (rev 175270)
</span><span class="lines">@@ -282,16 +282,60 @@
</span><span class="cx">
</span><span class="cx"> void ArgumentCoder<Credential>::encodePlatformData(ArgumentEncoder& encoder, const Credential& credential)
</span><span class="cx"> {
</span><ins>+ NSURLCredential *nsCredential = credential.nsCredential();
+ // NSURLCredential doesn't serialize identities correctly, so we encode the pieces individually in the identity case.
+ if (SecIdentityRef identity = nsCredential.identity) {
+ encoder << true;
+ IPC::encode(encoder, identity);
+
+ if (NSArray *certificates = nsCredential.certificates) {
+ encoder << true;
+ IPC::encode(encoder, reinterpret_cast<CFArrayRef>(certificates));
+ } else
+ encoder << false;
+
+ encoder << static_cast<uint64_t>(nsCredential.persistence);
+ return;
+ }
+
+ encoder << false;
</ins><span class="cx"> RetainPtr<NSMutableData> data = adoptNS([[NSMutableData alloc] init]);
</span><span class="cx"> RetainPtr<NSKeyedArchiver> archiver = adoptNS([[NSKeyedArchiver alloc] initForWritingWithMutableData:data.get()]);
</span><span class="cx"> [archiver setRequiresSecureCoding:YES];
</span><del>- [archiver encodeObject:credential.nsCredential() forKey:@"credential"];
</del><ins>+ [archiver encodeObject:nsCredential forKey:@"credential"];
</ins><span class="cx"> [archiver finishEncoding];
</span><span class="cx"> IPC::encode(encoder, reinterpret_cast<CFDataRef>(data.get()));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool ArgumentCoder<Credential>::decodePlatformData(ArgumentDecoder& decoder, Credential& credential)
</span><span class="cx"> {
</span><ins>+ bool hasIdentity;
+ if (!decoder.decode(hasIdentity))
+ return false;
+
+ if (hasIdentity) {
+ RetainPtr<SecIdentityRef> identity;
+ if (!IPC::decode(decoder, identity))
+ return false;
+
+ RetainPtr<CFArrayRef> certificates;
+ bool hasCertificates;
+ if (!decoder.decode(hasCertificates))
+ return false;
+
+ if (hasCertificates) {
+ if (!IPC::decode(decoder, certificates))
+ return false;
+ }
+
+ uint64_t persistence;
+ if (!decoder.decode(persistence))
+ return false;
+
+ credential = Credential(adoptNS([[NSURLCredential alloc] initWithIdentity:identity.get() certificates:(NSArray *)certificates.get() persistence:(NSURLCredentialPersistence)persistence]).get());
+ return true;
+ }
+
</ins><span class="cx"> RetainPtr<CFDataRef> data;
</span><span class="cx"> if (!IPC::decode(decoder, data))
</span><span class="cx"> return false;
</span></span></pre>
</div>
</div>
</body>
</html>