summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-16 13:19:08 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-16 13:19:08 +0000
commite59d0fa265afd5c6b7ba03b49ced32afc89c2ef7 (patch)
tree4eff57e2809ad4123cb62ba5679241fa1cb32af7 /net
parent6a7ef1035a4758a6cb2bc3c11c0ba895a71eb61f (diff)
downloadchromium_src-e59d0fa265afd5c6b7ba03b49ced32afc89c2ef7.zip
chromium_src-e59d0fa265afd5c6b7ba03b49ced32afc89c2ef7.tar.gz
chromium_src-e59d0fa265afd5c6b7ba03b49ced32afc89c2ef7.tar.bz2
net: more HSTS additions.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101482 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/base/transport_security_state.cc4
-rw-r--r--net/base/transport_security_state_unittest.cc17
2 files changed, 21 insertions, 0 deletions
diff --git a/net/base/transport_security_state.cc b/net/base/transport_security_state.cc
index edda1b8..787b1f14 100644
--- a/net/base/transport_security_state.cc
+++ b/net/base/transport_security_state.cc
@@ -689,6 +689,10 @@ bool TransportSecurityState::IsPreloadedSTS(
{21, false, "\003www\013ledgerscope\003net", true, 0 },
{10, false, "\004kyps\003net", true, 0 },
{14, false, "\003www\004kyps\003net", true, 0 },
+ {17, true, "\003app\007recurly\003com", true, 0 },
+ {17, true, "\003api\007recurly\003com", true, 0 },
+ {13, false, "\007greplin\003com", true, 0 },
+ {17, false, "\003www\007greplin\003com", true, 0 },
#if defined(OS_CHROMEOS)
{13, false, "\007twitter\003com", true, 0 },
{17, false, "\003www\007twitter\003com", true, 0 },
diff --git a/net/base/transport_security_state_unittest.cc b/net/base/transport_security_state_unittest.cc
index d84f469..d3b898f 100644
--- a/net/base/transport_security_state_unittest.cc
+++ b/net/base/transport_security_state_unittest.cc
@@ -712,6 +712,23 @@ TEST_F(TransportSecurityStateTest, Preloaded) {
EXPECT_FALSE(state->IsEnabledForHost(&domain_state,
"foo.kyps.net",
false));
+
+ EXPECT_TRUE(state->IsEnabledForHost(&domain_state,
+ "foo.app.recurly.com",
+ false));
+ EXPECT_TRUE(state->IsEnabledForHost(&domain_state,
+ "foo.api.recurly.com",
+ false));
+
+ EXPECT_TRUE(state->IsEnabledForHost(&domain_state,
+ "greplin.com",
+ false));
+ EXPECT_TRUE(state->IsEnabledForHost(&domain_state,
+ "www.greplin.com",
+ false));
+ EXPECT_FALSE(state->IsEnabledForHost(&domain_state,
+ "foo.greplin.com",
+ false));
}
TEST_F(TransportSecurityStateTest, LongNames) {