mirror of
https://github.com/YunoHost/yunohost.git
synced 2024-09-03 20:06:10 +02:00
configpanel: raise when unknown filter key
This commit is contained in:
parent
25e23ce963
commit
d28b6e96c8
1 changed files with 17 additions and 9 deletions
|
@ -53,6 +53,7 @@ if TYPE_CHECKING:
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
from moulinette.utils.log import MoulinetteLogger
|
from moulinette.utils.log import MoulinetteLogger
|
||||||
|
|
||||||
logger = cast(MoulinetteLogger, getLogger("yunohost.configpanel"))
|
logger = cast(MoulinetteLogger, getLogger("yunohost.configpanel"))
|
||||||
else:
|
else:
|
||||||
logger = getLogger("yunohost.configpanel")
|
logger = getLogger("yunohost.configpanel")
|
||||||
|
@ -715,19 +716,26 @@ class ConfigPanel:
|
||||||
raw_config = self._get_raw_config()
|
raw_config = self._get_raw_config()
|
||||||
|
|
||||||
panel_id, section_id, option_id = self.filter_key
|
panel_id, section_id, option_id = self.filter_key
|
||||||
if panel_id:
|
|
||||||
raw_config = filter_keys(raw_config, panel_id, ConfigPanelModel)
|
|
||||||
|
|
||||||
if section_id:
|
try:
|
||||||
raw_config[panel_id] = filter_keys(
|
if panel_id:
|
||||||
raw_config[panel_id], section_id, PanelModel
|
raw_config = filter_keys(raw_config, panel_id, ConfigPanelModel)
|
||||||
)
|
|
||||||
|
|
||||||
if option_id:
|
if section_id:
|
||||||
raw_config[panel_id][section_id] = filter_keys(
|
raw_config[panel_id] = filter_keys(
|
||||||
raw_config[panel_id][section_id], option_id, SectionModel
|
raw_config[panel_id], section_id, PanelModel
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if option_id:
|
||||||
|
raw_config[panel_id][section_id] = filter_keys(
|
||||||
|
raw_config[panel_id][section_id], option_id, SectionModel
|
||||||
|
)
|
||||||
|
except KeyError:
|
||||||
|
raise YunohostValidationError(
|
||||||
|
"config_unknown_filter_key",
|
||||||
|
filter_key=".".join([k for k in self.filter_key if k]),
|
||||||
|
)
|
||||||
|
|
||||||
return raw_config
|
return raw_config
|
||||||
|
|
||||||
def _get_partial_raw_settings_and_mutate_config(
|
def _get_partial_raw_settings_and_mutate_config(
|
||||||
|
|
Loading…
Add table
Reference in a new issue