Skip to content

added username to redis connection #491

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

Merged
chillaq merged 1 commit into from
Dec 5, 2023
Merged

added username to redis connection #491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions splitio/client/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
'redisHost': 'localhost',
'redisPort': 6379,
'redisDb': 0,
'redisUsername': None,
'redisPassword': None,
'redisSocketTimeout': None,
'redisSocketConnectTimeout': None,
Expand Down
4 changes: 4 additions & 0 deletions splitio/storage/adapters/redis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,7 @@ def _build_default_client(config): # pylint: disable=too-many-locals
host = config.get('redisHost', 'localhost')
port = config.get('redisPort', 6379)
database = config.get('redisDb', 0)
username = config.get('redisUsername', None)
password = config.get('redisPassword', None)
socket_timeout = config.get('redisSocketTimeout', None)
socket_connect_timeout = config.get('redisSocketConnectTimeout', None)
Expand All @@ -382,6 +383,7 @@ def _build_default_client(config): # pylint: disable=too-many-locals
port=port,
db=database,
password=password,
username=username,
socket_timeout=socket_timeout,
socket_connect_timeout=socket_connect_timeout,
socket_keepalive=socket_keepalive,
Expand Down Expand Up @@ -435,6 +437,7 @@ def _build_sentinel_client(config): # pylint: disable=too-many-locals
raise SentinelConfigurationException('redisMasterService must be specified.')

database = config.get('redisDb', 0)
username = config.get('redisUsername', None)
password = config.get('redisPassword', None)
socket_timeout = config.get('redisSocketTimeout', None)
socket_connect_timeout = config.get('redisSocketConnectTimeout', None)
Expand All @@ -452,6 +455,7 @@ def _build_sentinel_client(config): # pylint: disable=too-many-locals
sentinels,
db=database,
password=password,
username=username,
socket_timeout=socket_timeout,
socket_connect_timeout=socket_connect_timeout,
socket_keepalive=socket_keepalive,
Expand Down
2 changes: 2 additions & 0 deletions tests/client/test_factory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ def test_redis_client_creation(self, mocker):
'redisPort': 1234,
'redisDb': 1,
'redisPassword': 'some_password',
'redisUsername': 'redis_user',
'redisSocketTimeout': 123,
'redisSocketConnectTimeout': 123,
'redisSocketKeepalive': 123,
Expand Down Expand Up @@ -134,6 +135,7 @@ def test_redis_client_creation(self, mocker):
host='some_host',
port=1234,
db=1,
username='redis_user',
password='some_password',
socket_timeout=123,
socket_connect_timeout=123,
Expand Down
12 changes: 9 additions & 3 deletions tests/integration/test_redis_integration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from splitio.models import splits, impressions, events
from splitio.storage.redis import RedisSplitStorage, RedisSegmentStorage, RedisImpressionsStorage, \
RedisEventsStorage
from splitio.storage.adapters.redis import _build_default_client
from splitio.storage.adapters.redis import _build_default_client, StrictRedis
from splitio.client.config import DEFAULT_CONFIG


Expand All @@ -17,7 +17,11 @@ class SplitStorageTests(object):

def test_put_fetch(self):
"""Test storing and retrieving splits in redis."""
adapter = _build_default_client({})
redis = StrictRedis(host="localhost")
redis.acl_setuser(username='redis_user', enabled=True, passwords=["+split"], categories=["+admin"],
commands=["+@all"], keys=["~*"])
redis.close()
adapter = _build_default_client({'redisUsername': 'redis_user', 'redisPassword': 'split'})
try:
storage = RedisSplitStorage(adapter)
with open(os.path.join(os.path.dirname(__file__), 'files', 'split_changes.json'), 'r') as flo:
Expand Down Expand Up @@ -73,10 +77,12 @@ def test_put_fetch(self):
]
for item in to_delete:
adapter.delete(item)

storage = RedisSplitStorage(adapter)
assert storage.is_valid_traffic_type('user') is False
assert storage.is_valid_traffic_type('account') is False
redis = StrictRedis(host="localhost")
redis.acl_deluser("redis_user")
redis.close()

def test_get_all(self):
"""Test get all names & splits."""
Expand Down
4 changes: 4 additions & 0 deletions tests/storage/adapters/test_redis_adapter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ def test_adapter_building(self, mocker):
'redisHost': 'some_host',
'redisPort': 1234,
'redisDb': 0,
'redisUsername': 'redis_user',
'redisPassword': 'some_password',
'redisSocketTimeout': 123,
'redisSocketConnectTimeout': 456,
Expand All @@ -113,6 +114,7 @@ def test_adapter_building(self, mocker):
host='some_host',
port=1234,
db=0,
username='redis_user',
password='some_password',
socket_timeout=123,
socket_connect_timeout=456,
Expand All @@ -137,6 +139,7 @@ def test_adapter_building(self, mocker):
'redisSentinels': [('123.123.123.123', 1), ('456.456.456.456', 2), ('789.789.789.789', 3)],
'redisMasterService': 'some_master',
'redisDb': 0,
'redisUsername': 'redis_user',
'redisPassword': 'some_password',
'redisSocketTimeout': 123,
'redisSocketConnectTimeout': 456,
Expand All @@ -162,6 +165,7 @@ def test_adapter_building(self, mocker):
assert sentinel_mock.mock_calls[0] == mocker.call(
[('123.123.123.123', 1), ('456.456.456.456', 2), ('789.789.789.789', 3)],
db=0,
username='redis_user',
password='some_password',
socket_timeout=123,
socket_connect_timeout=456,
Expand Down