[Cache] Fix Couchbase password parsing

alexandre-daubois · alexandre-daubois · commit fbc9c21ae847 · 2023-11-27T16:53:50.000+01:00
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -132,16 +132,16 @@ jobs:
 
       - name: Configure Couchbase
         run: |
-          curl -s -u 'username=Administrator&password=111111' -X POST http://localhost:8091/node/controller/setupServices -d 'services=kv%2Cn1ql%2Cindex%2Cfts'
-          curl -s -X POST http://localhost:8091/settings/web -d 'username=Administrator&password=111111&port=SAME'
-          curl -s -u Administrator:111111 -X POST http://localhost:8091/pools/default/buckets -d 'ramQuotaMB=100&bucketType=ephemeral&name=cache'
-          curl -s -u Administrator:111111 -X POST  http://localhost:8091/pools/default -d 'memoryQuota=256'
+          curl -s -u 'username=Administrator&password=111111@' -X POST http://localhost:8091/node/controller/setupServices -d 'services=kv%2Cn1ql%2Cindex%2Cfts'
+          curl -s -X POST http://localhost:8091/settings/web -d 'username=Administrator&password=111111%40&port=SAME'
+          curl -s -u Administrator:111111@ -X POST http://localhost:8091/pools/default/buckets -d 'ramQuotaMB=100&bucketType=ephemeral&name=cache'
+          curl -s -u Administrator:111111@ -X POST http://localhost:8091/pools/default -d 'memoryQuota=256'
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
           coverage: "none"
-          extensions: "json,couchbase-3.2.2,memcached,mongodb-1.10.0,redis-5.3.4,rdkafka,xsl,ldap"
+          extensions: "json,couchbase-3.0.4,memcached,mongodb-1.10.0,redis-5.3.4,rdkafka,xsl,ldap"
           ini-values: date.timezone=UTC,memory_limit=-1,default_socket_timeout=10,session.gc_probability=0,apc.enable_cli=1,zend.assertions=1
           php-version: "${{ matrix.php }}"
           tools: pecl
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -25,7 +25,7 @@
         <env name="ZOOKEEPER_HOST" value="localhost" />
         <env name="COUCHBASE_HOST" value="localhost" />
         <env name="COUCHBASE_USER" value="Administrator" />
-        <env name="COUCHBASE_PASS" value="111111" />
+        <env name="COUCHBASE_PASS" value="111111%40" />
     </php>
 
     <testsuites>
diff --git a/src/Symfony/Component/Cache/Adapter/CouchbaseCollectionAdapter.php b/src/Symfony/Component/Cache/Adapter/CouchbaseCollectionAdapter.php
@@ -85,7 +85,7 @@ public static function createConnection($dsn, array $options = [])
                 preg_match($dsnPattern, $server, $matches);
 
                 $username = $matches['username'] ?: $username;
-                $password = $matches['password'] ?: $password;
+                $password = rawurldecode($matches['password'] ?: $password);
                 $protocol = $matches['protocol'] ?: $protocol;
 
                 if (isset($matches['options'])) {
@@ -122,7 +122,7 @@ public static function createConnection($dsn, array $options = [])
 
     public static function isSupported(): bool
     {
-        return \extension_loaded('couchbase') && version_compare(phpversion('couchbase'), '3.0.5', '>=') && version_compare(phpversion('couchbase'), '4.0', '<');
+        return \extension_loaded('couchbase') && version_compare(phpversion('couchbase'), '3.0.4', '>=') && version_compare(phpversion('couchbase'), '4.0', '<');
     }
 
     private static function getOptions(string $options): array
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/CouchbaseCollectionAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/CouchbaseCollectionAdapterTest.php
@@ -63,4 +63,20 @@ public function createCachePool($defaultLifetime = 0): CacheItemPoolInterface
 
         return new CouchbaseCollectionAdapter($client, str_replace('\\', '.', __CLASS__), $defaultLifetime);
     }
+
+    public function testExpiration()
+    {
+        $cache = $this->createCachePool();
+        $cache->save($cache->getItem('k1')->set('v1')->expiresAfter(2 * 1000));
+        $cache->save($cache->getItem('k2')->set('v2')->expiresAfter(366 * 86400 * 1000));
+
+        sleep(3);
+        $item = $cache->getItem('k1');
+        $this->assertFalse($item->isHit());
+        $this->assertNull($item->get(), "Item's value must be null when isHit() is false.");
+
+        $item = $cache->getItem('k2');
+        $this->assertTrue($item->isHit());
+        $this->assertSame('v2', $item->get());
+    }
 }
diff --git a/src/Symfony/Component/Cache/phpunit.xml.dist b/src/Symfony/Component/Cache/phpunit.xml.dist
@@ -15,7 +15,7 @@
         <env name="MEMCACHED_HOST" value="localhost" />
         <env name="COUCHBASE_HOST" value="localhost" />
         <env name="COUCHBASE_USER" value="Administrator" />
-        <env name="COUCHBASE_PASS" value="111111" />
+        <env name="COUCHBASE_PASS" value="111111%40" />
     </php>
 
     <testsuites>

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public static function createConnection($dsn, array $options = [])`
`85`	`85`	`preg_match($dsnPattern, $server, $matches);`
`86`	`86`
`87`	`87`	`$username = $matches['username'] ?: $username;`
`88`		`- $password = $matches['password'] ?: $password;`
	`88`	`+ $password = rawurldecode($matches['password'] ?: $password);`
`89`	`89`	`$protocol = $matches['protocol'] ?: $protocol;`
`90`	`90`
`91`	`91`	`if (isset($matches['options'])) {`
`@@ -122,7 +122,7 @@ public static function createConnection($dsn, array $options = [])`
`122`	`122`
`123`	`123`	`public static function isSupported(): bool`
`124`	`124`	`{`
`125`		`- return \extension_loaded('couchbase') && version_compare(phpversion('couchbase'), '3.0.5', '>=') && version_compare(phpversion('couchbase'), '4.0', '<');`
	`125`	`+ return \extension_loaded('couchbase') && version_compare(phpversion('couchbase'), '3.0.4', '>=') && version_compare(phpversion('couchbase'), '4.0', '<');`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`private static function getOptions(string $options): array`