IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

cli: When parsing options require name/value pairs

Browse Source 
If single-option values are combined together with invalid options
an exception would be raised.

For example -verbose was treated as -v -e rbose. Since rbose isn't
a name/value pair things would blow up. This is now caught and
a somewhat more reable error returned. The -v and -e are consumed,
not much we can do about that, but at least a more usable error is
returned.

https://pagure.io/freeipa/issue/6115

Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
This commit is contained in:
Rob Crittenden 2020-08-24 16:26:46 -04:00
parent 4a89da5352
commit 12dfb0fc96
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ipalib/plugable.py
View File

@ -600,13 +600,18 @@ class API(ReadOnly):
assert type(options.env) is list assert type(options.env) is list
for item in options.env: for item in options.env:
try: try:
(key, value) = item.split('=', 1) values = item.split('=', 1)
except ValueError: except ValueError:
# FIXME: this should raise an IPA exception with an # FIXME: this should raise an IPA exception with an
# error code. # error code.
# --Jason, 2008-10-31 # --Jason, 2008-10-31
pass pass
overrides[str(key.strip())] = value.strip() if len(values) == 2:
(key, value) = values
overrides[str(key.strip())] = value.strip()
else:
raise errors.OptionError(_('Unable to parse option {item}'
.format(item=item)))
for key in ('conf', 'debug', 'verbose', 'prompt_all', 'interactive', for key in ('conf', 'debug', 'verbose', 'prompt_all', 'interactive',
'fallback', 'delegate'): 'fallback', 'delegate'):
value = getattr(options, key, None) value = getattr(options, key, None)