| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CHROME_BROWSER_SSL_SSL_ERROR_INFO_H_ | 5 #ifndef COMPONENTS_SSL_ERRORS_SSL_ERROR_INFO_H_ |
| 6 #define CHROME_BROWSER_SSL_SSL_ERROR_INFO_H_ | 6 #define COMPONENTS_SSL_ERRORS_SSL_ERROR_INFO_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| 11 #include "base/strings/string16.h" | 11 #include "base/strings/string16.h" |
| 12 #include "net/cert/cert_status_flags.h" | 12 #include "net/cert/cert_status_flags.h" |
| 13 #include "net/cert/x509_certificate.h" | 13 #include "net/cert/x509_certificate.h" |
| 14 | 14 |
| 15 class GURL; | 15 class GURL; |
| 16 | 16 |
| 17 namespace ssl_errors { |
| 18 |
| 17 // This class describes an error that happened while showing a page over SSL. | 19 // This class describes an error that happened while showing a page over SSL. |
| 18 // An SSLErrorInfo object only exists on the UI thread and only contains | 20 // An ErrorInfo object only exists on the UI thread and only contains |
| 19 // information about an error (type of error and text details). | 21 // information about an error (type of error and text details). |
| 20 // Note no DISALLOW_COPY_AND_ASSIGN as we want the copy constructor. | 22 // Note no DISALLOW_COPY_AND_ASSIGN as we want the copy constructor. |
| 21 class SSLErrorInfo { | 23 class ErrorInfo { |
| 22 public: | 24 public: |
| 23 // This enum is being histogrammed; please only add new values at the end. | 25 // This enum is being histogrammed; please only add new values at the end. |
| 24 enum ErrorType { | 26 enum ErrorType { |
| 25 CERT_COMMON_NAME_INVALID = 0, | 27 CERT_COMMON_NAME_INVALID = 0, |
| 26 CERT_DATE_INVALID, | 28 CERT_DATE_INVALID, |
| 27 CERT_AUTHORITY_INVALID, | 29 CERT_AUTHORITY_INVALID, |
| 28 CERT_CONTAINS_ERRORS, | 30 CERT_CONTAINS_ERRORS, |
| 29 CERT_NO_REVOCATION_MECHANISM, | 31 CERT_NO_REVOCATION_MECHANISM, |
| 30 CERT_UNABLE_TO_CHECK_REVOCATION, | 32 CERT_UNABLE_TO_CHECK_REVOCATION, |
| 31 CERT_REVOKED, | 33 CERT_REVOKED, |
| 32 CERT_INVALID, | 34 CERT_INVALID, |
| 33 CERT_WEAK_SIGNATURE_ALGORITHM, | 35 CERT_WEAK_SIGNATURE_ALGORITHM, |
| 34 CERT_WEAK_KEY, | 36 CERT_WEAK_KEY, |
| 35 CERT_NAME_CONSTRAINT_VIOLATION, | 37 CERT_NAME_CONSTRAINT_VIOLATION, |
| 36 UNKNOWN, | 38 UNKNOWN, |
| 37 CERT_WEAK_KEY_DH, | 39 CERT_WEAK_KEY_DH, |
| 38 CERT_PINNED_KEY_MISSING, | 40 CERT_PINNED_KEY_MISSING, |
| 39 CERT_VALIDITY_TOO_LONG, | 41 CERT_VALIDITY_TOO_LONG, |
| 40 END_OF_ENUM | 42 END_OF_ENUM |
| 41 }; | 43 }; |
| 42 | 44 |
| 43 virtual ~SSLErrorInfo(); | 45 virtual ~ErrorInfo(); |
| 44 | 46 |
| 45 // Converts a network error code to an ErrorType. | 47 // Converts a network error code to an ErrorType. |
| 46 static ErrorType NetErrorToErrorType(int net_error); | 48 static ErrorType NetErrorToErrorType(int net_error); |
| 47 | 49 |
| 48 static SSLErrorInfo CreateError(ErrorType error_type, | 50 static ErrorInfo CreateError(ErrorType error_type, |
| 49 net::X509Certificate* cert, | 51 net::X509Certificate* cert, |
| 50 const GURL& request_url); | 52 const GURL& request_url); |
| 51 | 53 |
| 52 // Populates the specified |errors| vector with the errors contained in | 54 // Populates the specified |errors| vector with the errors contained in |
| 53 // |cert_status|. Returns the number of errors found. | 55 // |cert_status| for |cert|. Returns the number of errors found. |
| 54 // Callers only interested in the error count can pass NULL for |errors|. | 56 // Callers only interested in the error count can pass NULL for |errors|. |
| 55 // TODO(wtc): Document |cert_id| and |url| arguments. | 57 static void GetErrorsForCertStatus( |
| 56 static void GetErrorsForCertStatus(int cert_id, | 58 const scoped_refptr<net::X509Certificate>& cert, |
| 57 net::CertStatus cert_status, | 59 net::CertStatus cert_status, |
| 58 const GURL& url, | 60 const GURL& url, |
| 59 std::vector<SSLErrorInfo>* errors); | 61 std::vector<ErrorInfo>* errors); |
| 60 | 62 |
| 61 // A description of the error. | 63 // A description of the error. |
| 62 const base::string16& details() const { return details_; } | 64 const base::string16& details() const { return details_; } |
| 63 | 65 |
| 64 // A short message describing the error (1 line). | 66 // A short message describing the error (1 line). |
| 65 const base::string16& short_description() const { return short_description_; } | 67 const base::string16& short_description() const { return short_description_; } |
| 66 | 68 |
| 67 private: | 69 private: |
| 68 SSLErrorInfo(const base::string16& details, | 70 ErrorInfo(const base::string16& details, |
| 69 const base::string16& short_description); | 71 const base::string16& short_description); |
| 70 | 72 |
| 71 base::string16 details_; | 73 base::string16 details_; |
| 72 base::string16 short_description_; | 74 base::string16 short_description_; |
| 73 }; | 75 }; |
| 74 | 76 |
| 75 #endif // CHROME_BROWSER_SSL_SSL_ERROR_INFO_H_ | 77 } // namespace ssl_errors |
| 78 |
| 79 #endif // COMPONENTS_SSL_ERRORS_SSL_ERROR_INFO_H_ |
| OLD | NEW |