summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpalmer@chromium.org <palmer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-01 21:25:54 +0000
committerpalmer@chromium.org <palmer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-01 21:25:54 +0000
commit143094e5a5f6c524ef57a0201906c988ecbc88ba (patch)
tree7c230abbd36a69f8c286d5a886fdaa58b11db748
parent3a3e1712d881db14618a8ee023c744cc196e7a83 (diff)
downloadchromium_src-143094e5a5f6c524ef57a0201906c988ecbc88ba.zip
chromium_src-143094e5a5f6c524ef57a0201906c988ecbc88ba.tar.gz
chromium_src-143094e5a5f6c524ef57a0201906c988ecbc88ba.tar.bz2
Force HTTPS and public keys for sandbox.google.com and subdomains.
This would have helped mitigate a recent security bug. BUG=172984 TEST=visit http://{plus,www,}.sandbox.google.com and make sure the request is upgraded to HTTPS. Review URL: https://codereview.chromium.org/12093100 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180188 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--net/base/transport_security_state_static.h1
-rw-r--r--net/base/transport_security_state_static.json1
2 files changed, 2 insertions, 0 deletions
diff --git a/net/base/transport_security_state_static.h b/net/base/transport_security_state_static.h
index d5b5571..35b81f0 100644
--- a/net/base/transport_security_state_static.h
+++ b/net/base/transport_security_state_static.h
@@ -392,6 +392,7 @@ static const struct HSTSPreload kPreloadedSTS[] = {
{17, true, "\004talk\006google\003com", true, kGooglePins, DOMAIN_GOOGLE_COM },
{29, true, "\020hostedtalkgadget\006google\003com", true, kGooglePins, DOMAIN_GOOGLE_COM },
{17, true, "\004plus\006google\003com", true, kGooglePins, DOMAIN_GOOGLE_COM },
+ {25, true, "\004plus\007sandbox\006google\003com", true, kGooglePins, DOMAIN_GOOGLE_COM },
{19, true, "\006script\006google\003com", true, kGooglePins, DOMAIN_GOOGLE_COM },
{20, true, "\007history\006google\003com", true, kGooglePins, DOMAIN_GOOGLE_COM },
{20, true, "\006market\007android\003com", true, kGooglePins, DOMAIN_ANDROID_COM },
diff --git a/net/base/transport_security_state_static.json b/net/base/transport_security_state_static.json
index 1bf06e0..98a0392 100644
--- a/net/base/transport_security_state_static.json
+++ b/net/base/transport_security_state_static.json
@@ -173,6 +173,7 @@
{ "name": "talk.google.com", "include_subdomains": true, "mode": "force-https", "pins": "google" },
{ "name": "hostedtalkgadget.google.com", "include_subdomains": true, "mode": "force-https", "pins": "google" },
{ "name": "plus.google.com", "include_subdomains": true, "mode": "force-https", "pins": "google" },
+ { "name": "plus.sandbox.google.com", "include_subdomains": true, "mode": "force-https", "pins": "google" },
{ "name": "script.google.com", "include_subdomains": true, "mode": "force-https", "pins": "google" },
{ "name": "history.google.com", "include_subdomains": true, "mode": "force-https", "pins": "google" },