Changeset 294819 in webkit

Timestamp:

May 25, 2022, 12:53:21 PM (4 years ago)

Author:

Patrick Griffis

Message:

Add support for Link nonces
​https://bugs.webkit.org/show_bug.cgi?id=240817

This reads the nonce from link elements and Link headers.

This was implemented by Chromium in 2017 to be consistent with the HTMLPreloader:
​https://chromium-review.googlesource.com/c/chromium/src/+/676769/

Reviewed by Kate Cheney.

• LayoutTests/imported/w3c/web-platform-tests/preload/link-header-preload-nonce-expected.txt:
• LayoutTests/imported/w3c/web-platform-tests/preload/link-header-preload-nonce.html:

These test changes were already upstream: ​https://github.com/web-platform-tests/wpt/commit/306dc506adba97ca84ada67bdab6227dba65bbcb

• Source/WebCore/html/HTMLLinkElement.cpp:

(WebCore::HTMLLinkElement::process):

• Source/WebCore/loader/LinkHeader.cpp:

(WebCore::paramterNameFromString):
(WebCore::LinkHeader::setValue):

• Source/WebCore/loader/LinkHeader.h:

(WebCore::LinkHeader::nonce const):

• Source/WebCore/loader/LinkLoader.cpp:

(WebCore::LinkLoader::loadLinksFromHeader):
(WebCore::LinkLoader::preloadIfNeeded):
(WebCore::LinkLoader::prefetchIfNeeded):

• Source/WebCore/loader/LinkLoader.h:

Canonical link: ​https://commits.webkit.org/250972@main

Location:

trunk

Files:

• LayoutTests/imported/w3c/web-platform-tests/preload/link-header-preload-nonce-expected.txt (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/preload/link-header-preload-nonce.html (modified) (1 diff)
• Source/WebCore/html/HTMLLinkElement.cpp (modified) (1 diff)
• Source/WebCore/loader/LinkHeader.cpp (modified) (2 diffs)
• Source/WebCore/loader/LinkHeader.h (modified) (3 diffs)
• Source/WebCore/loader/LinkLoader.cpp (modified) (3 diffs)
• Source/WebCore/loader/LinkLoader.h (modified) (1 diff)

trunk/LayoutTests/imported/w3c/web-platform-tests/preload/link-header-preload-nonce-expected.txt

@@ -1 +1 @@
 CONSOLE MESSAGE: Refused to load http://localhost:8800/preload/resources/dummy.js?from-header&without-nonce because it does not appear in the script-src directive of the Content Security Policy.
-CONSOLE MESSAGE: Refused to load http://localhost:8800/preload/resources/dummy.js?from-header&with-nonce because it does not appear in the script-src directive of the Content Security Policy.
-CONSOLE MESSAGE: Error: assert_equals: resources/dummy.js?from-header&with-nonce expected 1 but got 0
 
-Harness Error (FAIL), message = Error: assert_equals: resources/dummy.js?from-header&with-nonce expected 1 but got 0
+PASS Makes sure that Link headers preload resources with CSP nonce
 
-

trunk/LayoutTests/imported/w3c/web-platform-tests/preload/link-header-preload-nonce.html

@@ -6 +6 @@
 <body>
 <script nonce="abc">
-    setup({explicit_done: true});
+    setup({single_test: true});
 
     var iterations = 0;

trunk/Source/WebCore/html/HTMLLinkElement.cpp

@@ -264 +264 @@
         attributeWithoutSynchronization(imagesrcsetAttr),
         attributeWithoutSynchronization(imagesizesAttr),
+        nonce(),
         referrerPolicy(),
     };

trunk/Source/WebCore/loader/LinkHeader.cpp

@@ -158 +158 @@
     if (equalLettersIgnoringASCIICase(name, "imagesizes"_s))
         return LinkHeader::LinkParameterImageSizes;
+    if (equalLettersIgnoringASCIICase(name, "nonce"_s))
+        return LinkHeader::LinkParameterNonce;
     return LinkHeader::LinkParameterUnknown;
 }
@@ -281 +283 @@
         m_imageSizes = WTFMove(value);
         break;
+    case LinkParameterNonce:
+        m_nonce = WTFMove(value);
+        break;
     case LinkParameterTitle:
     case LinkParameterRev:

trunk/Source/WebCore/loader/LinkHeader.h

@@ -45 +45 @@
     const String& imageSrcSet() const { return m_imageSrcSet; }
     const String& imageSizes() const { return m_imageSizes; }
+    const String& nonce() const { return m_nonce; }
     bool valid() const { return m_isValid; }
     bool isViewportDependent() const { return !media().isEmpty() || !imageSrcSet().isEmpty() || !imageSizes().isEmpty(); }
@@ -62 +63 @@
         LinkParameterImageSrcSet,
         LinkParameterImageSizes,
+        LinkParameterNonce,
     };
 
@@ -75 +77 @@
     String m_imageSrcSet;
     String m_imageSizes;
+    String m_nonce;
     bool m_isValid { true };
 };

trunk/Source/WebCore/loader/LinkLoader.cpp

@@ -113 +113 @@
             continue;
 
-        LinkLoadParameters params { relAttribute, url, header.as(), header.media(), header.mimeType(), header.crossOrigin(), header.imageSrcSet(), header.imageSizes(), ReferrerPolicy::EmptyString };
+        LinkLoadParameters params { relAttribute, url, header.as(), header.media(), header.mimeType(), header.crossOrigin(), header.imageSrcSet(), header.imageSizes(), header.nonce(), ReferrerPolicy::EmptyString };
         preconnectIfNeeded(params, document);
         preloadIfNeeded(params, document, nullptr);
@@ -262 +262 @@
     auto options = CachedResourceLoader::defaultCachedResourceOptions();
     options.referrerPolicy = params.referrerPolicy;
+    options.nonce = params.nonce;
     auto linkRequest = createPotentialAccessControlRequest(url, WTFMove(options), document, params.crossOrigin);
     linkRequest.setPriority(DefaultResourceLoadPriority::forResourceType(type.value()));
@@ -303 +304 @@
     options.cachingPolicy = CachingPolicy::DisallowCaching;
     options.referrerPolicy = params.referrerPolicy;
+    options.nonce = params.nonce;
     m_cachedLinkResource = document.cachedResourceLoader().requestLinkResource(type, CachedResourceRequest(ResourceRequest { document.completeURL(params.href.string()) }, options, priority)).value_or(nullptr);
     if (m_cachedLinkResource)

trunk/Source/WebCore/loader/LinkLoader.h

@@ -53 +53 @@
     String imageSrcSet;
     String imageSizes;
+    String nonce;
     ReferrerPolicy referrerPolicy { ReferrerPolicy::EmptyString };
 };