open.source/whoogle-search
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix encryption tag in preferences token

Browse Source
This commit is contained in:
Joao Ramos 2022-09-21 13:54:02 +02:00
parent 0d31b1aeeb
commit 8f39087ffb
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/models/config.py
View File

@ -51,7 +51,8 @@ class Config:
'block', 'block',
'safe', 'safe',
'nojs', 'nojs',
'anon_view' 'anon_view',
'preferences_encrypted'
] ]
# Skip setting custom config if there isn't one # Skip setting custom config if there isn't one
@ -87,6 +88,13 @@ class Config:
@property @property
def preferences(self) -> str: def preferences(self) -> str:
# if encryption key is not set will uncheck preferences encryption
if self.preferences_encrypted:
self.preferences_encrypted = bool(self.preferences_key)
# add a tag for visibility if preferences token startswith 'e' it means
# the token is encrypted, 'u' means the token is unencrypted and can be
# used by other whoogle instances
encrypted_flag = "e" if self.preferences_encrypted else 'u' encrypted_flag = "e" if self.preferences_encrypted else 'u'
preferences_digest = self._encode_preferences() preferences_digest = self._encode_preferences()
return f"{encrypted_flag}{preferences_digest}" return f"{encrypted_flag}{preferences_digest}"
@ -175,13 +183,14 @@ class Config:
if self.preferences_key != '': if self.preferences_key != '':
key = self._get_fernet_key(self.preferences_key) key = self._get_fernet_key(self.preferences_key)
encoded_preferences = Fernet(key).encrypt(encoded_preferences) encoded_preferences = Fernet(key).encrypt(encoded_preferences)
encoded_preferences = brotli.compress(encoded_preferences)
return urlsafe_b64encode( return urlsafe_b64encode(encoded_preferences).decode()
brotli.compress(encoded_preferences)
).decode()
def _decode_preferences(self, preferences: str) -> dict: def _decode_preferences(self, preferences: str) -> dict:
if preferences.startswith('e'): # preferences are encrypted mode = preferences[0]
preferences = preferences[1:]
if mode == 'e': # preferences are encrypted
try: try:
key = self._get_fernet_key(self.preferences_key) key = self._get_fernet_key(self.preferences_key)
@ -192,7 +201,7 @@ class Config:
config = pickle.loads(brotli.decompress(config)) config = pickle.loads(brotli.decompress(config))
except Exception: except Exception:
config = {} config = {}
elif preferences.startswith('u'): # preferences are not encrypted elif mode == 'u': # preferences are not encrypted
config = pickle.loads( config = pickle.loads(
brotli.decompress(urlsafe_b64decode(preferences.encode())) brotli.decompress(urlsafe_b64decode(preferences.encode()))
) )