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

Rework prompt() again

Browse source
This commit is contained in:
Alexandre Aubin 2021-09-21 20:21:05 +02:00
parent bfa26ff469
commit 2d158b5a6d
3 changed files with 35 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
locales/en.json
View file

@ -16,7 +16,7 @@
"app_argument_choice_invalid": "Use one of these choices '{choices}' for the argument '{name}' instead of '{value}'",
"app_argument_invalid": "Pick a valid value for the argument '{name}': {error}",
"app_argument_password_help_keep": "Press Enter to keep the current value",
"app_argument_password_help_optional": "Type one space to empty the password",
"app_argument_password_help_optional": "Enter a single space to empty the password",
"app_argument_password_no_default": "Error while parsing password argument '{name}': password argument can't have a default value for security reason",
"app_argument_required": "Argument '{name}' is required",
"app_change_url_identical_domains": "The old and new domain/url_path are identical ('{domain}{path}'), nothing to do.",

2
src/yunohost/user.py
View file

@ -420,7 +420,7 @@ def user_update(
# without a specified value, change_password will be set to the const 0.
# In this case we prompt for the new password.
if Moulinette.interface.type == "cli" and not change_password:
change_password = Moulinette.prompt(m18n.n("ask_password"), True, True)
change_password = Moulinette.prompt(m18n.n("ask_password"), is_password=True, confirm=True)
# Ensure sufficiently complex password
assert_password_is_strong_enough("user", change_password)

76
src/yunohost/utils/config.py
View file

@ -99,6 +99,9 @@ class ConfigPanel:
result[key]["value"] = question_class.humanize(
option["current_value"], option
)
# FIXME: semantics, technically here this is not about a prompt...
if question_class.hide_user_input_in_prompt:
result[key]["value"] = "**************" # Prevent displaying password in `config get`
if mode == "full":
return self.config
@ -480,6 +483,8 @@ class Question(object):
@staticmethod
def normalize(value, option={}):
if isinstance(value, str):
value = value.strip()
return value
def _prompt(self, text):
@ -491,9 +496,11 @@ class Question(object):
self.value = Moulinette.prompt(
message=text,
is_password=self.hide_user_input_in_prompt,
confirm=False, # We doesn't want to confirm this kind of password like in webadmin
confirm=False,
prefill=prefill,
is_multiline=(self.type == "text"),
autocomplete=self.choices,
help=_value_for_locale(self.help)
)
def ask_if_needed(self):
@ -558,18 +565,8 @@ class Question(object):
choices=", ".join(self.choices),
)
def _format_text_for_user_input_in_cli(self, column=False):
text_for_user_input_in_cli = _value_for_locale(self.ask)
if self.choices:
text_for_user_input_in_cli += " [{0}]".format(" | ".join(self.choices))
if self.help or column:
text_for_user_input_in_cli += ":\033[m"
if self.help:
text_for_user_input_in_cli += "\n - "
text_for_user_input_in_cli += _value_for_locale(self.help)
return text_for_user_input_in_cli
def _format_text_for_user_input_in_cli(self):
return _value_for_locale(self.ask)
def _post_parse_value(self):
if not self.redact:
@ -659,6 +656,8 @@ class TagsQuestion(Question):
def normalize(value, option={}):
if isinstance(value, list):
return ",".join(value)
if isinstance(value, str):
value = value.strip()
return value
def _prevalidate(self):
@ -692,12 +691,6 @@ class PasswordQuestion(Question):
"app_argument_password_no_default", name=self.name
)
@staticmethod
def humanize(value, option={}):
if value:
return "********" # Avoid to display the password on screen
return ""
def _prevalidate(self):
super()._prevalidate()
@ -712,29 +705,6 @@ class PasswordQuestion(Question):
assert_password_is_strong_enough("user", self.value)
def _format_text_for_user_input_in_cli(self):
need_column = self.current_value or self.optional
text_for_user_input_in_cli = super()._format_text_for_user_input_in_cli(
need_column
)
if self.current_value:
text_for_user_input_in_cli += "\n - " + m18n.n(
"app_argument_password_help_keep"
)
if self.optional:
text_for_user_input_in_cli += "\n - " + m18n.n(
"app_argument_password_help_optional"
)
return text_for_user_input_in_cli
def _prompt(self, text):
super()._prompt(text)
if self.current_value and self.value == "":
self.value = self.current_value
elif self.value == " ":
self.value = ""
class PathQuestion(Question):
argument_type = "path"
@ -769,14 +739,30 @@ class BooleanQuestion(Question):
"app_argument_choice_invalid",
name=option.get("name", ""),
value=value,
# FIXME : this doesn't match yes_answers / no_answers...
choices="yes, no, y, n, 1, 0",
)
@staticmethod
def normalize(value, option={}):
if isinstance(value, str):
value = value.strip()
yes = option.get("yes", 1)
no = option.get("no", 0)
#
# FIXME: Shouldn't we also check that value == yes ?
# Otherwise is yes = "foobar", normalize is not idempotent
# i.e normalize("true") will return "foobar"
# but normalize(normalize("true")) will raise an exception ?
#
# FIXME: it's also a bit confusing to understand if the
# packager-provided 'yes' value is meant for humans (in which case
# shouldn't it be used as a return value for humanize?)
# or as an internal value for better interfacing with scripts/computers
#
# Also shouldnt we be using normalize() in humanize() ?
if str(value).lower() in BooleanQuestion.yes_answers:
return yes
@ -881,14 +867,18 @@ class NumberQuestion(Question):
if isinstance(value, int):
return value
if isinstance(value, str):
value = value.strip()
if isinstance(value, str) and value.isdigit():
return int(value)
if value in [None, ""]:
return value
# FIXME: option.name may not exist if option={}...
raise YunohostValidationError(
"app_argument_invalid", name=option.name, error=m18n.n("invalid_number")
"app_argument_invalid", name=option.get("name", ""), error=m18n.n("invalid_number")
)
def _prevalidate(self):