summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-03 16:13:54 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-03 16:13:54 +0000
commit42c9f0d4ee50170a3decb1930cc3f116f0d82327 (patch)
tree56e9b8486e7b0218fa7fe2b0280c3e2f76c5028c /net
parent38950138d995f881cf9140ba73900128a93122c1 (diff)
downloadchromium_src-42c9f0d4ee50170a3decb1930cc3f116f0d82327.zip
chromium_src-42c9f0d4ee50170a3decb1930cc3f116f0d82327.tar.gz
chromium_src-42c9f0d4ee50170a3decb1930cc3f116f0d82327.tar.bz2
net: pin (*.)googletagmanager.com
BUG=340280 Review URL: https://codereview.chromium.org/151163004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@248500 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/http/transport_security_state.cc2
-rw-r--r--net/http/transport_security_state_static.h3
-rw-r--r--net/http/transport_security_state_static.json3
3 files changed, 8 insertions, 0 deletions
diff --git a/net/http/transport_security_state.cc b/net/http/transport_security_state.cc
index e6c5b42..6a7a14f 100644
--- a/net/http/transport_security_state.cc
+++ b/net/http/transport_security_state.cc
@@ -521,6 +521,8 @@ enum SecondLevelDomainName {
DOMAIN_CRYPTO_CAT,
DOMAIN_LAVABIT_COM,
+ DOMAIN_GOOGLETAGMANAGER_COM,
+
// Boundary value for UMA_HISTOGRAM_ENUMERATION:
DOMAIN_NUM_EVENTS
};
diff --git a/net/http/transport_security_state_static.h b/net/http/transport_security_state_static.h
index e0dbe89..ae852e0 100644
--- a/net/http/transport_security_state_static.h
+++ b/net/http/transport_security_state_static.h
@@ -436,6 +436,7 @@ static const struct HSTSPreload kPreloadedSTS[] = {
{12, true, "\006urchin\003com", false, kGooglePins, DOMAIN_URCHIN_COM },
{8, true, "\003goo\002gl", false, kGooglePins, DOMAIN_GOO_GL },
{6, true, "\001g\002co", false, kGooglePins, DOMAIN_G_CO },
+ {22, true, "\020googletagmanager\003com", false, kGooglePins, DOMAIN_GOOGLETAGMANAGER_COM },
{11, true, "\006google\002ac", false, kGooglePins, DOMAIN_GOOGLE_AC },
{11, true, "\006google\002ad", false, kGooglePins, DOMAIN_GOOGLE_AD },
{11, true, "\006google\002ae", false, kGooglePins, DOMAIN_GOOGLE_AE },
@@ -900,6 +901,8 @@ static const struct HSTSPreload kPreloadedSTS[] = {
{18, false, "\003www\010evernote\003com", true, kNoPins, DOMAIN_NOT_PINNED },
{18, false, "\003app\010yinxiang\003com", true, kNoPins, DOMAIN_NOT_PINNED },
{15, false, "\011neilwynne\003com", true, kNoPins, DOMAIN_NOT_PINNED },
+ {20, false, "\016calyxinstitute\003org", true, kNoPins, DOMAIN_NOT_PINNED },
+ {24, false, "\003www\016calyxinstitute\003org", true, kNoPins, DOMAIN_NOT_PINNED },
};
static const size_t kNumPreloadedSTS = ARRAYSIZE_UNSAFE(kPreloadedSTS);
diff --git a/net/http/transport_security_state_static.json b/net/http/transport_security_state_static.json
index 3a4e4f7..a852543 100644
--- a/net/http/transport_security_state_static.json
+++ b/net/http/transport_security_state_static.json
@@ -225,6 +225,7 @@
{ "name": "urchin.com", "include_subdomains": true, "pins": "google" },
{ "name": "goo.gl", "include_subdomains": true, "pins": "google" },
{ "name": "g.co", "include_subdomains": true, "pins": "google" },
+ { "name": "googletagmanager.com", "include_subdomains": true, "pins": "google" },
{ "name": "google.ac", "include_subdomains": true, "pins": "google" },
{ "name": "google.ad", "include_subdomains": true, "pins": "google" },
{ "name": "google.ae", "include_subdomains": true, "pins": "google" },
@@ -693,6 +694,8 @@
{ "name": "www.evernote.com", "mode": "force-https" },
{ "name": "app.yinxiang.com", "mode": "force-https" },
{ "name": "neilwynne.com", "mode": "force-https" },
+ { "name": "calyxinstitute.org", "mode": "force-https" },
+ { "name": "www.calyxinstitute.org", "mode": "force-https" },
// Entries that are only valid if the client supports SNI.
{ "name": "gmail.com", "mode": "force-https", "pins": "google", "snionly": true },