diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-15 16:28:59 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-15 16:28:59 +0000 |
| commit | 4691a36492c2b8cf4eca379d5dc200029ac0221e (patch) | |
| tree | 6061e5a696d2476ba2956518495e023831928f3c /net | |
| parent | 687998e618ef6759b6423170030719967bceee62 (diff) | |
| download | chromium_src-4691a36492c2b8cf4eca379d5dc200029ac0221e.zip chromium_src-4691a36492c2b8cf4eca379d5dc200029ac0221e.tar.gz chromium_src-4691a36492c2b8cf4eca379d5dc200029ac0221e.tar.bz2 | |
ServerBoundCertService: use different certs for subdomains of "private registries".
BUG=129174
Review URL: https://chromiumcodereview.appspot.com/14997013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200290 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/ssl/server_bound_cert_service.cc | 2 | ||||
| -rw-r--r-- | net/ssl/server_bound_cert_service_unittest.cc | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/net/ssl/server_bound_cert_service.cc b/net/ssl/server_bound_cert_service.cc index 327ca93..86efad9 100644 --- a/net/ssl/server_bound_cert_service.cc +++ b/net/ssl/server_bound_cert_service.cc @@ -414,7 +414,7 @@ ServerBoundCertService::~ServerBoundCertService() { std::string ServerBoundCertService::GetDomainForHost(const std::string& host) { std::string domain = registry_controlled_domains::GetDomainAndRegistry( - host, registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES); + host, registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES); if (domain.empty()) return host; return domain; diff --git a/net/ssl/server_bound_cert_service_unittest.cc b/net/ssl/server_bound_cert_service_unittest.cc index 45d5080..d913381 100644 --- a/net/ssl/server_bound_cert_service_unittest.cc +++ b/net/ssl/server_bound_cert_service_unittest.cc @@ -52,11 +52,12 @@ TEST_F(ServerBoundCertServiceTest, GetDomainForHost) { ServerBoundCertService::GetDomainForHost("google.com")); EXPECT_EQ("google.com", ServerBoundCertService::GetDomainForHost("www.google.com")); - // NOTE(rch): we would like to segregate cookies and certificates for - // *.appspot.com, but currently we can not do that becaues we want to - // allow direct navigation to appspot.com. - EXPECT_EQ("appspot.com", + EXPECT_EQ("foo.appspot.com", ServerBoundCertService::GetDomainForHost("foo.appspot.com")); + EXPECT_EQ("bar.appspot.com", + ServerBoundCertService::GetDomainForHost("foo.bar.appspot.com")); + EXPECT_EQ("appspot.com", + ServerBoundCertService::GetDomainForHost("appspot.com")); EXPECT_EQ("google.com", ServerBoundCertService::GetDomainForHost("www.mail.google.com")); EXPECT_EQ("goto", |