feat(headers): support multiple values for Referrer-Policy header

Closes hyperium#882
gsquire · Oct 6, 2016 · f518583 · f518583
1 parent 8672ec5
commit f518583
Showing 1 changed file with 22 additions and 10 deletions.
diff --git a/src/header/common/referrer_policy.rs b/src/header/common/referrer_policy.rs
@@ -54,18 +54,23 @@ impl Header for ReferrerPolicy {
 
     fn parse_header(raw: &Raw) -> ::Result<ReferrerPolicy> {
         use self::ReferrerPolicy::*;
-        parsing::from_one_raw_str(raw).and_then(|s: String| {
-            let slice = &s.to_ascii_lowercase()[..];
+        parsing::from_comma_delimited(raw).and_then(|v: Vec<String>| {
             // See https://www.w3.org/TR/referrer-policy/#determine-policy-for-token
-            match slice {
-                "no-referrer" | "never" => Ok(NoReferrer),
-                "no-referrer-when-downgrade" | "default" => Ok(NoReferrerWhenDowngrade),
-                "same-origin" => Ok(SameOrigin),
-                "origin" => Ok(Origin),
-                "origin-when-cross-origin" => Ok(OriginWhenCrossOrigin),
-                "unsafe-url" | "always" => Ok(UnsafeUrl),
-                _ => Err(::Error::Header),
+            for rh in v.iter().rev() {
+                let ok = match &rh.to_ascii_lowercase()[..] {
+                    "no-referrer" | "never" => Ok(NoReferrer),
+                    "no-referrer-when-downgrade" | "default" => Ok(NoReferrerWhenDowngrade),
+                    "same-origin" => Ok(SameOrigin),
+                    "origin" => Ok(Origin),
+                    "origin-when-cross-origin" => Ok(OriginWhenCrossOrigin),
+                    "unsafe-url" | "always" => Ok(UnsafeUrl),
+                    _ => Err(::Error::Header),
+                };
+                if ok.is_ok() {
+                    return ok;
+                }
             }
+            Err(::Error::Header)
         })
     }
 
@@ -90,3 +95,10 @@ fn test_parse_header() {
     let e: ::Result<ReferrerPolicy> = Header::parse_header(&"foobar".into());
     assert!(e.is_err());
 }
+
+#[test]
+fn test_rightmost_header() {
+    let a: ReferrerPolicy = Header::parse_header(&"same-origin, origin, foobar".into()).unwrap();
+    let b = ReferrerPolicy::Origin;
+    assert_eq!(a, b);
+}