bug #38126 [Cache] Limit cache version character range (lstrojny)

nicolas-grekas · nicolas-grekas · commit e8dc35dc2de7 · 2020-09-10T18:48:32.000+02:00
This PR was squashed before being merged into the 4.4 branch. Discussion ---------- [Cache] Limit cache version character range | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | n.A. | License | MIT | Doc PR | Follow up for #38108 With current HEAD in 4.4, this will fail eventually: `simple-phpunit --repeat 1000 --stop-on-failure --filter "testGetMultiple$" src/Symfony/Component/Cache/Tests/Simple/MemcachedCacheTextModeTest.php` After this PR it will no longer fail @nicolas-grekas Commits ------- 15c21db [Cache] Limit cache version character range
diff --git a/src/Symfony/Component/Cache/Simple/AbstractCache.php b/src/Symfony/Component/Cache/Simple/AbstractCache.php
@@ -182,7 +182,7 @@ private function generateValues(iterable $values, array &$keys, $default): itera
         try {
             foreach ($values as $id => $value) {
                 if (!isset($keys[$id])) {
-                    $id = key($keys);
+                    throw new InvalidArgumentException(sprintf('Could not match value id "%s" to keys "%s".', $id, implode('", "', $keys)));
                 }
                 $key = $keys[$id];
                 unset($keys[$id]);
diff --git a/src/Symfony/Component/Cache/Traits/AbstractTrait.php b/src/Symfony/Component/Cache/Traits/AbstractTrait.php
@@ -119,7 +119,7 @@ public function clear(/*string $prefix = ''*/)
                 }
             }
             $namespaceToClear = $this->namespace.$namespaceVersionToClear;
-            $namespaceVersion = substr_replace(base64_encode(pack('V', mt_rand())), static::NS_SEPARATOR, 5);
+            $namespaceVersion = strtr(substr_replace(base64_encode(pack('V', mt_rand())), static::NS_SEPARATOR, 5), '/', '_');
             try {
                 $cleared = $this->doSave([static::NS_SEPARATOR.$this->namespace => $namespaceVersion], 0);
             } catch (\Exception $e) {
@@ -268,7 +268,7 @@ private function getId($key): string
                     $this->namespaceVersion = $v;
                 }
                 if ('1'.static::NS_SEPARATOR === $this->namespaceVersion) {
-                    $this->namespaceVersion = substr_replace(base64_encode(pack('V', time())), static::NS_SEPARATOR, 5);
+                    $this->namespaceVersion = strtr(substr_replace(base64_encode(pack('V', time())), static::NS_SEPARATOR, 5), '/', '_');
                     $this->doSave([static::NS_SEPARATOR.$this->namespace => $this->namespaceVersion], 0);
                 }
             } catch (\Exception $e) {

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ private function generateValues(iterable $values, array &$keys, $default): itera`
`182`	`182`	`try {`
`183`	`183`	`foreach ($values as $id => $value) {`
`184`	`184`	`if (!isset($keys[$id])) {`
`185`		`- $id = key($keys);`
	`185`	`+ throw new InvalidArgumentException(sprintf('Could not match value id "%s" to keys "%s".', $id, implode('", "', $keys)));`
`186`	`186`	`}`
`187`	`187`	`$key = $keys[$id];`
`188`	`188`	`unset($keys[$id]);`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ public function clear(/string $prefix = ''/)`
`119`	`119`	`}`
`120`	`120`	`}`
`121`	`121`	`$namespaceToClear = $this->namespace.$namespaceVersionToClear;`
`122`		`- $namespaceVersion = substr_replace(base64_encode(pack('V', mt_rand())), static::NS_SEPARATOR, 5);`
	`122`	`+ $namespaceVersion = strtr(substr_replace(base64_encode(pack('V', mt_rand())), static::NS_SEPARATOR, 5), '/', '_');`
`123`	`123`	`try {`
`124`	`124`	`$cleared = $this->doSave([static::NS_SEPARATOR.$this->namespace => $namespaceVersion], 0);`
`125`	`125`	`} catch (\Exception $e) {`
`@@ -268,7 +268,7 @@ private function getId($key): string`
`268`	`268`	`$this->namespaceVersion = $v;`
`269`	`269`	`}`
`270`	`270`	`if ('1'.static::NS_SEPARATOR === $this->namespaceVersion) {`
`271`		`- $this->namespaceVersion = substr_replace(base64_encode(pack('V', time())), static::NS_SEPARATOR, 5);`
	`271`	`+ $this->namespaceVersion = strtr(substr_replace(base64_encode(pack('V', time())), static::NS_SEPARATOR, 5), '/', '_');`
`272`	`272`	`$this->doSave([static::NS_SEPARATOR.$this->namespace => $this->namespaceVersion], 0);`
`273`	`273`	`}`
`274`	`274`	`} catch (\Exception $e) {`