Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Authentication support #1 #2

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Authentication support #1 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7dc873e
add password option for authetication
May 27, 2021
116dd3b
fix composer.json
May 27, 2021
0e1f38b
be backwards compatible
May 27, 2021
aa44c3d
use warning instead of error
May 27, 2021
4e3c2fc
add me as author
May 27, 2021
2d076fa
revert packag name
May 27, 2021
5d2ae86
add comment
May 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
{
"name": "Tomas Saghy",
"email": "[email protected]"
},
{
"name": "Martin Mitterhauser",
"email": "[email protected]"
}
],
"require": {
Expand Down
24 changes: 22 additions & 2 deletions src/Cache/Engine/RedisClusterEngine.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ class RedisClusterEngine extends RedisEngine
*/
protected $_Redis;

/**
* PHP redis extension version
* @var string
*/
protected $_redisExtensionVersion;

/**
* The default config used unless overridden by runtime configuration.
*
Expand All @@ -27,6 +33,7 @@ class RedisClusterEngine extends RedisEngine
* - `probability` Probability of hitting a cache gc cleanup. Setting to 0 will disable
* cache::gc from ever being called automatically.
* - `server` array of Redis server hosts.
* - `password` Password for Redis cluster authorisation
* - `timeout` timeout in seconds (float).
* - `read_timeout` read timeout in seconds (float).
*
Expand All @@ -40,6 +47,7 @@ class RedisClusterEngine extends RedisEngine
'prefix' => 'cake_',
'probability' => 100,
'server' => [],
'password' => null,
'timeout' => 2,
'read_timeout' => 2,
'failover' => 'none'
Expand All @@ -52,6 +60,12 @@ public function init(array $config = [])
{
if (!extension_loaded('redis')) {
return false;
} else {
$this->_redisExtensionVersion = filter_var(phpversion('redis'), FILTER_SANITIZE_NUMBER_INT);
}

if (!class_exists('RedisCluster')) {
return false;
}

parent::init($config);
Expand Down Expand Up @@ -107,8 +121,14 @@ public function clear($check)
protected function _connect()
{
try {
$this->_Redis = new \RedisCluster($this->_config['name'], $this->_config['server'], $this->_config['timeout'], $this->_config['read_timeout'], $this->_config['persistent']);

if (400 <= $this->_redisExtensionVersion) {
$this->_Redis = new \RedisCluster($this->_config['name'], $this->_config['server'], $this->_config['timeout'], $this->_config['read_timeout'], $this->_config['persistent'], $this->_config['password']);
} else {
if (isset($this->_config['password']) && null !== $this->_config['password']) {
trigger_error("Password not supported prior phpredis prior 4.0.0", E_USER_WARNING);
}
$this->_Redis = new \RedisCluster($this->_config['name'], $this->_config['server'], $this->_config['timeout'], $this->_config['read_timeout'], $this->_config['persistent']);
}
switch ($this->_config['failover']) {
case 'error':
$this->_Redis->setOption(\RedisCluster::OPT_SLAVE_FAILOVER, \RedisCluster::FAILOVER_ERROR);
Expand Down