Addition of Certificate Transparency details to Security panel of DevTools

third_party/WebKit/Source/platform/network/ResourceResponse.h

 /*
  * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 16 matching lines @@
 #ifndef ResourceResponse_h
 #define ResourceResponse_h
 
 #include "platform/PlatformExport.h"
 #include "platform/blob/BlobData.h"
 #include "platform/network/HTTPHeaderMap.h"
 #include "platform/network/HTTPParsers.h"
 #include "platform/network/ResourceLoadInfo.h"
 #include "platform/network/ResourceLoadTiming.h"
 #include "platform/weborigin/KURL.h"
+#include "public/platform/WebURLResponse.h"
 #include "public/platform/modules/serviceworker/WebServiceWorkerResponseType.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/RefCounted.h"
 #include "wtf/RefPtr.h"
 #include "wtf/text/CString.h"
 
+#include <vector>

[estark, 2016/05/20 22:36:42]

This should be above the other includes.

[dwaxweiler, 2016/05/21 09:21:37]

That yields a presubmit error "check-webkit-style failed" with the explanation
"Alphabetical sorting problem. [build/include_order] [4]"

+
 namespace blink {
 
 struct CrossThreadResourceResponseData;
 
 class PLATFORM_EXPORT ResourceResponse final {
     DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
 public:
     enum HTTPVersion { HTTPVersionUnknown,
         HTTPVersion_0_9,
         HTTPVersion_1_0,
         HTTPVersion_1_1,
         HTTPVersion_2_0 };
     enum SecurityStyle {
         SecurityStyleUnknown,
         SecurityStyleUnauthenticated,
         SecurityStyleAuthenticationBroken,
         SecurityStyleWarning,
         SecurityStyleAuthenticated
     };
 
+    class SignedCertificateTimestamp {
+    public:
+        SignedCertificateTimestamp(
+            String status,
+            String origin,
+            String version,
+            String logDescription,
+            String logId,
+            int64_t timestamp,
+            String hashAlgorithm,
+            String signatureAlgorithm,
+            String signatureData)
+            : status(status)
+            , origin(origin)
+            , version(version)
+            , logDescription(logDescription)
+            , logId(logId)
+            , timestamp(timestamp)
+            , hashAlgorithm(hashAlgorithm)
+            , signatureAlgorithm(signatureAlgorithm)
+            , signatureData(signatureData)
+        {
+        }
+        SignedCertificateTimestamp(
+            const struct blink::WebURLResponse::SignedCertificateTimestamp&);
+        String status;
+        String origin;
+        String version;
+        String logDescription;
+        String logId;
+        int64_t timestamp;
+        String hashAlgorithm;
+        String signatureAlgorithm;
+        String signatureData;
+    };
+
+    using SignedCertificateTimestampList = std::vector<SignedCertificateTimestamp>;
+
     struct SecurityDetails {
         DISALLOW_NEW();
         SecurityDetails()
             : certID(0)
             , numUnknownSCTs(0)
             , numInvalidSCTs(0)
             , numValidSCTs(0)
         {
         }
         // All strings are human-readable values.
         String protocol;
         String keyExchange;
         String cipher;
         // mac is the empty string when the connection cipher suite does not
         // have a separate MAC value (i.e. if the cipher suite is AEAD).
         String mac;
         int certID;
         size_t numUnknownSCTs;
         size_t numInvalidSCTs;
         size_t numValidSCTs;
+        SignedCertificateTimestampList sctList;
     };
 
     class ExtraData : public RefCounted<ExtraData> {
     public:
         virtual ~ExtraData() { }
     };
 
     explicit ResourceResponse(CrossThreadResourceResponseData*);
 
     // Gets a copy of the data suitable for passing to another thread.
@@ skipping 77 matching lines @@
     const CString& getSecurityInfo() const { return m_securityInfo; }
     void setSecurityInfo(const CString& securityInfo) { m_securityInfo = securityInfo; }
 
     bool hasMajorCertificateErrors() const { return m_hasMajorCertificateErrors; }
     void setHasMajorCertificateErrors(bool hasMajorCertificateErrors) { m_hasMajorCertificateErrors = hasMajorCertificateErrors; }
 
     SecurityStyle getSecurityStyle() const { return m_securityStyle; }
     void setSecurityStyle(SecurityStyle securityStyle) { m_securityStyle = securityStyle; }
 
     const SecurityDetails* getSecurityDetails() const { return &m_securityDetails; }
-    void setSecurityDetails(const String& protocol, const String& keyExchange, const String& cipher, const String& mac, int certId, size_t numUnknownScts, size_t numInvalidScts, size_t numValidScts);
+    void setSecurityDetails(const String& protocol, const String& keyExchange, const String& cipher, const String& mac, int certId, size_t numUnknownScts, size_t numInvalidScts, size_t numValidScts, const SignedCertificateTimestampList& sctList);
 
     long long appCacheID() const { return m_appCacheID; }
     void setAppCacheID(long long id) { m_appCacheID = id; }
 
     const KURL& appCacheManifestURL() const { return m_appCacheManifestURL; }
     void setAppCacheManifestURL(const KURL& url) { m_appCacheManifestURL = url; }
 
     bool wasFetchedViaSPDY() const { return m_wasFetchedViaSPDY; }
     void setWasFetchedViaSPDY(bool value) { m_wasFetchedViaSPDY = value; }
 
@@ skipping 213 matching lines @@
     int64_t m_responseTime;
     String m_remoteIPAddress;
     unsigned short m_remotePort;
     String m_downloadedFilePath;
     RefPtr<BlobDataHandle> m_downloadedFileHandle;
 };
 
 } // namespace blink
 
 #endif // ResourceResponse_h