Stop supporting legacy keywords in Referrer-Policy header

third_party/WebKit/Source/platform/weborigin/SecurityPolicy.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 40 matching lines @@
     DEFINE_STATIC_LOCAL(OriginAccessMap, originAccessMap, ());
     return originAccessMap;
 }
 
 static OriginSet& trustworthyOriginSet()
 {
     DEFINE_STATIC_LOCAL(OriginSet, trustworthyOriginSet, ());
     return trustworthyOriginSet;
 }
 
+static bool referrerPolicyFromStringImpl(const String& policy, bool supportLegacyKeywords, ReferrerPolicy* result)

[jochen (gone - plz use gerrit), 2016/08/26 15:07:35]

nit. please use an enum (class) instead of a bool

[estark, 2016/08/26 16:23:44]

Done.

+{
+    DCHECK(!policy.isNull());
+
+    if (equalIgnoringCase(policy, "no-referrer") || (supportLegacyKeywords && equalIgnoringCase(policy, "never"))) {
+        *result = ReferrerPolicyNever;
+        return true;
+    }
+    if (equalIgnoringCase(policy, "unsafe-url") || (supportLegacyKeywords && equalIgnoringCase(policy, "always"))) {
+        *result = ReferrerPolicyAlways;
+        return true;
+    }
+    if (equalIgnoringCase(policy, "origin")) {
+        *result = ReferrerPolicyOrigin;
+        return true;
+    }
+    if (equalIgnoringCase(policy, "origin-when-cross-origin") || (supportLegacyKeywords && equalIgnoringCase(policy, "origin-when-crossorigin"))) {
+        *result = ReferrerPolicyOriginWhenCrossOrigin;
+        return true;
+    }
+    if (equalIgnoringCase(policy, "no-referrer-when-downgrade") || (supportLegacyKeywords && equalIgnoringCase(policy, "default"))) {
+        *result = ReferrerPolicyNoReferrerWhenDowngrade;
+        return true;
+    }
+    return false;
+}
+
 void SecurityPolicy::init()
 {
     originAccessMap();
     trustworthyOriginSet();
 }
 
 bool SecurityPolicy::shouldHideReferrer(const KURL& url, const String& referrer)
 {
     bool referrerIsSecureURL = protocolIs(referrer, "https");
     String scheme = KURL(KURL(), referrer).protocol();
@@ skipping 147 matching lines @@
 }
 
 void SecurityPolicy::resetOriginAccessWhitelists()
 {
     ASSERT(isMainThread());
     originAccessMap().clear();
 }
 
 bool SecurityPolicy::referrerPolicyFromString(const String& policy, ReferrerPolicy* result)
 {
-    ASSERT(!policy.isNull());
+    return referrerPolicyFromStringImpl(policy, false /* use legacy keywords */, result);
+}
 
-    if (equalIgnoringCase(policy, "no-referrer") || equalIgnoringCase(policy, "never")) {
-        *result = ReferrerPolicyNever;
-        return true;
-    }
-    if (equalIgnoringCase(policy, "unsafe-url") || equalIgnoringCase(policy, "always")) {
-        *result = ReferrerPolicyAlways;
-        return true;
-    }
-    if (equalIgnoringCase(policy, "origin")) {
-        *result = ReferrerPolicyOrigin;
-        return true;
-    }
-    if (equalIgnoringCase(policy, "origin-when-cross-origin") || equalIgnoringCase(policy, "origin-when-crossorigin")) {
-        *result = ReferrerPolicyOriginWhenCrossOrigin;
-        return true;
-    }
-    if (equalIgnoringCase(policy, "no-referrer-when-downgrade") || equalIgnoringCase(policy, "default")) {
-        *result = ReferrerPolicyNoReferrerWhenDowngrade;
-        return true;
-    }
-    return false;
+bool SecurityPolicy::referrerPolicyFromStringWithLegacyKeywords(const String& policy, ReferrerPolicy* result)
+{
+    return referrerPolicyFromStringImpl(policy, true /* use legacy keywords */, result);
 }
 
 } // namespace blink