mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-17 14:04:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Proper parsing of safe_string fields

Browse Source
This commit is contained in:
Kovid Goyal
2023-05-28 13:18:31 +05:30
parent 425e993ab7
commit 6c79ae4443
6 changed files with 47 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
kitty/file_transmission.py
View File

@@ -29,10 +29,7 @@ MAX_ACTIVE_RECEIVES = MAX_ACTIVE_SENDS = 10
ftc_prefix = str(FILE_TRANSFER_CODE)
def escape_semicolons(x: str) -> str:
return x.replace(';', ';;')
@run_once
def safe_string_pat() -> 're.Pattern[str]':
return re.compile(r'[^0-9a-zA-Z_:./@-]')
@@ -316,7 +313,7 @@ class FileTransmissionCommand:
if k.metadata.get('base64'):
yield standard_b64encode(val.encode('utf-8'))
else:
yield escape_semicolons(safe_string(val))
yield safe_string(val)
elif k.type is int:
yield str(val)
else:
@@ -331,7 +328,7 @@ class FileTransmissionCommand:
fmap = serialized_to_field_map()
from kittens.transfer.rsync import decode_utf8_buffer, parse_ftc
def handle_item(key: memoryview, val: memoryview, has_semicolons: bool) -> None:
def handle_item(key: memoryview, val: memoryview) -> None:
field = fmap.get(key)
if field is None:
return
@@ -345,9 +342,7 @@ class FileTransmissionCommand:
if field.metadata.get('base64'):
sval = standard_b64decode(val).decode('utf-8')
else:
sval = decode_utf8_buffer(val)
if has_semicolons:
sval = sval.replace(';;', ';')
sval = safe_string(decode_utf8_buffer(val))
setattr(ans, field.name, safe_string(sval))
parse_ftc(data, handle_item)