tor-browser

commit 97f2a0770ea2e72a77b7028c9f530f61fda2fb7d
parent e8702c723d3d5985a1263a37325578a21f061a5b
Author: agoloman <agoloman@mozilla.com>
Date:   Fri, 12 Dec 2025 16:02:22 +0200

Revert "Bug 2004710 - Check that SRI hash is in base64 format r=tschuster" for causing mochitest failures @test_bug_1364262.html.

This reverts commit 5462742b3ea5cc18c876e9a76e0beded8bff694c.

Diffstat:
M
dom/security/SRIMetadata.cpp
 | 
22
+++++-----------------
M
dom/security/nsCSPParser.cpp
 | 
11
+++++------
M
dom/security/nsCSPParser.h
 | 
8
+-------
A
testing/web-platform/meta/subresource-integrity/subresource-integrity.html.ini
 | 
6
++++++

4 files changed, 17 insertions(+), 30 deletions(-)
diff --git a/dom/security/SRIMetadata.cpp b/dom/security/SRIMetadata.cpp
@@ -8,7 +8,6 @@
 
 #include "hasht.h"
 #include "mozilla/Logging.h"
-#include "nsCSPParser.h"
 #include "nsICryptoHash.h"
 
 static mozilla::LogModule* GetSriMetadataLog() {
@@ -39,35 +38,24 @@ SRIMetadata::SRIMetadata(const nsACString& aToken)
   // split the token into its components
   mAlgorithm = Substring(aToken, 0, hyphen);
   uint32_t hashStart = hyphen + 1;
-  uint32_t hashEnd = aToken.Length();
   if (hashStart >= aToken.Length()) {
     SRIMETADATAERROR(("SRIMetadata::SRIMetadata, invalid (missing digest)"));
     return;  // invalid metadata
   }
-
   int32_t question = aToken.FindChar('?');
-  if (question != -1) {
+  if (question == -1) {
+    mHashes.AppendElement(
+        Substring(aToken, hashStart, aToken.Length() - hashStart));
+  } else {
     MOZ_ASSERT(question > 0);
     if (static_cast<uint32_t>(question) <= hashStart) {
       SRIMETADATAERROR(
           ("SRIMetadata::SRIMetadata, invalid (options w/o digest)"));
       return;  // invalid metadata
     }
-    hashEnd = question;
+    mHashes.AppendElement(Substring(aToken, hashStart, question - hashStart));
   }
 
-  // The hash must be in valid base64 format as defined by the CSP spec.
-  // https://w3c.github.io/webappsec-subresource-integrity/#grammardef-hash-expression
-  // https://w3c.github.io/webappsec-csp/#grammardef-base64-value
-  if (!nsCSPParser::isValidBase64Value(NS_ConvertUTF8toUTF16(
-          Substring(aToken, hashStart, hashEnd - hashStart)))) {
-    SRIMETADATAERROR(
-        ("SRIMetadata::SRIMetadata, invalid (digest not in base64 format)"));
-    return;  // invalid metadata
-  }
-
-  mHashes.AppendElement(Substring(aToken, hashStart, hashEnd - hashStart));
-
   if (mAlgorithm.EqualsLiteral("sha256")) {
     mAlgorithmType = nsICryptoHash::SHA256;
   } else if (mAlgorithm.EqualsLiteral("sha384")) {
diff --git a/dom/security/nsCSPParser.cpp b/dom/security/nsCSPParser.cpp
@@ -91,13 +91,10 @@ bool isGroupDelim(char16_t aSymbol) {
           aSymbol == '\\' || aSymbol == ']' || aSymbol == '"');
 }
 
-bool nsCSPParser::isValidBase64Value(const nsAString& aValue) {
+static bool isValidBase64Value(const char16_t* cur, const char16_t* end) {
   // Using grammar at
   // https://w3c.github.io/webappsec-csp/#grammardef-nonce-source
 
-  const char16_t* cur = aValue.BeginReading();
-  const char16_t* end = aValue.EndReading();
-
   // May end with one or two =
   if (end > cur && *(end - 1) == EQUALS) end--;
   if (end > cur && *(end - 1) == EQUALS) end--;
@@ -567,7 +564,8 @@ nsCSPNonceSrc* nsCSPParser::nonceSource() {
   if (dashIndex < 0) {
     return nullptr;
   }
-  if (!isValidBase64Value(Substring(expr, dashIndex + 1))) {
+  if (!isValidBase64Value(expr.BeginReading() + dashIndex + 1,
+                          expr.EndReading())) {
     return nullptr;
   }
 
@@ -596,7 +594,8 @@ nsCSPHashSrc* nsCSPParser::hashSource() {
     return nullptr;
   }
 
-  if (!isValidBase64Value(Substring(expr, dashIndex + 1))) {
+  if (!isValidBase64Value(expr.BeginReading() + dashIndex + 1,
+                          expr.EndReading())) {
     return nullptr;
   }
 
diff --git a/dom/security/nsCSPParser.h b/dom/security/nsCSPParser.h
@@ -41,7 +41,7 @@ const char16_t ATSYMBOL     = '@';
 class nsCSPParser {
  public:
   /**
-   * The CSP parser only has one main publicly accessible function, which is
+   * The CSP parser only has one publicly accessible function, which is
    * parseContentSecurityPolicy. Internally the input string is separated into
    * string tokens and policy() is called, which starts parsing the policy. The
    * parser calls one function after the other according the the source-list
@@ -56,12 +56,6 @@ class nsCSPParser {
                                                  bool aDeliveredViaMetaTag,
                                                  bool aSuppressLogMessages);
 
-  /**
-   * Check if given string is valid base64 as per CSP spec.
-   * https://w3c.github.io/webappsec-csp/#grammardef-base64-value
-   */
-  static bool isValidBase64Value(const nsAString& aValue);
-
  private:
   nsCSPParser(policyTokens& aTokens, nsIURI* aSelfURI,
               nsCSPContext* aCSPContext, bool aDeliveredViaMetaTag,
diff --git a/testing/web-platform/meta/subresource-integrity/subresource-integrity.html.ini b/testing/web-platform/meta/subresource-integrity/subresource-integrity.html.ini
@@ -0,0 +1,6 @@
+[subresource-integrity.html]
+  [Script: Same-origin with non-Base64 hash.]
+    expected: FAIL
+
+  [Style: Same-origin with non-Base64 integrity]
+    expected: FAIL