bug #58547 [HtmlSanitizer] Fix force_attributes not replacing existing attribute in initial data (tgalopin)

nicolas-grekas · nicolas-grekas · commit e39431f083a8 · 2025-08-12T12:22:15.000+02:00
This PR was merged into the 6.4 branch. Discussion ---------- [HtmlSanitizer] Fix `force_attributes` not replacing existing attribute in initial data | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #58065 | License | MIT Fix the override of an existing attribute value. Commits ------- 926985b [HtmlSanitizer] Fix force_attributes not replacing existing attribute in initial data
diff --git a/src/Symfony/Component/HtmlSanitizer/Tests/HtmlSanitizerCustomTest.php b/src/Symfony/Component/HtmlSanitizer/Tests/HtmlSanitizerCustomTest.php
@@ -232,10 +232,17 @@ public function testForceAttribute()
     {
         $config = (new HtmlSanitizerConfig())
             ->allowElement('div')
+            ->allowElement('img', '*')
             ->allowElement('a', ['href'])
             ->forceAttribute('a', 'rel', 'noopener noreferrer')
+            ->forceAttribute('img', 'loading', 'lazy')
         ;
 
+        $this->assertSame(
+            '<img title="My image" src="https://example.com/image.png" loading="lazy" />',
+            $this->sanitize($config, '<img title="My image" src="https://example.com/image.png" loading="eager" onerror="alert(\'1234\')" />')
+        );
+
         $this->assertSame(
             '<a rel="noopener noreferrer">Hello</a> world',
             $this->sanitize($config, '<a>Hello</a> world')
@@ -250,6 +257,11 @@ public function testForceAttribute()
             '<div>Hello</div> world',
             $this->sanitize($config, '<div style="width: 100px">Hello</div> world')
         );
+
+        $this->assertSame(
+            '<a href="https://symfony.com" rel="noopener noreferrer">Hello</a> world',
+            $this->sanitize($config, '<a href="https://symfony.com" rel="noopener">Hello</a> world')
+        );
     }
 
     public function testForceHttps()
diff --git a/src/Symfony/Component/HtmlSanitizer/Visitor/DomVisitor.php b/src/Symfony/Component/HtmlSanitizer/Visitor/DomVisitor.php
@@ -120,7 +120,7 @@ private function enterNode(string $domNodeName, \DOMNode $domNode, Cursor $curso
 
         // Force configured attributes
         foreach ($this->forcedAttributes[$domNodeName] ?? [] as $attribute => $value) {
-            $node->setAttribute($attribute, $value);
+            $node->setAttribute($attribute, $value, true);
         }
 
         $cursor->node->addChild($node);
diff --git a/src/Symfony/Component/HtmlSanitizer/Visitor/Node/Node.php b/src/Symfony/Component/HtmlSanitizer/Visitor/Node/Node.php
@@ -58,10 +58,10 @@ public function getAttribute(string $name): ?string
         return $this->attributes[$name] ?? null;
     }
 
-    public function setAttribute(string $name, ?string $value): void
+    public function setAttribute(string $name, ?string $value, bool $override = false): void
     {
         // Always use only the first declaration (ease sanitization)
-        if (!\array_key_exists($name, $this->attributes)) {
+        if ($override || !\array_key_exists($name, $this->attributes)) {
             $this->attributes[$name] = $value;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ private function enterNode(string $domNodeName, \DOMNode $domNode, Cursor $curso`
`120`	`120`
`121`	`121`	`// Force configured attributes`
`122`	`122`	`foreach ($this->forcedAttributes[$domNodeName] ?? [] as $attribute => $value) {`
`123`		`- $node->setAttribute($attribute, $value);`
	`123`	`+ $node->setAttribute($attribute, $value, true);`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`$cursor->node->addChild($node);`
Original file line number	Diff line number	Diff line change
`@@ -58,10 +58,10 @@ public function getAttribute(string $name): ?string`
`58`	`58`	`return $this->attributes[$name] ?? null;`
`59`	`59`	`}`
`60`	`60`
`61`		`- public function setAttribute(string $name, ?string $value): void`
	`61`	`+ public function setAttribute(string $name, ?string $value, bool $override = false): void`
`62`	`62`	`{`
`63`	`63`	`// Always use only the first declaration (ease sanitization)`
`64`		`- if (!\array_key_exists($name, $this->attributes)) {`
	`64`	`+ if ($override \|\| !\array_key_exists($name, $this->attributes)) {`
`65`	`65`	`$this->attributes[$name] = $value;`
`66`	`66`	`}`
`67`	`67`	`}`