Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * 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 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 55 HTTPVersion_1_1, | 55 HTTPVersion_1_1, |
| 56 HTTPVersion_2_0 }; | 56 HTTPVersion_2_0 }; |
| 57 enum SecurityStyle { | 57 enum SecurityStyle { |
| 58 SecurityStyleUnknown, | 58 SecurityStyleUnknown, |
| 59 SecurityStyleUnauthenticated, | 59 SecurityStyleUnauthenticated, |
| 60 SecurityStyleAuthenticationBroken, | 60 SecurityStyleAuthenticationBroken, |
| 61 SecurityStyleWarning, | 61 SecurityStyleWarning, |
| 62 SecurityStyleAuthenticated | 62 SecurityStyleAuthenticated |
| 63 }; | 63 }; |
| 64 | 64 |
| 65 struct SignedCertificateTimestamp { | |
| 66 SignedCertificateTimestamp() {} | |
| 67 SignedCertificateTimestamp( | |
| 68 WebString status, | |
| 69 WebString origin, | |
| 70 WebString logDescription, | |
| 71 WebString logId, | |
| 72 int64_t timestamp, | |
| 73 WebString hashAlgorithm, | |
| 74 WebString signatureAlgorithm, | |
| 75 WebString signatureData) | |
| 76 : status(status) | |
| 77 , origin(origin) | |
| 78 , logDescription(logDescription) | |
| 79 , logId(logId) | |
| 80 , timestamp(timestamp) | |
| 81 , hashAlgorithm(hashAlgorithm) | |
| 82 , signatureAlgorithm(signatureAlgorithm) | |
| 83 , signatureData(signatureData) | |
| 84 { | |
| 85 } | |
| 86 WebString status; | |
| 87 WebString origin; | |
| 88 WebString logDescription; | |
| 89 WebString logId; | |
| 90 int64_t timestamp; | |
| 91 WebString hashAlgorithm; | |
| 92 WebString signatureAlgorithm; | |
| 93 WebString signatureData; | |
| 94 }; | |
| 95 | |
| 96 using SignedCertificateTimestampList = WebVector<SignedCertificateTimestamp> ; | |
| 97 | |
| 65 struct WebSecurityDetails { | 98 struct WebSecurityDetails { |
| 66 WebSecurityDetails(const WebString& protocol, const WebString& keyExchan ge, const WebString& cipher, const WebString& mac, int certId, size_t numUnknown Scts, size_t numInvalidScts, size_t numValidScts) | 99 WebSecurityDetails(const WebString& protocol, |
| 100 const WebString& keyExchange, | |
| 101 const WebString& cipher, | |
| 102 const WebString& mac, | |
| 103 int certId, | |
| 104 size_t numUnknownScts, | |
| 105 size_t numInvalidScts, | |
| 106 size_t numValidScts, | |
| 107 const SignedCertificateTimestampList& sctList) | |
| 67 : protocol(protocol) | 108 : protocol(protocol) |
| 68 , keyExchange(keyExchange) | 109 , keyExchange(keyExchange) |
| 69 , cipher(cipher) | 110 , cipher(cipher) |
| 70 , mac(mac) | 111 , mac(mac) |
| 71 , certId(certId) | 112 , certId(certId) |
| 72 , numUnknownScts(numUnknownScts) | 113 , numUnknownScts(numUnknownScts) |
| 73 , numInvalidScts(numInvalidScts) | 114 , numInvalidScts(numInvalidScts) |
| 74 , numValidScts(numValidScts) | 115 , numValidScts(numValidScts) |
| 116 , sctList(sctList) | |
| 75 { | 117 { |
| 76 } | 118 } |
| 77 // All strings are human-readable values. | 119 // All strings are human-readable values. |
| 78 WebString protocol; | 120 WebString protocol; |
| 79 WebString keyExchange; | 121 WebString keyExchange; |
| 80 WebString cipher; | 122 WebString cipher; |
| 81 // mac is the empty string when the connection cipher suite does not | 123 // mac is the empty string when the connection cipher suite does not |
| 82 // have a separate MAC value (i.e. if the cipher suite is AEAD). | 124 // have a separate MAC value (i.e. if the cipher suite is AEAD). |
| 83 WebString mac; | 125 WebString mac; |
| 84 int certId; | 126 int certId; |
| 85 size_t numUnknownScts; | 127 size_t numUnknownScts; |
| 86 size_t numInvalidScts; | 128 size_t numInvalidScts; |
| 87 size_t numValidScts; | 129 size_t numValidScts; |
| 130 SignedCertificateTimestampList sctList; | |
|
Mike West
2016/06/23 06:48:01
This seems like a lot of data to add for something
dwaxweiler
2016/06/23 11:53:02
A list of SCTs could be appended to every response
Mike West
2016/06/23 16:32:30
Ok, I think you're right: `WebURLLoaderImpl::Popul
| |
| 88 }; | 131 }; |
| 89 | 132 |
| 90 class ExtraData { | 133 class ExtraData { |
| 91 public: | 134 public: |
| 92 virtual ~ExtraData() { } | 135 virtual ~ExtraData() { } |
| 93 }; | 136 }; |
| 94 | 137 |
| 95 ~WebURLResponse() { reset(); } | 138 ~WebURLResponse() { reset(); } |
| 96 | 139 |
| 97 WebURLResponse() : m_private(0) { } | 140 WebURLResponse() : m_private(0) { } |
| (...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 264 protected: | 307 protected: |
| 265 BLINK_PLATFORM_EXPORT void assign(WebURLResponsePrivate*); | 308 BLINK_PLATFORM_EXPORT void assign(WebURLResponsePrivate*); |
| 266 | 309 |
| 267 private: | 310 private: |
| 268 WebURLResponsePrivate* m_private; | 311 WebURLResponsePrivate* m_private; |
| 269 }; | 312 }; |
| 270 | 313 |
| 271 } // namespace blink | 314 } // namespace blink |
| 272 | 315 |
| 273 #endif | 316 #endif |
| OLD | NEW |