bug #49848 [Cache] Fix storing binary keys when using pgsql (nicolas-grekas)

fabpot · fabpot · commit 2794527d7245 · 2023-03-29T20:45:44.000+02:00
This PR was merged into the 5.4 branch. Discussion ---------- [Cache] Fix storing binary keys when using pgsql | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #49748 | License | MIT | Doc PR | - Commits ------- be88fd0 [Cache] Fix storing binary keys when using pgsql
diff --git a/src/Symfony/Component/Cache/Adapter/DoctrineDbalAdapter.php b/src/Symfony/Component/Cache/Adapter/DoctrineDbalAdapter.php
@@ -334,6 +334,22 @@ protected function doSave(array $values, int $lifetime)
         return $failed;
     }
 
+    /**
+     * @internal
+     */
+    protected function getId($key)
+    {
+        if ('pgsql' !== $this->platformName ??= $this->getPlatformName()) {
+            return parent::getId($key);
+        }
+
+        if (str_contains($key, "\0") || str_contains($key, '%') || !preg_match('//u', $key)) {
+            $key = rawurlencode($key);
+        }
+
+        return parent::getId($key);
+    }
+
     private function getPlatformName(): string
     {
         if (isset($this->platformName)) {
diff --git a/src/Symfony/Component/Cache/Adapter/PdoAdapter.php b/src/Symfony/Component/Cache/Adapter/PdoAdapter.php
@@ -559,6 +559,22 @@ protected function doSave(array $values, int $lifetime)
         return $failed;
     }
 
+    /**
+     * @internal
+     */
+    protected function getId($key)
+    {
+        if ('pgsql' !== $this->driver ?? ($this->getConnection() ? $this->driver : null)) {
+            return parent::getId($key);
+        }
+
+        if (str_contains($key, "\0") || str_contains($key, '%') || !preg_match('//u', $key)) {
+            $key = rawurlencode($key);
+        }
+
+        return parent::getId($key);
+    }
+
     private function getConnection(): \PDO
     {
         if (null === $this->conn) {
diff --git a/src/Symfony/Component/Cache/Traits/AbstractAdapterTrait.php b/src/Symfony/Component/Cache/Traits/AbstractAdapterTrait.php
@@ -365,7 +365,10 @@ private function generateItems(iterable $items, array &$keys): \Generator
         }
     }
 
-    private function getId($key)
+    /**
+     * @internal
+     */
+    protected function getId($key)
     {
         if ($this->versioningIsEnabled && '' === $this->namespaceVersion) {
             $this->ids = [];

Original file line number	Diff line number	Diff line change
`@@ -365,7 +365,10 @@ private function generateItems(iterable $items, array &$keys): \Generator`
`365`	`365`	`}`
`366`	`366`	`}`
`367`	`367`
`368`		`- private function getId($key)`
	`368`	`+ /**`
	`369`	`+ * @internal`
	`370`	`+ */`
	`371`	`+ protected function getId($key)`
`369`	`372`	`{`
`370`	`373`	`if ($this->versioningIsEnabled && '' === $this->namespaceVersion) {`
`371`	`374`	`$this->ids = [];`