Add support for urlencoding of passwords, parse params using parse_str, refs snc#248

Author: Seldaek

Diff for: DependencyInjection/Configuration/RedisDsn.php

@@ -155,15 +155,17 @@ protected function parseDsn($dsn)
         $dsn = str_replace('redis://', '', $dsn); // remove "redis://"
         if (false !== $pos = strrpos($dsn, '@')) {
             // parse password
-            $this->password = str_replace('\@', '@', substr($dsn, 0, $pos));
+            $password = substr($dsn, 0, $pos);
 
-            if (strstr($this->password, ':')) {
-                list(, $this->password) = explode(':', $this->password);
+            if (strstr($password, ':')) {
+                list(, $password) = explode(':', $password, 2);
             }
 
+            $this->password = urldecode($password);
+
             $dsn = substr($dsn, $pos + 1);
         }
-        $dsn = preg_replace_callback('/\?(weight|alias)=[^&]+.*$/', array($this, 'parseParameters'), $dsn); // parse parameters
+        $dsn = preg_replace_callback('/\?(.*)$/', array($this, 'parseParameters'), $dsn); // parse parameters
         if (preg_match('#^(.*)/(\d+)$#', $dsn, $matches)) {
             // parse database
             $this->database = (int) $matches[2];
@@ -192,22 +194,19 @@ protected function parseDsn($dsn)
      */
     protected function parseParameters($matches)
     {
-        $parameters = explode('&', substr($matches[0], 1));
-        foreach ($parameters as $parameter) {
-            $kv = explode('=', $parameter, 2);
-            if (2 === count($kv)) {
-                switch ($kv[0]) {
-                    case 'weight':
-                        if ($kv[1]) {
-                            $this->weight = (int) $kv[1];
-                        }
-                        break;
-                    case 'alias':
-                        if ($kv[1]) {
-                            $this->alias = $kv[1];
-                        }
-                        break;
-                }
+        parse_str($matches[1], $params);
+
+        foreach ($params as $key => $val) {
+            if (!$val) {
+                continue;
+            }
+            switch ($key) {
+                case 'weight':
+                    $this->weight = (int) $val;
+                    break;
+                case 'alias':
+                    $this->alias = $val;
+                    break;
             }
         }
 

Diff for: Tests/DependencyInjection/Configuration/RedisDsnTest.php

@@ -174,17 +174,20 @@ public static function passwordValues()
             array('redis://localhost', null),
             array('redis://localhost/1', null),
             array('redis://pw@localhost:63790/10', 'pw'),
-            array('redis://p\@w@localhost:63790/10', 'p@w'),
+            array('redis://user:pw@localhost:63790/10', 'pw'),
+            array('redis://user:pw:withcolon@localhost:63790/10', 'pw:withcolon'),
+            array('redis://Pw%3AColon%25@localhost:63790/10', 'Pw:Colon%'),
+            array('redis://p%40w@localhost:63790/10', 'p@w'),
             array('redis://mB(.z9},6o?zl>v!LM76A]lCg77,;.@localhost:63790/10', 'mB(.z9},6o?zl>v!LM76A]lCg77,;.'),
             array('redis://127.0.0.1', null),
             array('redis://127.0.0.1/1', null),
             array('redis://[email protected]:63790/10', 'pw'),
-            array('redis://p\@w@127.0.0.1:63790/10', 'p@w'),
+            array('redis://p%40w@127.0.0.1:63790/10', 'p@w'),
             array('redis://mB(.z9},6o?zl>v!LM76A]lCg77,;[email protected]:63790/10', 'mB(.z9},6o?zl>v!LM76A]lCg77,;.'),
             array('redis:///redis.sock', null),
             array('redis:///redis.sock/1', null),
             array('redis://pw@/redis.sock/10', 'pw'),
-            array('redis://p\@w@/redis.sock/10', 'p@w'),
+            array('redis://p%40w@/redis.sock/10', 'p@w'),
             array('redis://mB(.z9},6o?zl>v!LM76A]lCg77,;.@/redis.sock/10', 'mB(.z9},6o?zl>v!LM76A]lCg77,;.'),
         );
     }

Diff for: UPDATE.md

@@ -1,5 +1,12 @@
 # Update notes #
 
+## 2.0.0 ##
+
+Passwords in DSNs must now be properly urlencoded if they contain any of
+the following special characters: `@`, `%` or `:`. Encode them as `%40`,
+`%25` and `%3A` respectively. The `\@` notation for escaping `@` has been
+removed.
+
 ## 1.0.11 and 1.1.6 ##
 
 The monolog handler was renamed from `monolog.handler.redis` to