Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 15:23:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

msg: Rename ReferrerPolicy::NoRefWhenDowngrade NoReferrerWhenDowngrade

Browse source 
This is more consistent with the other variants.
This commit is contained in:
Aravind Gollakota 2016-07-14 23:13:44 -07:00
parent e7ae1e86e1
commit bfda32ea00
6 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/msg/constellation_msg.rs
View file

@ -332,7 +332,7 @@ pub enum FrameType {
#[derive(Clone, Copy, Debug, Deserialize, HeapSizeOf, Serialize)] #[derive(Clone, Copy, Debug, Deserialize, HeapSizeOf, Serialize)]
pub enum ReferrerPolicy { pub enum ReferrerPolicy {
NoReferrer, NoReferrer,
NoRefWhenDowngrade, NoReferrerWhenDowngrade,
Origin, Origin,
SameOrigin, SameOrigin,
OriginWhenCrossOrigin, OriginWhenCrossOrigin,

2
components/net/fetch/methods.rs
View file

@ -155,7 +155,7 @@ fn main_fetch(request: Rc<Request>, cache: &mut CORSCache, cors_flag: bool,
// Step 7 // Step 7
if request.referrer_policy.get().is_none() { if request.referrer_policy.get().is_none() {
request.referrer_policy.set(Some(ReferrerPolicy::NoRefWhenDowngrade)); request.referrer_policy.set(Some(ReferrerPolicy::NoReferrerWhenDowngrade));
} }
// Step 8 // Step 8

5
components/net/http_loader.rs
View file

@ -425,7 +425,7 @@ fn set_default_accept_language(headers: &mut Headers) {
} }
/// https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-state-no-referrer-when-downgrade /// https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-state-no-referrer-when-downgrade
fn no_ref_when_downgrade_header(referrer_url: Url, url: Url) -> Option<Url> { fn no_referrer_when_downgrade_header(referrer_url: Url, url: Url) -> Option<Url> {
if referrer_url.scheme() == "https" && url.scheme() != "https" { if referrer_url.scheme() == "https" && url.scheme() != "https" {
return None; return None;
} }
@ -462,7 +462,8 @@ pub fn determine_request_referrer(headers: &mut Headers,
Some(ReferrerPolicy::SameOrigin) => if cross_origin { None } else { strip_url(ref_url, false) }, Some(ReferrerPolicy::SameOrigin) => if cross_origin { None } else { strip_url(ref_url, false) },
Some(ReferrerPolicy::UnsafeUrl) => strip_url(ref_url, false), Some(ReferrerPolicy::UnsafeUrl) => strip_url(ref_url, false),
Some(ReferrerPolicy::OriginWhenCrossOrigin) => strip_url(ref_url, cross_origin), Some(ReferrerPolicy::OriginWhenCrossOrigin) => strip_url(ref_url, cross_origin),
Some(ReferrerPolicy::NoRefWhenDowngrade) | None => no_ref_when_downgrade_header(ref_url, url), Some(ReferrerPolicy::NoReferrerWhenDowngrade) | None =>
no_referrer_when_downgrade_header(ref_url, url),
}; };
} }
return None; return None;

2
components/script/dom/document.rs
View file

@ -2863,7 +2863,7 @@ pub fn determine_policy_for_token(token: &str) -> Option<ReferrerPolicy> {
let lower = token.to_lowercase(); let lower = token.to_lowercase();
return match lower.as_ref() { return match lower.as_ref() {
"never" | "no-referrer" => Some(ReferrerPolicy::NoReferrer), "never" | "no-referrer" => Some(ReferrerPolicy::NoReferrer),
"default" | "no-referrer-when-downgrade" => Some(ReferrerPolicy::NoRefWhenDowngrade), "default" | "no-referrer-when-downgrade" => Some(ReferrerPolicy::NoReferrerWhenDowngrade),
"origin" => Some(ReferrerPolicy::Origin), "origin" => Some(ReferrerPolicy::Origin),
"same-origin" => Some(ReferrerPolicy::SameOrigin), "same-origin" => Some(ReferrerPolicy::SameOrigin),
"origin-when-cross-origin" => Some(ReferrerPolicy::OriginWhenCrossOrigin), "origin-when-cross-origin" => Some(ReferrerPolicy::OriginWhenCrossOrigin),

2
components/script/script_thread.rs
View file

@ -1721,7 +1721,7 @@ impl ScriptThread {
ReferrerPolicyHeader::NoReferrer => ReferrerPolicyHeader::NoReferrer =>
ReferrerPolicy::NoReferrer, ReferrerPolicy::NoReferrer,
ReferrerPolicyHeader::NoReferrerWhenDowngrade => ReferrerPolicyHeader::NoReferrerWhenDowngrade =>
ReferrerPolicy::NoRefWhenDowngrade, ReferrerPolicy::NoReferrerWhenDowngrade,
ReferrerPolicyHeader::SameOrigin => ReferrerPolicyHeader::SameOrigin =>
ReferrerPolicy::SameOrigin, ReferrerPolicy::SameOrigin,
ReferrerPolicyHeader::Origin => ReferrerPolicyHeader::Origin =>

8
tests/unit/net/http_loader.rs
View file

@ -1732,7 +1732,7 @@ fn test_http_to_https_considered_cross_origin_for_referer_header_logic() {
fn test_referer_set_to_ref_url_with_noreferrerwhendowngrade_policy_https_to_https() { fn test_referer_set_to_ref_url_with_noreferrerwhendowngrade_policy_https_to_https() {
let request_url = "https://mozilla.com"; let request_url = "https://mozilla.com";
let referrer_url = "https://username:password@mozilla.com/some/path#fragment"; let referrer_url = "https://username:password@mozilla.com/some/path#fragment";
let referrer_policy = Some(ReferrerPolicy::NoRefWhenDowngrade); let referrer_policy = Some(ReferrerPolicy::NoReferrerWhenDowngrade);
let expected_referrer = "https://mozilla.com/some/path"; let expected_referrer = "https://mozilla.com/some/path";
let origin_info = LoadOriginInfo { let origin_info = LoadOriginInfo {
@ -1747,7 +1747,7 @@ fn test_referer_set_to_ref_url_with_noreferrerwhendowngrade_policy_https_to_http
fn test_no_referer_set_with_noreferrerwhendowngrade_policy_https_to_http() { fn test_no_referer_set_with_noreferrerwhendowngrade_policy_https_to_http() {
let request_url = "http://mozilla.com"; let request_url = "http://mozilla.com";
let referrer_url = "https://username:password@mozilla.com/some/path#fragment"; let referrer_url = "https://username:password@mozilla.com/some/path#fragment";
let referrer_policy = Some(ReferrerPolicy::NoRefWhenDowngrade); let referrer_policy = Some(ReferrerPolicy::NoReferrerWhenDowngrade);
let origin_info = LoadOriginInfo { let origin_info = LoadOriginInfo {
referrer_url: referrer_url, referrer_url: referrer_url,
@ -1761,7 +1761,7 @@ fn test_no_referer_set_with_noreferrerwhendowngrade_policy_https_to_http() {
fn test_referer_set_to_ref_url_with_noreferrerwhendowngrade_policy_http_to_https() { fn test_referer_set_to_ref_url_with_noreferrerwhendowngrade_policy_http_to_https() {
let request_url = "https://mozilla.com"; let request_url = "https://mozilla.com";
let referrer_url = "http://username:password@mozilla.com/some/path#fragment"; let referrer_url = "http://username:password@mozilla.com/some/path#fragment";
let referrer_policy = Some(ReferrerPolicy::NoRefWhenDowngrade); let referrer_policy = Some(ReferrerPolicy::NoReferrerWhenDowngrade);
let expected_referrer = "http://mozilla.com/some/path"; let expected_referrer = "http://mozilla.com/some/path";
let origin_info = LoadOriginInfo { let origin_info = LoadOriginInfo {
@ -1776,7 +1776,7 @@ fn test_referer_set_to_ref_url_with_noreferrerwhendowngrade_policy_http_to_https
fn test_referer_set_to_ref_url_with_noreferrerwhendowngrade_policy_http_to_http() { fn test_referer_set_to_ref_url_with_noreferrerwhendowngrade_policy_http_to_http() {
let request_url = "http://mozilla.com"; let request_url = "http://mozilla.com";
let referrer_url = "http://username:password@mozilla.com/some/path#fragment"; let referrer_url = "http://username:password@mozilla.com/some/path#fragment";
let referrer_policy = Some(ReferrerPolicy::NoRefWhenDowngrade); let referrer_policy = Some(ReferrerPolicy::NoReferrerWhenDowngrade);
let expected_referrer = "http://mozilla.com/some/path"; let expected_referrer = "http://mozilla.com/some/path";
let origin_info = LoadOriginInfo { let origin_info = LoadOriginInfo {