YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

[fix] Validate app argument choice for input value too

Browse source
This commit is contained in:
Jérôme Lebleu 2015-12-28 20:16:19 +01:00
parent 4a06cbdc31
commit 96f9ca9961
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/yunohost/app.py
View file

@ -1326,10 +1326,6 @@ def _parse_args_from_manifest(manifest, action, args={}, auth=None):
# Attempt to retrieve argument value # Attempt to retrieve argument value
if arg_name in args: if arg_name in args:
arg_value = args[arg_name] arg_value = args[arg_name]
if 'choices' in arg and arg_value not in arg['choices']:
raise MoulinetteError(errno.EINVAL,
m18n.n('app_argument_choice_invalid',
name=arg_name, choices=', '.join(arg['choices'])))
else: else:
if os.isatty(1) and 'ask' in arg: if os.isatty(1) and 'ask' in arg:
# Retrieve proper ask string # Retrieve proper ask string
@ -1337,7 +1333,7 @@ def _parse_args_from_manifest(manifest, action, args={}, auth=None):
# Append extra strings # Append extra strings
if 'choices' in arg: if 'choices' in arg:
ask_string += ' ({:s})'.format('|'.join(arg['choices'])) ask_string += ' [{:s}]'.format(' | '.join(arg['choices']))
if 'default' in arg: if 'default' in arg:
ask_string += ' (default: {:s})'.format(arg['default']) ask_string += ' (default: {:s})'.format(arg['default'])
@ -1353,6 +1349,10 @@ def _parse_args_from_manifest(manifest, action, args={}, auth=None):
m18n.n('app_argument_missing', name=arg_name)) m18n.n('app_argument_missing', name=arg_name))
# Validate argument value # Validate argument value
if 'choices' in arg and arg_value not in arg['choices']:
raise MoulinetteError(errno.EINVAL,
m18n.n('app_argument_choice_invalid',
name=arg_name, choices=', '.join(arg['choices'])))
# TODO: Add more type, e.g. boolean # TODO: Add more type, e.g. boolean
arg_type = arg.get('type', 'string') arg_type = arg.get('type', 'string')
if arg_type == 'domain': if arg_type == 'domain':