Merge remote-tracking branch 'dfau/fix/invalid-signature'

christophlehmann · Feb 7, 2024 · 89a971c · 89a971c
2 parents 698eaf5 + cac5dd3
commit 89a971c
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/Classes/Service/UrlBuilder.php b/Classes/Service/UrlBuilder.php
@@ -49,7 +49,7 @@ public function setCrop(float $width, float $height, string $cropGravityType, fl
 
     public function setFilename(string $filename)
     {
-        $this->options[] = 'fn:' . $filename;
+        $this->options[] = 'fn:' . $this->encodeUrl($filename) . ':t';
         return $this;
     }
 
@@ -83,7 +83,7 @@ public function setResizeType(string $resizeType)
 
     public function generate(): string
     {
-        $this->options[] = rtrim(strtr(base64_encode($this->sourceUrl), '+/', '-_'), '=');
+        $this->options[] = $this->encodeUrl($this->sourceUrl);
         $unsignedPath = '/' . implode('/', $this->options);
 
         if (!empty($this->key)) {
@@ -98,4 +98,9 @@ public function generate(): string
 
         return $url;
     }
+
+    protected function encodeUrl(string $url): string
+    {
+        return rtrim(strtr(base64_encode($url), '+/', '-_'), '=');
+    }
 }