mirror of
https://github.com/YunoHost/yunohost.git
synced 2024-09-03 20:06:10 +02:00
config/question: broadcast data to redact to all OperationLogger instances
This commit is contained in:
Alexandre Aubin
parent
155942a92c
commit
12bc94f76e
3 changed files with 12 additions and 51 deletions
|
|
@ -1723,8 +1723,6 @@ def app_config_set(
|
|||
|
||||
config_ = AppConfigPanel(app)
|
||||
|
||||
Question.operation_logger = operation_logger
|
||||
|
||||
return config_.set(key, value, args, args_file, operation_logger=operation_logger)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -348,8 +348,6 @@ def test_question_password():
|
|||
]
|
||||
answers = {"some_password": "some_value"}
|
||||
expected_result = OrderedDict({"some_password": ("some_value", "password")})
|
||||
Question.operation_logger = MagicMock()
|
||||
with patch.object(Question.operation_logger, "data_to_redact", create=True):
|
||||
assert parse_args_in_yunohost_format(answers, questions) == expected_result
|
||||
|
||||
|
||||
|
|
@ -375,13 +373,9 @@ def test_question_password_input():
|
|||
}
|
||||
]
|
||||
answers = {}
|
||||
Question.operation_logger = {"data_to_redact": []}
|
||||
expected_result = OrderedDict({"some_password": ("some_value", "password")})
|
||||
|
||||
Question.operation_logger = MagicMock()
|
||||
with patch.object(
|
||||
Question.operation_logger, "data_to_redact", create=True
|
||||
), patch.object(Moulinette, "prompt", return_value="some_value"), patch.object(
|
||||
with patch.object(Moulinette, "prompt", return_value="some_value"), patch.object(
|
||||
os, "isatty", return_value=True
|
||||
):
|
||||
assert parse_args_in_yunohost_format(answers, questions) == expected_result
|
||||
|
|
@ -397,10 +391,7 @@ def test_question_password_input_no_ask():
|
|||
answers = {}
|
||||
expected_result = OrderedDict({"some_password": ("some_value", "password")})
|
||||
|
||||
Question.operation_logger = MagicMock()
|
||||
with patch.object(
|
||||
Question.operation_logger, "data_to_redact", create=True
|
||||
), patch.object(Moulinette, "prompt", return_value="some_value"), patch.object(
|
||||
with patch.object(Moulinette, "prompt", return_value="some_value"), patch.object(
|
||||
os, "isatty", return_value=True
|
||||
):
|
||||
assert parse_args_in_yunohost_format(answers, questions) == expected_result
|
||||
|
|
@ -417,20 +408,14 @@ def test_question_password_no_input_optional():
|
|||
answers = {}
|
||||
expected_result = OrderedDict({"some_password": ("", "password")})
|
||||
|
||||
Question.operation_logger = MagicMock()
|
||||
with patch.object(
|
||||
Question.operation_logger, "data_to_redact", create=True
|
||||
), patch.object(os, "isatty", return_value=False):
|
||||
with patch.object(os, "isatty", return_value=False):
|
||||
assert parse_args_in_yunohost_format(answers, questions) == expected_result
|
||||
|
||||
questions = [
|
||||
{"name": "some_password", "type": "password", "optional": True, "default": ""}
|
||||
]
|
||||
|
||||
Question.operation_logger = MagicMock()
|
||||
with patch.object(
|
||||
Question.operation_logger, "data_to_redact", create=True
|
||||
), patch.object(os, "isatty", return_value=False):
|
||||
with patch.object(os, "isatty", return_value=False):
|
||||
assert parse_args_in_yunohost_format(answers, questions) == expected_result
|
||||
|
||||
|
||||
|
|
@ -446,10 +431,7 @@ def test_question_password_optional_with_input():
|
|||
answers = {}
|
||||
expected_result = OrderedDict({"some_password": ("some_value", "password")})
|
||||
|
||||
Question.operation_logger = MagicMock()
|
||||
with patch.object(
|
||||
Question.operation_logger, "data_to_redact", create=True
|
||||
), patch.object(Moulinette, "prompt", return_value="some_value"), patch.object(
|
||||
with patch.object(Moulinette, "prompt", return_value="some_value"), patch.object(
|
||||
os, "isatty", return_value=True
|
||||
):
|
||||
assert parse_args_in_yunohost_format(answers, questions) == expected_result
|
||||
|
|
@ -467,10 +449,7 @@ def test_question_password_optional_with_empty_input():
|
|||
answers = {}
|
||||
expected_result = OrderedDict({"some_password": ("", "password")})
|
||||
|
||||
Question.operation_logger = MagicMock()
|
||||
with patch.object(
|
||||
Question.operation_logger, "data_to_redact", create=True
|
||||
), patch.object(Moulinette, "prompt", return_value=""), patch.object(
|
||||
with patch.object(Moulinette, "prompt", return_value=""), patch.object(
|
||||
os, "isatty", return_value=True
|
||||
):
|
||||
assert parse_args_in_yunohost_format(answers, questions) == expected_result
|
||||
|
|
@ -487,10 +466,7 @@ def test_question_password_optional_with_input_without_ask():
|
|||
answers = {}
|
||||
expected_result = OrderedDict({"some_password": ("some_value", "password")})
|
||||
|
||||
Question.operation_logger = MagicMock()
|
||||
with patch.object(
|
||||
Question.operation_logger, "data_to_redact", create=True
|
||||
), patch.object(Moulinette, "prompt", return_value="some_value"), patch.object(
|
||||
with patch.object(Moulinette, "prompt", return_value="some_value"), patch.object(
|
||||
os, "isatty", return_value=True
|
||||
):
|
||||
assert parse_args_in_yunohost_format(answers, questions) == expected_result
|
||||
|
|
@ -540,10 +516,7 @@ def test_question_password_input_test_ask():
|
|||
]
|
||||
answers = {}
|
||||
|
||||
Question.operation_logger = MagicMock()
|
||||
with patch.object(
|
||||
Question.operation_logger, "data_to_redact", create=True
|
||||
), patch.object(
|
||||
Moulinette, "prompt", return_value="some_value"
|
||||
) as prompt, patch.object(
|
||||
os, "isatty", return_value=True
|
||||
|
|
@ -572,10 +545,7 @@ def test_question_password_input_test_ask_with_example():
|
|||
]
|
||||
answers = {}
|
||||
|
||||
Question.operation_logger = MagicMock()
|
||||
with patch.object(
|
||||
Question.operation_logger, "data_to_redact", create=True
|
||||
), patch.object(
|
||||
Moulinette, "prompt", return_value="some_value"
|
||||
) as prompt, patch.object(
|
||||
os, "isatty", return_value=True
|
||||
|
|
@ -599,10 +569,7 @@ def test_question_password_input_test_ask_with_help():
|
|||
]
|
||||
answers = {}
|
||||
|
||||
Question.operation_logger = MagicMock()
|
||||
with patch.object(
|
||||
Question.operation_logger, "data_to_redact", create=True
|
||||
), patch.object(
|
||||
Moulinette, "prompt", return_value="some_value"
|
||||
) as prompt, patch.object(
|
||||
os, "isatty", return_value=True
|
||||
|
|
|
|||
|
|
@ -39,6 +39,7 @@ from moulinette.utils.filesystem import (
|
|||
|
||||
from yunohost.utils.i18n import _value_for_locale
|
||||
from yunohost.utils.error import YunohostError, YunohostValidationError
|
||||
from yunohost.log import OperationLogger
|
||||
|
||||
logger = getActionLogger("yunohost.config")
|
||||
CONFIG_PANEL_VERSION_SUPPORTED = 1.0
|
||||
|
|
@ -441,7 +442,6 @@ class ConfigPanel:
|
|||
|
||||
class Question(object):
|
||||
hide_user_input_in_prompt = False
|
||||
operation_logger = None
|
||||
pattern = None
|
||||
|
||||
def __init__(self, question, user_answers):
|
||||
|
|
@ -575,13 +575,9 @@ class Question(object):
|
|||
for data in data_to_redact
|
||||
if urllib.parse.quote(data) != data
|
||||
]
|
||||
if self.operation_logger:
|
||||
self.operation_logger.data_to_redact.extend(data_to_redact)
|
||||
elif data_to_redact:
|
||||
raise YunohostError(
|
||||
f"Can't redact {self.name} because no operation logger available in the context",
|
||||
raw_msg=True,
|
||||
)
|
||||
|
||||
for operation_logger in OperationLogger._instances:
|
||||
operation_logger.data_to_redact.extend(data_to_redact)
|
||||
|
||||
return self.value
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue