<!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>[203671] 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/203671">203671</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2016-07-24 17:48:51 -0700 (Sun, 24 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add specialization for encoding/decoding WebCore::CertificateInfos in the Network Cache
<rdar://problem/27409315>
https://bugs.webkit.org/show_bug.cgi?id=160144
Reviewed by Chris Dumez.
* NetworkProcess/cache/NetworkCacheCoders.cpp:
(WebKit::NetworkCache::encodeCFData):
(WebKit::NetworkCache::decodeCFData):
(WebKit::NetworkCache::encodeSecTrustRef):
(WebKit::NetworkCache::decodeSecTrustRef):
(WebKit::NetworkCache::encodeCertificateChain):
(WebKit::NetworkCache::decodeCertificateChain):
(WebKit::NetworkCache::Coder<WebCore::CertificateInfo>::encode):
(WebKit::NetworkCache::Coder<WebCore::CertificateInfo>::decode):
* NetworkProcess/cache/NetworkCacheStorage.h:
(WebKit::NetworkCache::Storage::version):
Bump the version and lastStableVersion to account for the format change.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheCoderscpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheCoders.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheStorageh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (203670 => 203671)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-07-24 20:33:40 UTC (rev 203670)
+++ trunk/Source/WebKit2/ChangeLog 2016-07-25 00:48:51 UTC (rev 203671)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-07-24 Sam Weinig <sam@webkit.org>
+
+ Add specialization for encoding/decoding WebCore::CertificateInfos in the Network Cache
+ <rdar://problem/27409315>
+ https://bugs.webkit.org/show_bug.cgi?id=160144
+
+ Reviewed by Chris Dumez.
+
+ * NetworkProcess/cache/NetworkCacheCoders.cpp:
+ (WebKit::NetworkCache::encodeCFData):
+ (WebKit::NetworkCache::decodeCFData):
+ (WebKit::NetworkCache::encodeSecTrustRef):
+ (WebKit::NetworkCache::decodeSecTrustRef):
+ (WebKit::NetworkCache::encodeCertificateChain):
+ (WebKit::NetworkCache::decodeCertificateChain):
+ (WebKit::NetworkCache::Coder<WebCore::CertificateInfo>::encode):
+ (WebKit::NetworkCache::Coder<WebCore::CertificateInfo>::decode):
+
+ * NetworkProcess/cache/NetworkCacheStorage.h:
+ (WebKit::NetworkCache::Storage::version):
+ Bump the version and lastStableVersion to account for the format change.
+
</ins><span class="cx"> 2016-07-22 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Automation: All key events should be processed before sending response
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheCoderscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheCoders.cpp (203670 => 203671)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheCoders.cpp 2016-07-24 20:33:40 UTC (rev 203670)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheCoders.cpp 2016-07-25 00:48:51 UTC (rev 203671)
</span><span class="lines">@@ -28,10 +28,15 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETWORK_CACHE)
</span><span class="cx">
</span><del>-#include "WebCoreArgumentCoders.h"
</del><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><ins>+#if PLATFORM(COCOA)
+#include <Security/SecCertificate.h>
+#include <Security/SecTrust.h>
+#include <wtf/spi/cocoa/SecuritySPI.h>
+#endif
+
</ins><span class="cx"> namespace WebKit {
</span><span class="cx"> namespace NetworkCache {
</span><span class="cx">
</span><span class="lines">@@ -145,26 +150,215 @@
</span><span class="cx"> return decodeStringText<UChar>(decoder, length, result);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if PLATFORM(COCOA)
+static void encodeCFData(Encoder& encoder, CFDataRef data)
+{
+ uint64_t length = CFDataGetLength(data);
+ const uint8_t* bytePtr = CFDataGetBytePtr(data);
+
+ encoder << length;
+ encoder.encodeFixedLengthData(bytePtr, length);
+}
+
+static bool decodeCFData(Decoder& decoder, RetainPtr<CFDataRef>& data)
+{
+ uint64_t size = 0;
+ if (!decoder.decode(size))
+ return false;
+
+ Vector<uint8_t> vector(size);
+ if (!decoder.decodeFixedLengthData(vector.data(), vector.size()))
+ return false;
+
+ data = adoptCF(CFDataCreate(nullptr, vector.data(), vector.size()));
+ return true;
+}
+
+
+#if HAVE(SEC_TRUST_SERIALIZATION)
+static void encodeSecTrustRef(Encoder& encoder, SecTrustRef trust)
+{
+ auto data = adoptCF(SecTrustSerialize(trust, nullptr));
+ if (!data) {
+ encoder << false;
+ return;
+ }
+
+ encoder << true;
+ encodeCFData(encoder, data.get());
+}
+
+static bool decodeSecTrustRef(Decoder& decoder, RetainPtr<SecTrustRef>& result)
+{
+ bool hasTrust;
+ if (!decoder.decode(hasTrust))
+ return false;
+
+ if (!hasTrust)
+ return true;
+
+ RetainPtr<CFDataRef> trustData;
+ if (!decodeCFData(decoder, trustData))
+ return false;
+
+ auto trust = adoptCF(SecTrustDeserialize(trustData.get(), nullptr));
+ if (!trust)
+ return false;
+
+ result = WTFMove(trust);
+ return true;
+}
+#endif
+
+static void encodeCertificateChain(Encoder& encoder, CFArrayRef certificateChain)
+{
+ CFIndex size = CFArrayGetCount(certificateChain);
+ Vector<CFTypeRef, 32> values(size);
+
+ CFArrayGetValues(certificateChain, CFRangeMake(0, size), values.data());
+
+ encoder << static_cast<uint64_t>(size);
+
+ for (CFIndex i = 0; i < size; ++i) {
+ ASSERT(values[i]);
+ ASSERT(CFGetTypeID(values[i]) != SecCertificateGetTypeID());
+
+ auto data = adoptCF(SecCertificateCopyData((SecCertificateRef)values[i]));
+ encodeCFData(encoder, data.get());
+ }
+}
+
+static bool decodeCertificateChain(Decoder& decoder, RetainPtr<CFArrayRef>& certificateChain)
+{
+ uint64_t size;
+ if (!decoder.decode(size))
+ return false;
+
+ auto array = adoptCF(CFArrayCreateMutable(0, 0, &kCFTypeArrayCallBacks));
+
+ for (size_t i = 0; i < size; ++i) {
+ RetainPtr<CFDataRef> data;
+ if (!decodeCFData(decoder, data))
+ return false;
+
+ auto certificate = adoptCF(SecCertificateCreateWithData(0, data.get()));
+ CFArrayAppendValue(array.get(), certificate.get());
+ }
+
+ certificateChain = WTFMove(array);
+ return true;
+}
+
</ins><span class="cx"> void Coder<WebCore::CertificateInfo>::encode(Encoder& encoder, const WebCore::CertificateInfo& certificateInfo)
</span><span class="cx"> {
</span><del>- // FIXME: Cocoa CertificateInfo is a CF object tree. Generalize CF type coding so we don't need to use ArgumentCoder here.
- IPC::ArgumentEncoder argumentEncoder;
- argumentEncoder << certificateInfo;
- encoder << static_cast<uint64_t>(argumentEncoder.bufferSize());
- encoder.encodeFixedLengthData(argumentEncoder.buffer(), argumentEncoder.bufferSize());
</del><ins>+ encoder.encodeEnum(certificateInfo.type());
+
+ switch (certificateInfo.type()) {
+#if HAVE(SEC_TRUST_SERIALIZATION)
+ case WebCore::CertificateInfo::Type::Trust:
+ encodeSecTrustRef(encoder, certificateInfo.trust());
+ break;
+#endif
+ case WebCore::CertificateInfo::Type::CertificateChain: {
+ encodeCertificateChain(encoder, certificateInfo.certificateChain());
+ break;
+ }
+ case WebCore::CertificateInfo::Type::None:
+ // Do nothing.
+ break;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool Coder<WebCore::CertificateInfo>::decode(Decoder& decoder, WebCore::CertificateInfo& certificateInfo)
</span><span class="cx"> {
</span><del>- uint64_t certificateSize;
- if (!decoder.decode(certificateSize))
</del><ins>+ WebCore::CertificateInfo::Type certificateInfoType;
+ if (!decoder.decodeEnum(certificateInfoType))
</ins><span class="cx"> return false;
</span><del>- Vector<uint8_t> data(certificateSize);
- if (!decoder.decodeFixedLengthData(data.data(), data.size()))
</del><ins>+
+ switch (certificateInfoType) {
+#if HAVE(SEC_TRUST_SERIALIZATION)
+ case WebCore::CertificateInfo::Type::Trust: {
+ RetainPtr<SecTrustRef> trust;
+ if (!decodeSecTrustRef(decoder, trust))
+ return false;
+
+ certificateInfo = WebCore::CertificateInfo(WTFMove(trust));
+ return true;
+ }
+#endif
+ case WebCore::CertificateInfo::Type::CertificateChain: {
+ RetainPtr<CFArrayRef> certificateChain;
+ if (!decodeCertificateChain(decoder, certificateChain))
+ return false;
+
+ certificateInfo = WebCore::CertificateInfo(WTFMove(certificateChain));
+ return true;
+ }
+ case WebCore::CertificateInfo::Type::None:
+ // Do nothing.
+ break;
+ }
+
+ return true;
+}
+#else
+void Coder<WebCore::CertificateInfo>::encode(Encoder& encoder, const WebCore::CertificateInfo& certificateInfo)
+{
+ if (!certificateInfo.certificate()) {
+ encoder << false;
+ return;
+ }
+
+ GByteArray* certificateData = 0;
+ g_object_get(G_OBJECT(certificateInfo.certificate()), "certificate", &certificateData, NULL);
+ if (!certificateData) {
+ encoder << false;
+ return;
+ }
+
+ encoder << true;
+
+ GRefPtr<GByteArray> certificate = adoptGRef(certificateData);
+ encoder << static_cast<uint64_t>(certificate->len);
+ encoder.encodeFixedLengthData(certificate->data, certificate->len);
+
+ encoder << static_cast<uint32_t>(certificateInfo.tlsErrors());
+}
+
+bool Coder<WebCore::CertificateInfo>::decode(Decoder& decoder, WebCore::CertificateInfo& certificateInfo)
+{
+ bool hasCertificate;
+ if (!decoder.decode(hasCertificate))
</ins><span class="cx"> return false;
</span><del>- IPC::ArgumentDecoder argumentDecoder(data.data(), data.size());
- return argumentDecoder.decode(certificateInfo);
</del><ins>+
+ if (!hasCertificate)
+ return true;
+
+ uint64_t size = 0;
+ if (!decoder.decode(size))
+ return false;
+
+ Vector<uint8_t> vector(size);
+ if (!decoder.decodeFixedLengthData(vector.data(), vector.size()))
+ return false;
+
+ GByteArray* certificateData = g_byte_array_sized_new(vector.size());
+ certificateData = g_byte_array_append(certificateData, vector.data(), vector.size());
+ GRefPtr<GByteArray> certificateBytes = adoptGRef(certificateData);
+
+ GTlsBackend* backend = g_tls_backend_get_default();
+ GRefPtr<GTlsCertificate> certificate = adoptGRef(G_TLS_CERTIFICATE(g_initable_new(
+ g_tls_backend_get_certificate_type(backend), 0, 0, "certificate", certificateBytes.get(), nullptr)));
+ certificateInfo.setCertificate(certificate.get());
+
+ uint32_t tlsErrors;
+ if (!decoder.decode(tlsErrors))
+ return false;
+ certificateInfo.setTLSErrors(static_cast<GTlsCertificateFlags>(tlsErrors));
+
+ return true;
</ins><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> void Coder<SHA1::Digest>::encode(Encoder& encoder, const SHA1::Digest& digest)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStorageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h (203670 => 203671)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h 2016-07-24 20:33:40 UTC (rev 203670)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h 2016-07-25 00:48:51 UTC (rev 203671)
</span><span class="lines">@@ -87,10 +87,10 @@
</span><span class="cx"> size_t capacity() const { return m_capacity; }
</span><span class="cx"> size_t approximateSize() const;
</span><span class="cx">
</span><del>- static const unsigned version = 8;
</del><ins>+ static const unsigned version = 9;
</ins><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> /// Allow the last stable version of the cache to co-exist with the latest development one.
</span><del>- static const unsigned lastStableVersion = 8;
</del><ins>+ static const unsigned lastStableVersion = 9;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> String basePath() const;
</span></span></pre>
</div>
</div>
</body>
</html>