Merge pull request #35 from JohnPremKumar/patch-1

Support Redis Password Encoding

Author: danhunsaker

lib/Resque/Redis.php

@@ -207,9 +207,8 @@ public static function parseDsn($dsn)
 			$database = intval(preg_replace('/[^0-9]/', '', $parts['path']));
 		}
 
-		// Extract any 'user' and 'pass' values
+		// Extract any 'user' values
 		$user = isset($parts['user']) ? $parts['user'] : false;
-		$pass = isset($parts['pass']) ? $parts['pass'] : false;
 
 		// Convert the query string into an associative array
 		$options = array();
@@ -218,6 +217,20 @@ public static function parseDsn($dsn)
 			parse_str($parts['query'], $options);
 		}
 
+		//check 'password-encoding' parameter and extracting password based on encoding
+		if($options && isset($options['password-encoding']) && $options['password-encoding'] === 'u'){
+			//extracting urlencoded password
+			$pass = isset($parts['pass']) ? urldecode($parts['pass']) : false;
+		}
+		else if($options && isset($options['password-encoding']) && $options['password-encoding'] === 'b'){
+			//extracting base64 encoded password
+			$pass = isset($parts['pass']) ? base64_decode($parts['pass']) : false;
+		}
+		else{
+			//extracting pass directly since 'password-encoding' parameter is not present
+			$pass = isset($parts['pass']) ? $parts['pass'] : false;
+		}
+
 		return array(
 			$parts['host'],
 			$port,