Commit aceabf63 authored by Dominic Farolino's avatar Dominic Farolino Committed by Commit Bot

Update name of strict-origin-when-cross-origin referrer policy

This changes updates all uses of
kReferrerPolicyNoReferrerWhenDowngradeOriginWhenCrossOrigin
to kReferrerPolicyStrictOriginWhenCrossOrigin, to more closely
match the spec.

R=jochen@chromium.org, tkent@chromium.org

Change-Id: I04412fc56e0739e91783f1cc6d3c7d981d54b289
Reviewed-on: https://chromium-review.googlesource.com/952528Reviewed-by: default avatarKent Tamura <tkent@chromium.org>
Reviewed-by: default avatarJochen Eisinger <jochen@chromium.org>
Commit-Queue: Jochen Eisinger <jochen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#544144}
parent fe667977
...@@ -508,7 +508,7 @@ TEST_F(DocumentTest, referrerPolicyParsing) { ...@@ -508,7 +508,7 @@ TEST_F(DocumentTest, referrerPolicyParsing) {
{"same-origin", kReferrerPolicySameOrigin, false}, {"same-origin", kReferrerPolicySameOrigin, false},
{"strict-origin", kReferrerPolicyStrictOrigin, false}, {"strict-origin", kReferrerPolicyStrictOrigin, false},
{"strict-origin-when-cross-origin", {"strict-origin-when-cross-origin",
kReferrerPolicyNoReferrerWhenDowngradeOriginWhenCrossOrigin, false}, kReferrerPolicyStrictOriginWhenCrossOrigin, false},
{"unsafe-url", kReferrerPolicyAlways}, {"unsafe-url", kReferrerPolicyAlways},
}; };
......
...@@ -637,7 +637,7 @@ String Request::getReferrerPolicy() const { ...@@ -637,7 +637,7 @@ String Request::getReferrerPolicy() const {
return "same-origin"; return "same-origin";
case kReferrerPolicyStrictOrigin: case kReferrerPolicyStrictOrigin:
return "strict-origin"; return "strict-origin";
case kReferrerPolicyNoReferrerWhenDowngradeOriginWhenCrossOrigin: case kReferrerPolicyStrictOriginWhenCrossOrigin:
return "strict-origin-when-cross-origin"; return "strict-origin-when-cross-origin";
} }
NOTREACHED(); NOTREACHED();
......
...@@ -235,8 +235,7 @@ void RequestInit::CheckEnumValues( ...@@ -235,8 +235,7 @@ void RequestInit::CheckEnumValues(
} else if (*referrer_policy_string == "unsafe-url") { } else if (*referrer_policy_string == "unsafe-url") {
referrer_.referrer_policy = kReferrerPolicyAlways; referrer_.referrer_policy = kReferrerPolicyAlways;
} else if (*referrer_policy_string == "strict-origin-when-cross-origin") { } else if (*referrer_policy_string == "strict-origin-when-cross-origin") {
referrer_.referrer_policy = referrer_.referrer_policy = kReferrerPolicyStrictOriginWhenCrossOrigin;
kReferrerPolicyNoReferrerWhenDowngradeOriginWhenCrossOrigin;
} else { } else {
exception_state.ThrowTypeError("Invalid referrer policy"); exception_state.ThrowTypeError("Invalid referrer policy");
return; return;
......
...@@ -830,7 +830,7 @@ TEST_F(HTMLPreloadScannerTest, testReferrerPolicy) { ...@@ -830,7 +830,7 @@ TEST_F(HTMLPreloadScannerTest, testReferrerPolicy) {
"referrerpolicy='strict-origin-when-cross-origin' " "referrerpolicy='strict-origin-when-cross-origin' "
"href='bla.gif'/>", "href='bla.gif'/>",
"bla.gif", "http://example.test/", Resource::kImage, 0, "bla.gif", "http://example.test/", Resource::kImage, 0,
kReferrerPolicyNoReferrerWhenDowngradeOriginWhenCrossOrigin, nullptr}, kReferrerPolicyStrictOriginWhenCrossOrigin, nullptr},
{"http://example.test", {"http://example.test",
"<link rel='stylesheet' href='sheet.css' type='text/css'>", "sheet.css", "<link rel='stylesheet' href='sheet.css' type='text/css'>", "sheet.css",
"http://example.test/", Resource::kCSSStyleSheet, 0, "http://example.test/", Resource::kCSSStyleSheet, 0,
......
...@@ -399,7 +399,7 @@ String GetReferrerPolicy(ReferrerPolicy policy) { ...@@ -399,7 +399,7 @@ String GetReferrerPolicy(ReferrerPolicy policy) {
return protocol::Network::Request::ReferrerPolicyEnum::SameOrigin; return protocol::Network::Request::ReferrerPolicyEnum::SameOrigin;
case kReferrerPolicyStrictOrigin: case kReferrerPolicyStrictOrigin:
return protocol::Network::Request::ReferrerPolicyEnum::StrictOrigin; return protocol::Network::Request::ReferrerPolicyEnum::StrictOrigin;
case kReferrerPolicyNoReferrerWhenDowngradeOriginWhenCrossOrigin: case kReferrerPolicyStrictOriginWhenCrossOrigin:
return protocol::Network::Request::ReferrerPolicyEnum:: return protocol::Network::Request::ReferrerPolicyEnum::
StrictOriginWhenCrossOrigin; StrictOriginWhenCrossOrigin;
} }
......
...@@ -315,7 +315,7 @@ constexpr ReferrerPolicy kPreloadReferrerPolicyTestParams[] = { ...@@ -315,7 +315,7 @@ constexpr ReferrerPolicy kPreloadReferrerPolicyTestParams[] = {
kReferrerPolicyOriginWhenCrossOrigin, kReferrerPolicyOriginWhenCrossOrigin,
kReferrerPolicySameOrigin, kReferrerPolicySameOrigin,
kReferrerPolicyStrictOrigin, kReferrerPolicyStrictOrigin,
kReferrerPolicyNoReferrerWhenDowngradeOriginWhenCrossOrigin, kReferrerPolicyStrictOriginWhenCrossOrigin,
kReferrerPolicyNever}; kReferrerPolicyNever};
class LinkLoaderPreloadReferrerPolicyTest class LinkLoaderPreloadReferrerPolicyTest
......
...@@ -50,9 +50,7 @@ enum ReferrerPolicy : uint8_t { ...@@ -50,9 +50,7 @@ enum ReferrerPolicy : uint8_t {
// https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin // https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin
// Also used as the default policy when reduced-referrer-granularity is // Also used as the default policy when reduced-referrer-granularity is
// enabled (not spec conformant). // enabled (not spec conformant).
// TODO(estark): rename to kReferrerPolicyStrictOriginWhenCrossOrigin to kReferrerPolicyStrictOriginWhenCrossOrigin,
// match spec.
kReferrerPolicyNoReferrerWhenDowngradeOriginWhenCrossOrigin,
// https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin // https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin
kReferrerPolicySameOrigin, kReferrerPolicySameOrigin,
// https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin // https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin
......
...@@ -86,8 +86,7 @@ Referrer SecurityPolicy::GenerateReferrer(ReferrerPolicy referrer_policy, ...@@ -86,8 +86,7 @@ Referrer SecurityPolicy::GenerateReferrer(ReferrerPolicy referrer_policy,
ReferrerPolicy referrer_policy_no_default = referrer_policy; ReferrerPolicy referrer_policy_no_default = referrer_policy;
if (referrer_policy_no_default == kReferrerPolicyDefault) { if (referrer_policy_no_default == kReferrerPolicyDefault) {
if (RuntimeEnabledFeatures::ReducedReferrerGranularityEnabled()) { if (RuntimeEnabledFeatures::ReducedReferrerGranularityEnabled()) {
referrer_policy_no_default = referrer_policy_no_default = kReferrerPolicyStrictOriginWhenCrossOrigin;
kReferrerPolicyNoReferrerWhenDowngradeOriginWhenCrossOrigin;
} else { } else {
referrer_policy_no_default = kReferrerPolicyNoReferrerWhenDowngrade; referrer_policy_no_default = kReferrerPolicyNoReferrerWhenDowngrade;
} }
...@@ -143,7 +142,7 @@ Referrer SecurityPolicy::GenerateReferrer(ReferrerPolicy referrer_policy, ...@@ -143,7 +142,7 @@ Referrer SecurityPolicy::GenerateReferrer(ReferrerPolicy referrer_policy,
: origin + "/", : origin + "/",
referrer_policy_no_default); referrer_policy_no_default);
} }
case kReferrerPolicyNoReferrerWhenDowngradeOriginWhenCrossOrigin: { case kReferrerPolicyStrictOriginWhenCrossOrigin: {
scoped_refptr<const SecurityOrigin> referrer_origin = scoped_refptr<const SecurityOrigin> referrer_origin =
SecurityOrigin::Create(referrer_url); SecurityOrigin::Create(referrer_url);
scoped_refptr<const SecurityOrigin> url_origin = scoped_refptr<const SecurityOrigin> url_origin =
...@@ -316,7 +315,7 @@ bool SecurityPolicy::ReferrerPolicyFromString( ...@@ -316,7 +315,7 @@ bool SecurityPolicy::ReferrerPolicyFromString(
return true; return true;
} }
if (EqualIgnoringASCIICase(policy, "strict-origin-when-cross-origin")) { if (EqualIgnoringASCIICase(policy, "strict-origin-when-cross-origin")) {
*result = kReferrerPolicyNoReferrerWhenDowngradeOriginWhenCrossOrigin; *result = kReferrerPolicyStrictOriginWhenCrossOrigin;
return true; return true;
} }
if (EqualIgnoringASCIICase(policy, "no-referrer-when-downgrade") || if (EqualIgnoringASCIICase(policy, "no-referrer-when-downgrade") ||
...@@ -381,6 +380,6 @@ STATIC_ASSERT_ENUM(kWebReferrerPolicySameOrigin, kReferrerPolicySameOrigin); ...@@ -381,6 +380,6 @@ STATIC_ASSERT_ENUM(kWebReferrerPolicySameOrigin, kReferrerPolicySameOrigin);
STATIC_ASSERT_ENUM(kWebReferrerPolicyStrictOrigin, kReferrerPolicyStrictOrigin); STATIC_ASSERT_ENUM(kWebReferrerPolicyStrictOrigin, kReferrerPolicyStrictOrigin);
STATIC_ASSERT_ENUM( STATIC_ASSERT_ENUM(
kWebReferrerPolicyNoReferrerWhenDowngradeOriginWhenCrossOrigin, kWebReferrerPolicyNoReferrerWhenDowngradeOriginWhenCrossOrigin,
kReferrerPolicyNoReferrerWhenDowngradeOriginWhenCrossOrigin); kReferrerPolicyStrictOriginWhenCrossOrigin);
} // namespace blink } // namespace blink
...@@ -105,8 +105,8 @@ TEST(SecurityPolicyTest, GenerateReferrer) { ...@@ -105,8 +105,8 @@ TEST(SecurityPolicyTest, GenerateReferrer) {
{kReferrerPolicySameOrigin, kInsecureURLA, kInsecureURLA, kInsecureURLA}, {kReferrerPolicySameOrigin, kInsecureURLA, kInsecureURLA, kInsecureURLA},
{kReferrerPolicyStrictOrigin, kInsecureURLA, kInsecureURLA, {kReferrerPolicyStrictOrigin, kInsecureURLA, kInsecureURLA,
kInsecureOriginA}, kInsecureOriginA},
{kReferrerPolicyNoReferrerWhenDowngradeOriginWhenCrossOrigin, {kReferrerPolicyStrictOriginWhenCrossOrigin, kInsecureURLA, kInsecureURLA,
kInsecureURLA, kInsecureURLA, kInsecureURLA}, kInsecureURLA},
// HTTP -> HTTP: Cross Origin // HTTP -> HTTP: Cross Origin
{kReferrerPolicyAlways, kInsecureURLA, kInsecureURLB, kInsecureURLA}, {kReferrerPolicyAlways, kInsecureURLA, kInsecureURLB, kInsecureURLA},
...@@ -120,8 +120,8 @@ TEST(SecurityPolicyTest, GenerateReferrer) { ...@@ -120,8 +120,8 @@ TEST(SecurityPolicyTest, GenerateReferrer) {
{kReferrerPolicySameOrigin, kInsecureURLA, kInsecureURLB, nullptr}, {kReferrerPolicySameOrigin, kInsecureURLA, kInsecureURLB, nullptr},
{kReferrerPolicyStrictOrigin, kInsecureURLA, kInsecureURLB, {kReferrerPolicyStrictOrigin, kInsecureURLA, kInsecureURLB,
kInsecureOriginA}, kInsecureOriginA},
{kReferrerPolicyNoReferrerWhenDowngradeOriginWhenCrossOrigin, {kReferrerPolicyStrictOriginWhenCrossOrigin, kInsecureURLA, kInsecureURLB,
kInsecureURLA, kInsecureURLB, kInsecureOriginA}, kInsecureOriginA},
// HTTPS -> HTTPS: Same Origin // HTTPS -> HTTPS: Same Origin
{kReferrerPolicyAlways, kSecureURLA, kSecureURLA, kSecureURLA}, {kReferrerPolicyAlways, kSecureURLA, kSecureURLA, kSecureURLA},
...@@ -134,8 +134,8 @@ TEST(SecurityPolicyTest, GenerateReferrer) { ...@@ -134,8 +134,8 @@ TEST(SecurityPolicyTest, GenerateReferrer) {
kSecureURLA}, kSecureURLA},
{kReferrerPolicySameOrigin, kSecureURLA, kSecureURLA, kSecureURLA}, {kReferrerPolicySameOrigin, kSecureURLA, kSecureURLA, kSecureURLA},
{kReferrerPolicyStrictOrigin, kSecureURLA, kSecureURLA, kSecureOriginA}, {kReferrerPolicyStrictOrigin, kSecureURLA, kSecureURLA, kSecureOriginA},
{kReferrerPolicyNoReferrerWhenDowngradeOriginWhenCrossOrigin, kSecureURLA, {kReferrerPolicyStrictOriginWhenCrossOrigin, kSecureURLA, kSecureURLA,
kSecureURLA, kSecureURLA}, kSecureURLA},
// HTTPS -> HTTPS: Cross Origin // HTTPS -> HTTPS: Cross Origin
{kReferrerPolicyAlways, kSecureURLA, kSecureURLB, kSecureURLA}, {kReferrerPolicyAlways, kSecureURLA, kSecureURLB, kSecureURLA},
...@@ -148,8 +148,8 @@ TEST(SecurityPolicyTest, GenerateReferrer) { ...@@ -148,8 +148,8 @@ TEST(SecurityPolicyTest, GenerateReferrer) {
kSecureOriginA}, kSecureOriginA},
{kReferrerPolicySameOrigin, kSecureURLA, kSecureURLB, nullptr}, {kReferrerPolicySameOrigin, kSecureURLA, kSecureURLB, nullptr},
{kReferrerPolicyStrictOrigin, kSecureURLA, kSecureURLB, kSecureOriginA}, {kReferrerPolicyStrictOrigin, kSecureURLA, kSecureURLB, kSecureOriginA},
{kReferrerPolicyNoReferrerWhenDowngradeOriginWhenCrossOrigin, kSecureURLA, {kReferrerPolicyStrictOriginWhenCrossOrigin, kSecureURLA, kSecureURLB,
kSecureURLB, kSecureOriginA}, kSecureOriginA},
// HTTP -> HTTPS // HTTP -> HTTPS
{kReferrerPolicyAlways, kInsecureURLA, kSecureURLB, kInsecureURLA}, {kReferrerPolicyAlways, kInsecureURLA, kSecureURLB, kInsecureURLA},
...@@ -163,8 +163,8 @@ TEST(SecurityPolicyTest, GenerateReferrer) { ...@@ -163,8 +163,8 @@ TEST(SecurityPolicyTest, GenerateReferrer) {
{kReferrerPolicySameOrigin, kInsecureURLA, kSecureURLB, nullptr}, {kReferrerPolicySameOrigin, kInsecureURLA, kSecureURLB, nullptr},
{kReferrerPolicyStrictOrigin, kInsecureURLA, kSecureURLB, {kReferrerPolicyStrictOrigin, kInsecureURLA, kSecureURLB,
kInsecureOriginA}, kInsecureOriginA},
{kReferrerPolicyNoReferrerWhenDowngradeOriginWhenCrossOrigin, {kReferrerPolicyStrictOriginWhenCrossOrigin, kInsecureURLA, kSecureURLB,
kInsecureURLA, kSecureURLB, kInsecureOriginA}, kInsecureOriginA},
// HTTPS -> HTTP // HTTPS -> HTTP
{kReferrerPolicyAlways, kSecureURLA, kInsecureURLB, kSecureURLA}, {kReferrerPolicyAlways, kSecureURLA, kInsecureURLB, kSecureURLA},
...@@ -177,8 +177,8 @@ TEST(SecurityPolicyTest, GenerateReferrer) { ...@@ -177,8 +177,8 @@ TEST(SecurityPolicyTest, GenerateReferrer) {
kSecureOriginA}, kSecureOriginA},
{kReferrerPolicySameOrigin, kSecureURLA, kInsecureURLB, nullptr}, {kReferrerPolicySameOrigin, kSecureURLA, kInsecureURLB, nullptr},
{kReferrerPolicyStrictOrigin, kSecureURLA, kInsecureURLB, nullptr}, {kReferrerPolicyStrictOrigin, kSecureURLA, kInsecureURLB, nullptr},
{kReferrerPolicyNoReferrerWhenDowngradeOriginWhenCrossOrigin, kSecureURLA, {kReferrerPolicyStrictOriginWhenCrossOrigin, kSecureURLA, kInsecureURLB,
kInsecureURLB, nullptr}, nullptr},
// blob and filesystem URL handling // blob and filesystem URL handling
{kReferrerPolicyAlways, kInsecureURLA, kBlobURL, nullptr}, {kReferrerPolicyAlways, kInsecureURLA, kBlobURL, nullptr},
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment