Now can pass nonce code to TwigGeneric event

idmarinas · Dec 24, 2022 · 29a2c52 · 29a2c52
1 parent 774aeca
commit 29a2c52
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/src/Event/TwigGeneric.php b/src/Event/TwigGeneric.php
@@ -34,6 +34,7 @@ class TwigGeneric extends Event
     private string $slot      = '';
     private array $scripts    = [];
     private array $slotConfig = [];
+    private string $nonce     = '';
 
     /** Set or reemplace banner selected. */
     public function setBanner(string $banner): self
@@ -104,4 +105,18 @@ public function setScripts(array $scripts): self
 
         return $this;
     }
+
+    /** Get nonce (CSP) string */
+    public function getNonce(): string
+    {
+        return $this->nonce;
+    }
+
+    /** Set a nonce string for CSP script/style */
+    public function setNonce(string $nonce): self
+    {
+        $this->nonce = $nonce;
+
+        return $this;
+    }
 }
diff --git a/src/Twig/Extension/AdvertisingGeneric.php b/src/Twig/Extension/AdvertisingGeneric.php
@@ -112,6 +112,15 @@ public function showScripts(?string $network = null): string
             return '';
         }
 
-        return '<script async src="'.implode('"></script><script async src="', $scripts).'"></script>';
+        $attributes = array_filter([
+            'nonce' => (string) $event->getNonce(),
+        ]);
+
+        $attributes = urldecode(http_build_query(array_map(fn($v) => '"'.$v.'"', $attributes), '', ' '));
+
+        return sprintf(
+            '<script %1$s async src="'.implode('"></script><script %1$s async src="', $scripts).'"></script>',
+            $attributes
+        );
     }
 }