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

domain: add _get_raw_domain_settings to read settings directly + use it in app_info to avoid infinite recursion

Browse source
This commit is contained in:
axolotle 2023-11-09 15:49:19 +01:00
parent 5a655ba8cf
commit 03fc739b3c
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/app.py
View file

@ -128,7 +128,7 @@ def app_info(app, full=False, upgradable=False):
""" """
Get info for a specific app Get info for a specific app
""" """
from yunohost.domain import domain_config_get from yunohost.domain import _get_raw_domain_settings
from yunohost.permission import user_permission_list from yunohost.permission import user_permission_list
_assert_is_installed(app) _assert_is_installed(app)
@ -229,7 +229,7 @@ def app_info(app, full=False, upgradable=False):
if ret["is_webapp"]: if ret["is_webapp"]:
ret["is_default"] = ( ret["is_default"] = (
domain_config_get(settings["domain"], "feature.app.default_app") == app _get_raw_domain_settings(settings["domain"]).get("default_app") == app
) )
ret["supports_change_url"] = os.path.exists( ret["supports_change_url"] = os.path.exists(

18
src/domain.py
View file

@ -617,6 +617,19 @@ def domain_url_available(domain, path):
return len(_get_conflicting_apps(domain, path)) == 0 return len(_get_conflicting_apps(domain, path)) == 0
def _get_raw_domain_settings(domain):
"""Get domain settings directly from file.
Be carefull, domain settings are saved in `"diff"` mode (i.e. default settings are not saved)
so the file may be completely empty
"""
_assert_domain_exists(domain)
path = DomainConfigPanel.save_path_tpl.format(entity=domain)
if os.path.exists(path):
return read_yaml(path)
return {}
def domain_config_get(domain, key="", full=False, export=False): def domain_config_get(domain, key="", full=False, export=False):
""" """
Display a domain configuration Display a domain configuration
@ -738,7 +751,7 @@ class DomainConfigPanel(ConfigPanel):
if next_settings.get("recovery_password", None): if next_settings.get("recovery_password", None):
domain_dyndns_set_recovery_password( domain_dyndns_set_recovery_password(
self.entity, form["recovery_password"] self.entity, next_settings["recovery_password"]
) )
portal_options = [ portal_options = [
@ -749,8 +762,7 @@ class DomainConfigPanel(ConfigPanel):
"portal_theme", "portal_theme",
] ]
if _get_parent_domain_of(self.entity, topest=True) is None and any( if _get_parent_domain_of(self.entity, topest=True) is None and any(
option in next_settings option in next_settings for option in portal_options
for option in portal_options
): ):
from yunohost.portal import PORTAL_SETTINGS_DIR from yunohost.portal import PORTAL_SETTINGS_DIR