| Index: chrome/browser/ssl/ssl_error_classification_unittest.cc
|
| diff --git a/chrome/browser/ssl/ssl_error_classification_unittest.cc b/chrome/browser/ssl/ssl_error_classification_unittest.cc
|
| index fc4e23fc615da4cdc43ef2f237f4c90126c9d22e..11e35d40731db838f83511948f83213e97c696c4 100644
|
| --- a/chrome/browser/ssl/ssl_error_classification_unittest.cc
|
| +++ b/chrome/browser/ssl/ssl_error_classification_unittest.cc
|
| @@ -5,37 +5,151 @@
|
| #include "chrome/browser/ssl/ssl_error_classification.h"
|
|
|
| #include "base/files/file_path.h"
|
| +#include "base/strings/string_split.h"
|
| #include "base/time/time.h"
|
| #include "net/base/test_data_directory.h"
|
| +#include "net/cert/x509_cert_types.h"
|
| #include "net/cert/x509_certificate.h"
|
| #include "net/test/cert_test_util.h"
|
| #include "net/test/test_certificate_data.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| +#include "url/gurl.h"
|
|
|
| using base::Time;
|
|
|
| -TEST(SSLErrorClassification, TestDateInvalidScore) {
|
| +TEST(SSLErrorClassificationTest, TestDateInvalidScore) {
|
| base::FilePath certs_dir = net::GetTestCertsDirectory();
|
| scoped_refptr<net::X509Certificate> expired_cert =
|
| net::ImportCertFromFile(certs_dir, "expired_cert.pem");
|
| base::Time time;
|
| + GURL origin("https://example.com");
|
|
|
| {
|
| EXPECT_TRUE(base::Time::FromString("Wed, 03 Jan 2007 12:00:00 GMT", &time));
|
| - SSLErrorClassification ssl_error(time, *expired_cert);
|
| + SSLErrorClassification ssl_error(time, origin, *expired_cert);
|
| EXPECT_FLOAT_EQ(0.2f, ssl_error.CalculateScoreTimePassedSinceExpiry());
|
| }
|
|
|
| {
|
| EXPECT_TRUE(base::Time::FromString("Sat, 06 Jan 2007 12:00:00 GMT", &time));
|
| - SSLErrorClassification ssl_error(time, *expired_cert);
|
| + SSLErrorClassification ssl_error(time, origin, *expired_cert);
|
| EXPECT_FLOAT_EQ(0.3f, ssl_error.CalculateScoreTimePassedSinceExpiry());
|
| }
|
|
|
| {
|
| EXPECT_TRUE(base::Time::FromString("Mon, 08 Jan 2007 12:00:00 GMT", &time));
|
| - SSLErrorClassification ssl_error(time, *expired_cert);
|
| + SSLErrorClassification ssl_error(time, origin, *expired_cert);
|
| EXPECT_FLOAT_EQ(0.4f, ssl_error.CalculateScoreTimePassedSinceExpiry());
|
| }
|
| +}
|
| +
|
| +TEST(SSLErrorClassificationTest, TestNameMismatch) {
|
| + scoped_refptr<net::X509Certificate> google_cert(
|
| + net::X509Certificate::CreateFromBytes(
|
| + reinterpret_cast<const char*>(google_der), sizeof(google_der)));
|
| + ASSERT_NE(static_cast<net::X509Certificate*>(NULL), google_cert);
|
| + base::Time time = base::Time::NowFromSystemTime();
|
| + std::vector<std::string> dns_names_google;
|
| + dns_names_google.push_back("www");
|
| + dns_names_google.push_back("google");
|
| + dns_names_google.push_back("com");
|
| + std::vector<std::vector<std::string>> dns_name_tokens_google;
|
| + dns_name_tokens_google.push_back(dns_names_google);
|
| + {
|
| + GURL origin("https://google.com");
|
| + std::string host_name = origin.host();
|
| + std::vector<std::string> host_name_tokens;
|
| + base::SplitStringDontTrim(host_name, '.', &host_name_tokens);
|
| + SSLErrorClassification ssl_error(time, origin, *google_cert);
|
| + EXPECT_TRUE(ssl_error.IsWWWSubDomainMatch());
|
| + EXPECT_FALSE(ssl_error.NameUnderAnyNames(host_name_tokens,
|
| + dns_name_tokens_google));
|
| + EXPECT_FALSE(ssl_error.AnyNamesUnderName(dns_name_tokens_google,
|
| + host_name_tokens));
|
| + EXPECT_FALSE(ssl_error.IsSubDomainOutsideWildcard(host_name_tokens));
|
| + }
|
| +
|
| + {
|
| + GURL origin("https://foo.blah.google.com");
|
| + std::string host_name = origin.host();
|
| + std::vector<std::string> host_name_tokens;
|
| + base::SplitStringDontTrim(host_name, '.', &host_name_tokens);
|
| + SSLErrorClassification ssl_error(time, origin, *google_cert);
|
| + EXPECT_FALSE(ssl_error.IsWWWSubDomainMatch());
|
| + EXPECT_FALSE(ssl_error.NameUnderAnyNames(host_name_tokens,
|
| + dns_name_tokens_google));
|
| + EXPECT_FALSE(ssl_error.AnyNamesUnderName(dns_name_tokens_google,
|
| + host_name_tokens));
|
| + }
|
| +
|
| + {
|
| + GURL origin("https://foo.www.google.com");
|
| + std::string host_name = origin.host();
|
| + std::vector<std::string> host_name_tokens;
|
| + base::SplitStringDontTrim(host_name, '.', &host_name_tokens);
|
| + SSLErrorClassification ssl_error(time, origin, *google_cert);
|
| + EXPECT_FALSE(ssl_error.IsWWWSubDomainMatch());
|
| + EXPECT_TRUE(ssl_error.NameUnderAnyNames(host_name_tokens,
|
| + dns_name_tokens_google));
|
| + EXPECT_FALSE(ssl_error.AnyNamesUnderName(dns_name_tokens_google,
|
| + host_name_tokens));
|
| + }
|
| +
|
| + {
|
| + GURL origin("https://www.google.com.foo");
|
| + std::string host_name = origin.host();
|
| + std::vector<std::string> host_name_tokens;
|
| + base::SplitStringDontTrim(host_name, '.', &host_name_tokens);
|
| + SSLErrorClassification ssl_error(time, origin, *google_cert);
|
| + EXPECT_FALSE(ssl_error.IsWWWSubDomainMatch());
|
| + EXPECT_FALSE(ssl_error.NameUnderAnyNames(host_name_tokens,
|
| + dns_name_tokens_google));
|
| + EXPECT_FALSE(ssl_error.AnyNamesUnderName(dns_name_tokens_google,
|
| + host_name_tokens));
|
| + }
|
| +
|
| + {
|
| + GURL origin("https://www.foogoogle.com.");
|
| + std::string host_name = origin.host();
|
| + std::vector<std::string> host_name_tokens;
|
| + base::SplitStringDontTrim(host_name, '.', &host_name_tokens);
|
| + SSLErrorClassification ssl_error(time, origin, *google_cert);
|
| + EXPECT_FALSE(ssl_error.IsWWWSubDomainMatch());
|
| + EXPECT_FALSE(ssl_error.NameUnderAnyNames(host_name_tokens,
|
| + dns_name_tokens_google));
|
| + EXPECT_FALSE(ssl_error.AnyNamesUnderName(dns_name_tokens_google,
|
| + host_name_tokens));
|
| + }
|
| +
|
| + scoped_refptr<net::X509Certificate> webkit_cert(
|
| + net::X509Certificate::CreateFromBytes(
|
| + reinterpret_cast<const char*>(webkit_der), sizeof(webkit_der)));
|
| + ASSERT_NE(static_cast<net::X509Certificate*>(NULL), webkit_cert);
|
| + std::vector<std::string> dns_names_webkit;
|
| + dns_names_webkit.push_back("webkit");
|
| + dns_names_webkit.push_back("org");
|
| + std::vector<std::vector<std::string>> dns_name_tokens_webkit;
|
| + dns_name_tokens_webkit.push_back(dns_names_webkit);
|
| + {
|
| + GURL origin("https://a.b.webkit.org");
|
| + std::string host_name = origin.host();
|
| + std::vector<std::string> host_name_tokens;
|
| + base::SplitStringDontTrim(host_name, '.', &host_name_tokens);
|
| + SSLErrorClassification ssl_error(time, origin, *webkit_cert);
|
| + EXPECT_FALSE(ssl_error.IsWWWSubDomainMatch());
|
| + EXPECT_FALSE(ssl_error.NameUnderAnyNames(host_name_tokens,
|
| + dns_name_tokens_webkit));
|
| + EXPECT_FALSE(ssl_error.AnyNamesUnderName(dns_name_tokens_webkit,
|
| + host_name_tokens));
|
| + EXPECT_TRUE(ssl_error.IsSubDomainOutsideWildcard(host_name_tokens));
|
| + }
|
| +}
|
|
|
| +TEST(SSLErrorClassificationTest, TestHostNameHasKnownTLD) {
|
| + std::string url1 = "www.google.com";
|
| + std::string url2 = "b.appspot.com";
|
| + std::string url3 = "a.private";
|
| + EXPECT_TRUE(SSLErrorClassification::IsHostNameKnownTLD(url1));
|
| + EXPECT_TRUE(SSLErrorClassification::IsHostNameKnownTLD(url2));
|
| + EXPECT_FALSE(SSLErrorClassification::IsHostNameKnownTLD(url3));
|
| }
|
|
|