Changeset 261485 in webkit

Timestamp:

May 11, 2020, 11:59:22 AM (5 years ago)

Author:

achristensen@apple.com

Message:

Fix assertion after r261414
​https://bugs.webkit.org/show_bug.cgi?id=211731

This fixes a debug assertion that fired 100% of the time when running the test introduced in r261414
I also respond to Darin's and Youenn's post-commit feedback.

• page/SecurityPolicy.cpp:

(WebCore::SecurityPolicy::generateReferrerHeader):

• platform/network/ResourceRequestBase.cpp:

(WebCore::ResourceRequestBase::setHTTPReferrer):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/SecurityPolicy.cpp (modified) (1 diff)
• platform/network/ResourceRequestBase.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-05-11  Alex Christensen  <achristensen@webkit.org>
+
+        Fix assertion after r261414
+        https://bugs.webkit.org/show_bug.cgi?id=211731
+
+        This fixes a debug assertion that fired 100% of the time when running the test introduced in r261414
+        I also respond to Darin's and Youenn's post-commit feedback.
+
+        * page/SecurityPolicy.cpp:
+        (WebCore::SecurityPolicy::generateReferrerHeader):
+        * platform/network/ResourceRequestBase.cpp:
+        (WebCore::ResourceRequestBase::setHTTPReferrer):
+
 2020-05-11  Andres Gonzalez  <andresg_22@apple.com>
 

trunk/Source/WebCore/page/SecurityPolicy.cpp

@@ -91 +91 @@
 String SecurityPolicy::generateReferrerHeader(ReferrerPolicy referrerPolicy, const URL& url, const String& referrer)
 {
-    ASSERT(referrer == URL(URL(), referrer).strippedForUseAsReferrer());
+    ASSERT(referrer == URL(URL(), referrer).strippedForUseAsReferrer()
+        || referrer == SecurityOrigin::create(URL(URL(), referrer))->toString());
 
     if (referrer.isEmpty())

trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp

@@ -379 +379 @@
 void ResourceRequestBase::setHTTPReferrer(const String& httpReferrer)
 {
-    const size_t maxLength = 4096;
+    // https://w3c.github.io/webappsec-referrer-policy/#determine-requests-referrer
+    constexpr size_t maxLength = 4096;
     if (httpReferrer.length() > maxLength) {
         RELEASE_LOG(Loading, "Truncating HTTP referer");