mirror of
https://github.com/zulip/zulip.git
synced 2025-11-20 22:48:16 +00:00
redis_utils: Validate requested key length in helper functions.
This commit is contained in:
committed by
Tim Abbott
parent
859bde482d
commit
ad460e6ccb
@@ -5,6 +5,13 @@ from zerver.lib.utils import generate_random_token
|
||||
import redis
|
||||
import ujson
|
||||
|
||||
# Redis accepts keys up to 512MB in size, but there's no reason for us to use such size,
|
||||
# so we want to stay limited to 1024 characters.
|
||||
MAX_KEY_LENGTH = 1024
|
||||
|
||||
class ZulipRedisKeyTooLongError(Exception):
|
||||
pass
|
||||
|
||||
def get_redis_client() -> redis.StrictRedis:
|
||||
return redis.StrictRedis(host=settings.REDIS_HOST, port=settings.REDIS_PORT,
|
||||
password=settings.REDIS_PASSWORD, db=0)
|
||||
@@ -13,9 +20,13 @@ def put_dict_in_redis(redis_client: redis.StrictRedis, key_format: str,
|
||||
data_to_store: Dict[str, Any],
|
||||
expiration_seconds: int,
|
||||
token_length: int=64) -> str:
|
||||
key_length = len(key_format) - len('{token}') + token_length
|
||||
if key_length > MAX_KEY_LENGTH:
|
||||
error_msg = "Requested key too long in put_dict_in_redis. Key format: %s, token length: %s"
|
||||
raise ZulipRedisKeyTooLongError(error_msg % (key_format, token_length))
|
||||
token = generate_random_token(token_length)
|
||||
key = key_format.format(token=token)
|
||||
with redis_client.pipeline() as pipeline:
|
||||
token = generate_random_token(token_length)
|
||||
key = key_format.format(token=token)
|
||||
pipeline.set(key, ujson.dumps(data_to_store))
|
||||
pipeline.expire(key, expiration_seconds)
|
||||
pipeline.execute()
|
||||
@@ -23,6 +34,9 @@ def put_dict_in_redis(redis_client: redis.StrictRedis, key_format: str,
|
||||
return key
|
||||
|
||||
def get_dict_from_redis(redis_client: redis.StrictRedis, key: str) -> Optional[Dict[str, Any]]:
|
||||
if len(key) > MAX_KEY_LENGTH:
|
||||
error_msg = "Requested key too long in get_dict_from_redis: %s"
|
||||
raise ZulipRedisKeyTooLongError(error_msg % (key,))
|
||||
data = redis_client.get(key)
|
||||
if data is None:
|
||||
return None
|
||||
|
||||
Reference in New Issue
Block a user