mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-03-09 21:57:24 +00:00
Code Issues Releases Wiki Activity

yes: deal with UnicodeDecodeError in input(), fixes #6984

Browse source 
if retry is True, it will just retry to get a valid answer.
if retry is False, it will return the default.

the code can be tested by entering "error" (without the quotes).
This commit is contained in:
Thomas Waldmann 2024-12-24 21:44:28 +01:00
parent d94b954da2
commit f0564036e9
No known key found for this signature in database
GPG key ID: 243ACFA951F78E01
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/borg/helpers/yes.py
View file

@ -8,6 +8,9 @@ FALSISH = ('No', 'NO', 'no', 'N', 'n', '0', )
TRUISH = ('Yes', 'YES', 'yes', 'Y', 'y', '1', ) TRUISH = ('Yes', 'YES', 'yes', 'Y', 'y', '1', )
DEFAULTISH = ('Default', 'DEFAULT', 'default', 'D', 'd', '', ) DEFAULTISH = ('Default', 'DEFAULT', 'default', 'D', 'd', '', )
ERROR = "error"
assert ERROR not in TRUISH + FALSISH + DEFAULTISH
def yes(msg=None, false_msg=None, true_msg=None, default_msg=None, def yes(msg=None, false_msg=None, true_msg=None, default_msg=None,
retry_msg=None, invalid_msg=None, env_msg='{} (from {})', retry_msg=None, invalid_msg=None, env_msg='{} (from {})',
@ -77,10 +80,14 @@ def yes(msg=None, false_msg=None, true_msg=None, default_msg=None,
if not prompt: if not prompt:
return default return default
try: try:
answer = input() answer = input() # this may raise UnicodeDecodeError, #6984
if answer == ERROR: # for testing purposes
raise UnicodeDecodeError("?", b"?", 0, 1, "?") # args don't matter
except EOFError: except EOFError:
# avoid defaultish[0], defaultish could be empty # avoid defaultish[0], defaultish could be empty
answer = truish[0] if default else falsish[0] answer = truish[0] if default else falsish[0]
except UnicodeDecodeError:
answer = ERROR
if answer in defaultish: if answer in defaultish:
if default_msg: if default_msg:
output(default_msg, 'accepted_default') output(default_msg, 'accepted_default')