From 8c46d9805c07369f863dd6f5ac0322ba02edd3c0 Mon Sep 17 00:00:00 2001 From: yminer Date: Wed, 5 Jul 2023 08:45:58 +0000 Subject: [PATCH] disable external redis using acl username auth Signed-off-by: yminer --- make/harbor.yml.tmpl | 2 -- .../prepare/migrations/version_2_8_0/harbor.yml.jinja | 8 -------- make/photon/prepare/utils/configs.py | 3 +-- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/make/harbor.yml.tmpl b/make/harbor.yml.tmpl index 4ed087eb199..9c9c331d8a2 100644 --- a/make/harbor.yml.tmpl +++ b/make/harbor.yml.tmpl @@ -170,8 +170,6 @@ _version: 2.8.0 # # :,:,: # host: redis:6379 # password: -# # Redis AUTH command was extended in Redis 6, it is possible to use it in the two-arguments AUTH form. -# # username: # # sentinel_master_set must be set to support redis+sentinel # #sentinel_master_set: # # db_index 0 is for core, it's unchangeable diff --git a/make/photon/prepare/migrations/version_2_8_0/harbor.yml.jinja b/make/photon/prepare/migrations/version_2_8_0/harbor.yml.jinja index d87218dfcad..6a21576af03 100644 --- a/make/photon/prepare/migrations/version_2_8_0/harbor.yml.jinja +++ b/make/photon/prepare/migrations/version_2_8_0/harbor.yml.jinja @@ -389,12 +389,6 @@ external_redis: # :,:,: host: {{ external_redis.host }} password: {{ external_redis.password }} - # Redis AUTH command was extended in Redis 6, it is possible to use it in the two-arguments AUTH form. - {% if external_redis.username is defined %} - username: {{ external_redis.username }} - {% else %} - # username: - {% endif %} # sentinel_master_set must be set to support redis+sentinel #sentinel_master_set: # db_index 0 is for core, it's unchangeable @@ -411,8 +405,6 @@ external_redis: # # :,:,: # host: redis:6379 # password: -# # Redis AUTH command was extended in Redis 6, it is possible to use it in the two-arguments AUTH form. -# # username: # # sentinel_master_set must be set to support redis+sentinel # #sentinel_master_set: # # db_index 0 is for core, it's unchangeable diff --git a/make/photon/prepare/utils/configs.py b/make/photon/prepare/utils/configs.py index d7d73f2db30..89ec2b9ab98 100644 --- a/make/photon/prepare/utils/configs.py +++ b/make/photon/prepare/utils/configs.py @@ -349,9 +349,8 @@ def get_redis_url(db, redis=None): kwargs['db_part'] = db and ("/%s" % db) or "" kwargs['sentinel_part'] = kwargs.get('sentinel_master_set', None) and ("/" + kwargs['sentinel_master_set']) or '' kwargs['password_part'] = quote(str(kwargs.get('password', None)), safe='') and (':%s@' % quote(str(kwargs['password']), safe='')) or '' - kwargs['username_part'] = kwargs.get('username', None) or '' - return "{scheme}://{username_part}{password_part}{host}{sentinel_part}{db_part}".format(**kwargs) + get_redis_url_param(kwargs) + return "{scheme}://{password_part}{host}{sentinel_part}{db_part}".format(**kwargs) + get_redis_url_param(kwargs) def get_redis_url_param(redis=None):