Backed out changeset d53513a85e73 (bug 1935434) for causing GTest failures. CLOSED TREE

Author: chorotan

dom/security/nsCSPParser.cpp

@@ -990,10 +990,14 @@ void nsCSPParser::handleTrustedTypesDirective(nsCSPDirective* aDir) {
           new nsCSPTrustedTypesDirectivePolicyName(mCurToken));
     } else {
       AutoTArray<nsString, 1> token = {mCurToken};
-      logWarningErrorToConsole(nsIScriptError::warningFlag,
+      logWarningErrorToConsole(nsIScriptError::errorFlag,
                                "invalidTrustedTypesExpression", token);
-      trustedTypesExpressions.AppendElement(
-          new nsCSPTrustedTypesDirectiveInvalidToken(mCurToken));
+
+      for (auto* trustedTypeExpression : trustedTypesExpressions) {
+        delete trustedTypeExpression;
+      }
+
+      return;
     }
   }
 

dom/security/nsCSPUtils.cpp

@@ -1085,24 +1085,6 @@ void nsCSPTrustedTypesDirectivePolicyName::toString(nsAString& aOutStr) const {
   aOutStr.Append(mName);
 }
 
-/* =============== nsCSPTrustedTypesDirectiveInvalidToken =============== */
-
-nsCSPTrustedTypesDirectiveInvalidToken::nsCSPTrustedTypesDirectiveInvalidToken(
-    const nsAString& aInvalidToken)
-    : mInvalidToken{aInvalidToken} {}
-
-bool nsCSPTrustedTypesDirectiveInvalidToken::visit(
-    nsCSPSrcVisitor* aVisitor) const {
-  MOZ_ASSERT_UNREACHABLE(
-      "Should only be called for other overloads of this method.");
-  return false;
-}
-
-void nsCSPTrustedTypesDirectiveInvalidToken::toString(
-    nsAString& aOutStr) const {
-  aOutStr.Append(mInvalidToken);
-}
-
 /* ===== nsCSPDirective ====================== */
 
 nsCSPDirective::nsCSPDirective(CSPDirective aDirective) {

dom/security/nsCSPUtils.h

@@ -437,19 +437,6 @@ class nsCSPTrustedTypesDirectivePolicyName : public nsCSPBaseSrc {
   const nsString mName;
 };
 
-class nsCSPTrustedTypesDirectiveInvalidToken : public nsCSPBaseSrc {
- public:
-  explicit nsCSPTrustedTypesDirectiveInvalidToken(
-      const nsAString& aInvalidToken);
-  virtual ~nsCSPTrustedTypesDirectiveInvalidToken() = default;
-
-  bool visit(nsCSPSrcVisitor* aVisitor) const override;
-  void toString(nsAString& aOutStr) const override;
-
- private:
-  const nsString mInvalidToken;
-};
-
 /* =============== nsCSPSrcVisitor ================== */
 
 class nsCSPSrcVisitor {

dom/security/test/gtest/TestCSPParser.cpp

@@ -228,12 +228,9 @@ TEST(CSPParser, Directives)
       "script-src http://example.com"},
     { "require-trusted-types-for 'script'",
       "require-trusted-types-for 'script'" },
-    { "require-trusted-types-for 'script' invalid",
-      "require-trusted-types-for 'script' 'invalid'"}, // bug 1956731
     { "trusted-types somePolicyName", "trusted-types somePolicyName" },
     { "trusted-types somePolicyName anotherPolicyName 1 - # = _ / @ . % *",
       "trusted-types somePolicyName anotherPolicyName 1 - # = _ / @ . % *" },
-    { "trusted-types $", "trusted-types 'invalid'" }, // bug 1935434
       // clang-format on
   };
 
@@ -411,8 +408,7 @@ TEST(CSPParser, Paths)
     { "script-src http://www.example.com:88/.js",
       "script-src http://www.example.com:88/.js" },
     { "script-src https://foo.com/_abc/abc_/_/_a_b_c_",
-      "script-src https://foo.com/_abc/abc_/_/_a_b_c_" }
-      // clang-format on
+      "script-src https://foo.com/_abc/abc_/_/_a_b_c_" }  // clang-format on
   };
 
   uint32_t policyCount = sizeof(policies) / sizeof(PolicyTest);
@@ -612,8 +608,8 @@ TEST(CSPParser, BadPolicies)
     { "report-uri http://:foo", ""},
     { "require-sri-for", ""},
     { "require-sri-for style", ""},
-    { "require-trusted-types-for invalid" },
-    { "require-trusted-types-for 'invalid'" },
+    { "trusted-types $", ""},
+    { "trusted-types 'report-sample'", "" },
 
       // clang-format on
   };

testing/web-platform/meta/trusted-types/should-trusted-type-policy-creation-be-blocked-by-csp-002.html.ini

@@ -0,0 +1,15 @@
+[should-trusted-type-policy-creation-be-blocked-by-csp-002.html]
+  [invalid tt-policy-name name "policy*name"]
+    expected: FAIL
+
+  [invalid tt-policy-name name "policy$name"]
+    expected: FAIL
+
+  [invalid tt-policy-name name "policy?name"]
+    expected: FAIL
+
+  [invalid tt-policy-name name "policy!name"]
+    expected: FAIL
+
+  [invalid directive "trusted-type _TTP" (no ascii whitespace)]
+    expected: FAIL

testing/web-platform/tests/trusted-types/should-trusted-type-policy-creation-be-blocked-by-csp-002.html

@@ -63,8 +63,6 @@
       // https://w3c.github.io/trusted-types/dist/spec/#should-block-create-policy
       assert_true(results[0].exception instanceof TypeError, "createPolicy() should throw a TypeError.");
       assert_equals(results[0].violatedPolicies.length, 1, "createPolicy() should trigger a violation report.");
-      assert_equals(results[0].violatedPolicies[0].disposition, "enforce");
-      assert_equals(results[0].violatedPolicies[0].policy, `trusted-types ${trustedTypePolicyName}`);
     }, `invalid tt-policy-name name "${trustedTypePolicyName}"`);
   });
 
@@ -92,7 +90,5 @@
     assert_equals(results.length, 1);
     assert_true(results[0].exception instanceof TypeError);
     assert_equals(results[0].violatedPolicies.length, 1);
-    assert_equals(results[0].violatedPolicies[0].disposition, "enforce");
-    assert_equals(results[0].violatedPolicies[0].policy, `trusted-types _TTP_*`);
   }, `invalid directive "trusted-type _TTP" (no ascii whitespace)`);
 </script>