RedisEngine: authenticate connection if 'password' is set

cakephp · Nov 2, 2012 · 7d84486 · 7d84486
1 parent 0196c6f
commit 7d84486
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/lib/Cake/Cache/Cache.php b/lib/Cake/Cache/Cache.php
@@ -103,7 +103,7 @@ class Cache {
  * - `path` Used by FileCache.  Path to where cachefiles should be saved.
  * - `lock` Used by FileCache.  Should files be locked before writing to them?
  * - `user` Used by Xcache.  Username for XCache
- * - `password` Used by Xcache.  Password for XCache
+ * - `password` Used by Xcache/Redis.  Password for XCache/Redis
  *
  * @see app/Config/core.php for configuration settings
  * @param string $name Name of the configuration

diff --git a/lib/Cake/Cache/Engine/RedisEngine.php b/lib/Cake/Cache/Engine/RedisEngine.php
@@ -62,6 +62,7 @@ public function init($settings = array()) {
 			'prefix' => null,
 			'server' => '127.0.0.1',
 			'port' => 6379,
+			'password' => false,
 			'timeout' => 0,
 			'persistent' => true
 			), $settings)
@@ -87,6 +88,9 @@ protected function _connect() {
 		} catch (RedisException $e) {
 			return false;
 		}
+		if ($return && $this->settings['password']) {
+			$return = $this->_Redis->auth($this->settings['password']);
+		}
 		return $return;
 	}
 

diff --git a/lib/Cake/Test/Case/Cache/Engine/RedisEngineTest.php b/lib/Cake/Test/Case/Cache/Engine/RedisEngineTest.php
@@ -73,7 +73,8 @@ public function testSettings() {
 			'server' => '127.0.0.1',
 			'port' => 6379,
 			'timeout' => 0,
-			'persistent' => true
+			'persistent' => true,
+			'password' => false,
 		);
 		$this->assertEquals($expecting, $settings);
 	}