Unsignedio
/
python-gnupg
mirror of https://github.com/markqvist/python-gnupg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix a bug where sometimes sanitised options values were not being added.

feature/documentation-builds-dirhtml
Isis Lovecruft 2001-09-17 00:00:00 +00:00 committed by Isis Lovecruft
parent b5f687060c
commit 618567b1d8
1 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
gnupg.py
View File

@ -912,27 +912,21 @@ def _sanitise(*args):
logger.warn(error.message) logger.warn(error.message)
logger.debug("Dropping option '%s'..." % _fix_unsafe(arg)) logger.debug("Dropping option '%s'..." % _fix_unsafe(arg))
else: else:
if allowed_flag is not None: safe_values += (allowed_flag + " ")
safe_values += (allowed_flag + " ") if isinstance(value, str):
if isinstance(value, str): value_list = []
value_list = [] if value.find(' ') > 0:
if value.find(' ') > 0: value_list = value.split(' ')
value_list = value.split(' ') else:
else: logger.debug("_check_values(): got non-string for values")
logger.debug("_check_values(): got non-string for values") for value in value_list:
for value in value_list: safe_value = _fix_unsafe(value)
safe_value = _fix_unsafe(value) if allowed_flag == '--encrypt' or '--encrypt-files' \
if allowed_flag == '--encrypt' or '--encrypt-files' \ or '--decrypt' or '--decrypt-file' \
or '--decrypt' or '--decrypt-file' \ or '--import' or '--verify':
or '--import' or '--verify': ## xxx what other things should we check for?
## xxx what other things should we check for? ## Place checks here:
## Place checks here: if _is_file(safe_value):
if _is_file(safe_value):
safe_values += (safe_value + " ")
else:
logger.debug("Got non-filename for %s option: %s"
% (allowed_flag, safe_value))
else:
safe_values += (safe_value + " ") safe_values += (safe_value + " ")
logger.debug("Got non-checked value: %s" % safe_value) logger.debug("Got non-checked value: %s" % safe_value)
else: else: