Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(164)

Side by Side Diff: third_party/WebKit/Source/platform/network/ResourceResponse.cpp

Issue 1589703002: Surface SCT (Signed Certificate Timestamp) counts in the Security panel. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address latest comments. Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
3 * Copyright (C) 2009 Google Inc. All rights reserved. 3 * Copyright (C) 2009 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 setLastModifiedDate(data->m_lastModifiedDate); 117 setLastModifiedDate(data->m_lastModifiedDate);
118 setResourceLoadTiming(data->m_resourceLoadTiming.release()); 118 setResourceLoadTiming(data->m_resourceLoadTiming.release());
119 m_securityInfo = data->m_securityInfo; 119 m_securityInfo = data->m_securityInfo;
120 m_hasMajorCertificateErrors = data->m_hasMajorCertificateErrors; 120 m_hasMajorCertificateErrors = data->m_hasMajorCertificateErrors;
121 m_securityStyle = data->m_securityStyle; 121 m_securityStyle = data->m_securityStyle;
122 m_securityDetails.protocol = data->m_securityDetails.protocol; 122 m_securityDetails.protocol = data->m_securityDetails.protocol;
123 m_securityDetails.cipher = data->m_securityDetails.cipher; 123 m_securityDetails.cipher = data->m_securityDetails.cipher;
124 m_securityDetails.keyExchange = data->m_securityDetails.keyExchange; 124 m_securityDetails.keyExchange = data->m_securityDetails.keyExchange;
125 m_securityDetails.mac = data->m_securityDetails.mac; 125 m_securityDetails.mac = data->m_securityDetails.mac;
126 m_securityDetails.certID = data->m_securityDetails.certID; 126 m_securityDetails.certID = data->m_securityDetails.certID;
127 m_securityDetails.numUnknownSCTs = data->m_securityDetails.numUnknownSCTs;
128 m_securityDetails.numInvalidSCTs = data->m_securityDetails.numInvalidSCTs;
129 m_securityDetails.numValidSCTs = data->m_securityDetails.numValidSCTs;
127 m_httpVersion = data->m_httpVersion; 130 m_httpVersion = data->m_httpVersion;
128 m_appCacheID = data->m_appCacheID; 131 m_appCacheID = data->m_appCacheID;
129 m_appCacheManifestURL = data->m_appCacheManifestURL.copy(); 132 m_appCacheManifestURL = data->m_appCacheManifestURL.copy();
130 m_isMultipartPayload = data->m_isMultipartPayload; 133 m_isMultipartPayload = data->m_isMultipartPayload;
131 m_wasFetchedViaSPDY = data->m_wasFetchedViaSPDY; 134 m_wasFetchedViaSPDY = data->m_wasFetchedViaSPDY;
132 m_wasNpnNegotiated = data->m_wasNpnNegotiated; 135 m_wasNpnNegotiated = data->m_wasNpnNegotiated;
133 m_wasAlternateProtocolAvailable = data->m_wasAlternateProtocolAvailable; 136 m_wasAlternateProtocolAvailable = data->m_wasAlternateProtocolAvailable;
134 m_wasFetchedViaProxy = data->m_wasFetchedViaProxy; 137 m_wasFetchedViaProxy = data->m_wasFetchedViaProxy;
135 m_wasFetchedViaServiceWorker = data->m_wasFetchedViaServiceWorker; 138 m_wasFetchedViaServiceWorker = data->m_wasFetchedViaServiceWorker;
136 m_wasFallbackRequiredByServiceWorker = data->m_wasFallbackRequiredByServiceW orker; 139 m_wasFallbackRequiredByServiceWorker = data->m_wasFallbackRequiredByServiceW orker;
(...skipping 24 matching lines...) Expand all
161 if (m_resourceLoadTiming) 164 if (m_resourceLoadTiming)
162 data->m_resourceLoadTiming = m_resourceLoadTiming->deepCopy(); 165 data->m_resourceLoadTiming = m_resourceLoadTiming->deepCopy();
163 data->m_securityInfo = CString(m_securityInfo.data(), m_securityInfo.length( )); 166 data->m_securityInfo = CString(m_securityInfo.data(), m_securityInfo.length( ));
164 data->m_hasMajorCertificateErrors = m_hasMajorCertificateErrors; 167 data->m_hasMajorCertificateErrors = m_hasMajorCertificateErrors;
165 data->m_securityStyle = m_securityStyle; 168 data->m_securityStyle = m_securityStyle;
166 data->m_securityDetails.protocol = m_securityDetails.protocol.isolatedCopy() ; 169 data->m_securityDetails.protocol = m_securityDetails.protocol.isolatedCopy() ;
167 data->m_securityDetails.cipher = m_securityDetails.cipher.isolatedCopy(); 170 data->m_securityDetails.cipher = m_securityDetails.cipher.isolatedCopy();
168 data->m_securityDetails.keyExchange = m_securityDetails.keyExchange.isolated Copy(); 171 data->m_securityDetails.keyExchange = m_securityDetails.keyExchange.isolated Copy();
169 data->m_securityDetails.mac = m_securityDetails.mac.isolatedCopy(); 172 data->m_securityDetails.mac = m_securityDetails.mac.isolatedCopy();
170 data->m_securityDetails.certID = m_securityDetails.certID; 173 data->m_securityDetails.certID = m_securityDetails.certID;
174 data->m_securityDetails.numUnknownSCTs = m_securityDetails.numUnknownSCTs;
175 data->m_securityDetails.numInvalidSCTs = m_securityDetails.numInvalidSCTs;
176 data->m_securityDetails.numValidSCTs = m_securityDetails.numValidSCTs;
171 data->m_httpVersion = m_httpVersion; 177 data->m_httpVersion = m_httpVersion;
172 data->m_appCacheID = m_appCacheID; 178 data->m_appCacheID = m_appCacheID;
173 data->m_appCacheManifestURL = m_appCacheManifestURL.copy(); 179 data->m_appCacheManifestURL = m_appCacheManifestURL.copy();
174 data->m_isMultipartPayload = m_isMultipartPayload; 180 data->m_isMultipartPayload = m_isMultipartPayload;
175 data->m_wasFetchedViaSPDY = m_wasFetchedViaSPDY; 181 data->m_wasFetchedViaSPDY = m_wasFetchedViaSPDY;
176 data->m_wasNpnNegotiated = m_wasNpnNegotiated; 182 data->m_wasNpnNegotiated = m_wasNpnNegotiated;
177 data->m_wasAlternateProtocolAvailable = m_wasAlternateProtocolAvailable; 183 data->m_wasAlternateProtocolAvailable = m_wasAlternateProtocolAvailable;
178 data->m_wasFetchedViaProxy = m_wasFetchedViaProxy; 184 data->m_wasFetchedViaProxy = m_wasFetchedViaProxy;
179 data->m_wasFetchedViaServiceWorker = m_wasFetchedViaServiceWorker; 185 data->m_wasFetchedViaServiceWorker = m_wasFetchedViaServiceWorker;
180 data->m_wasFallbackRequiredByServiceWorker = m_wasFallbackRequiredByServiceW orker; 186 data->m_wasFallbackRequiredByServiceWorker = m_wasFallbackRequiredByServiceW orker;
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 else if (equalIgnoringCase(name, cacheControlHeaderString()) || equalIgnorin gCase(name, pragmaHeaderString())) 317 else if (equalIgnoringCase(name, cacheControlHeaderString()) || equalIgnorin gCase(name, pragmaHeaderString()))
312 m_cacheControlHeader = CacheControlHeader(); 318 m_cacheControlHeader = CacheControlHeader();
313 else if (equalIgnoringCase(name, dateHeader)) 319 else if (equalIgnoringCase(name, dateHeader))
314 m_haveParsedDateHeader = false; 320 m_haveParsedDateHeader = false;
315 else if (equalIgnoringCase(name, expiresHeader)) 321 else if (equalIgnoringCase(name, expiresHeader))
316 m_haveParsedExpiresHeader = false; 322 m_haveParsedExpiresHeader = false;
317 else if (equalIgnoringCase(name, lastModifiedHeader)) 323 else if (equalIgnoringCase(name, lastModifiedHeader))
318 m_haveParsedLastModifiedHeader = false; 324 m_haveParsedLastModifiedHeader = false;
319 } 325 }
320 326
321 void ResourceResponse::setSecurityDetails(const String& protocol, const String& keyExchange, const String& cipher, const String& mac, int certId) 327 void ResourceResponse::setSecurityDetails(const String& protocol, const String& keyExchange, const String& cipher, const String& mac, int certId, size_t numUnkn ownScts, size_t numInvalidScts, size_t numValidScts)
322 { 328 {
323 m_securityDetails.protocol = protocol; 329 m_securityDetails.protocol = protocol;
324 m_securityDetails.keyExchange = keyExchange; 330 m_securityDetails.keyExchange = keyExchange;
325 m_securityDetails.cipher = cipher; 331 m_securityDetails.cipher = cipher;
326 m_securityDetails.mac = mac; 332 m_securityDetails.mac = mac;
327 m_securityDetails.certID = certId; 333 m_securityDetails.certID = certId;
334 m_securityDetails.numUnknownSCTs = numUnknownScts;
335 m_securityDetails.numInvalidSCTs = numInvalidScts;
336 m_securityDetails.numValidSCTs = numValidScts;
328 } 337 }
329 338
330 void ResourceResponse::setHTTPHeaderField(const AtomicString& name, const Atomic String& value) 339 void ResourceResponse::setHTTPHeaderField(const AtomicString& name, const Atomic String& value)
331 { 340 {
332 updateHeaderParsedState(name); 341 updateHeaderParsedState(name);
333 342
334 m_httpHeaderFields.set(name, value); 343 m_httpHeaderFields.set(name, value);
335 } 344 }
336 345
337 void ResourceResponse::addHTTPHeaderField(const AtomicString& name, const Atomic String& value) 346 void ResourceResponse::addHTTPHeaderField(const AtomicString& name, const Atomic String& value)
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
560 if (a.httpHeaderFields() != b.httpHeaderFields()) 569 if (a.httpHeaderFields() != b.httpHeaderFields())
561 return false; 570 return false;
562 if (a.resourceLoadTiming() && b.resourceLoadTiming() && *a.resourceLoadTimin g() == *b.resourceLoadTiming()) 571 if (a.resourceLoadTiming() && b.resourceLoadTiming() && *a.resourceLoadTimin g() == *b.resourceLoadTiming())
563 return true; 572 return true;
564 if (a.resourceLoadTiming() != b.resourceLoadTiming()) 573 if (a.resourceLoadTiming() != b.resourceLoadTiming())
565 return false; 574 return false;
566 return true; 575 return true;
567 } 576 }
568 577
569 } // namespace blink 578 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698