SelfPrivacy/selfprivacy-rest-api
1
0
Fork 0
mirror of https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git synced 2024-11-22 20:11:30 +00:00
Code Issues Projects Releases Wiki Activity

fix(tokens-repo): persistent hashing

Browse source
This commit is contained in:
Houkime 2023-06-21 12:15:33 +00:00
parent c77191864e
commit 5be3c83952
1 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
selfprivacy_api/repositories/tokens/redis_tokens_repository.py
View file

@ -3,6 +3,7 @@ Token repository using Redis as backend.
""" """
from typing import Optional from typing import Optional
from datetime import datetime, timezone from datetime import datetime, timezone
from hashlib import md5
from selfprivacy_api.repositories.tokens.abstract_tokens_repository import ( from selfprivacy_api.repositories.tokens.abstract_tokens_repository import (
AbstractTokensRepository, AbstractTokensRepository,
@ -28,7 +29,10 @@ class RedisTokensRepository(AbstractTokensRepository):
@staticmethod @staticmethod
def token_key_for_device(device_name: str): def token_key_for_device(device_name: str):
return TOKENS_PREFIX + str(hash(device_name)) hash = md5()
hash.update(bytes(device_name, "utf-8"))
digest = hash.hexdigest()
return TOKENS_PREFIX + digest
def get_tokens(self) -> list[Token]: def get_tokens(self) -> list[Token]:
"""Get the tokens""" """Get the tokens"""
@ -38,16 +42,23 @@ class RedisTokensRepository(AbstractTokensRepository):
for key in token_keys: for key in token_keys:
token = self._token_from_hash(key) token = self._token_from_hash(key)
if token is not None: if token is not None:
# token creation dates are temporarily not tz-aware
token.created_at = token.created_at.replace(tzinfo=None)
tokens.append(token) tokens.append(token)
return tokens return tokens
def _discover_token_key(self, input_token: Token) -> str:
"""brute-force searching for tokens, for robust deletion"""
redis = self.connection
token_keys = redis.keys(TOKENS_PREFIX + "*")
for key in token_keys:
token = self._token_from_hash(key)
if token == input_token:
return key
def delete_token(self, input_token: Token) -> None: def delete_token(self, input_token: Token) -> None:
"""Delete the token""" """Delete the token"""
redis = self.connection redis = self.connection
key = RedisTokensRepository._token_redis_key(input_token) key = self._discover_token_key(input_token)
if input_token not in self.get_tokens(): if key is None:
raise TokenNotFound raise TokenNotFound
redis.delete(key) redis.delete(key)
@ -131,7 +142,10 @@ class RedisTokensRepository(AbstractTokensRepository):
return None return None
def _token_from_hash(self, redis_key: str) -> Optional[Token]: def _token_from_hash(self, redis_key: str) -> Optional[Token]:
return self._hash_as_model(redis_key, Token) token = self._hash_as_model(redis_key, Token)
if token is not None:
token.created_at = token.created_at.replace(tzinfo=None)
return token
def _recovery_key_from_hash(self, redis_key: str) -> Optional[RecoveryKey]: def _recovery_key_from_hash(self, redis_key: str) -> Optional[RecoveryKey]:
return self._hash_as_model(redis_key, RecoveryKey) return self._hash_as_model(redis_key, RecoveryKey)