Chromium Code Reviews| Index: chrome/browser/ssl/ssl_error_classification.h |
| diff --git a/chrome/browser/ssl/ssl_error_classification.h b/chrome/browser/ssl/ssl_error_classification.h |
| index c37ce2e007b820ec55483a50b8fd7de5bda821ad..b68e4fc088a5bbe074aaf5e7215aa58012d9b543 100644 |
| --- a/chrome/browser/ssl/ssl_error_classification.h |
| +++ b/chrome/browser/ssl/ssl_error_classification.h |
| @@ -5,18 +5,23 @@ |
| #ifndef CHROME_BROWSER_SSL_SSL_ERROR_CLASSIFICATION_H_ |
| #define CHROME_BROWSER_SSL_SSL_ERROR_CLASSIFICATION_H_ |
| +#include <string> |
| +#include <vector> |
| + |
| #include "base/time/time.h" |
| #include "net/cert/x509_certificate.h" |
| +#include "url/gurl.h" |
| // This class calculates the severity scores for the different type of SSL |
| // errors. |
| class SSLErrorClassification { |
| public: |
| SSLErrorClassification(base::Time current_time, |
| + const GURL& url, |
| const net::X509Certificate& cert); |
| ~SSLErrorClassification(); |
| - // This method checks whether the user clock is in the past or not. |
| + // This method checks whether the system time is in the past. |
| static bool IsUserClockInThePast(base::Time time_now); |
| // This method checks whether the system time is too far in the future or |
| @@ -27,17 +32,60 @@ class SSLErrorClassification { |
| // CERT_DATE_INVALID. |
| float InvalidDateSeverityScore() const; |
| - static void RecordUMAStatistics(bool overridable); |
| + // A method which calculates the severity score when the ssl error is |
| + // CERT_COMMON_NAME_INVALID. |
| + float InvalidCommonNameSeverityScore() const; |
| + |
| + void RecordUMAStatistics(bool overridable, int cert_error); |
| base::TimeDelta TimePassedSinceExpiry() const; |
| private: |
| - FRIEND_TEST_ALL_PREFIXES(SSLErrorClassification, TestDateInvalidScore); |
| + FRIEND_TEST_ALL_PREFIXES(SSLErrorClassificationTest, TestDateInvalidScore); |
| + FRIEND_TEST_ALL_PREFIXES(SSLErrorClassificationTest, TestNameMismatch); |
| + FRIEND_TEST_ALL_PREFIXES(SSLErrorClassificationTest, |
| + TestHostNameHasKnownTLD); |
| + |
| + // This method checks whether the hostname has a known Top Level Domain or |
| + // not. |
| + static bool IsHostNameKnownTLD(const std::string& host_name); |
| + |
| + // This method checks whether or not the difference between the hostname in |
| + // the given URL and any DNS name given in the CN or SAN fields of the SSL |
| + // certificate is "www.". |
|
felt
2014/07/21 21:34:13
My brain still can't parse this comment. Can you t
radhikabhar
2014/07/22 16:03:38
Done.
|
| + bool IsWWWSubDomainMatch() const; |
| + |
| + // This method checks whether or not the hostname in the given URL is a |
| + // subdomain of any DNS name given in the CN or SAN fields of the SSL |
| + // certificate. |
| + bool IsSubDomainMatch( |
| + const std::vector<std::string>& host_name_tokens, |
| + const std::vector<std::vector<std::string>>& dns_name_tokens) const; |
| + |
| + // This method checks whether any DNS name given in the CN or SAN fields of |
| + // the SSL certificate is a subdomain of the given URL or not. |
| + bool IsSubDomainInverseMatch( |
| + const std::vector<std::string>& host_name_tokens, |
| + const std::vector<std::vector<std::string>>& dns_name_tokens) const; |
| + |
| + // This method checks whether the hostname is too broad for the scope of a |
| + // wildcard certificate or not. For e.g. it returns true if the host name of |
| + // the URL is "a.b.example.com" and the DNS name in the CN or SAN field of the |
| + // SSL certificate is "*.example.com". But, it retuns false for the hostname |
| + // "b.example.com". |
| + bool IsSubDomainOutsideWildcard( |
| + const std::vector<std::string>& host_name_tokens) const; |
| + bool IsSelfSigned() const; |
| float CalculateScoreTimePassedSinceExpiry() const; |
| + std::vector<std::vector<std::string>> GetTokenizedDNSNames( |
| + std::vector<std::string>& dns_names) const; |
| + |
| // This stores the current time. |
| base::Time current_time_; |
| + const GURL& request_url_; |
| + |
| // This stores the certificate. |
| const net::X509Certificate& cert_; |
| }; |