ayo/kitty
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix de-serialization of base64 data

Browse source
This commit is contained in:
Kovid Goyal 2023-07-20 13:12:15 +05:30
parent 42edfa6a47
commit 8d4fe0e821
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
kitty/file_transmission.py
View file

@ -344,7 +344,7 @@ def handle_item(key: memoryview, val: memoryview) -> None:
sval = base64_decode(val).decode('utf-8')
else:
sval = safe_string(decode_utf8_buffer(val))
setattr(ans, field.name, safe_string(sval))
setattr(ans, field.name, sval)
parse_ftc(data, handle_item)
if ans.action is Action.invalid:
@ -565,10 +565,13 @@ def check_bypass(password: str, request_id: str, bypass_data: str) -> bool:
if abs(delta) > 5 * 60 * 1e9:
return False
return payload == f'{request_id};{password}'
except Exception:
except Exception as err:
log_error(f'Invalid file transmission bypass data received: {err}')
return False
elif protocol == 'sha256':
return (encode_bypass(request_id, password) == bypass_data) if password else False
else:
log_error(f'Invalid file transmission bypass data received with protocol: {protocol}')
return False