From 54a7f7a570ea93c495b2bbf1f924ed174280b5c9 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Sun, 15 Aug 2021 01:41:06 +0200 Subject: [PATCH 01/89] manifestv2: auto-save install settings, auto-load all settings --- src/yunohost/app.py | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/yunohost/app.py b/src/yunohost/app.py index fe5281384..c2adbd550 100644 --- a/src/yunohost/app.py +++ b/src/yunohost/app.py @@ -831,6 +831,18 @@ def app_install( "install_time": int(time.time()), "current_revision": manifest.get("remote", {}).get("revision", "?"), } + + # If packaging_format v2+, save all install questions as settings + packaging_format = int(manifest.get("packaging_format", 0)) + if packaging_format >= 2: + for arg_name, arg_value_and_type in args_odict.items(): + + # ... except is_public because it should not be saved and should only be about initializing permisisons + if arg_name == "is_public": + continue + + app_settings[arg_name] = arg_value_and_type[0] + _set_app_settings(app_instance_name, app_settings) # Move scripts and manifest to the right place @@ -2401,6 +2413,24 @@ def _make_environment_for_app_script( for arg_name, arg_value in args.items(): env_dict["YNH_%s%s" % (args_prefix, arg_name.upper())] = str(arg_value) + # If packaging format v2, load all settings + packaging_format = int(manifest.get("packaging_format", 0)) + if packaging_format >= 2: + env_dict["app"] = app + for setting_name, setting_value in _get_app_settings(app): + + # Ignore special internal settings like checksum__ + # (not a huge deal to load them but idk...) + if setting_name.startswith("checksum__"): + continue + + env_dict[setting_name] = str(setting_value) + + # Special weird case for backward compatibility... + # 'path' was loaded into 'path_url' ..... + if 'path' in env_dict: + env_dict["path_url"] = env_dict["path"] + return env_dict From 953eb0cc1d20fb2a711c24591929465d79ea7e6e Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Sun, 15 Aug 2021 02:54:58 +0200 Subject: [PATCH 02/89] manifestv2: on-the-fly convert v1 manifest to v2 --- src/yunohost/app.py | 90 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 74 insertions(+), 16 deletions(-) diff --git a/src/yunohost/app.py b/src/yunohost/app.py index c2adbd550..64766f96c 100644 --- a/src/yunohost/app.py +++ b/src/yunohost/app.py @@ -32,6 +32,7 @@ import time import re import subprocess import tempfile +import copy from collections import OrderedDict from typing import List, Tuple, Dict, Any @@ -1929,21 +1930,7 @@ def _get_manifest_of_app(path): # ¦ ¦ }, if os.path.exists(os.path.join(path, "manifest.toml")): - manifest_toml = read_toml(os.path.join(path, "manifest.toml")) - - manifest = manifest_toml.copy() - - install_arguments = [] - for name, values in ( - manifest_toml.get("arguments", {}).get("install", {}).items() - ): - args = values.copy() - args["name"] = name - - install_arguments.append(args) - - manifest["arguments"]["install"] = install_arguments - + manifest = read_toml(os.path.join(path, "manifest.toml")) elif os.path.exists(os.path.join(path, "manifest.json")): manifest = read_json(os.path.join(path, "manifest.json")) else: @@ -1953,7 +1940,78 @@ def _get_manifest_of_app(path): raw_msg=True, ) - manifest["arguments"] = _set_default_ask_questions(manifest.get("arguments", {})) + if int(manifest.get("packaging_format", 0)) <= 1: + manifest = _convert_v1_manifest_to_v2(manifest) + + manifest["install"] = _set_default_ask_questions(manifest.get("install", {})) + return manifest + + +def _convert_v1_manifest_to_v2(manifest): + + manifest = copy.deepcopy(manifest) + + if "upstream" not in manifest: + manifest["upstream"] = {} + + if "license" in manifest and "license" not in manifest["upstream"]: + manifest["upstream"]["license"] = manifest["license"] + + if "url" in manifest and "website" not in manifest["upstream"]: + manifest["upstream"]["website"] = manifest["url"] + + manifest["integration"] = { + "yunohost": manifest.get("requirements", {}).get("yunohost"), + "architectures": "all", + "multi_instance": manifest.get("multi_instance", False), + "ldap": "?", + "sso": "?", + } + + maintainer = manifest.get("maintainer", {}).get("name") + manifest["maintainers"] = [maintainer] if maintainer else [] + + install_questions = manifest["arguments"]["install"] + manifest["install"] = {} + for question in install_questions: + name = question.pop("name") + if "ask" in question and name in ["domain", "path", "admin", "is_public", "password"]: + question.pop("ask") + if question.get("example") and question.get("type") in ["domain", "path", "user", "boolean", "password"]: + question.pop("example") + + manifest["install"][name] = question + + manifest["resources"] = { + "disk": { + "build": "50M", # This is an *estimate* minimum value for the disk needed at build time (e.g. during install/upgrade) and during regular usage + "usage": "50M" # Please only use round values such as: 10M, 100M, 200M, 400M, 800M, 1G, 2G, 4G, 8G + }, + "ram": { + "build": "50M", # This is an *estimate* minimum value for the RAM needed at build time (i.e. during install/upgrade) and during regular usage + "usage": "10M", # Please only use round values like ["10M", "100M", "200M", "400M", "800M", "1G", "2G", "4G", "8G"] + "include_swap": False + }, + "route": {}, + "install_dir": { + "base_dir": "/var/www/", # This means that the app shall be installed in /var/www/$app which is the standard for webapps. You may change this to /opt/ if the app is a system app. + "alias": "final_path" + } + } + + if "domain" in manifest["install"] and "path" in manifest["install"]: + manifest["resources"]["route"]["url"] = "{domain}{path}" + elif "path" not in manifest["install"]: + manifest["resources"]["route"]["url"] = "{domain}/" + else: + del manifest["resources"]["route"] + + keys_to_keep = ["packaging_format", "id", "name", "description", "version", "maintainers", "upstream", "integration", "install", "resources"] + + keys_to_del = [key for key in manifest.keys() if key not in keys_to_keep] + for key in keys_to_del: + del manifest[key] + return manifest From 56ac85af37a4161d947f8d4bb3d9432fff70e394 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Sun, 15 Aug 2021 02:55:20 +0200 Subject: [PATCH 03/89] Misc tweaks to handle new install questions format --- src/yunohost/app.py | 78 ++++++++++++++----------------------- src/yunohost/app_catalog.py | 4 +- 2 files changed, 31 insertions(+), 51 deletions(-) diff --git a/src/yunohost/app.py b/src/yunohost/app.py index 64766f96c..35ad2be36 100644 --- a/src/yunohost/app.py +++ b/src/yunohost/app.py @@ -95,7 +95,6 @@ APP_FILES_TO_COPY = [ "doc", ] - def app_list(full=False, installed=False, filter=None): """ List installed apps @@ -161,8 +160,8 @@ def app_info(app, full=False): ret["setting_path"] = setting_path ret["manifest"] = local_manifest - ret["manifest"]["arguments"] = _set_default_ask_questions( - ret["manifest"].get("arguments", {}) + ret["manifest"]["install"] = _set_default_ask_questions( + ret["manifest"].get("install", {}) ) ret["settings"] = settings @@ -179,7 +178,7 @@ def app_info(app, full=False): os.path.join(setting_path, "scripts", "backup") ) and os.path.exists(os.path.join(setting_path, "scripts", "restore")) ret["supports_multi_instance"] = is_true( - local_manifest.get("multi_instance", False) + local_manifest.get("integration", {}).get("multi_instance", False) ) ret["supports_config_panel"] = os.path.exists( os.path.join(setting_path, "config_panel.toml") @@ -836,13 +835,13 @@ def app_install( # If packaging_format v2+, save all install questions as settings packaging_format = int(manifest.get("packaging_format", 0)) if packaging_format >= 2: - for arg_name, arg_value_and_type in args_odict.items(): + for arg_name, arg_value in args.items(): - # ... except is_public because it should not be saved and should only be about initializing permisisons + # ... except is_public .... if arg_name == "is_public": continue - app_settings[arg_name] = arg_value_and_type[0] + app_settings[arg_name] = arg_value _set_app_settings(app_instance_name, app_settings) @@ -1751,15 +1750,7 @@ def _get_app_actions(app_id): for key, value in toml_actions.items(): action = dict(**value) action["id"] = key - - arguments = [] - for argument_name, argument in value.get("arguments", {}).items(): - argument = dict(**argument) - argument["name"] = argument_name - - arguments.append(argument) - - action["arguments"] = arguments + action["arguments"] = value.get("arguments", {}) actions.append(action) return actions @@ -2015,21 +2006,19 @@ def _convert_v1_manifest_to_v2(manifest): return manifest -def _set_default_ask_questions(arguments): +def _set_default_ask_questions(questions, script_name="install"): # arguments is something like - # { "install": [ - # { "name": "domain", + # { "domain": + # { # "type": "domain", # .... # }, - # { "name": "path", - # "type": "path" + # "path": { + # "type": "path", # ... # }, # ... - # ], - # "upgrade": [ ... ] # } # We set a default for any question with these matching (type, name) @@ -2041,38 +2030,29 @@ def _set_default_ask_questions(arguments): ("path", "path"), # i18n: app_manifest_install_ask_path ("password", "password"), # i18n: app_manifest_install_ask_password ("user", "admin"), # i18n: app_manifest_install_ask_admin - ("boolean", "is_public"), - ] # i18n: app_manifest_install_ask_is_public + ("boolean", "is_public"), # i18n: app_manifest_install_ask_is_public + ] - for script_name, arg_list in arguments.items(): + for question_name, question in questions.items(): + question["name"] = question_name - # We only support questions for install so far, and for other - if script_name != "install": - continue - - for arg in arg_list: - - # Do not override 'ask' field if provided by app ?... Or shall we ? - # if "ask" in arg: - # continue - - # If this arg corresponds to a question with default ask message... - if any( - (arg.get("type"), arg["name"]) == question - for question in questions_with_default - ): - # The key is for example "app_manifest_install_ask_domain" - key = "app_manifest_%s_ask_%s" % (script_name, arg["name"]) - arg["ask"] = m18n.n(key) + # If this question corresponds to a question with default ask message... + if any( + (question.get("type"), question["name"]) == q + for q in questions_with_default + ): + # The key is for example "app_manifest_install_ask_domain" + key = "app_manifest_%s_ask_%s" % (script_name, question["name"]) + question["ask"] = m18n.n(key) # Also it in fact doesn't make sense for any of those questions to have an example value nor a default value... - if arg.get("type") in ["domain", "user", "password"]: + if question.get("type") in ["domain", "user", "password"]: if "example" in arg: - del arg["example"] + del question["example"] if "default" in arg: - del arg["domain"] + del question["domain"] - return arguments + return questions def _is_app_repo_url(string: str) -> bool: @@ -2306,7 +2286,7 @@ def _check_manifest_requirements(manifest: Dict): """Check if required packages are met from the manifest""" packaging_format = int(manifest.get("packaging_format", 0)) - if packaging_format not in [0, 1]: + if packaging_format not in [2]: raise YunohostValidationError("app_packaging_format_not_supported") requirements = manifest.get("requirements", dict()) diff --git a/src/yunohost/app_catalog.py b/src/yunohost/app_catalog.py index e4ffa1db6..575f0bf1b 100644 --- a/src/yunohost/app_catalog.py +++ b/src/yunohost/app_catalog.py @@ -58,8 +58,8 @@ def app_catalog(full=False, with_categories=False): "level": infos["level"], } else: - infos["manifest"]["arguments"] = _set_default_ask_questions( - infos["manifest"].get("arguments", {}) + infos["manifest"]["install"] = _set_default_ask_questions( + infos["manifest"].get("install", {}) ) # Trim info for categories if not using --full From fe6ebe8e66741d827398097526445219b315c4ce Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Thu, 7 Oct 2021 09:34:28 +0200 Subject: [PATCH 04/89] Always define YNH_ACTION --- src/yunohost/app.py | 22 ++++++++++++++-------- src/yunohost/backup.py | 4 ++-- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/yunohost/app.py b/src/yunohost/app.py index 35ad2be36..c86c88747 100644 --- a/src/yunohost/app.py +++ b/src/yunohost/app.py @@ -408,7 +408,7 @@ def app_change_url(operation_logger, app, domain, path): tmp_workdir_for_app = _make_tmp_workdir_for_app(app=app) # Prepare env. var. to pass to script - env_dict = _make_environment_for_app_script(app, workdir=tmp_workdir_for_app) + env_dict = _make_environment_for_app_script(app, workdir=tmp_workdir_for_app, action="change_url") env_dict["YNH_APP_OLD_DOMAIN"] = old_domain env_dict["YNH_APP_OLD_PATH"] = old_path env_dict["YNH_APP_NEW_DOMAIN"] = domain @@ -562,7 +562,7 @@ def app_upgrade(app=[], url=None, file=None, force=False, no_safety_backup=False # Prepare env. var. to pass to script env_dict = _make_environment_for_app_script( - app_instance_name, workdir=extracted_app_folder + app_instance_name, workdir=extracted_app_folder, action="upgrade" ) env_dict["YNH_APP_UPGRADE_TYPE"] = upgrade_type env_dict["YNH_APP_MANIFEST_VERSION"] = str(app_new_version) @@ -868,7 +868,7 @@ def app_install( # Prepare env. var. to pass to script env_dict = _make_environment_for_app_script( - app_instance_name, args=args, workdir=extracted_app_folder + app_instance_name, args=args, workdir=extracted_app_folder, action="install" ) env_dict_for_logging = env_dict.copy() @@ -931,7 +931,7 @@ def app_install( # Setup environment for remove script env_dict_remove = _make_environment_for_app_script( - app_instance_name, workdir=extracted_app_folder + app_instance_name, workdir=extracted_app_folder, action="remove" ) # Execute remove script @@ -1046,7 +1046,7 @@ def app_remove(operation_logger, app, purge=False): env_dict = {} app_id, app_instance_nb = _parse_app_instance_name(app) - env_dict = _make_environment_for_app_script(app, workdir=tmp_workdir_for_app) + env_dict = _make_environment_for_app_script(app, workdir=tmp_workdir_for_app, action="remove") env_dict["YNH_APP_PURGE"] = str(1 if purge else 0) operation_logger.extra.update({"env": env_dict}) @@ -1541,9 +1541,8 @@ def app_action_run(operation_logger, app, action, args=None): tmp_workdir_for_app = _make_tmp_workdir_for_app(app=app) env_dict = _make_environment_for_app_script( - app, args=args, args_prefix="ACTION_", workdir=tmp_workdir_for_app + app, args=args, args_prefix="ACTION_", workdir=tmp_workdir_for_app, action=action ) - env_dict["YNH_ACTION"] = action _, action_script = tempfile.mkstemp(dir=tmp_workdir_for_app) @@ -2430,7 +2429,11 @@ def _assert_no_conflicting_apps(domain, path, ignore_app=None, full_domain=False def _make_environment_for_app_script( - app, args={}, args_prefix="APP_ARG_", workdir=None + app, + args={}, + args_prefix="APP_ARG_", + workdir=None, + action=None ): app_setting_path = os.path.join(APPS_SETTING_PATH, app) @@ -2448,6 +2451,9 @@ def _make_environment_for_app_script( if workdir: env_dict["YNH_APP_BASEDIR"] = workdir + if action: + env_dict["YNH_ACTION"] = action + for arg_name, arg_value in args.items(): env_dict["YNH_%s%s" % (args_prefix, arg_name.upper())] = str(arg_value) diff --git a/src/yunohost/backup.py b/src/yunohost/backup.py index cce66597a..1b6aebd79 100644 --- a/src/yunohost/backup.py +++ b/src/yunohost/backup.py @@ -577,7 +577,7 @@ class BackupManager: env_var["YNH_BACKUP_CSV"] = tmp_csv if app is not None: - env_var.update(_make_environment_for_app_script(app)) + env_var.update(_make_environment_for_app_script(app, action="backup")) env_var["YNH_APP_BACKUP_DIR"] = os.path.join( self.work_dir, "apps", app, "backup" ) @@ -1490,7 +1490,7 @@ class RestoreManager: # FIXME : workdir should be a tmp workdir app_workdir = os.path.join(self.work_dir, "apps", app_instance_name, "settings") env_dict = _make_environment_for_app_script( - app_instance_name, workdir=app_workdir + app_instance_name, workdir=app_workdir, action="restore" ) env_dict.update( { From fe6d9c2617d1e947d4f4946049cfa663a6f97042 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Wed, 13 Oct 2021 22:56:51 +0200 Subject: [PATCH 05/89] manifestv2: automatically trigger ynh_abort_if_errors (set -eu) for scripts except remove --- data/helpers.d/utils | 6 ++++++ src/yunohost/app.py | 15 ++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/data/helpers.d/utils b/data/helpers.d/utils index 453a1ab94..57d5de56a 100644 --- a/data/helpers.d/utils +++ b/data/helpers.d/utils @@ -61,6 +61,12 @@ ynh_abort_if_errors() { trap ynh_exit_properly EXIT # Capturing exit signals on shell script } +# When running an app script with packaging format >= 2, auto-enable ynh_abort_if_errors except for remove script +if [[ ${YNH_APP_PACKAGING_FORMAT:-0} -ge 2 ]] && [[ ${YNH_APP_ACTION} != "remove" ]] +then + ynh_abort_if_errors +fi + # Download, check integrity, uncompress and patch the source from app.src # # usage: ynh_setup_source --dest_dir=dest_dir [--source_id=source_id] [--keep="file1 file2"] diff --git a/src/yunohost/app.py b/src/yunohost/app.py index a0c6d55d1..7488a1646 100644 --- a/src/yunohost/app.py +++ b/src/yunohost/app.py @@ -1371,7 +1371,7 @@ def app_register_url(app, domain, path): raise YunohostValidationError("app_already_installed_cant_change_url") # Check the url is available - _assert_no_conflicting_apps(domain, path) + _assert_no_conflicting_apps(domain, path, ignore_app=app) app_setting(app, "domain", value=domain) app_setting(app, "path", value=path) @@ -1930,7 +1930,9 @@ def _get_manifest_of_app(path): raw_msg=True, ) - if int(manifest.get("packaging_format", 0)) <= 1: + manifest["packaging_format"] = float(str(manifest.get("packaging_format", "")).strip() or "0") + + if manifest["packaging_format"] < 2: manifest = _convert_v1_manifest_to_v2(manifest) manifest["install"] = _set_default_ask_questions(manifest.get("install", {})) @@ -2284,8 +2286,7 @@ def _get_all_installed_apps_id(): def _check_manifest_requirements(manifest: Dict): """Check if required packages are met from the manifest""" - packaging_format = int(manifest.get("packaging_format", 0)) - if packaging_format not in [2]: + if manifest["packaging_format"] not in [1, 2]: raise YunohostValidationError("app_packaging_format_not_supported") requirements = manifest.get("requirements", dict()) @@ -2446,20 +2447,20 @@ def _make_environment_for_app_script( "YNH_APP_INSTANCE_NAME": app, "YNH_APP_INSTANCE_NUMBER": str(app_instance_nb), "YNH_APP_MANIFEST_VERSION": manifest.get("version", "?"), + "YNH_APP_PACKAGING_FORMAT": str(manifest["packaging_format"]), } if workdir: env_dict["YNH_APP_BASEDIR"] = workdir if action: - env_dict["YNH_ACTION"] = action + env_dict["YNH_APP_ACTION"] = action for arg_name, arg_value in args.items(): env_dict["YNH_%s%s" % (args_prefix, arg_name.upper())] = str(arg_value) # If packaging format v2, load all settings - packaging_format = int(manifest.get("packaging_format", 0)) - if packaging_format >= 2: + if manifest["packaging_format"] >= 2: env_dict["app"] = app for setting_name, setting_value in _get_app_settings(app): From 859b3b6f128edafec363a06d41a4fe2042dcf665 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Wed, 13 Oct 2021 22:57:17 +0200 Subject: [PATCH 06/89] Yoloimplement some resources classes, not used for anything for now --- src/yunohost/utils/resources.py | 247 ++++++++++++++++++++++++++++++++ 1 file changed, 247 insertions(+) create mode 100644 src/yunohost/utils/resources.py diff --git a/src/yunohost/utils/resources.py b/src/yunohost/utils/resources.py new file mode 100644 index 000000000..42ae94d83 --- /dev/null +++ b/src/yunohost/utils/resources.py @@ -0,0 +1,247 @@ +# -*- coding: utf-8 -*- + +""" License + + Copyright (C) 2021 YUNOHOST.ORG + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program; if not, see http://www.gnu.org/licenses + +""" +import os +import copy +import psutil +from typing import Dict, Any + +from yunohost.utils.error import YunohostError, YunohostValidationError +from yunohost.utils.filesystem import free_space_in_directory + + +class AppResource: + + def __init__(self, properties: Dict[str, Any], app_id: str, app_settings): + + for key, value in self.default_properties.items(): + setattr(self, key, value) + + for key, value in properties: + setattr(self. key, value) + + +M = 1024 ** 2 +G = 1024 * M +sizes = { + "10M": 10 * M, + "20M": 20 * M, + "40M": 40 * M, + "80M": 80 * M, + "100M": 100 * M, + "200M": 200 * M, + "400M": 400 * M, + "800M": 800 * M, + "1G": 1 * G, + "2G": 2 * G, + "4G": 4 * G, + "8G": 8 * G, + "10G": 10 * G, + "20G": 20 * G, + "40G": 40 * G, + "80G": 80 * G, +} + + +class DiskAppResource(AppResource): + type = "disk" + + default_properties = { + "space": "10M", + } + + def __init__(self, *args, **kwargs): + super().__init__(self, *args, **kwargs) + # FIXME: better error handling + assert self.space in sizes + + def provision_or_update(self, context: Dict): + + if free_space_in_directory("/") <= sizes[self.space] \ + or free_space_in_directory("/var") <= sizes[self.space]: + raise YunohostValidationError("Not enough disk space") # FIXME: i18n / better messaging + + def deprovision(self, context: Dict): + pass + + +class RamAppResource(AppResource): + type = "ram" + + default_properties = { + "build": "10M", + "runtime": "10M", + "include_swap": False + } + + def __init__(self, *args, **kwargs): + super().__init__(self, *args, **kwargs) + # FIXME: better error handling + assert self.build in sizes + assert self.runtime in sizes + assert isinstance(self.include_swap, bool) + + def provision_or_update(self, context: Dict): + + memory = psutil.virtual_memory().available + if self.include_swap: + memory += psutil.swap_memory().available + + max_size = max(sizes[self.build], sizes[self.runtime]) + + if memory <= max_size: + raise YunohostValidationError("Not enough RAM/swap") # FIXME: i18n / better messaging + + def deprovision(self, context: Dict): + pass + + +class WebpathAppResource(AppResource): + type = "webpath" + + default_properties = { + "url": "__DOMAIN____PATH__" + } + + def provision_or_update(self, context: Dict): + + from yunohost.app import _assert_no_conflicting_apps + + # Check the url is available + domain = context["app_settings"]["domain"] + path = context["app_settings"]["path"] or "/" + _assert_no_conflicting_apps(domain, path, ignore_app=context["app"]) + context["app_settings"]["path"] = path + + if context["app_action"] == "install": + # Initially, the .main permission is created with no url at all associated + # When the app register/books its web url, we also add the url '/' + # (meaning the root of the app, domain.tld/path/) + # and enable the tile to the SSO, and both of this should match 95% of apps + # For more specific cases, the app is free to change / add urls or disable + # the tile using the permission helpers. + permission_url(app + ".main", url="/", sync_perm=False) + user_permission_update(app + ".main", show_tile=True, sync_perm=False) + permission_sync_to_user() + + def deprovision(self, context: Dict): + del context["app_settings"]["domain"] + del context["app_settings"]["path"] + + +class PortAppResource(AppResource): + type = "port" + + default_properties = { + "value": 1000 + } + + def _port_is_used(self, port): + + # FIXME : this could be less brutal than two os.system ... + cmd1 = "ss --numeric --listening --tcp --udp | awk '{print$5}' | grep --quiet --extended-regexp ':%s$'" % port + # This second command is mean to cover (most) case where an app is using a port yet ain't currently using it for some reason (typically service ain't up) + cmd2 = f"grep -q \"port: '{port}'\" /etc/yunohost/apps/*/settings.yml" + return os.system(cmd1) == 0 and os.system(cmd2) == 0 + + def provision_or_update(self, context: str): + + # Don't do anything if port already defined ? + if context["app_settings"].get("port"): + return + + port = self.value + while self._port_is_used(port): + port += 1 + + context["app_settings"]["port"] = port + + def deprovision(self, context: Dict): + raise NotImplementedError() + + +class UserAppResource(AppResource): + type = "user" + + default_properties = { + "username": "__APP__", + "home_dir": "/var/www/__APP__", + "use_shell": False, + "groups": [] + } + + def provision_or_update(self, context: str): + raise NotImplementedError() + + def deprovision(self, context: Dict): + raise NotImplementedError() + + +class InstalldirAppResource(AppResource): + type = "installdir" + + default_properties = { + "dir": "/var/www/__APP__", + "alias": "final_path" + } + + def provision_or_update(self, context: Dict): + + if context["app_action"] in ["install", "restore"]: + if os.path.exists(self.dir): + raise YunohostValidationError(f"Path {self.dir} already exists") + + if "installdir" not in context["app_settings"]: + context["app_settings"]["installdir"] = self.dir + context["app_settings"][self.alias] = context["app_settings"]["installdir"] + + def deprovision(self, context: Dict): + # FIXME: should it rm the directory during remove/deprovision ? + pass + + +class DatadirAppResource(AppResource): + type = "datadir" + + default_properties = { + "dir": "/home/yunohost.app/__APP__", + } + + def provision_or_update(self, context: Dict): + if "datadir" not in context["app_settings"]: + context["app_settings"]["datadir"] = self.dir + + def deprovision(self, context: Dict): + # FIXME: should it rm the directory during remove/deprovision ? + pass + + +class DBAppResource(AppResource): + type = "db" + + default_properties = { + "type": "mysql" + } + + def provision_or_update(self, context: str): + raise NotImplementedError() + + def deprovision(self, context: Dict): + raise NotImplementedError() From 3084359155bf29c3cb69cc654cac0d19876e109f Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 1 Nov 2021 22:40:52 +0100 Subject: [PATCH 07/89] Typos --- data/helpers.d/utils | 2 +- src/yunohost/app.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/helpers.d/utils b/data/helpers.d/utils index 57d5de56a..02fd10ba9 100644 --- a/data/helpers.d/utils +++ b/data/helpers.d/utils @@ -62,7 +62,7 @@ ynh_abort_if_errors() { } # When running an app script with packaging format >= 2, auto-enable ynh_abort_if_errors except for remove script -if [[ ${YNH_APP_PACKAGING_FORMAT:-0} -ge 2 ]] && [[ ${YNH_APP_ACTION} != "remove" ]] +if dpkg --compare-versions ${YNH_APP_PACKAGING_FORMAT:-0} ge 2 && [[ ${YNH_APP_ACTION} != "remove" ]] then ynh_abort_if_errors fi diff --git a/src/yunohost/app.py b/src/yunohost/app.py index 7488a1646..ba4351c2f 100644 --- a/src/yunohost/app.py +++ b/src/yunohost/app.py @@ -627,7 +627,7 @@ def app_upgrade(app=[], url=None, file=None, force=False, no_safety_backup=False if upgrade_failed or broke_the_system: # display this if there are remaining apps - if apps[number + 1 :]: + if apps[number + 1:]: not_upgraded_apps = apps[number:] logger.error( m18n.n( @@ -2048,9 +2048,9 @@ def _set_default_ask_questions(questions, script_name="install"): # Also it in fact doesn't make sense for any of those questions to have an example value nor a default value... if question.get("type") in ["domain", "user", "password"]: - if "example" in arg: + if "example" in question: del question["example"] - if "default" in arg: + if "default" in question: del question["domain"] return questions From 8a71fae732212a28b215b1a20f12b49da9dc7958 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 1 Nov 2021 22:41:31 +0100 Subject: [PATCH 08/89] manifestv2 upgrade: implement safety backup mecanism in the core --- src/yunohost/app.py | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/src/yunohost/app.py b/src/yunohost/app.py index ba4351c2f..05db1fa56 100644 --- a/src/yunohost/app.py +++ b/src/yunohost/app.py @@ -469,6 +469,7 @@ def app_upgrade(app=[], url=None, file=None, force=False, no_safety_backup=False from yunohost.permission import permission_sync_to_user from yunohost.regenconf import manually_modified_files from yunohost.utils.legacy import _patch_legacy_php_versions, _patch_legacy_helpers + from yunohost.backup import backup_list, backup_create, backup_delete, backup_restore apps = app # Check if disk space available @@ -556,6 +557,31 @@ def app_upgrade(app=[], url=None, file=None, force=False, no_safety_backup=False # Check requirements _check_manifest_requirements(manifest) + + if manifest["packaging_format"] >= 2: + if no_safety_backup: + logger.warning("Skipping the creation of a backup prior to the upgrade.") + else: + # FIXME: i18n + logger.info("Creating a safety backup prior to the upgrade") + + # Switch between pre-upgrade1 or pre-upgrade2 + safety_backup_name = f"{app_instance_name}-pre-upgrade1" + other_safety_backup_name = f"{app_instance_name}-pre-upgrade2" + if safety_backup_name in backup_list()["archives"]: + safety_backup_name = f"{app_instance_name}-pre-upgrade2" + other_safety_backup_name = f"{app_instance_name}-pre-upgrade1" + + backup_create(name=safety_backup_name, apps=[app_instance_name]) + + if safety_backup_name in backup_list()["archives"]: + # if the backup suceeded, delete old safety backup to save space + if other_safety_backup_name in backup_list()["archives"]: + backup_delete(other_safety_backup_name) + else: + # Is this needed ? Shouldn't backup_create report an expcetion if backup failed ? + raise YunohostError("Uhoh the safety backup failed ?! Aborting the upgrade process.", raw_msg=True) + _assert_system_is_sane_for_app(manifest, "pre") app_setting_path = os.path.join(APPS_SETTING_PATH, app_instance_name) @@ -567,7 +593,8 @@ def app_upgrade(app=[], url=None, file=None, force=False, no_safety_backup=False env_dict["YNH_APP_UPGRADE_TYPE"] = upgrade_type env_dict["YNH_APP_MANIFEST_VERSION"] = str(app_new_version) env_dict["YNH_APP_CURRENT_VERSION"] = str(app_current_version) - env_dict["NO_BACKUP_UPGRADE"] = "1" if no_safety_backup else "0" + if manifest["packaging_format"] < 2: + env_dict["NO_BACKUP_UPGRADE"] = "1" if no_safety_backup else "0" # We'll check that the app didn't brutally edit some system configuration manually_modified_files_before_install = manually_modified_files() @@ -599,6 +626,16 @@ def app_upgrade(app=[], url=None, file=None, force=False, no_safety_backup=False ), ) finally: + + # If upgrade failed, try to restore the safety backup + if upgrade_failed and manifest["packaging_format"] >= 2 and not no_safety_backup: + logger.warning("Upgrade failed ... attempting to restore the satefy backup (Yunohost first need to remove the app for this) ...") + + app_remove(app_instance_name) + backup_restore(name=safety_backup_name, apps=[app_instance_name], force=True) + if not _is_installed(app_instance_name): + logger.error("Uhoh ... Yunohost failed to restore the app to the way it was before the failed upgrade :|") + # Whatever happened (install success or failure) we check if it broke the system # and warn the user about it try: From 0a750b7b61f2d0c01a90d3049a928c6963ab0dff Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Wed, 3 Nov 2021 16:36:38 +0100 Subject: [PATCH 09/89] Absolutely yolo iteration on app resources draft --- src/yunohost/app.py | 48 ++++++----- src/yunohost/utils/config.py | 20 ++++- src/yunohost/utils/resources.py | 144 +++++++++++++++++++++++++------- 3 files changed, 160 insertions(+), 52 deletions(-) diff --git a/src/yunohost/app.py b/src/yunohost/app.py index 05db1fa56..8e05c37c9 100644 --- a/src/yunohost/app.py +++ b/src/yunohost/app.py @@ -59,6 +59,7 @@ from yunohost.utils.config import ( DomainQuestion, PathQuestion, ) +from yunohost.utils.resources import AppResourceSet from yunohost.utils.i18n import _value_for_locale from yunohost.utils.error import YunohostError, YunohostValidationError from yunohost.utils.filesystem import free_space_in_directory @@ -803,6 +804,7 @@ def app_install( confirm_install(app) manifest, extracted_app_folder = _extract_app(app) + packaging_format = manifest["packaging_format"] # Check ID if "id" not in manifest or "__" in manifest["id"] or "." in manifest["id"]: @@ -827,7 +829,7 @@ def app_install( app_instance_name = app_id # Retrieve arguments list for install script - raw_questions = manifest.get("arguments", {}).get("install", {}) + raw_questions = manifest["install"] questions = ask_questions_and_parse_answers(raw_questions, prefilled_answers=args) args = { question.name: question.value @@ -836,11 +838,12 @@ def app_install( } # Validate domain / path availability for webapps - path_requirement = _guess_webapp_path_requirement(extracted_app_folder) - _validate_webpath_requirement(args, path_requirement) + if packaging_format < 2: + path_requirement = _guess_webapp_path_requirement(extracted_app_folder) + _validate_webpath_requirement(args, path_requirement) - # Attempt to patch legacy helpers ... - _patch_legacy_helpers(extracted_app_folder) + # Attempt to patch legacy helpers ... + _patch_legacy_helpers(extracted_app_folder) # Apply dirty patch to make php5 apps compatible with php7 _patch_legacy_php_versions(extracted_app_folder) @@ -870,7 +873,6 @@ def app_install( } # If packaging_format v2+, save all install questions as settings - packaging_format = int(manifest.get("packaging_format", 0)) if packaging_format >= 2: for arg_name, arg_value in args.items(): @@ -891,17 +893,23 @@ def app_install( recursive=True, ) - # Initialize the main permission for the app - # The permission is initialized with no url associated, and with tile disabled - # For web app, the root path of the app will be added as url and the tile - # will be enabled during the app install. C.f. 'app_register_url()' below. - permission_create( - app_instance_name + ".main", - allowed=["all_users"], - label=label, - show_tile=False, - protected=False, - ) + + resources = AppResourceSet(manifest["resources"], app_instance_name) + resources.check_availability() + resources.provision() + + if packaging_format < 2: + # Initialize the main permission for the app + # The permission is initialized with no url associated, and with tile disabled + # For web app, the root path of the app will be added as url and the tile + # will be enabled during the app install. C.f. 'app_register_url()' below. + permission_create( + app_instance_name + ".main", + allowed=["all_users"], + label=label, + show_tile=False, + protected=False, + ) # Prepare env. var. to pass to script env_dict = _make_environment_for_app_script( @@ -2354,13 +2362,13 @@ def _guess_webapp_path_requirement(app_folder: str) -> str: # is an available url and normalize the path. manifest = _get_manifest_of_app(app_folder) - raw_questions = manifest.get("arguments", {}).get("install", {}) + raw_questions = manifest["install"] domain_questions = [ - question for question in raw_questions if question.get("type") == "domain" + question for question in raw_questions.values() if question.get("type") == "domain" ] path_questions = [ - question for question in raw_questions if question.get("type") == "path" + question for question in raw_questions.values() if question.get("type") == "path" ] if len(domain_questions) == 0 and len(path_questions) == 0: diff --git a/src/yunohost/utils/config.py b/src/yunohost/utils/config.py index 4ee62c6f7..b7bd4e723 100644 --- a/src/yunohost/utils/config.py +++ b/src/yunohost/utils/config.py @@ -1052,6 +1052,21 @@ class UserQuestion(Question): break +class GroupQuestion(Question): + argument_type = "group" + + def __init__(self, question, context: Mapping[str, Any] = {}): + + from yunohost.user import user_group_list + + super().__init__(question, context) + + self.choices = list(user_group_list(short=True)["groups"]) + + if self.default is None: + self.default = "all_users" + + class NumberQuestion(Question): argument_type = "number" default_value = None @@ -1204,6 +1219,7 @@ ARGUMENTS_TYPE_PARSERS = { "boolean": BooleanQuestion, "domain": DomainQuestion, "user": UserQuestion, + "group": GroupQuestion, "number": NumberQuestion, "range": NumberQuestion, "display_text": DisplayTextQuestion, @@ -1243,9 +1259,9 @@ def ask_questions_and_parse_answers( out = [] - for raw_question in raw_questions: + for name, raw_question in raw_questions.items(): question_class = ARGUMENTS_TYPE_PARSERS[raw_question.get("type", "string")] - raw_question["value"] = answers.get(raw_question["name"]) + raw_question["value"] = answers.get(name) question = question_class(raw_question, context=answers) answers[question.name] = question.ask_if_needed() out.append(question) diff --git a/src/yunohost/utils/resources.py b/src/yunohost/utils/resources.py index 42ae94d83..c71af09b8 100644 --- a/src/yunohost/utils/resources.py +++ b/src/yunohost/utils/resources.py @@ -27,15 +27,37 @@ from yunohost.utils.error import YunohostError, YunohostValidationError from yunohost.utils.filesystem import free_space_in_directory -class AppResource: +class AppResource(object): - def __init__(self, properties: Dict[str, Any], app_id: str, app_settings): + def __init__(self, properties: Dict[str, Any], app_id: str): + + self.app_id = app_id for key, value in self.default_properties.items(): setattr(self, key, value) - for key, value in properties: - setattr(self. key, value) + for key, value in properties.items(): + setattr(self, key, value) + + def get_app_settings(self): + from yunohost.app import _get_app_settings + return _get_app_settings(self.app_id) + + def check_availability(self, context: Dict): + pass + + +class AppResourceSet: + + def __init__(self, resources_dict: Dict[str, Dict[str, Any]], app_id: str): + + self.set = {name: AppResourceClassesByType[name](infos, app_id) + for name, infos in resources_dict.items()} + + def check_availability(self): + + for name, resource in self.set.items(): + resource.check_availability(context={}) M = 1024 ** 2 @@ -68,19 +90,16 @@ class DiskAppResource(AppResource): } def __init__(self, *args, **kwargs): - super().__init__(self, *args, **kwargs) + super().__init__(*args, **kwargs) # FIXME: better error handling assert self.space in sizes - def provision_or_update(self, context: Dict): + def assert_availability(self, context: Dict): if free_space_in_directory("/") <= sizes[self.space] \ or free_space_in_directory("/var") <= sizes[self.space]: raise YunohostValidationError("Not enough disk space") # FIXME: i18n / better messaging - def deprovision(self, context: Dict): - pass - class RamAppResource(AppResource): type = "ram" @@ -92,13 +111,13 @@ class RamAppResource(AppResource): } def __init__(self, *args, **kwargs): - super().__init__(self, *args, **kwargs) + super().__init__(*args, **kwargs) # FIXME: better error handling assert self.build in sizes assert self.runtime in sizes assert isinstance(self.include_swap, bool) - def provision_or_update(self, context: Dict): + def assert_availability(self, context: Dict): memory = psutil.virtual_memory().available if self.include_swap: @@ -109,37 +128,78 @@ class RamAppResource(AppResource): if memory <= max_size: raise YunohostValidationError("Not enough RAM/swap") # FIXME: i18n / better messaging - def deprovision(self, context: Dict): + +class AptDependenciesAppResource(AppResource): + type = "apt" + + default_properties = { + "packages": [], + "extras": {} + } + + def check_availability(self, context): + # ? FIXME + # call helpers idk ... + pass + +class SourcesAppResource(AppResource): + type = "sources" + + default_properties = { + "main": {"url": "?", "sha256sum": "?", "predownload": True} + } + + def check_availability(self, context): + # ? FIXME + # call request.head on the url idk pass -class WebpathAppResource(AppResource): - type = "webpath" +class RoutesAppResource(AppResource): + type = "routes" default_properties = { - "url": "__DOMAIN____PATH__" + "full_domain": False, + "main": { + "url": "/", + "additional_urls": [], + "init_allowed": "__FIXME__", + "show_tile": True, + "protected": False, + "auth_header": True, + "label": "FIXME", + } } - def provision_or_update(self, context: Dict): + def check_availability(self, context): from yunohost.app import _assert_no_conflicting_apps - # Check the url is available - domain = context["app_settings"]["domain"] - path = context["app_settings"]["path"] or "/" - _assert_no_conflicting_apps(domain, path, ignore_app=context["app"]) - context["app_settings"]["path"] = path + app_settings = self.get_app_settings() + domain = app_settings["domain"] + path = app_settings["path"] if not self.full_domain else "/" + _assert_no_conflicting_apps(domain, path, ignore_app=self.app_id) + + def provision_or_update(self, context: Dict): if context["app_action"] == "install": + pass # FIXME # Initially, the .main permission is created with no url at all associated # When the app register/books its web url, we also add the url '/' # (meaning the root of the app, domain.tld/path/) # and enable the tile to the SSO, and both of this should match 95% of apps # For more specific cases, the app is free to change / add urls or disable # the tile using the permission helpers. - permission_url(app + ".main", url="/", sync_perm=False) - user_permission_update(app + ".main", show_tile=True, sync_perm=False) - permission_sync_to_user() + #permission_create( + # self.app_id + ".main", + # allowed=["all_users"], + # label=label, + # show_tile=False, + # protected=False, + #) + #permission_url(app + ".main", url="/", sync_perm=False) + #user_permission_update(app + ".main", show_tile=True, sync_perm=False) + #permission_sync_to_user() def deprovision(self, context: Dict): del context["app_settings"]["domain"] @@ -177,8 +237,8 @@ class PortAppResource(AppResource): raise NotImplementedError() -class UserAppResource(AppResource): - type = "user" +class SystemuserAppResource(AppResource): + type = "system_user" default_properties = { "username": "__APP__", @@ -187,6 +247,12 @@ class UserAppResource(AppResource): "groups": [] } + def check_availability(self, context): + if os.system(f"getent passwd {self.username} &>/dev/null") != 0: + raise YunohostValidationError(f"User {self.username} already exists") + if os.system(f"getent group {self.username} &>/dev/null") != 0: + raise YunohostValidationError(f"Group {self.username} already exists") + def provision_or_update(self, context: str): raise NotImplementedError() @@ -195,13 +261,19 @@ class UserAppResource(AppResource): class InstalldirAppResource(AppResource): - type = "installdir" + type = "install_dir" default_properties = { - "dir": "/var/www/__APP__", + "dir": "/var/www/__APP__", # FIXME or choose to move this elsewhere nowadays idk... "alias": "final_path" } + # FIXME: change default dir to /opt/stuff if app ain't a webapp ... + + def check_availability(self, context): + if os.path.exists(self.dir): + raise YunohostValidationError(f"Folder {self.dir} already exists") + def provision_or_update(self, context: Dict): if context["app_action"] in ["install", "restore"]: @@ -218,12 +290,16 @@ class InstalldirAppResource(AppResource): class DatadirAppResource(AppResource): - type = "datadir" + type = "data_dir" default_properties = { - "dir": "/home/yunohost.app/__APP__", + "dir": "/home/yunohost.app/__APP__", # FIXME or choose to move this elsewhere nowadays idk... } + def check_availability(self, context): + if os.path.exists(self.dir): + raise YunohostValidationError(f"Folder {self.dir} already exists") + def provision_or_update(self, context: Dict): if "datadir" not in context["app_settings"]: context["app_settings"]["datadir"] = self.dir @@ -240,8 +316,16 @@ class DBAppResource(AppResource): "type": "mysql" } + def check_availability(self, context): + # FIXME : checking availability sort of imply that mysql / postgresql is installed + # or we gotta make sure mariadb-server or postgresql is gonna be installed (apt resource) + pass + def provision_or_update(self, context: str): raise NotImplementedError() def deprovision(self, context: Dict): raise NotImplementedError() + + +AppResourceClassesByType = {c.type: c for c in AppResource.__subclasses__()} From 6a437c0b4fe80149328bfa2150af4525f4a3c098 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Wed, 3 Nov 2021 18:33:00 +0100 Subject: [PATCH 10/89] Rework requirement checks to integrate architecture, multiinnstance, disk/ram, ... + drop disk/ram as resource, have them directly in 'integration' --- src/yunohost/app.py | 125 ++++++++++++++++++++------------ src/yunohost/backup.py | 1 + src/yunohost/utils/resources.py | 71 ------------------ 3 files changed, 79 insertions(+), 118 deletions(-) diff --git a/src/yunohost/app.py b/src/yunohost/app.py index c5d75b25b..d555b6872 100644 --- a/src/yunohost/app.py +++ b/src/yunohost/app.py @@ -35,6 +35,7 @@ import tempfile import copy from collections import OrderedDict from typing import List, Tuple, Dict, Any +from packaging import version from moulinette import Moulinette, m18n from moulinette.utils.log import getActionLogger @@ -52,7 +53,7 @@ from moulinette.utils.filesystem import ( chmod, ) -from yunohost.utils import packages +from yunohost.utils.packages import dpkg_is_broken, get_ynh_package_version from yunohost.utils.config import ( ConfigPanel, ask_questions_and_parse_answers, @@ -194,7 +195,6 @@ def app_info(app, full=False): def _app_upgradable(app_infos): - from packaging import version # Determine upgradability @@ -460,7 +460,6 @@ def app_upgrade(app=[], url=None, file=None, force=False, no_safety_backup=False no_safety_backup -- Disable the safety backup during upgrade """ - from packaging import version from yunohost.hook import ( hook_add, hook_remove, @@ -557,7 +556,7 @@ def app_upgrade(app=[], url=None, file=None, force=False, no_safety_backup=False upgrade_type = "UPGRADE_FULL" # Check requirements - _check_manifest_requirements(manifest) + _check_manifest_requirements(manifest, action="upgrade") if manifest["packaging_format"] >= 2: if no_safety_backup: @@ -814,15 +813,12 @@ def app_install( label = label if label else manifest["name"] # Check requirements - _check_manifest_requirements(manifest) + _check_manifest_requirements(manifest, action="install") _assert_system_is_sane_for_app(manifest, "pre") # Check if app can be forked instance_number = _next_instance_number_for_app(app_id) if instance_number > 1: - if "multi_instance" not in manifest or not is_true(manifest["multi_instance"]): - raise YunohostValidationError("app_already_installed", app=app_id) - # Change app_id to the forked app id app_instance_name = app_id + "__" + str(instance_number) else: @@ -1995,11 +1991,13 @@ def _convert_v1_manifest_to_v2(manifest): manifest["upstream"]["website"] = manifest["url"] manifest["integration"] = { - "yunohost": manifest.get("requirements", {}).get("yunohost"), + "yunohost": manifest.get("requirements", {}).get("yunohost", "").replace(">", "").replace("=", "").replace(" ", ""), "architectures": "all", - "multi_instance": manifest.get("multi_instance", False), + "multi_instance": is_true(manifest.get("multi_instance", False)), "ldap": "?", "sso": "?", + "disk": "50M", + "ram": {"build": "50M", "runtime": "10M", "include_swap": False} } maintainer = manifest.get("maintainer", {}).get("name") @@ -2017,29 +2015,12 @@ def _convert_v1_manifest_to_v2(manifest): manifest["install"][name] = question manifest["resources"] = { - "disk": { - "build": "50M", # This is an *estimate* minimum value for the disk needed at build time (e.g. during install/upgrade) and during regular usage - "usage": "50M" # Please only use round values such as: 10M, 100M, 200M, 400M, 800M, 1G, 2G, 4G, 8G - }, - "ram": { - "build": "50M", # This is an *estimate* minimum value for the RAM needed at build time (i.e. during install/upgrade) and during regular usage - "usage": "10M", # Please only use round values like ["10M", "100M", "200M", "400M", "800M", "1G", "2G", "4G", "8G"] - "include_swap": False - }, - "route": {}, + "system_user": {}, "install_dir": { - "base_dir": "/var/www/", # This means that the app shall be installed in /var/www/$app which is the standard for webapps. You may change this to /opt/ if the app is a system app. "alias": "final_path" } } - if "domain" in manifest["install"] and "path" in manifest["install"]: - manifest["resources"]["route"]["url"] = "{domain}{path}" - elif "path" not in manifest["install"]: - manifest["resources"]["route"]["url"] = "{domain}/" - else: - del manifest["resources"]["route"] - keys_to_keep = ["packaging_format", "id", "name", "description", "version", "maintainers", "upstream", "integration", "install", "resources"] keys_to_del = [key for key in manifest.keys() if key not in keys_to_keep] @@ -2325,32 +2306,60 @@ def _get_all_installed_apps_id(): return all_apps_ids_formatted -def _check_manifest_requirements(manifest: Dict): +def _check_manifest_requirements(manifest: Dict, action: str): """Check if required packages are met from the manifest""" if manifest["packaging_format"] not in [1, 2]: raise YunohostValidationError("app_packaging_format_not_supported") - requirements = manifest.get("requirements", dict()) - - if not requirements: - return - - app = manifest.get("id", "?") + app_id = manifest["id"] logger.debug(m18n.n("app_requirements_checking", app=app)) - # Iterate over requirements - for pkgname, spec in requirements.items(): - if not packages.meets_version_specifier(pkgname, spec): - version = packages.ynh_packages_version()[pkgname]["version"] - raise YunohostValidationError( - "app_requirements_unmeet", - pkgname=pkgname, - version=version, - spec=spec, - app=app, - ) + # Yunohost version requirement + + yunohost_requirement = version.parse(manifest["integration"]["yunohost"] or "4.3") + yunohost_installed_version = get_ynh_package_version("yunohost")["version"] + if yunohost_requirement > yunohost_installed_version: + # FIXME : i18n + raise YunohostValidationError(f"This app requires Yunohost >= {yunohost_requirement} but current installed version is {yunohost_installed_version}") + + # Architectures + arch_requirement = manifest["integration"]["architectures"] + if arch_requirement != "all": + arch = check_output("dpkg --print-architecture") + if arch not in arch_requirement: + # FIXME: i18n + raise YunohostValidationError(f"This app can only be installed on architectures {', '.join(arch_requirement)} but your server architecture is {arch}") + + # Multi-instance + if action == "install" and manifest["integration"]["multi_instance"] == False: + apps = _installed_apps() + sibling_apps = [a for a in apps if a == app_id or a.startswith(f"{app_id}__")] + if len(sibling_apps) > 0: + raise YunohostValidationError("app_already_installed", app=app_id) + + # Disk + if action == "install": + disk_requirement = manifest["integration"]["disk"] + + if free_space_in_directory("/") <= human_to_binary[disk_requirement] \ + or free_space_in_directory("/var") <= human_to_binary[disk_requirement]: + # FIXME : i18m + raise YunohostValidationError("This app requires {disk_requirement} free space.") + + # Ram for build + import psutil + ram_build_requirement = manifest["integration"]["ram"]["build"] + ram_include_swap = manifest["integration"]["ram"]["include_swap"] + + ram_available = psutil.virtual_memory().available + if ram_include_swap: + ram_available += psutil.swap_memory().available + + if ram_available < human_to_binary(ram_build_requirement): + # FIXME : i18n + raise YunohostValidationError("This app requires {ram_build_requirement} RAM available to install/upgrade") def _guess_webapp_path_requirement(app_folder: str) -> str: @@ -2688,8 +2697,30 @@ def _assert_system_is_sane_for_app(manifest, when): "app_action_broke_system", services=", ".join(faulty_services) ) - if packages.dpkg_is_broken(): + if dpkg_is_broken(): if when == "pre": raise YunohostValidationError("dpkg_is_broken") elif when == "post": raise YunohostError("this_action_broke_dpkg") + + + +def human_to_binary(size: str) -> int: + + symbols = ("K", "M", "G", "T", "P", "E", "Z", "Y") + factor = {} + for i, s in enumerate(symbols): + factor[s] = 1 << (i + 1) * 10 + + suffix = size[-1] + size = size[:-1] + + if suffix not in symbols: + raise YunohostError(f"Invalid size suffix '{suffix}', expected one of {symbols}") + + try: + size = float(size) + except Exception: + raise YunohostError(f"Failed to convert size {size} to float") + + return size * factor[suffix] diff --git a/src/yunohost/backup.py b/src/yunohost/backup.py index 8deb2b3bf..78aab0dce 100644 --- a/src/yunohost/backup.py +++ b/src/yunohost/backup.py @@ -2695,3 +2695,4 @@ def binary_to_human(n, customary=False): value = float(n) / prefix[s] return "%.1f%s" % (value, s) return "%s" % n + diff --git a/src/yunohost/utils/resources.py b/src/yunohost/utils/resources.py index c71af09b8..424e38f91 100644 --- a/src/yunohost/utils/resources.py +++ b/src/yunohost/utils/resources.py @@ -20,11 +20,9 @@ """ import os import copy -import psutil from typing import Dict, Any from yunohost.utils.error import YunohostError, YunohostValidationError -from yunohost.utils.filesystem import free_space_in_directory class AppResource(object): @@ -60,75 +58,6 @@ class AppResourceSet: resource.check_availability(context={}) -M = 1024 ** 2 -G = 1024 * M -sizes = { - "10M": 10 * M, - "20M": 20 * M, - "40M": 40 * M, - "80M": 80 * M, - "100M": 100 * M, - "200M": 200 * M, - "400M": 400 * M, - "800M": 800 * M, - "1G": 1 * G, - "2G": 2 * G, - "4G": 4 * G, - "8G": 8 * G, - "10G": 10 * G, - "20G": 20 * G, - "40G": 40 * G, - "80G": 80 * G, -} - - -class DiskAppResource(AppResource): - type = "disk" - - default_properties = { - "space": "10M", - } - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - # FIXME: better error handling - assert self.space in sizes - - def assert_availability(self, context: Dict): - - if free_space_in_directory("/") <= sizes[self.space] \ - or free_space_in_directory("/var") <= sizes[self.space]: - raise YunohostValidationError("Not enough disk space") # FIXME: i18n / better messaging - - -class RamAppResource(AppResource): - type = "ram" - - default_properties = { - "build": "10M", - "runtime": "10M", - "include_swap": False - } - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - # FIXME: better error handling - assert self.build in sizes - assert self.runtime in sizes - assert isinstance(self.include_swap, bool) - - def assert_availability(self, context: Dict): - - memory = psutil.virtual_memory().available - if self.include_swap: - memory += psutil.swap_memory().available - - max_size = max(sizes[self.build], sizes[self.runtime]) - - if memory <= max_size: - raise YunohostValidationError("Not enough RAM/swap") # FIXME: i18n / better messaging - - class AptDependenciesAppResource(AppResource): type = "apt" From 810534c661f5c57050c974a8bd8ddd2c7c46bc74 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Wed, 3 Nov 2021 20:38:51 +0100 Subject: [PATCH 11/89] Cleanup / refactor a bunch of utils into utils/system.py --- data/actionsmap/yunohost.yml | 2 +- data/hooks/diagnosis/00-basesystem.py | 13 +- src/yunohost/app.py | 82 ++++--------- src/yunohost/backup.py | 88 +++++--------- .../data_migrations/0015_migrate_to_buster.py | 4 +- .../0017_postgresql_9p6_to_11.py | 2 +- src/yunohost/log.py | 2 +- src/yunohost/tools.py | 23 +--- src/yunohost/user.py | 12 +- src/yunohost/utils/filesystem.py | 31 ----- src/yunohost/utils/{packages.py => system.py} | 111 ++++++++++++------ 11 files changed, 146 insertions(+), 224 deletions(-) delete mode 100644 src/yunohost/utils/filesystem.py rename src/yunohost/utils/{packages.py => system.py} (67%) diff --git a/data/actionsmap/yunohost.yml b/data/actionsmap/yunohost.yml index 16ea2c5d2..e63a04a41 100644 --- a/data/actionsmap/yunohost.yml +++ b/data/actionsmap/yunohost.yml @@ -43,7 +43,7 @@ _global: help: Display YunoHost packages versions action: callback callback: - method: yunohost.utils.packages.ynh_packages_version + method: yunohost.utils.system.ynh_packages_version return: true ############################# diff --git a/data/hooks/diagnosis/00-basesystem.py b/data/hooks/diagnosis/00-basesystem.py index b472a2d32..afb44ff37 100644 --- a/data/hooks/diagnosis/00-basesystem.py +++ b/data/hooks/diagnosis/00-basesystem.py @@ -7,7 +7,11 @@ import subprocess from moulinette.utils.process import check_output from moulinette.utils.filesystem import read_file, read_json, write_to_json from yunohost.diagnosis import Diagnoser -from yunohost.utils.packages import ynh_packages_version +from yunohost.utils.system import ( + ynh_packages_version, + system_virt, + system_arch, +) class BaseSystemDiagnoser(Diagnoser): @@ -18,15 +22,12 @@ class BaseSystemDiagnoser(Diagnoser): def run(self): - # Detect virt technology (if not bare metal) and arch - # Gotta have this "|| true" because it systemd-detect-virt return 'none' - # with an error code on bare metal ~.~ - virt = check_output("systemd-detect-virt || true", shell=True) + virt = system_virt() if virt.lower() == "none": virt = "bare-metal" # Detect arch - arch = check_output("dpkg --print-architecture") + arch = system_arch() hardware = dict( meta={"test": "hardware"}, status="INFO", diff --git a/src/yunohost/app.py b/src/yunohost/app.py index d555b6872..e251b99de 100644 --- a/src/yunohost/app.py +++ b/src/yunohost/app.py @@ -53,7 +53,6 @@ from moulinette.utils.filesystem import ( chmod, ) -from yunohost.utils.packages import dpkg_is_broken, get_ynh_package_version from yunohost.utils.config import ( ConfigPanel, ask_questions_and_parse_answers, @@ -63,7 +62,15 @@ from yunohost.utils.config import ( from yunohost.utils.resources import AppResourceSet from yunohost.utils.i18n import _value_for_locale from yunohost.utils.error import YunohostError, YunohostValidationError -from yunohost.utils.filesystem import free_space_in_directory +from yunohost.utils.system import ( + free_space_in_directory, + dpkg_is_broken, + get_ynh_package_version, + system_arch, + human_to_binary, + binary_to_human, + ram_available, +) from yunohost.log import is_unit_operation, OperationLogger from yunohost.app_catalog import ( # noqa app_catalog, @@ -179,9 +186,7 @@ def app_info(app, full=False): ret["supports_backup_restore"] = os.path.exists( os.path.join(setting_path, "scripts", "backup") ) and os.path.exists(os.path.join(setting_path, "scripts", "restore")) - ret["supports_multi_instance"] = is_true( - local_manifest.get("integration", {}).get("multi_instance", False) - ) + ret["supports_multi_instance"] = local_manifest.get("integration", {}).get("multi_instance", False) ret["supports_config_panel"] = os.path.exists( os.path.join(setting_path, "config_panel.toml") ) @@ -1993,7 +1998,7 @@ def _convert_v1_manifest_to_v2(manifest): manifest["integration"] = { "yunohost": manifest.get("requirements", {}).get("yunohost", "").replace(">", "").replace("=", "").replace(" ", ""), "architectures": "all", - "multi_instance": is_true(manifest.get("multi_instance", False)), + "multi_instance": manifest.get("multi_instance", False), "ldap": "?", "sso": "?", "disk": "50M", @@ -2314,12 +2319,12 @@ def _check_manifest_requirements(manifest: Dict, action: str): app_id = manifest["id"] - logger.debug(m18n.n("app_requirements_checking", app=app)) + logger.debug(m18n.n("app_requirements_checking", app=app_id)) # Yunohost version requirement yunohost_requirement = version.parse(manifest["integration"]["yunohost"] or "4.3") - yunohost_installed_version = get_ynh_package_version("yunohost")["version"] + yunohost_installed_version = version.parse(get_ynh_package_version("yunohost")["version"]) if yunohost_requirement > yunohost_installed_version: # FIXME : i18n raise YunohostValidationError(f"This app requires Yunohost >= {yunohost_requirement} but current installed version is {yunohost_installed_version}") @@ -2327,7 +2332,7 @@ def _check_manifest_requirements(manifest: Dict, action: str): # Architectures arch_requirement = manifest["integration"]["architectures"] if arch_requirement != "all": - arch = check_output("dpkg --print-architecture") + arch = system_arch() if arch not in arch_requirement: # FIXME: i18n raise YunohostValidationError(f"This app can only be installed on architectures {', '.join(arch_requirement)} but your server architecture is {arch}") @@ -2343,23 +2348,23 @@ def _check_manifest_requirements(manifest: Dict, action: str): if action == "install": disk_requirement = manifest["integration"]["disk"] - if free_space_in_directory("/") <= human_to_binary[disk_requirement] \ - or free_space_in_directory("/var") <= human_to_binary[disk_requirement]: + if free_space_in_directory("/") <= human_to_binary(disk_requirement) \ + or free_space_in_directory("/var") <= human_to_binary(disk_requirement): # FIXME : i18m - raise YunohostValidationError("This app requires {disk_requirement} free space.") + raise YunohostValidationError(f"This app requires {disk_requirement} free space.") # Ram for build - import psutil ram_build_requirement = manifest["integration"]["ram"]["build"] ram_include_swap = manifest["integration"]["ram"]["include_swap"] - ram_available = psutil.virtual_memory().available + ram, swap = ram_available() if ram_include_swap: - ram_available += psutil.swap_memory().available + ram += swap - if ram_available < human_to_binary(ram_build_requirement): + if ram < human_to_binary(ram_build_requirement): # FIXME : i18n - raise YunohostValidationError("This app requires {ram_build_requirement} RAM available to install/upgrade") + ram_human = binary_to_human(ram) + raise YunohostValidationError(f"This app requires {ram_build_requirement} RAM to install/upgrade but only {ram_human} is available right now.") def _guess_webapp_path_requirement(app_folder: str) -> str: @@ -2499,7 +2504,7 @@ def _make_environment_for_app_script( "YNH_APP_INSTANCE_NUMBER": str(app_instance_nb), "YNH_APP_MANIFEST_VERSION": manifest.get("version", "?"), "YNH_APP_PACKAGING_FORMAT": str(manifest["packaging_format"]), - "YNH_ARCH": check_output("dpkg --print-architecture"), + "YNH_ARCH": system_arch(), } if workdir: @@ -2607,26 +2612,6 @@ def _make_tmp_workdir_for_app(app=None): return tmpdir -def is_true(arg): - """ - Convert a string into a boolean - - Keyword arguments: - arg -- The string to convert - - Returns: - Boolean - - """ - if isinstance(arg, bool): - return arg - elif isinstance(arg, str): - return arg.lower() in ["yes", "true", "on"] - else: - logger.debug("arg should be a boolean or a string, got %r", arg) - return True if arg else False - - def unstable_apps(): output = [] @@ -2703,24 +2688,3 @@ def _assert_system_is_sane_for_app(manifest, when): elif when == "post": raise YunohostError("this_action_broke_dpkg") - - -def human_to_binary(size: str) -> int: - - symbols = ("K", "M", "G", "T", "P", "E", "Z", "Y") - factor = {} - for i, s in enumerate(symbols): - factor[s] = 1 << (i + 1) * 10 - - suffix = size[-1] - size = size[:-1] - - if suffix not in symbols: - raise YunohostError(f"Invalid size suffix '{suffix}', expected one of {symbols}") - - try: - size = float(size) - except Exception: - raise YunohostError(f"Failed to convert size {size} to float") - - return size * factor[suffix] diff --git a/src/yunohost/backup.py b/src/yunohost/backup.py index 78aab0dce..67b5cde05 100644 --- a/src/yunohost/backup.py +++ b/src/yunohost/backup.py @@ -39,9 +39,8 @@ from functools import reduce from packaging import version from moulinette import Moulinette, m18n -from moulinette.utils import filesystem from moulinette.utils.log import getActionLogger -from moulinette.utils.filesystem import read_file, mkdir, write_to_yaml, read_yaml +from moulinette.utils.filesystem import read_file, mkdir, write_to_yaml, read_yaml, rm, chown, chmod from moulinette.utils.process import check_output import yunohost.domain @@ -67,8 +66,12 @@ from yunohost.tools import ( from yunohost.regenconf import regen_conf from yunohost.log import OperationLogger, is_unit_operation from yunohost.utils.error import YunohostError, YunohostValidationError -from yunohost.utils.packages import ynh_packages_version -from yunohost.utils.filesystem import free_space_in_directory +from yunohost.utils.system import ( + free_space_in_directory, + get_ynh_package_version, + binary_to_human, + space_used_by_directory, +) from yunohost.settings import settings_get BACKUP_PATH = "/home/yunohost.backup" @@ -312,7 +315,7 @@ class BackupManager: "size_details": self.size_details, "apps": self.apps_return, "system": self.system_return, - "from_yunohost_version": ynh_packages_version()["yunohost"]["version"], + "from_yunohost_version": get_ynh_package_version("yunohost")["version"], } @property @@ -342,7 +345,7 @@ class BackupManager: # FIXME replace isdir by exists ? manage better the case where the path # exists if not os.path.isdir(self.work_dir): - filesystem.mkdir(self.work_dir, 0o750, parents=True, uid="admin") + mkdir(self.work_dir, 0o750, parents=True, uid="admin") elif self.is_tmp_work_dir: logger.debug( @@ -357,8 +360,8 @@ class BackupManager: # If umount succeeded, remove the directory (we checked that # we're in /home/yunohost.backup/tmp so that should be okay... # c.f. method clean() which also does this) - filesystem.rm(self.work_dir, recursive=True, force=True) - filesystem.mkdir(self.work_dir, 0o750, parents=True, uid="admin") + rm(self.work_dir, recursive=True, force=True) + mkdir(self.work_dir, 0o750, parents=True, uid="admin") # # Backup target management # @@ -535,7 +538,7 @@ class BackupManager: successfull_system = self.targets.list("system", include=["Success", "Warning"]) if not successfull_apps and not successfull_system: - filesystem.rm(self.work_dir, True, True) + rm(self.work_dir, True, True) raise YunohostError("backup_nothings_done") # Add unlisted files from backup tmp dir @@ -647,7 +650,7 @@ class BackupManager: restore_hooks_dir = os.path.join(self.work_dir, "hooks", "restore") if not os.path.exists(restore_hooks_dir): - filesystem.mkdir(restore_hooks_dir, mode=0o700, parents=True, uid="root") + mkdir(restore_hooks_dir, mode=0o700, parents=True, uid="root") restore_hooks = hook_list("restore")["hooks"] @@ -714,7 +717,7 @@ class BackupManager: tmp_workdir_for_app = _make_tmp_workdir_for_app(app=app) try: # Prepare backup directory for the app - filesystem.mkdir(tmp_app_bkp_dir, 0o700, True, uid="root") + mkdir(tmp_app_bkp_dir, 0o700, True, uid="root") # Copy the app settings to be able to call _common.sh shutil.copytree(app_setting_path, settings_dir) @@ -753,7 +756,7 @@ class BackupManager: # Remove tmp files in all situations finally: shutil.rmtree(tmp_workdir_for_app) - filesystem.rm(env_dict["YNH_BACKUP_CSV"], force=True) + rm(env_dict["YNH_BACKUP_CSV"], force=True) # # Actual backup archive creation / method management # @@ -796,7 +799,7 @@ class BackupManager: if row["dest"] == "info.json": continue - size = disk_usage(row["source"]) + size = space_used_by_directory(row["source"], follow_symlinks=False) # Add size to apps details splitted_dest = row["dest"].split("/") @@ -945,7 +948,7 @@ class RestoreManager: ret = subprocess.call(["umount", self.work_dir]) if ret != 0: logger.warning(m18n.n("restore_cleaning_failed")) - filesystem.rm(self.work_dir, recursive=True, force=True) + rm(self.work_dir, recursive=True, force=True) # # Restore target manangement # @@ -975,7 +978,7 @@ class RestoreManager: available_restore_system_hooks = hook_list("restore")["hooks"] custom_restore_hook_folder = os.path.join(CUSTOM_HOOK_FOLDER, "restore") - filesystem.mkdir(custom_restore_hook_folder, 755, parents=True, force=True) + mkdir(custom_restore_hook_folder, 755, parents=True, force=True) for system_part in target_list: # By default, we'll use the restore hooks on the current install @@ -1080,7 +1083,7 @@ class RestoreManager: else: raise YunohostError("restore_removing_tmp_dir_failed") - filesystem.mkdir(self.work_dir, parents=True) + mkdir(self.work_dir, parents=True) self.method.mount() @@ -1398,7 +1401,7 @@ class RestoreManager: # Delete _common.sh file in backup common_file = os.path.join(app_backup_in_archive, "_common.sh") - filesystem.rm(common_file, force=True) + rm(common_file, force=True) # Check if the app has a restore script app_restore_script_in_archive = os.path.join(app_scripts_in_archive, "restore") @@ -1414,14 +1417,14 @@ class RestoreManager: ) app_scripts_new_path = os.path.join(app_settings_new_path, "scripts") shutil.copytree(app_settings_in_archive, app_settings_new_path) - filesystem.chmod(app_settings_new_path, 0o400, 0o400, True) - filesystem.chown(app_scripts_new_path, "root", None, True) + chmod(app_settings_new_path, 0o400, 0o400, True) + chown(app_scripts_new_path, "root", None, True) # Copy the app scripts to a writable temporary folder tmp_workdir_for_app = _make_tmp_workdir_for_app() copytree(app_scripts_in_archive, tmp_workdir_for_app) - filesystem.chmod(tmp_workdir_for_app, 0o700, 0o700, True) - filesystem.chown(tmp_workdir_for_app, "root", None, True) + chmod(tmp_workdir_for_app, 0o700, 0o700, True) + chown(tmp_workdir_for_app, "root", None, True) restore_script = os.path.join(tmp_workdir_for_app, "restore") # Restore permissions @@ -1724,7 +1727,7 @@ class BackupMethod(object): raise YunohostError("backup_cleaning_failed") if self.manager.is_tmp_work_dir: - filesystem.rm(self.work_dir, True, True) + rm(self.work_dir, True, True) def _check_is_enough_free_space(self): """ @@ -1772,11 +1775,11 @@ class BackupMethod(object): # Be sure the parent dir of destination exists if not os.path.isdir(dest_dir): - filesystem.mkdir(dest_dir, parents=True) + mkdir(dest_dir, parents=True) # For directory, attempt to mount bind if os.path.isdir(src): - filesystem.mkdir(dest, parents=True, force=True) + mkdir(dest, parents=True, force=True) try: subprocess.check_call(["mount", "--rbind", src, dest]) @@ -1830,7 +1833,7 @@ class BackupMethod(object): # to mounting error # Compute size to copy - size = sum(disk_usage(path["source"]) for path in paths_needed_to_be_copied) + size = sum(space_used_by_directory(path["source"], follow_symlinks=False) for path in paths_needed_to_be_copied) size /= 1024 * 1024 # Convert bytes to megabytes # Ask confirmation for copying @@ -1882,7 +1885,7 @@ class CopyBackupMethod(BackupMethod): dest_parent = os.path.dirname(dest) if not os.path.exists(dest_parent): - filesystem.mkdir(dest_parent, 0o700, True, uid="admin") + mkdir(dest_parent, 0o700, True, uid="admin") if os.path.isdir(source): shutil.copytree(source, dest) @@ -1900,7 +1903,7 @@ class CopyBackupMethod(BackupMethod): if not os.path.isdir(self.repo): raise YunohostError("backup_no_uncompress_archive_dir") - filesystem.mkdir(self.work_dir, parent=True) + mkdir(self.work_dir, parent=True) ret = subprocess.call(["mount", "-r", "--rbind", self.repo, self.work_dir]) if ret == 0: return @@ -1944,7 +1947,7 @@ class TarBackupMethod(BackupMethod): """ if not os.path.exists(self.repo): - filesystem.mkdir(self.repo, 0o750, parents=True, uid="admin") + mkdir(self.repo, 0o750, parents=True, uid="admin") # Check free space in output self._check_is_enough_free_space() @@ -2667,32 +2670,3 @@ def _recursive_umount(directory): continue return everything_went_fine - - -def disk_usage(path): - # We don't do this in python with os.stat because we don't want - # to follow symlinks - - du_output = check_output(["du", "-sb", path], shell=False) - return int(du_output.split()[0]) - - -def binary_to_human(n, customary=False): - """ - Convert bytes or bits into human readable format with binary prefix - Keyword argument: - n -- Number to convert - customary -- Use customary symbol instead of IEC standard - """ - symbols = ("Ki", "Mi", "Gi", "Ti", "Pi", "Ei", "Zi", "Yi") - if customary: - symbols = ("K", "M", "G", "T", "P", "E", "Z", "Y") - prefix = {} - for i, s in enumerate(symbols): - prefix[s] = 1 << (i + 1) * 10 - for s in reversed(symbols): - if n >= prefix[s]: - value = float(n) / prefix[s] - return "%.1f%s" % (value, s) - return "%s" % n - diff --git a/src/yunohost/data_migrations/0015_migrate_to_buster.py b/src/yunohost/data_migrations/0015_migrate_to_buster.py index 4f2d4caf8..e71ee1d3a 100644 --- a/src/yunohost/data_migrations/0015_migrate_to_buster.py +++ b/src/yunohost/data_migrations/0015_migrate_to_buster.py @@ -10,8 +10,8 @@ from moulinette.utils.filesystem import read_file from yunohost.tools import Migration, tools_update, tools_upgrade from yunohost.app import unstable_apps from yunohost.regenconf import manually_modified_files -from yunohost.utils.filesystem import free_space_in_directory -from yunohost.utils.packages import ( +from yunohost.utils.system import ( + free_space_in_directory, get_ynh_package_version, _list_upgradable_apt_packages, ) diff --git a/src/yunohost/data_migrations/0017_postgresql_9p6_to_11.py b/src/yunohost/data_migrations/0017_postgresql_9p6_to_11.py index 1ccf5ccc9..67df8d771 100644 --- a/src/yunohost/data_migrations/0017_postgresql_9p6_to_11.py +++ b/src/yunohost/data_migrations/0017_postgresql_9p6_to_11.py @@ -5,7 +5,7 @@ from yunohost.utils.error import YunohostError, YunohostValidationError from moulinette.utils.log import getActionLogger from yunohost.tools import Migration -from yunohost.utils.filesystem import free_space_in_directory, space_used_by_directory +from yunohost.utils.system import free_space_in_directory, space_used_by_directory logger = getActionLogger("yunohost.migration") diff --git a/src/yunohost/log.py b/src/yunohost/log.py index d73a62cd0..4b064fb9c 100644 --- a/src/yunohost/log.py +++ b/src/yunohost/log.py @@ -38,7 +38,7 @@ from io import IOBase from moulinette import m18n, Moulinette from moulinette.core import MoulinetteError from yunohost.utils.error import YunohostError, YunohostValidationError -from yunohost.utils.packages import get_ynh_package_version +from yunohost.utils.system import get_ynh_package_version from moulinette.utils.log import getActionLogger from moulinette.utils.filesystem import read_file, read_yaml diff --git a/src/yunohost/tools.py b/src/yunohost/tools.py index fb9839814..4e0ae660d 100644 --- a/src/yunohost/tools.py +++ b/src/yunohost/tools.py @@ -48,10 +48,12 @@ from yunohost.domain import domain_add from yunohost.firewall import firewall_upnp from yunohost.service import service_start, service_enable from yunohost.regenconf import regen_conf -from yunohost.utils.packages import ( +from yunohost.utils.system import ( _dump_sources_list, _list_upgradable_apt_packages, ynh_packages_version, + dpkg_is_broken, + dpkg_lock_available, ) from yunohost.utils.error import YunohostError, YunohostValidationError from yunohost.log import is_unit_operation, OperationLogger @@ -171,20 +173,6 @@ def _set_hostname(hostname, pretty_hostname=None): logger.debug(out) -def _detect_virt(): - """ - Returns the output of systemd-detect-virt (so e.g. 'none' or 'lxc' or ...) - You can check the man of the command to have a list of possible outputs... - """ - - p = subprocess.Popen( - "systemd-detect-virt".split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT - ) - - out, _ = p.communicate() - return out.split()[0] - - @is_unit_operation() def tools_postinstall( operation_logger, @@ -463,13 +451,12 @@ def tools_upgrade( apps -- List of apps to upgrade (or [] to update all apps) system -- True to upgrade system """ - from yunohost.utils import packages - if packages.dpkg_is_broken(): + if dpkg_is_broken(): raise YunohostValidationError("dpkg_is_broken") # Check for obvious conflict with other dpkg/apt commands already running in parallel - if not packages.dpkg_lock_available(): + if not dpkg_lock_available(): raise YunohostValidationError("dpkg_lock_not_available") # Legacy options management (--system, --apps) diff --git a/src/yunohost/user.py b/src/yunohost/user.py index c9f70e152..348aa7c4f 100644 --- a/src/yunohost/user.py +++ b/src/yunohost/user.py @@ -40,6 +40,7 @@ from moulinette.utils.process import check_output from yunohost.utils.error import YunohostError, YunohostValidationError from yunohost.service import service_status from yunohost.log import is_unit_operation +from yunohost.utils.system import binary_to_human logger = getActionLogger("yunohost.user") @@ -597,7 +598,7 @@ def user_info(username): if has_value: storage_use = int(has_value.group(1)) - storage_use = _convertSize(storage_use) + storage_use = binary_to_human(storage_use) if is_limited: has_percent = re.search(r"%=(\d+)", cmd_result) @@ -1330,15 +1331,6 @@ def user_ssh_remove_key(username, key): # End SSH subcategory # - -def _convertSize(num, suffix=""): - for unit in ["K", "M", "G", "T", "P", "E", "Z"]: - if abs(num) < 1024.0: - return "%3.1f%s%s" % (num, unit, suffix) - num /= 1024.0 - return "%.1f%s%s" % (num, "Yi", suffix) - - def _hash_user_password(password): """ This function computes and return a salted hash for the password in input. diff --git a/src/yunohost/utils/filesystem.py b/src/yunohost/utils/filesystem.py deleted file mode 100644 index 04d7d3906..000000000 --- a/src/yunohost/utils/filesystem.py +++ /dev/null @@ -1,31 +0,0 @@ -# -*- coding: utf-8 -*- - -""" License - - Copyright (C) 2018 YUNOHOST.ORG - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published - by the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program; if not, see http://www.gnu.org/licenses - -""" -import os - - -def free_space_in_directory(dirpath): - stat = os.statvfs(dirpath) - return stat.f_frsize * stat.f_bavail - - -def space_used_by_directory(dirpath): - stat = os.statvfs(dirpath) - return stat.f_frsize * stat.f_blocks diff --git a/src/yunohost/utils/packages.py b/src/yunohost/utils/system.py similarity index 67% rename from src/yunohost/utils/packages.py rename to src/yunohost/utils/system.py index 3105bc4c7..f7d37cf1c 100644 --- a/src/yunohost/utils/packages.py +++ b/src/yunohost/utils/system.py @@ -23,13 +23,85 @@ import os import logging from moulinette.utils.process import check_output -from packaging import version +from yunohost.utils.error import YunohostError logger = logging.getLogger("yunohost.utils.packages") YUNOHOST_PACKAGES = ["yunohost", "yunohost-admin", "moulinette", "ssowat"] +def system_arch(): + return check_output("dpkg --print-architecture") + + +def system_virt(): + """ + Returns the output of systemd-detect-virt (so e.g. 'none' or 'lxc' or ...) + You can check the man of the command to have a list of possible outputs... + """ + # Detect virt technology (if not bare metal) and arch + # Gotta have this "|| true" because it systemd-detect-virt return 'none' + # with an error code on bare metal ~.~ + return check_output("systemd-detect-virt || true") + + +def free_space_in_directory(dirpath): + stat = os.statvfs(dirpath) + return stat.f_frsize * stat.f_bavail + + +def space_used_by_directory(dirpath, follow_symlinks=True): + + if not follow_symlinks: + du_output = check_output(["du", "-sb", dirpath], shell=False) + return int(du_output.split()[0]) + + stat = os.statvfs(dirpath) + return stat.f_frsize * stat.f_blocks + + +def human_to_binary(size: str) -> int: + + symbols = ("K", "M", "G", "T", "P", "E", "Z", "Y") + factor = {} + for i, s in enumerate(symbols): + factor[s] = 1 << (i + 1) * 10 + + suffix = size[-1] + size = size[:-1] + + if suffix not in symbols: + raise YunohostError(f"Invalid size suffix '{suffix}', expected one of {symbols}") + + try: + size = float(size) + except Exception: + raise YunohostError(f"Failed to convert size {size} to float") + + return size * factor[suffix] + + +def binary_to_human(n: int) -> str: + """ + Convert bytes or bits into human readable format with binary prefix + """ + symbols = ("K", "M", "G", "T", "P", "E", "Z", "Y") + prefix = {} + for i, s in enumerate(symbols): + prefix[s] = 1 << (i + 1) * 10 + for s in reversed(symbols): + if n >= prefix[s]: + value = float(n) / prefix[s] + return "%.1f%s" % (value, s) + return "%s" % n + + +def ram_available(): + + import psutil + return (psutil.virtual_memory().available, psutil.swap_memory().free) + + def get_ynh_package_version(package): # Returns the installed version and release version ('stable' or 'testing' @@ -48,43 +120,6 @@ def get_ynh_package_version(package): return {"version": out[1].strip("()"), "repo": out[2].strip(";")} -def meets_version_specifier(pkg_name, specifier): - """ - Check if a package installed version meets specifier - - specifier is something like ">> 1.2.3" - """ - - # In practice, this function is only used to check the yunohost version - # installed. - # We'll trim any ~foobar in the current installed version because it's not - # handled correctly by version.parse, but we don't care so much in that - # context - assert pkg_name in YUNOHOST_PACKAGES - pkg_version = get_ynh_package_version(pkg_name)["version"] - pkg_version = re.split(r"\~|\+|\-", pkg_version)[0] - pkg_version = version.parse(pkg_version) - - # Extract operator and version specifier - op, req_version = re.search(r"(<<|<=|=|>=|>>) *([\d\.]+)", specifier).groups() - req_version = version.parse(req_version) - - # Python2 had a builtin that returns (-1, 0, 1) depending on comparison - # c.f. https://stackoverflow.com/a/22490617 - def cmp(a, b): - return (a > b) - (a < b) - - deb_operators = { - "<<": lambda v1, v2: cmp(v1, v2) in [-1], - "<=": lambda v1, v2: cmp(v1, v2) in [-1, 0], - "=": lambda v1, v2: cmp(v1, v2) in [0], - ">=": lambda v1, v2: cmp(v1, v2) in [0, 1], - ">>": lambda v1, v2: cmp(v1, v2) in [1], - } - - return deb_operators[op](pkg_version, req_version) - - def ynh_packages_version(*args, **kwargs): # from cli the received arguments are: # (Namespace(_callbacks=deque([]), _tid='_global', _to_return={}), []) {} From 744729713d469f3ef94a9a40e9aa5013097f3c84 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Wed, 3 Nov 2021 22:06:32 +0100 Subject: [PATCH 12/89] Add notes for app resources logic --- src/yunohost/utils/resources.py | 129 +++++++++++++++++++++++++++++++- 1 file changed, 126 insertions(+), 3 deletions(-) diff --git a/src/yunohost/utils/resources.py b/src/yunohost/utils/resources.py index 424e38f91..64ec67b8c 100644 --- a/src/yunohost/utils/resources.py +++ b/src/yunohost/utils/resources.py @@ -59,6 +59,21 @@ class AppResourceSet: class AptDependenciesAppResource(AppResource): + """ + is_provisioned -> package __APP__-ynh-deps exists (ideally should check the Depends: but hmgn) + is_available -> True? idk + + update -> update deps on __APP__-ynh-deps + provision -> create/update deps on __APP__-ynh-deps + + deprovision -> remove __APP__-ynh-deps (+autoremove?) + + deep_clean -> remove any __APP__-ynh-deps for app not in app list + + backup -> nothing + restore = provision + """ + type = "apt" default_properties = { @@ -71,7 +86,23 @@ class AptDependenciesAppResource(AppResource): # call helpers idk ... pass + class SourcesAppResource(AppResource): + """ + is_provisioned -> (if pre_download,) cache exists with appropriate checksum + is_available -> curl HEAD returns 200 + + update -> none? + provision -> full download + check checksum + + deprovision -> remove cache for __APP__ ? + + deep_clean -> remove all cache + + backup -> nothing + restore -> nothing + """ + type = "sources" default_properties = { @@ -85,6 +116,21 @@ class SourcesAppResource(AppResource): class RoutesAppResource(AppResource): + """ + is_provisioned -> main perm exists + is_available -> perm urls do not conflict + + update -> refresh/update values for url/additional_urls/show_tile/auth/protected/... create new perms / delete any perm not listed + provision -> same as update? + + deprovision -> delete permissions + + deep_clean -> delete permissions for any __APP__.foobar where app not in app list... + + backup -> handled elsewhere by the core, should be integrated in there (dump .ldif/yml?) + restore -> handled by the core, should be integrated in there (restore .ldif/yml?) + """ + type = "routes" default_properties = { @@ -136,10 +182,26 @@ class RoutesAppResource(AppResource): class PortAppResource(AppResource): + """ + is_provisioned -> port setting exists and is not the port used by another app (ie not in another app setting) + is_available -> true + + update -> true + provision -> find a port not used by any app + + deprovision -> delete the port setting + + deep_clean -> ? + + backup -> nothing (backup port setting) + restore -> nothing (restore port setting) + """ + type = "port" default_properties = { - "value": 1000 + "value": 1000, + "type": "internal", } def _port_is_used(self, port): @@ -167,11 +229,26 @@ class PortAppResource(AppResource): class SystemuserAppResource(AppResource): + """ + is_provisioned -> user __APP__ exists + is_available -> user and group __APP__ doesn't exists + + update -> update values for home / shell / groups + provision -> create user + + deprovision -> delete user + + deep_clean -> uuuuh ? delete any user that could correspond to an app x_x ? + + backup -> nothing + restore -> provision + """ + type = "system_user" default_properties = { "username": "__APP__", - "home_dir": "/var/www/__APP__", + "home_dir": "__INSTALL_DIR__", "use_shell": False, "groups": [] } @@ -190,11 +267,27 @@ class SystemuserAppResource(AppResource): class InstalldirAppResource(AppResource): + """ + is_provisioned -> setting install_dir exists + /dir/ exists + is_available -> /dir/ doesn't exists + + provision -> create setting + create dir + update -> update perms ? + + deprovision -> delete dir + delete setting + + deep_clean -> uuuuh ? delete any dir in /var/www/ that would not correspond to an app x_x ? + + backup -> cp install dir + restore -> cp install dir + """ + type = "install_dir" default_properties = { "dir": "/var/www/__APP__", # FIXME or choose to move this elsewhere nowadays idk... - "alias": "final_path" + "alias": "final_path", + # FIXME : add something about perms ? } # FIXME: change default dir to /opt/stuff if app ain't a webapp ... @@ -219,6 +312,21 @@ class InstalldirAppResource(AppResource): class DatadirAppResource(AppResource): + """ + is_provisioned -> setting data_dir exists + /dir/ exists + is_available -> /dir/ doesn't exists + + provision -> create setting + create dir + update -> update perms ? + + deprovision -> (only if purge enabled...) delete dir + delete setting + + deep_clean -> zblerg idk nothing + + backup -> cp data dir ? (if not backup_core_only) + restore -> cp data dir ? (if in backup) + """ + type = "data_dir" default_properties = { @@ -239,6 +347,21 @@ class DatadirAppResource(AppResource): class DBAppResource(AppResource): + """ + is_provisioned -> setting db_user, db_name, db_pwd exists + is_available -> db doesn't already exists ( ... also gotta make sure that mysql / postgresql is indeed installed ... or will be after apt provisions it) + + provision -> setup the db + init the setting + update -> ?? + + deprovision -> delete the db + + deep_clean -> ... idk look into any db name that would not be related to any app ... + + backup -> dump db + restore -> setup + inject db dump + """ + type = "db" default_properties = { From 7206be00201799bd04af052a0dc0a6c94a7616fd Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Sat, 13 Nov 2021 17:09:30 +0100 Subject: [PATCH 13/89] Tmp work on provision/deprovision apt and system user --- src/yunohost/app.py | 107 ++++--- src/yunohost/utils/resources.py | 542 ++++++++++++++++++++------------ 2 files changed, 398 insertions(+), 251 deletions(-) diff --git a/src/yunohost/app.py b/src/yunohost/app.py index e251b99de..409e94d2d 100644 --- a/src/yunohost/app.py +++ b/src/yunohost/app.py @@ -735,6 +735,37 @@ def app_manifest(app): return manifest +def _confirm_app_install(app, force=False): + + # Ignore if there's nothing for confirm (good quality app), if --force is used + # or if request on the API (confirm already implemented on the API side) + if force or Moulinette.interface.type == "api": + return + + quality = _app_quality(app) + if quality == "success": + return + + # i18n: confirm_app_install_warning + # i18n: confirm_app_install_danger + # i18n: confirm_app_install_thirdparty + + if quality in ["danger", "thirdparty"]: + answer = Moulinette.prompt( + m18n.n("confirm_app_install_" + quality, answers="Yes, I understand"), + color="red", + ) + if answer != "Yes, I understand": + raise YunohostError("aborting") + + else: + answer = Moulinette.prompt( + m18n.n("confirm_app_install_" + quality, answers="Y/N"), color="yellow" + ) + if answer.upper() != "Y": + raise YunohostError("aborting") + + @is_unit_operation() def app_install( operation_logger, @@ -776,37 +807,7 @@ def app_install( if free_space_in_directory("/") <= 512 * 1000 * 1000: raise YunohostValidationError("disk_space_not_sufficient_install") - def confirm_install(app): - - # Ignore if there's nothing for confirm (good quality app), if --force is used - # or if request on the API (confirm already implemented on the API side) - if force or Moulinette.interface.type == "api": - return - - quality = _app_quality(app) - if quality == "success": - return - - # i18n: confirm_app_install_warning - # i18n: confirm_app_install_danger - # i18n: confirm_app_install_thirdparty - - if quality in ["danger", "thirdparty"]: - answer = Moulinette.prompt( - m18n.n("confirm_app_install_" + quality, answers="Yes, I understand"), - color="red", - ) - if answer != "Yes, I understand": - raise YunohostError("aborting") - - else: - answer = Moulinette.prompt( - m18n.n("confirm_app_install_" + quality, answers="Y/N"), color="yellow" - ) - if answer.upper() != "Y": - raise YunohostError("aborting") - - confirm_install(app) + _confirm_app_install(app) manifest, extracted_app_folder = _extract_app(app) packaging_format = manifest["packaging_format"] @@ -815,7 +816,6 @@ def app_install( raise YunohostValidationError("app_id_invalid") app_id = manifest["id"] - label = label if label else manifest["name"] # Check requirements _check_manifest_requirements(manifest, action="install") @@ -829,6 +829,8 @@ def app_install( else: app_instance_name = app_id + app_setting_path = os.path.join(APPS_SETTING_PATH, app_instance_name) + # Retrieve arguments list for install script raw_questions = manifest["install"] questions = ask_questions_and_parse_answers(raw_questions, prefilled_answers=args) @@ -861,7 +863,6 @@ def app_install( logger.info(m18n.n("app_start_install", app=app_id)) # Create app directory - app_setting_path = os.path.join(APPS_SETTING_PATH, app_instance_name) if os.path.exists(app_setting_path): shutil.rmtree(app_setting_path) os.makedirs(app_setting_path) @@ -894,23 +895,31 @@ def app_install( recursive=True, ) + # Initialize the main permission for the app + # The permission is initialized with no url associated, and with tile disabled + # For web app, the root path of the app will be added as url and the tile + # will be enabled during the app install. C.f. 'app_register_url()' below. + if packaging_format >= 2: + init_main_perm_allowed = ["visitors"] if not args.get("is_public") else ["all_users"] + else: + init_main_perm_allowed = ["all_users"] - resources = AppResourceSet(manifest["resources"], app_instance_name) - resources.check_availability() - resources.provision() + permission_create( + app_instance_name + ".main", + allowed=init_main_perm_allowed, + label=label if label else manifest["name"], + show_tile=False, + protected=False, + ) - if packaging_format < 2: - # Initialize the main permission for the app - # The permission is initialized with no url associated, and with tile disabled - # For web app, the root path of the app will be added as url and the tile - # will be enabled during the app install. C.f. 'app_register_url()' below. - permission_create( - app_instance_name + ".main", - allowed=["all_users"], - label=label, - show_tile=False, - protected=False, - ) + if packaging_format >= 2: + try: + from yunohost.utils.resources import AppResourceManager + resources = AppResourceManager(app_instance_name, current=app_setting_path, wanted=extracted_app_folder) + resources.apply() + except: + raise + # FIXME : error handling # Prepare env. var. to pass to script env_dict = _make_environment_for_app_script( @@ -2519,7 +2528,7 @@ def _make_environment_for_app_script( # If packaging format v2, load all settings if manifest["packaging_format"] >= 2: env_dict["app"] = app - for setting_name, setting_value in _get_app_settings(app): + for setting_name, setting_value in _get_app_settings(app).items(): # Ignore special internal settings like checksum__ # (not a huge deal to load them but idk...) diff --git a/src/yunohost/utils/resources.py b/src/yunohost/utils/resources.py index 64ec67b8c..c9969f01b 100644 --- a/src/yunohost/utils/resources.py +++ b/src/yunohost/utils/resources.py @@ -22,14 +22,47 @@ import os import copy from typing import Dict, Any +from moulinette.utils.log import getActionLogger +from moulinette.utils.filesystem import mkdir, chown, chmod, write_to_file + from yunohost.utils.error import YunohostError, YunohostValidationError +from yunohost.hook import hook_exec + +logger = getActionLogger("yunohost.app_resources") + + +class AppResourceManager(object): + + def __init__(self, app: str, manifest: str): + + self.app = app + self.resources = {name: AppResourceClassesByType[name](infos, app) + for name, infos in resources_dict.items()} + + def apply(self): + + + + + + + def validate_resource_availability(self): + + for name, resource in self.resources.items(): + resource.validate_availability(context={}) + + def provision_or_update_resources(self): + + for name, resource in self.resources.items(): + logger.info("Running provision_or_upgrade for {self.type}") + resource.provision_or_update(context={}) class AppResource(object): - def __init__(self, properties: Dict[str, Any], app_id: str): + def __init__(self, properties: Dict[str, Any], app: str): - self.app_id = app_id + self.app = app for key, value in self.default_properties.items(): setattr(self, key, value) @@ -37,85 +70,48 @@ class AppResource(object): for key, value in properties.items(): setattr(self, key, value) - def get_app_settings(self): - from yunohost.app import _get_app_settings - return _get_app_settings(self.app_id) + def get_setting(self, key): + from yunohost.app import app_setting + return app_setting(self.app, key) - def check_availability(self, context: Dict): + def set_setting(self, key, value): + from yunohost.app import app_setting + app_setting(self.app, key, value=value) + + def delete_setting(self, key, value): + from yunohost.app import app_setting + app_setting(self.app, key, delete=True) + + def validate_availability(self, context: Dict): pass + def _run_script(self, action, script, env={}, user="root"): -class AppResourceSet: + from yunohost.app import _make_tmp_workdir_for_app, _make_environment_for_app_script - def __init__(self, resources_dict: Dict[str, Dict[str, Any]], app_id: str): + tmpdir = _make_tmp_workdir_for_app(app=self.app) - self.set = {name: AppResourceClassesByType[name](infos, app_id) - for name, infos in resources_dict.items()} + env_ = _make_environment_for_app_script(self.app, workdir=tmpdir, action=f"{action}_{self.type}") + env_.update(env) - def check_availability(self): + script_path = f"{tmpdir}/{action}_{self.type}" + script = f""" +source /usr/share/yunohost/helpers +ynh_abort_if_errors - for name, resource in self.set.items(): - resource.check_availability(context={}) +{script} +""" + + write_to_file(script_path, script) + + print(env_) + + # FIXME : use the hook_exec_with_debug_instructions_stuff + ret, _ = hook_exec(script_path, env=env_) + print(ret) -class AptDependenciesAppResource(AppResource): - """ - is_provisioned -> package __APP__-ynh-deps exists (ideally should check the Depends: but hmgn) - is_available -> True? idk - - update -> update deps on __APP__-ynh-deps - provision -> create/update deps on __APP__-ynh-deps - - deprovision -> remove __APP__-ynh-deps (+autoremove?) - - deep_clean -> remove any __APP__-ynh-deps for app not in app list - - backup -> nothing - restore = provision - """ - - type = "apt" - - default_properties = { - "packages": [], - "extras": {} - } - - def check_availability(self, context): - # ? FIXME - # call helpers idk ... - pass - - -class SourcesAppResource(AppResource): - """ - is_provisioned -> (if pre_download,) cache exists with appropriate checksum - is_available -> curl HEAD returns 200 - - update -> none? - provision -> full download + check checksum - - deprovision -> remove cache for __APP__ ? - - deep_clean -> remove all cache - - backup -> nothing - restore -> nothing - """ - - type = "sources" - - default_properties = { - "main": {"url": "?", "sha256sum": "?", "predownload": True} - } - - def check_availability(self, context): - # ? FIXME - # call request.head on the url idk - pass - - -class RoutesAppResource(AppResource): +class WebpathResource(AppResource): """ is_provisioned -> main perm exists is_available -> perm urls do not conflict @@ -131,101 +127,30 @@ class RoutesAppResource(AppResource): restore -> handled by the core, should be integrated in there (restore .ldif/yml?) """ - type = "routes" + type = "webpath" + priority = 10 default_properties = { "full_domain": False, - "main": { - "url": "/", - "additional_urls": [], - "init_allowed": "__FIXME__", - "show_tile": True, - "protected": False, - "auth_header": True, - "label": "FIXME", - } } - def check_availability(self, context): + def validate_availability(self, context): from yunohost.app import _assert_no_conflicting_apps - app_settings = self.get_app_settings() - domain = app_settings["domain"] - path = app_settings["path"] if not self.full_domain else "/" - _assert_no_conflicting_apps(domain, path, ignore_app=self.app_id) + domain = self.get_setting("domain") + path = self.get_setting("path") if not self.full_domain else "/" + _assert_no_conflicting_apps(domain, path, ignore_app=self.app) def provision_or_update(self, context: Dict): - if context["app_action"] == "install": - pass # FIXME - # Initially, the .main permission is created with no url at all associated - # When the app register/books its web url, we also add the url '/' - # (meaning the root of the app, domain.tld/path/) - # and enable the tile to the SSO, and both of this should match 95% of apps - # For more specific cases, the app is free to change / add urls or disable - # the tile using the permission helpers. - #permission_create( - # self.app_id + ".main", - # allowed=["all_users"], - # label=label, - # show_tile=False, - # protected=False, - #) - #permission_url(app + ".main", url="/", sync_perm=False) - #user_permission_update(app + ".main", show_tile=True, sync_perm=False) - #permission_sync_to_user() + # Nothing to do ? Just setting the domain/path during install + # already provisions it ... + return # FIXME def deprovision(self, context: Dict): - del context["app_settings"]["domain"] - del context["app_settings"]["path"] - - -class PortAppResource(AppResource): - """ - is_provisioned -> port setting exists and is not the port used by another app (ie not in another app setting) - is_available -> true - - update -> true - provision -> find a port not used by any app - - deprovision -> delete the port setting - - deep_clean -> ? - - backup -> nothing (backup port setting) - restore -> nothing (restore port setting) - """ - - type = "port" - - default_properties = { - "value": 1000, - "type": "internal", - } - - def _port_is_used(self, port): - - # FIXME : this could be less brutal than two os.system ... - cmd1 = "ss --numeric --listening --tcp --udp | awk '{print$5}' | grep --quiet --extended-regexp ':%s$'" % port - # This second command is mean to cover (most) case where an app is using a port yet ain't currently using it for some reason (typically service ain't up) - cmd2 = f"grep -q \"port: '{port}'\" /etc/yunohost/apps/*/settings.yml" - return os.system(cmd1) == 0 and os.system(cmd2) == 0 - - def provision_or_update(self, context: str): - - # Don't do anything if port already defined ? - if context["app_settings"].get("port"): - return - - port = self.value - while self._port_is_used(port): - port += 1 - - context["app_settings"]["port"] = port - - def deprovision(self, context: Dict): - raise NotImplementedError() + self.delete_setting("domain") + self.delete_setting("path") class SystemuserAppResource(AppResource): @@ -233,8 +158,8 @@ class SystemuserAppResource(AppResource): is_provisioned -> user __APP__ exists is_available -> user and group __APP__ doesn't exists - update -> update values for home / shell / groups provision -> create user + update -> update values for home / shell / groups deprovision -> delete user @@ -245,26 +170,69 @@ class SystemuserAppResource(AppResource): """ type = "system_user" + priority = 20 default_properties = { - "username": "__APP__", - "home_dir": "__INSTALL_DIR__", - "use_shell": False, - "groups": [] + "allow_ssh": [] + "allow_sftp": [] } - def check_availability(self, context): - if os.system(f"getent passwd {self.username} &>/dev/null") != 0: - raise YunohostValidationError(f"User {self.username} already exists") - if os.system(f"getent group {self.username} &>/dev/null") != 0: - raise YunohostValidationError(f"Group {self.username} already exists") + def validate_availability(self, context): + pass + # FIXME : do we care if user already exists ? shouldnt we assume that user $app corresponds to the app ...? + + # FIXME : but maybe we should at least check that no corresponding yunohost user exists + + #if os.system(f"getent passwd {self.username} &>/dev/null") != 0: + # raise YunohostValidationError(f"User {self.username} already exists") + #if os.system(f"getent group {self.username} &>/dev/null") != 0: + # raise YunohostValidationError(f"Group {self.username} already exists") + + def provision_or_update(self, context: Dict): + + if os.system(f"getent passwd {self.app} &>/dev/null") != 0: + cmd = f"useradd --system --user-group {self.app}" + os.system(cmd) + + if os.system(f"getent passwd {self.app} &>/dev/null") == 0: + raise YunohostError(f"Failed to create system user for {self.app}") + + groups = [] + if self.allow_ssh: + groups.append("ssh.app") + if self.allow_sftp: + groups.append("sftp.app") + groups = + + cmd = f"usermod -a -G {groups} {self.app}" + # FIXME : handle case where group gets removed + os.system(cmd) + +# useradd $user_home_dir --system --user-group $username $shell || ynh_die --message="Unable to create $username system account" +# for group in $groups; do +# usermod -a -G "$group" "$username" +# done + + +# | arg: -g, --groups - Add the user to system groups. Typically meant to add the user to the ssh.app / sftp.app group (e.g. for borgserver, my_webapp) - def provision_or_update(self, context: str): - raise NotImplementedError() def deprovision(self, context: Dict): - raise NotImplementedError() + self._run_script("deprovision", + f'ynh_system_user_delete "{self.username}"') + +# # Check if the user exists on the system +#if os.system(f"getent passwd {self.username} &>/dev/null") != 0: +# if ynh_system_user_exists "$username"; then +# deluser $username +# fi +# # Check if the group exists on the system +#if os.system(f"getent group {self.username} &>/dev/null") != 0: +# if ynh_system_group_exists "$username"; then +# delgroup $username +# fi +# class InstalldirAppResource(AppResource): """ @@ -283,32 +251,54 @@ class InstalldirAppResource(AppResource): """ type = "install_dir" + priority = 30 default_properties = { "dir": "/var/www/__APP__", # FIXME or choose to move this elsewhere nowadays idk... - "alias": "final_path", - # FIXME : add something about perms ? + "alias": None, + "owner": "__APP__:rx", + "group": "__APP__:rx", } # FIXME: change default dir to /opt/stuff if app ain't a webapp ... + # FIXME: what do in a scenario where the location changed - def check_availability(self, context): - if os.path.exists(self.dir): - raise YunohostValidationError(f"Folder {self.dir} already exists") + def validate_availability(self, context): + pass def provision_or_update(self, context: Dict): - if context["app_action"] in ["install", "restore"]: - if os.path.exists(self.dir): - raise YunohostValidationError(f"Path {self.dir} already exists") + current_install_dir = self.get_setting("install_dir") - if "installdir" not in context["app_settings"]: - context["app_settings"]["installdir"] = self.dir - context["app_settings"][self.alias] = context["app_settings"]["installdir"] + # If during install, /var/www/$app already exists, assume that it's okay to remove and recreate it + # FIXME : is this the right thing to do ? + if not current_install_dir and os.path.isdir(self.dir): + rm(self.dir, recursive=True) + + if not os.path.isdir(self.dir): + # Handle case where install location changed, in which case we shall move the existing install dir + if current_install_dir and os.path.isdir(current_install_dir): + shutil.move(current_install_dir, self.dir) + else: + mkdir(self.dir) + + owner, owner_perm = self.owner.split(":") + group, group_perm = self.group.split(":") + owner_perm_octal = (4 if "r" in owner_perm else 0) + (2 if "w" in owner_perm else 0) + (1 if "x" in owner_perm else 0) + group_perm_octal = (4 if "r" in group_perm else 0) + (2 if "w" in group_perm else 0) + (1 if "x" in group_perm else 0) + perm_octal = str(owner_perm_octal) + str(group_perm_octal) + "0" + + chmod(self.dir, oct(int(perm_octal))) + chown(self.dir, owner, group) + + self.set_setting("install_dir", self.dir) + if self.alias: + self.set_setting(self.alias, self.dir) def deprovision(self, context: Dict): - # FIXME: should it rm the directory during remove/deprovision ? - pass + # FIXME : check that self.dir has a sensible value to prevent catastrophes + if os.path.isdir(self.dir): + rm(self.dir, recursive=True) class DatadirAppResource(AppResource): @@ -328,56 +318,204 @@ class DatadirAppResource(AppResource): """ type = "data_dir" + priority = 40 default_properties = { "dir": "/home/yunohost.app/__APP__", # FIXME or choose to move this elsewhere nowadays idk... + "owner": "__APP__:rx", + "group": "__APP__:rx", } - def check_availability(self, context): - if os.path.exists(self.dir): - raise YunohostValidationError(f"Folder {self.dir} already exists") + def validate_availability(self, context): + pass + # Nothing to do ? If datadir already exists then it may be legit data + # from a previous install def provision_or_update(self, context: Dict): - if "datadir" not in context["app_settings"]: - context["app_settings"]["datadir"] = self.dir + + current_data_dir = self.get_setting("data_dir") + + if not os.path.isdir(self.dir): + # Handle case where install location changed, in which case we shall move the existing install dir + if current_data_dir and os.path.isdir(current_data_dir): + shutil.move(current_data_dir, self.dir) + else: + mkdir(self.dir) + + owner, owner_perm = self.owner.split(":") + group, group_perm = self.group.split(":") + owner_perm_octal = (4 if "r" in owner_perm else 0) + (2 if "w" in owner_perm else 0) + (1 if "x" in owner_perm else 0) + group_perm_octal = (4 if "r" in group_perm else 0) + (2 if "w" in group_perm else 0) + (1 if "x" in group_perm else 0) + perm_octal = str(owner_perm_octal) + str(group_perm_octal) + "0" + + chmod(self.dir, oct(int(perm_octal))) + chown(self.dir, owner, group) + + self.set_setting("data_dir", self.dir) def deprovision(self, context: Dict): - # FIXME: should it rm the directory during remove/deprovision ? + # FIXME: This should rm the datadir only if purge is enabled pass + #if os.path.isdir(self.dir): + # rm(self.dir, recursive=True) -class DBAppResource(AppResource): +# +#class SourcesAppResource(AppResource): +# """ +# is_provisioned -> (if pre_download,) cache exists with appropriate checksum +# is_available -> curl HEAD returns 200 +# +# update -> none? +# provision -> full download + check checksum +# +# deprovision -> remove cache for __APP__ ? +# +# deep_clean -> remove all cache +# +# backup -> nothing +# restore -> nothing +# """ +# +# type = "sources" +# +# default_properties = { +# "main": {"url": "?", "sha256sum": "?", "predownload": True} +# } +# +# def validate_availability(self, context): +# # ? FIXME +# # call request.head on the url idk +# pass +# +# def provision_or_update(self, context: Dict): +# # FIXME +# return +# + +class AptDependenciesAppResource(AppResource): """ - is_provisioned -> setting db_user, db_name, db_pwd exists - is_available -> db doesn't already exists ( ... also gotta make sure that mysql / postgresql is indeed installed ... or will be after apt provisions it) + is_provisioned -> package __APP__-ynh-deps exists (ideally should check the Depends: but hmgn) + is_available -> True? idk - provision -> setup the db + init the setting - update -> ?? + update -> update deps on __APP__-ynh-deps + provision -> create/update deps on __APP__-ynh-deps - deprovision -> delete the db + deprovision -> remove __APP__-ynh-deps (+autoremove?) - deep_clean -> ... idk look into any db name that would not be related to any app ... + deep_clean -> remove any __APP__-ynh-deps for app not in app list - backup -> dump db - restore -> setup + inject db dump + backup -> nothing + restore = provision """ - type = "db" + type = "apt" + priority = 50 default_properties = { - "type": "mysql" + "packages": [], + "extras": {} } - def check_availability(self, context): - # FIXME : checking availability sort of imply that mysql / postgresql is installed - # or we gotta make sure mariadb-server or postgresql is gonna be installed (apt resource) + def validate_availability(self, context): + # ? FIXME + # call helpers idk ... pass - def provision_or_update(self, context: str): - raise NotImplementedError() + def provision_or_update(self, context: Dict): + + # FIXME : implement 'extras' management + self._run_script("provision_or_update", + "ynh_install_app_dependencies $apt_dependencies", + {"apt_dependencies": self.packages}) def deprovision(self, context: Dict): - raise NotImplementedError() + self._run_script("deprovision", + "ynh_remove_app_dependencies") + + +class PortAppResource(AppResource): + """ + is_provisioned -> port setting exists and is not the port used by another app (ie not in another app setting) + is_available -> true + + update -> true + provision -> find a port not used by any app + + deprovision -> delete the port setting + + deep_clean -> ? + + backup -> nothing (backup port setting) + restore -> nothing (restore port setting) + """ + + type = "port" + priority = 70 + + default_properties = { + "default": 1000, + "type": "internal", # FIXME : implement logic for exposed port (allow/disallow in firewall ?) + } + + def _port_is_used(self, port): + + # FIXME : this could be less brutal than two os.system ... + cmd1 = "ss --numeric --listening --tcp --udp | awk '{print$5}' | grep --quiet --extended-regexp ':%s$'" % port + # This second command is mean to cover (most) case where an app is using a port yet ain't currently using it for some reason (typically service ain't up) + cmd2 = f"grep --quiet \"port: '{port}'\" /etc/yunohost/apps/*/settings.yml" + return os.system(cmd1) == 0 and os.system(cmd2) == 0 + + def provision_or_update(self, context: str): + + # Don't do anything if port already defined ? + if self.get_setting("port"): + return + + port = self.default + while self._port_is_used(port): + port += 1 + + self.set_setting("port", port) + + def deprovision(self, context: Dict): + + self.delete_setting("port") + + +#class DBAppResource(AppResource): +# """ +# is_provisioned -> setting db_user, db_name, db_pwd exists +# is_available -> db doesn't already exists ( ... also gotta make sure that mysql / postgresql is indeed installed ... or will be after apt provisions it) +# +# provision -> setup the db + init the setting +# update -> ?? +# +# deprovision -> delete the db +# +# deep_clean -> ... idk look into any db name that would not be related to any app ... +# +# backup -> dump db +# restore -> setup + inject db dump +# """ +# +# type = "db" +# +# default_properties = { +# "type": "mysql" +# } +# +# def validate_availability(self, context): +# # FIXME : checking availability sort of imply that mysql / postgresql is installed +# # or we gotta make sure mariadb-server or postgresql is gonna be installed (apt resource) +# pass +# +# def provision_or_update(self, context: str): +# raise NotImplementedError() +# +# def deprovision(self, context: Dict): +# raise NotImplementedError() +# AppResourceClassesByType = {c.type: c for c in AppResource.__subclasses__()} From 364a3bc70ab82be0c3d02d4f546df8e191eed30f Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 31 Dec 2021 19:02:19 +0100 Subject: [PATCH 14/89] manifestv2: fix many things, have resource system somewhat working for install/remove --- helpers/apt | 3 +- helpers/utils | 23 +++++-- locales/en.json | 2 +- src/app.py | 58 ++++++++++++------ src/utils/resources.py | 134 +++++++++++++++++++++++++---------------- 5 files changed, 140 insertions(+), 80 deletions(-) diff --git a/helpers/apt b/helpers/apt index 74bec758c..433318634 100644 --- a/helpers/apt +++ b/helpers/apt @@ -227,9 +227,8 @@ ynh_install_app_dependencies() { # Add a comma for each space between packages. But not add a comma if the space separate a version specification. (See below) dependencies="$(echo "$dependencies" | sed 's/\([^\<=\>]\)\ \([^(]\)/\1, \2/g')" local dependencies=${dependencies//|/ | } - local manifest_path="$YNH_APP_BASEDIR/manifest.json" - local version=$(jq -r '.version' "$manifest_path") + local version=$(ynh_read_manifest --manifest_key="version") if [ -z "${version}" ] || [ "$version" == "null" ]; then version="1.0" fi diff --git a/helpers/utils b/helpers/utils index 16e353dc4..a2484bb8b 100644 --- a/helpers/utils +++ b/helpers/utils @@ -765,12 +765,25 @@ ynh_read_manifest() { # Manage arguments with getopts ynh_handle_getopts_args "$@" - if [ ! -e "$manifest" ]; then + if [ ! -e "${manifest:-}" ]; then # If the manifest isn't found, try the common place for backup and restore script. - manifest="$YNH_APP_BASEDIR/manifest.json" + if [ -e "$YNH_APP_BASEDIR/manifest.json" ] + then + manifest="$YNH_APP_BASEDIR/manifest.json" + elif [ -e "$YNH_APP_BASEDIR/manifest.toml" ] + then + manifest="$YNH_APP_BASEDIR/manifest.toml" + else + ynh_die --message "No manifest found !?" + fi fi - jq ".$manifest_key" "$manifest" --raw-output + if echo "$manifest" | grep -q '\.json$' + then + jq ".$manifest_key" "$manifest" --raw-output + else + cat "$manifest" | python3 -c 'import json, toml, sys; print(json.dumps(toml.load(sys.stdin)))' | jq ".$manifest_key" --raw-output + fi } # Read the upstream version from the manifest or `$YNH_APP_MANIFEST_VERSION` @@ -914,9 +927,7 @@ ynh_compare_current_package_version() { _ynh_apply_default_permissions() { local target=$1 - local ynh_requirement=$(jq -r '.requirements.yunohost' $YNH_APP_BASEDIR/manifest.json | tr -d '>= ') - - if [ -z "$ynh_requirement" ] || [ "$ynh_requirement" == "null" ] || dpkg --compare-versions $ynh_requirement ge 4.2; then + if dpkg --compare-versions ${YNH_APP_PACKAGING_FORMAT:-0} ge 2 || [ -z "$ynh_requirement" ] || [ "$ynh_requirement" == "null" ] || dpkg --compare-versions $ynh_requirement ge 4.2; then chmod o-rwx $target chmod g-w $target chown -R root:root $target diff --git a/locales/en.json b/locales/en.json index fc4e4283a..cc5ad956a 100644 --- a/locales/en.json +++ b/locales/en.json @@ -43,7 +43,7 @@ "app_packaging_format_not_supported": "This app cannot be installed because its packaging format is not supported by your YunoHost version. You should probably consider upgrading your system.", "app_remove_after_failed_install": "Removing the app following the installation failure...", "app_removed": "{app} uninstalled", - "app_requirements_checking": "Checking required packages for {app}...", + "app_requirements_checking": "Checking requirements for {app}...", "app_requirements_unmeet": "Requirements are not met for {app}, the package {pkgname} ({version}) must be {spec}", "app_restore_failed": "Could not restore {app}: {error}", "app_restore_script_failed": "An error occured inside the app restore script", diff --git a/src/app.py b/src/app.py index a174d3eca..d2aa0fa65 100644 --- a/src/app.py +++ b/src/app.py @@ -59,7 +59,6 @@ from yunohost.utils.config import ( DomainQuestion, PathQuestion, ) -from yunohost.utils.resources import AppResourceSet from yunohost.utils.i18n import _value_for_locale from yunohost.utils.error import YunohostError, YunohostValidationError from yunohost.utils.system import ( @@ -790,7 +789,7 @@ def app_install( if free_space_in_directory("/") <= 512 * 1000 * 1000: raise YunohostValidationError("disk_space_not_sufficient_install") - _confirm_app_install(app) + _confirm_app_install(app, force) manifest, extracted_app_folder = _extract_app(app) packaging_format = manifest["packaging_format"] @@ -824,10 +823,11 @@ def app_install( } # Validate domain / path availability for webapps - if packaging_format < 2: - path_requirement = _guess_webapp_path_requirement(extracted_app_folder) - _validate_webpath_requirement(args, path_requirement) + # (ideally this should be handled by the resource system for manifest v >= 2 + path_requirement = _guess_webapp_path_requirement(extracted_app_folder) + _validate_webpath_requirement(args, path_requirement) + if packaging_format < 2: # Attempt to patch legacy helpers ... _patch_legacy_helpers(extracted_app_folder) @@ -881,9 +881,14 @@ def app_install( # Initialize the main permission for the app # The permission is initialized with no url associated, and with tile disabled # For web app, the root path of the app will be added as url and the tile - # will be enabled during the app install. C.f. 'app_register_url()' below. + # will be enabled during the app install. C.f. 'app_register_url()' below + # or the webpath resource if packaging_format >= 2: - init_main_perm_allowed = ["visitors"] if not args.get("is_public") else ["all_users"] + if args.get("init_permission_main"): + init_main_perm_allowed = args.get("init_permission_main") + else: + init_main_perm_allowed = ["visitors"] if not args.get("is_public") else ["all_users"] + else: init_main_perm_allowed = ["all_users"] @@ -896,13 +901,13 @@ def app_install( ) if packaging_format >= 2: + from yunohost.utils.resources import AppResourceManager try: - from yunohost.utils.resources import AppResourceManager - resources = AppResourceManager(app_instance_name, current=app_setting_path, wanted=extracted_app_folder) - resources.apply() - except: + AppResourceManager(app_instance_name, wanted=manifest["resources"], current={}).apply() + except Exception: + # FIXME : improve error handling .... + AppResourceManager(app_instance_name, wanted={}, current=manifest["resources"]).apply() raise - # FIXME : error handling # Prepare env. var. to pass to script env_dict = _make_environment_for_app_script( @@ -1000,6 +1005,14 @@ def app_install( m18n.n("unexpected_error", error="\n" + traceback.format_exc()) ) + if packaging_format >= 2: + from yunohost.utils.resources import AppResourceManager + try: + AppResourceManager(app_instance_name, wanted={}, current=manifest["resources"]).apply() + except Exception: + # FIXME : improve error handling .... + raise + # Remove all permission in LDAP for permission_name in user_permission_list()["permissions"].keys(): if permission_name.startswith(app_instance_name + "."): @@ -1103,21 +1116,30 @@ def app_remove(operation_logger, app, purge=False): finally: shutil.rmtree(tmp_workdir_for_app) - if ret == 0: - logger.success(m18n.n("app_removed", app=app)) - hook_callback("post_app_remove", env=env_dict) - else: - logger.warning(m18n.n("app_not_properly_removed", app=app)) - # Remove all permission in LDAP for permission_name in user_permission_list(apps=[app])["permissions"].keys(): permission_delete(permission_name, force=True, sync_perm=False) + packaging_format = manifest["packaging_format"] + if packaging_format >= 2: + try: + from yunohost.utils.resources import AppResourceManager + AppResourceManager(app, wanted={}, current=manifest["resources"]).apply() + except Exception: + # FIXME : improve error handling .... + raise + if os.path.exists(app_setting_path): shutil.rmtree(app_setting_path) hook_remove(app) + if ret == 0: + logger.success(m18n.n("app_removed", app=app)) + hook_callback("post_app_remove", env=env_dict) + else: + logger.warning(m18n.n("app_not_properly_removed", app=app)) + permission_sync_to_user() _assert_system_is_sane_for_app(manifest, "post") diff --git a/src/utils/resources.py b/src/utils/resources.py index c9969f01b..b0956a2d0 100644 --- a/src/utils/resources.py +++ b/src/utils/resources.py @@ -20,10 +20,15 @@ """ import os import copy +import shutil from typing import Dict, Any +from moulinette.utils.process import check_output from moulinette.utils.log import getActionLogger from moulinette.utils.filesystem import mkdir, chown, chmod, write_to_file +from moulinette.utils.filesystem import ( + rm, +) from yunohost.utils.error import YunohostError, YunohostValidationError from yunohost.hook import hook_exec @@ -31,43 +36,57 @@ from yunohost.hook import hook_exec logger = getActionLogger("yunohost.app_resources") -class AppResourceManager(object): +class AppResourceManager: - def __init__(self, app: str, manifest: str): + def __init__(self, app: str, current: Dict, wanted: Dict): self.app = app - self.resources = {name: AppResourceClassesByType[name](infos, app) - for name, infos in resources_dict.items()} + self.current = current + self.wanted = wanted - def apply(self): + def apply(self, **context): + + for name, infos in self.wanted.items(): + resource = AppResourceClassesByType[name](infos, self.app) + # FIXME: not a great place to check this because here + # we already started an operation + # We should find a way to validate this before actually starting + # the install procedure / theoperation log + if name not in self.current.keys(): + resource.validate_availability(context=context) + + for name, infos in reversed(self.current.items()): + if name not in self.wanted.keys(): + resource = AppResourceClassesByType[name](infos, self.app) + # FIXME : i18n, better info strings + logger.info(f"Deprovisionning {name} ...") + resource.deprovision(context=context) + + for name, infos in self.wanted.items(): + resource = AppResourceClassesByType[name](infos, self.app) + if name not in self.current.keys(): + # FIXME : i18n, better info strings + logger.info(f"Provisionning {name} ...") + else: + # FIXME : i18n, better info strings + logger.info(f"Updating {name} ...") + resource.provision_or_update(context=context) - - - - - def validate_resource_availability(self): - - for name, resource in self.resources.items(): - resource.validate_availability(context={}) - - def provision_or_update_resources(self): - - for name, resource in self.resources.items(): - logger.info("Running provision_or_upgrade for {self.type}") - resource.provision_or_update(context={}) - - -class AppResource(object): +class AppResource: def __init__(self, properties: Dict[str, Any], app: str): self.app = app for key, value in self.default_properties.items(): + if isinstance(value, str): + value = value.replace("__APP__", self.app) setattr(self, key, value) for key, value in properties.items(): + if isinstance(value, str): + value = value.replace("__APP__", self.app) setattr(self, key, value) def get_setting(self, key): @@ -78,7 +97,7 @@ class AppResource(object): from yunohost.app import app_setting app_setting(self.app, key, value=value) - def delete_setting(self, key, value): + def delete_setting(self, key): from yunohost.app import app_setting app_setting(self.app, key, delete=True) @@ -104,11 +123,12 @@ ynh_abort_if_errors write_to_file(script_path, script) - print(env_) + #print(env_) # FIXME : use the hook_exec_with_debug_instructions_stuff ret, _ = hook_exec(script_path, env=env_) - print(ret) + + #print(ret) class WebpathResource(AppResource): @@ -137,20 +157,28 @@ class WebpathResource(AppResource): def validate_availability(self, context): from yunohost.app import _assert_no_conflicting_apps - domain = self.get_setting("domain") path = self.get_setting("path") if not self.full_domain else "/" _assert_no_conflicting_apps(domain, path, ignore_app=self.app) def provision_or_update(self, context: Dict): - # Nothing to do ? Just setting the domain/path during install - # already provisions it ... - return # FIXME + from yunohost.permission import ( + permission_url, + user_permission_update, + permission_sync_to_user, + ) + + if context.get("action") == "install": + permission_url(f"{self.app}.main", url="/", sync_perm=False) + user_permission_update(f"{self.app}.main", show_tile=True, sync_perm=False) + permission_sync_to_user() def deprovision(self, context: Dict): self.delete_setting("domain") self.delete_setting("path") + # FIXME : theoretically here, should also remove the url in the main permission ? + # but is that worth the trouble ? class SystemuserAppResource(AppResource): @@ -173,7 +201,7 @@ class SystemuserAppResource(AppResource): priority = 20 default_properties = { - "allow_ssh": [] + "allow_ssh": [], "allow_sftp": [] } @@ -190,37 +218,37 @@ class SystemuserAppResource(AppResource): def provision_or_update(self, context: Dict): - if os.system(f"getent passwd {self.app} &>/dev/null") != 0: + if not check_output(f"getent passwd {self.app} &>/dev/null || true").strip(): + # FIXME: improve error handling ? cmd = f"useradd --system --user-group {self.app}" os.system(cmd) - if os.system(f"getent passwd {self.app} &>/dev/null") == 0: - raise YunohostError(f"Failed to create system user for {self.app}") + if not check_output(f"getent passwd {self.app} &>/dev/null || true").strip(): + raise YunohostError(f"Failed to create system user for {self.app}", raw_msg=True) + + groups = set(check_output(f"groups {self.app}").strip().split()[2:]) - groups = [] if self.allow_ssh: - groups.append("ssh.app") + groups.add("ssh.app") if self.allow_sftp: - groups.append("sftp.app") - groups = - - cmd = f"usermod -a -G {groups} {self.app}" - # FIXME : handle case where group gets removed - os.system(cmd) - -# useradd $user_home_dir --system --user-group $username $shell || ynh_die --message="Unable to create $username system account" -# for group in $groups; do -# usermod -a -G "$group" "$username" -# done - - -# | arg: -g, --groups - Add the user to system groups. Typically meant to add the user to the ssh.app / sftp.app group (e.g. for borgserver, my_webapp) + groups.add("sftp.app") + os.system(f"usermod -G {','.join(groups)} {self.app}") def deprovision(self, context: Dict): - self._run_script("deprovision", - f'ynh_system_user_delete "{self.username}"') + if check_output(f"getent passwd {self.app} &>/dev/null || true").strip(): + os.system(f"deluser {self.app} >/dev/null") + if check_output(f"getent passwd {self.app} &>/dev/null || true").strip(): + raise YunohostError(f"Failed to delete system user for {self.app}") + + if check_output(f"getent group {self.app} &>/dev/null || true").strip(): + os.system(f"delgroup {self.app} >/dev/null") + if check_output(f"getent group {self.app} &>/dev/null || true").strip(): + raise YunohostError(f"Failed to delete system user for {self.app}") + + # FIXME : better logging and error handling, add stdout/stderr from the deluser/delgroup commands... + # # Check if the user exists on the system #if os.system(f"getent passwd {self.username} &>/dev/null") != 0: @@ -288,7 +316,7 @@ class InstalldirAppResource(AppResource): group_perm_octal = (4 if "r" in group_perm else 0) + (2 if "w" in group_perm else 0) + (1 if "x" in group_perm else 0) perm_octal = str(owner_perm_octal) + str(group_perm_octal) + "0" - chmod(self.dir, oct(int(perm_octal))) + chmod(self.dir, int(perm_octal)) chown(self.dir, owner, group) self.set_setting("install_dir", self.dir) @@ -348,7 +376,7 @@ class DatadirAppResource(AppResource): group_perm_octal = (4 if "r" in group_perm else 0) + (2 if "w" in group_perm else 0) + (1 if "x" in group_perm else 0) perm_octal = str(owner_perm_octal) + str(group_perm_octal) + "0" - chmod(self.dir, oct(int(perm_octal))) + chmod(self.dir, int(perm_octal)) chown(self.dir, owner, group) self.set_setting("data_dir", self.dir) From dfc37a48c382c7adf6cb2e1dcecf63d2baa580d6 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Sun, 2 Jan 2022 03:30:57 +0100 Subject: [PATCH 15/89] manifestv2: forget about webpath ressource, replace with permissions ressource --- src/app.py | 69 +++++++++----------- src/utils/resources.py | 142 ++++++++++++++++++++++++++--------------- 2 files changed, 119 insertions(+), 92 deletions(-) diff --git a/src/app.py b/src/app.py index d2aa0fa65..5e67f620b 100644 --- a/src/app.py +++ b/src/app.py @@ -859,13 +859,13 @@ def app_install( # If packaging_format v2+, save all install questions as settings if packaging_format >= 2: - for arg_name, arg_value in args.items(): + for question in questions: - # ... except is_public .... - if arg_name == "is_public": + # Except user-provider passwords + if question.type == "password": continue - app_settings[arg_name] = arg_value + app_settings[question.name] = question.value _set_app_settings(app_instance_name, app_settings) @@ -878,36 +878,27 @@ def app_install( recursive=True, ) - # Initialize the main permission for the app - # The permission is initialized with no url associated, and with tile disabled - # For web app, the root path of the app will be added as url and the tile - # will be enabled during the app install. C.f. 'app_register_url()' below - # or the webpath resource - if packaging_format >= 2: - if args.get("init_permission_main"): - init_main_perm_allowed = args.get("init_permission_main") - else: - init_main_perm_allowed = ["visitors"] if not args.get("is_public") else ["all_users"] - - else: - init_main_perm_allowed = ["all_users"] - - permission_create( - app_instance_name + ".main", - allowed=init_main_perm_allowed, - label=label if label else manifest["name"], - show_tile=False, - protected=False, - ) - if packaging_format >= 2: from yunohost.utils.resources import AppResourceManager try: - AppResourceManager(app_instance_name, wanted=manifest["resources"], current={}).apply() + AppResourceManager(app_instance_name, wanted=manifest, current={}).apply() except Exception: # FIXME : improve error handling .... - AppResourceManager(app_instance_name, wanted={}, current=manifest["resources"]).apply() + AppResourceManager(app_instance_name, wanted={}, current=manifest).apply() raise + else: + # Initialize the main permission for the app + # The permission is initialized with no url associated, and with tile disabled + # For web app, the root path of the app will be added as url and the tile + # will be enabled during the app install. C.f. 'app_register_url()' below + # or the webpath resource + permission_create( + app_instance_name + ".main", + allowed=["all_users"], + label=label if label else manifest["name"], + show_tile=False, + protected=False, + ) # Prepare env. var. to pass to script env_dict = _make_environment_for_app_script( @@ -1008,15 +999,15 @@ def app_install( if packaging_format >= 2: from yunohost.utils.resources import AppResourceManager try: - AppResourceManager(app_instance_name, wanted={}, current=manifest["resources"]).apply() + AppResourceManager(app_instance_name, wanted={}, current=manifest).apply() except Exception: # FIXME : improve error handling .... raise - - # Remove all permission in LDAP - for permission_name in user_permission_list()["permissions"].keys(): - if permission_name.startswith(app_instance_name + "."): - permission_delete(permission_name, force=True, sync_perm=False) + else: + # Remove all permission in LDAP + for permission_name in user_permission_list()["permissions"].keys(): + if permission_name.startswith(app_instance_name + "."): + permission_delete(permission_name, force=True, sync_perm=False) if remove_retcode != 0: msg = m18n.n("app_not_properly_removed", app=app_instance_name) @@ -1116,18 +1107,18 @@ def app_remove(operation_logger, app, purge=False): finally: shutil.rmtree(tmp_workdir_for_app) - # Remove all permission in LDAP - for permission_name in user_permission_list(apps=[app])["permissions"].keys(): - permission_delete(permission_name, force=True, sync_perm=False) - packaging_format = manifest["packaging_format"] if packaging_format >= 2: try: from yunohost.utils.resources import AppResourceManager - AppResourceManager(app, wanted={}, current=manifest["resources"]).apply() + AppResourceManager(app, wanted={}, current=manifest).apply() except Exception: # FIXME : improve error handling .... raise + else: + # Remove all permission in LDAP + for permission_name in user_permission_list(apps=[app])["permissions"].keys(): + permission_delete(permission_name, force=True, sync_perm=False) if os.path.exists(app_setting_path): shutil.rmtree(app_setting_path) diff --git a/src/utils/resources.py b/src/utils/resources.py index b0956a2d0..23c1a7a5a 100644 --- a/src/utils/resources.py +++ b/src/utils/resources.py @@ -41,29 +41,23 @@ class AppResourceManager: def __init__(self, app: str, current: Dict, wanted: Dict): self.app = app - self.current = current - self.wanted = wanted + self.current = current.get("resources", {}) + self.wanted = wanted.get("resources", {}) + + # c.f. the permission ressources where we need the app label >_> + self.wanted_manifest = wanted def apply(self, **context): - for name, infos in self.wanted.items(): - resource = AppResourceClassesByType[name](infos, self.app) - # FIXME: not a great place to check this because here - # we already started an operation - # We should find a way to validate this before actually starting - # the install procedure / theoperation log - if name not in self.current.keys(): - resource.validate_availability(context=context) - for name, infos in reversed(self.current.items()): if name not in self.wanted.keys(): - resource = AppResourceClassesByType[name](infos, self.app) + resource = AppResourceClassesByType[name](infos, self.app, self) # FIXME : i18n, better info strings logger.info(f"Deprovisionning {name} ...") resource.deprovision(context=context) for name, infos in self.wanted.items(): - resource = AppResourceClassesByType[name](infos, self.app) + resource = AppResourceClassesByType[name](infos, self.app, self) if name not in self.current.keys(): # FIXME : i18n, better info strings logger.info(f"Provisionning {name} ...") @@ -75,9 +69,10 @@ class AppResourceManager: class AppResource: - def __init__(self, properties: Dict[str, Any], app: str): + def __init__(self, properties: Dict[str, Any], app: str, manager: str): self.app = app + self.manager = manager for key, value in self.default_properties.items(): if isinstance(value, str): @@ -101,9 +96,6 @@ class AppResource: from yunohost.app import app_setting app_setting(self.app, key, delete=True) - def validate_availability(self, context: Dict): - pass - def _run_script(self, action, script, env={}, user="root"): from yunohost.app import _make_tmp_workdir_for_app, _make_environment_for_app_script @@ -131,7 +123,7 @@ ynh_abort_if_errors #print(ret) -class WebpathResource(AppResource): +class PermissionsResource(AppResource): """ is_provisioned -> main perm exists is_available -> perm urls do not conflict @@ -147,38 +139,98 @@ class WebpathResource(AppResource): restore -> handled by the core, should be integrated in there (restore .ldif/yml?) """ - type = "webpath" + type = "permissions" priority = 10 default_properties = { - "full_domain": False, } - def validate_availability(self, context): + default_perm_properties = { + "url": None, + "additional_urls": [], + "auth_header": True, + "allowed": None, + "show_tile": None, # To be automagically set to True by default if an url is defined and show_tile not provided + "protected": False, + } - from yunohost.app import _assert_no_conflicting_apps - domain = self.get_setting("domain") - path = self.get_setting("path") if not self.full_domain else "/" - _assert_no_conflicting_apps(domain, path, ignore_app=self.app) + def __init__(self, properties: Dict[str, Any], *args, **kwargs): + + for perm, infos in properties.items(): + properties[perm] = copy.copy(self.default_perm_properties) + properties[perm].update(infos) + if properties[perm]["show_tile"] is None: + properties[perm]["show_tile"] = bool(properties[perm]["url"]) + + if isinstance(properties["main"]["url"], str) and properties["main"]["url"] != "/": + raise YunohostError("URL for the 'main' permission should be '/' for webapps (or undefined/None for non-webapps). Note that / refers to the install url of the app") + + super().__init__({"permissions": properties}, *args, **kwargs) def provision_or_update(self, context: Dict): from yunohost.permission import ( - permission_url, + permission_create, + #permission_url, + permission_delete, + user_permission_list, user_permission_update, permission_sync_to_user, ) - if context.get("action") == "install": - permission_url(f"{self.app}.main", url="/", sync_perm=False) - user_permission_update(f"{self.app}.main", show_tile=True, sync_perm=False) - permission_sync_to_user() + # Delete legacy is_public setting if not already done + self.delete_setting(f"is_public") + + existing_perms = user_permission_list(short=True, apps=[self.app])["permissions"] + for perm in existing_perms: + if perm.split(".") not in self.permissions.keys(): + permission_delete(perm, force=True, sync_perm=False) + + for perm, infos in self.permissions.items(): + if f"{self.app}.{perm}" not in existing_perms: + # Use the 'allowed' key from the manifest, + # or use the 'init_{perm}_permission' from the install questions + # which is temporarily saved as a setting as an ugly hack to pass the info to this piece of code... + init_allowed = infos["allowed"] or self.get_setting(f"init_{perm}_permission") or [] + permission_create( + f"{self.app}.{perm}", + allowed=init_allowed, + # This is why the ugly hack with self.manager and wanted_manifest exists >_> + label=self.manager.wanted_manifest["name"] if perm == "main" else perm, + url=infos["url"], + additional_urls=infos["additional_urls"], + auth_header=infos["auth_header"], + sync_perm=False, + ) + self.delete_setting(f"init_{perm}_permission") + + user_permission_update( + f"{self.app}.{perm}", + show_tile=infos["show_tile"], + protected=infos["protected"], + sync_perm=False + ) + else: + pass + # FIXME : current implementation of permission_url is hell for + # easy declarativeness of additional_urls >_> ... + #permission_url(f"{self.app}.{perm}", url=infos["url"], auth_header=infos["auth_header"], sync_perm=False) + + permission_sync_to_user() def deprovision(self, context: Dict): - self.delete_setting("domain") - self.delete_setting("path") - # FIXME : theoretically here, should also remove the url in the main permission ? - # but is that worth the trouble ? + + from yunohost.permission import ( + permission_delete, + user_permission_list, + permission_sync_to_user, + ) + + existing_perms = user_permission_list(short=True, apps=[self.app])["permissions"] + for perm in existing_perms: + permission_delete(perm, force=True, sync_perm=False) + + permission_sync_to_user() class SystemuserAppResource(AppResource): @@ -205,19 +257,11 @@ class SystemuserAppResource(AppResource): "allow_sftp": [] } - def validate_availability(self, context): - pass - # FIXME : do we care if user already exists ? shouldnt we assume that user $app corresponds to the app ...? - - # FIXME : but maybe we should at least check that no corresponding yunohost user exists - - #if os.system(f"getent passwd {self.username} &>/dev/null") != 0: - # raise YunohostValidationError(f"User {self.username} already exists") - #if os.system(f"getent group {self.username} &>/dev/null") != 0: - # raise YunohostValidationError(f"Group {self.username} already exists") - def provision_or_update(self, context: Dict): + # FIXME : validate that no yunohost user exists with that name? + # and/or that no system user exists during install ? + if not check_output(f"getent passwd {self.app} &>/dev/null || true").strip(): # FIXME: improve error handling ? cmd = f"useradd --system --user-group {self.app}" @@ -291,9 +335,6 @@ class InstalldirAppResource(AppResource): # FIXME: change default dir to /opt/stuff if app ain't a webapp ... # FIXME: what do in a scenario where the location changed - def validate_availability(self, context): - pass - def provision_or_update(self, context: Dict): current_install_dir = self.get_setting("install_dir") @@ -354,11 +395,6 @@ class DatadirAppResource(AppResource): "group": "__APP__:rx", } - def validate_availability(self, context): - pass - # Nothing to do ? If datadir already exists then it may be legit data - # from a previous install - def provision_or_update(self, context: Dict): current_data_dir = self.get_setting("data_dir") From 4c6786e8afe13ad703d80c6ddaf39630b3aacd70 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 3 Jan 2022 18:02:41 +0100 Subject: [PATCH 16/89] manifestv2, appresources: Implement a more generic 'apply' mecanism with possible rollback --- src/app.py | 34 ++++++---- src/backup.py | 10 +++ src/tests/test_app_resources.py | 115 ++++++++++++++++++++++++++++++++ src/utils/resources.py | 97 ++++++++++++++++++++------- 4 files changed, 218 insertions(+), 38 deletions(-) create mode 100644 src/tests/test_app_resources.py diff --git a/src/app.py b/src/app.py index 2e7c428d7..2f3f3e835 100644 --- a/src/app.py +++ b/src/app.py @@ -546,6 +546,7 @@ def app_upgrade(app=[], url=None, file=None, force=False, no_safety_backup=False if manifest["packaging_format"] >= 2: if no_safety_backup: + # FIXME: i18n logger.warning("Skipping the creation of a backup prior to the upgrade.") else: # FIXME: i18n @@ -570,8 +571,17 @@ def app_upgrade(app=[], url=None, file=None, force=False, no_safety_backup=False _assert_system_is_sane_for_app(manifest, "pre") + # We'll check that the app didn't brutally edit some system configuration + manually_modified_files_before_install = manually_modified_files() + app_setting_path = os.path.join(APPS_SETTING_PATH, app_instance_name) + # Attempt to patch legacy helpers ... + _patch_legacy_helpers(extracted_app_folder) + + # Apply dirty patch to make php5 apps compatible with php7 + _patch_legacy_php_versions(extracted_app_folder) + # Prepare env. var. to pass to script env_dict = _make_environment_for_app_script( app_instance_name, workdir=extracted_app_folder, action="upgrade" @@ -582,20 +592,19 @@ def app_upgrade(app=[], url=None, file=None, force=False, no_safety_backup=False if manifest["packaging_format"] < 2: env_dict["NO_BACKUP_UPGRADE"] = "1" if no_safety_backup else "0" - # We'll check that the app didn't brutally edit some system configuration - manually_modified_files_before_install = manually_modified_files() - - # Attempt to patch legacy helpers ... - _patch_legacy_helpers(extracted_app_folder) - - # Apply dirty patch to make php5 apps compatible with php7 - _patch_legacy_php_versions(extracted_app_folder) - # Start register change on system related_to = [("app", app_instance_name)] operation_logger = OperationLogger("app_upgrade", related_to, env=env_dict) operation_logger.start() + if manifest["packaging_format"] >= 2: + from yunohost.utils.resources import AppResourceManager + try: + AppResourceManager(app_instance_name, wanted=manifest, current=app_dict["manifest"]).apply(rollback_if_failure=True) + except Exception: + # FIXME : improve error handling .... + raise + # Execute the app upgrade script upgrade_failed = True try: @@ -880,10 +889,9 @@ def app_install( if packaging_format >= 2: from yunohost.utils.resources import AppResourceManager try: - AppResourceManager(app_instance_name, wanted=manifest, current={}).apply() + AppResourceManager(app_instance_name, wanted=manifest, current={}).apply(rollback_if_failure=True) except Exception: # FIXME : improve error handling .... - AppResourceManager(app_instance_name, wanted={}, current=manifest).apply() raise else: # Initialize the main permission for the app @@ -997,7 +1005,7 @@ def app_install( if packaging_format >= 2: from yunohost.utils.resources import AppResourceManager try: - AppResourceManager(app_instance_name, wanted={}, current=manifest).apply() + AppResourceManager(app_instance_name, wanted={}, current=manifest).apply(rollback_if_failure=False) except Exception: # FIXME : improve error handling .... raise @@ -1109,7 +1117,7 @@ def app_remove(operation_logger, app, purge=False): if packaging_format >= 2: try: from yunohost.utils.resources import AppResourceManager - AppResourceManager(app, wanted={}, current=manifest).apply() + AppResourceManager(app, wanted={}, current=manifest).apply(rollback_if_failure=False) except Exception: # FIXME : improve error handling .... raise diff --git a/src/backup.py b/src/backup.py index 1e16435b4..c2d921548 100644 --- a/src/backup.py +++ b/src/backup.py @@ -49,6 +49,7 @@ from yunohost.app import ( _is_installed, _make_environment_for_app_script, _make_tmp_workdir_for_app, + _get_manifest_of_app, ) from yunohost.hook import ( hook_list, @@ -1512,6 +1513,15 @@ class RestoreManager: operation_logger.extra["env"] = env_dict operation_logger.flush() + manifest = _get_manifest_of_app(app_dir_in_archive) + if manifest["packaging_format"] >= 2: + from yunohost.utils.resources import AppResourceManager + try: + AppResourceManager(app_instance_name, wanted=manifest, current={}).apply(rollback_if_failure=True) + except Exception: + # FIXME : improve error handling .... + raise + # Execute the app install script restore_failed = True try: diff --git a/src/tests/test_app_resources.py b/src/tests/test_app_resources.py new file mode 100644 index 000000000..d3abddc7f --- /dev/null +++ b/src/tests/test_app_resources.py @@ -0,0 +1,115 @@ +import os +import pytest + +from yunohost.utils.resources import AppResource, AppResourceManager, AppResourceClassesByType + +dummyfile = "/tmp/dummyappresource-testapp" + + +class DummyAppResource(AppResource): + + type = "dummy" + + default_properties = { + "file": "/tmp/dummyappresource-__APP__", + "content": "foo", + } + + def provision_or_update(self, context): + + open(self.file, "w").write(self.content) + + if self.content == "forbiddenvalue": + raise Exception("Emeged you used the forbidden value!1!£&") + + def deprovision(self, context): + + os.system(f"rm -f {self.file}") + + +AppResourceClassesByType["dummy"] = DummyAppResource + + +def setup_function(function): + + clean() + + +def teardown_function(function): + + clean() + + +def clean(): + + os.system(f"rm -f {dummyfile}") + + +def test_provision_dummy(): + + current = {"resources": {}} + wanted = {"resources": {"dummy": {}}} + + assert not os.path.exists(dummyfile) + AppResourceManager("testapp", current=current, wanted=wanted).apply(rollback_if_failure=False) + assert open(dummyfile).read().strip() == "foo" + + +def test_deprovision_dummy(): + + current = {"resources": {"dummy": {}}} + wanted = {"resources": {}} + + open(dummyfile, "w").write("foo") + + assert open(dummyfile).read().strip() == "foo" + AppResourceManager("testapp", current=current, wanted=wanted).apply(rollback_if_failure=False) + assert not os.path.exists(dummyfile) + + +def test_provision_dummy_nondefaultvalue(): + + current = {"resources": {}} + wanted = {"resources": {"dummy": {"content": "bar"}}} + + assert not os.path.exists(dummyfile) + AppResourceManager("testapp", current=current, wanted=wanted).apply(rollback_if_failure=False) + assert open(dummyfile).read().strip() == "bar" + + +def test_update_dummy(): + + current = {"resources": {"dummy": {}}} + wanted = {"resources": {"dummy": {"content": "bar"}}} + + open(dummyfile, "w").write("foo") + + assert open(dummyfile).read().strip() == "foo" + AppResourceManager("testapp", current=current, wanted=wanted).apply(rollback_if_failure=False) + assert open(dummyfile).read().strip() == "bar" + + +def test_update_dummy_fail(): + + current = {"resources": {"dummy": {}}} + wanted = {"resources": {"dummy": {"content": "forbiddenvalue"}}} + + open(dummyfile, "w").write("foo") + + assert open(dummyfile).read().strip() == "foo" + with pytest.raises(Exception): + AppResourceManager("testapp", current=current, wanted=wanted).apply(rollback_if_failure=False) + assert open(dummyfile).read().strip() == "forbiddenvalue" + + +def test_update_dummy_failwithrollback(): + + current = {"resources": {"dummy": {}}} + wanted = {"resources": {"dummy": {"content": "forbiddenvalue"}}} + + open(dummyfile, "w").write("foo") + + assert open(dummyfile).read().strip() == "foo" + with pytest.raises(Exception): + AppResourceManager("testapp", current=current, wanted=wanted).apply(rollback_if_failure=True) + assert open(dummyfile).read().strip() == "foo" diff --git a/src/utils/resources.py b/src/utils/resources.py index 23c1a7a5a..4e9876655 100644 --- a/src/utils/resources.py +++ b/src/utils/resources.py @@ -41,30 +41,77 @@ class AppResourceManager: def __init__(self, app: str, current: Dict, wanted: Dict): self.app = app - self.current = current.get("resources", {}) - self.wanted = wanted.get("resources", {}) + self.current = current + self.wanted = wanted - # c.f. the permission ressources where we need the app label >_> - self.wanted_manifest = wanted + def apply(self, rollback_if_failure, **context): - def apply(self, **context): + todos = list(self.compute_todos()) + completed = [] + rollback = False + exception = None - for name, infos in reversed(self.current.items()): - if name not in self.wanted.keys(): - resource = AppResourceClassesByType[name](infos, self.app, self) - # FIXME : i18n, better info strings - logger.info(f"Deprovisionning {name} ...") - resource.deprovision(context=context) - - for name, infos in self.wanted.items(): - resource = AppResourceClassesByType[name](infos, self.app, self) - if name not in self.current.keys(): - # FIXME : i18n, better info strings - logger.info(f"Provisionning {name} ...") + for todo, name, old, new in todos: + try: + if todo == "deprovision": + # FIXME : i18n, better info strings + logger.info(f"Deprovisionning {name} ...") + old.deprovision(context=context) + elif todo == "provision": + logger.info(f"Provisionning {name} ...") + new.provision_or_update(context=context) + elif todo == "update": + logger.info(f"Updating {name} ...") + new.provision_or_update(context=context) + except Exception as e: + exception = e + # FIXME: better error handling ? display stacktrace ? + logger.warning(f"Failed to {todo} for {name} : {e}") + if rollback_if_failure: + rollback = True + completed.append((todo, name, old, new)) + break + else: + pass else: - # FIXME : i18n, better info strings - logger.info(f"Updating {name} ...") - resource.provision_or_update(context=context) + completed.append((todo, name, old, new)) + + if rollback: + for todo, name, old, new in completed: + try: + # (NB. here we want to undo the todo) + if todo == "deprovision": + # FIXME : i18n, better info strings + logger.info(f"Reprovisionning {name} ...") + old.provision_or_update(context=context) + elif todo == "provision": + logger.info(f"Deprovisionning {name} ...") + new.deprovision(context=context) + elif todo == "update": + logger.info(f"Reverting {name} ...") + old.provision_or_update(context=context) + except Exception as e: + # FIXME: better error handling ? display stacktrace ? + logger.error(f"Failed to rollback {name} : {e}") + + if exception: + raise exception + + def compute_todos(self): + + for name, infos in reversed(self.current["resources"].items()): + if name not in self.wanted["resources"].keys(): + resource = AppResourceClassesByType[name](infos, self.app, self) + yield ("deprovision", name, resource, None) + + for name, infos in self.wanted["resources"].items(): + wanted_resource = AppResourceClassesByType[name](infos, self.app, self) + if name not in self.current["resources"].keys(): + yield ("provision", name, None, wanted_resource) + else: + infos_ = self.current["resources"][name] + current_resource = AppResourceClassesByType[name](infos_, self.app, self) + yield ("update", name, current_resource, wanted_resource) class AppResource: @@ -179,7 +226,7 @@ class PermissionsResource(AppResource): ) # Delete legacy is_public setting if not already done - self.delete_setting(f"is_public") + self.delete_setting("is_public") existing_perms = user_permission_list(short=True, apps=[self.app])["permissions"] for perm in existing_perms: @@ -195,8 +242,8 @@ class PermissionsResource(AppResource): permission_create( f"{self.app}.{perm}", allowed=init_allowed, - # This is why the ugly hack with self.manager and wanted_manifest exists >_> - label=self.manager.wanted_manifest["name"] if perm == "main" else perm, + # This is why the ugly hack with self.manager exists >_> + label=self.manager.wanted["name"] if perm == "main" else perm, url=infos["url"], additional_urls=infos["additional_urls"], auth_header=infos["auth_header"], @@ -499,7 +546,7 @@ class AptDependenciesAppResource(AppResource): "ynh_remove_app_dependencies") -class PortAppResource(AppResource): +class PortResource(AppResource): """ is_provisioned -> port setting exists and is not the port used by another app (ie not in another app setting) is_available -> true @@ -520,7 +567,7 @@ class PortAppResource(AppResource): default_properties = { "default": 1000, - "type": "internal", # FIXME : implement logic for exposed port (allow/disallow in firewall ?) + "expose": False, # FIXME : implement logic for exposed port (allow/disallow in firewall ?) } def _port_is_used(self, port): From 55963bef2309dd37566d8e57a9ea0ec9e5518bfa Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 14 Jan 2022 21:06:05 +0100 Subject: [PATCH 17/89] Cleanup --- src/utils/resources.py | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/src/utils/resources.py b/src/utils/resources.py index 4e9876655..b5ddb148e 100644 --- a/src/utils/resources.py +++ b/src/utils/resources.py @@ -300,8 +300,8 @@ class SystemuserAppResource(AppResource): priority = 20 default_properties = { - "allow_ssh": [], - "allow_sftp": [] + "allow_ssh": False, + "allow_sftp": False } def provision_or_update(self, context: Dict): @@ -494,11 +494,6 @@ class DatadirAppResource(AppResource): # "main": {"url": "?", "sha256sum": "?", "predownload": True} # } # -# def validate_availability(self, context): -# # ? FIXME -# # call request.head on the url idk -# pass -# # def provision_or_update(self, context: Dict): # # FIXME # return @@ -528,11 +523,6 @@ class AptDependenciesAppResource(AppResource): "extras": {} } - def validate_availability(self, context): - # ? FIXME - # call helpers idk ... - pass - def provision_or_update(self, context: Dict): # FIXME : implement 'extras' management @@ -568,6 +558,7 @@ class PortResource(AppResource): default_properties = { "default": 1000, "expose": False, # FIXME : implement logic for exposed port (allow/disallow in firewall ?) + # "protocol": "tcp", } def _port_is_used(self, port): @@ -617,11 +608,6 @@ class PortResource(AppResource): # "type": "mysql" # } # -# def validate_availability(self, context): -# # FIXME : checking availability sort of imply that mysql / postgresql is installed -# # or we gotta make sure mariadb-server or postgresql is gonna be installed (apt resource) -# pass -# # def provision_or_update(self, context: str): # raise NotImplementedError() # From 33d4dc9749a567c3526599109f020e81d6686cad Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 14 Jan 2022 21:41:02 +0100 Subject: [PATCH 18/89] apt resources: Yoloimplement extras repo management --- src/utils/resources.py | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/src/utils/resources.py b/src/utils/resources.py index b5ddb148e..c28f09390 100644 --- a/src/utils/resources.py +++ b/src/utils/resources.py @@ -30,7 +30,7 @@ from moulinette.utils.filesystem import ( rm, ) -from yunohost.utils.error import YunohostError, YunohostValidationError +from yunohost.utils.error import YunohostError from yunohost.hook import hook_exec logger = getActionLogger("yunohost.app_resources") @@ -210,7 +210,7 @@ class PermissionsResource(AppResource): properties[perm]["show_tile"] = bool(properties[perm]["url"]) if isinstance(properties["main"]["url"], str) and properties["main"]["url"] != "/": - raise YunohostError("URL for the 'main' permission should be '/' for webapps (or undefined/None for non-webapps). Note that / refers to the install url of the app") + raise YunohostValidationError("URL for the 'main' permission should be '/' for webapps (or undefined/None for non-webapps). Note that / refers to the install url of the app") super().__init__({"permissions": properties}, *args, **kwargs) @@ -523,17 +523,25 @@ class AptDependenciesAppResource(AppResource): "extras": {} } + def __init__(self, properties: Dict[str, Any], *args, **kwargs): + + for key, values in properties.get("extras", {}).items(): + if not all(isinstance(values.get(k), str) for k in ["repo", "key", "packages"]): + raise YunohostError("In apt resource in the manifest: 'extras' repo should have the keys 'repo', 'key' and 'packages' defined and be strings") + + super().__init__(properties, *args, **kwargs) + def provision_or_update(self, context: Dict): - # FIXME : implement 'extras' management - self._run_script("provision_or_update", - "ynh_install_app_dependencies $apt_dependencies", - {"apt_dependencies": self.packages}) + script = [f"ynh_install_app_dependencies {self.packages}"] + for repo, values in self.extras.items(): + script += [f"ynh_install_extra_app_dependencies --repo='{values['repo']}' --key='{values['key']}' --package='{values['packages']}'"] + + self._run_script("provision_or_update", '\n'.join(script)) def deprovision(self, context: Dict): - self._run_script("deprovision", - "ynh_remove_app_dependencies") + self._run_script("deprovision", "ynh_remove_app_dependencies") class PortResource(AppResource): From 13fb471f29b57a024df04f8bfbd20e299c4c066d Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 14 Jan 2022 21:58:11 +0100 Subject: [PATCH 19/89] install_dir resource: automigrate from final path value --- src/utils/resources.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/utils/resources.py b/src/utils/resources.py index c28f09390..73dd98380 100644 --- a/src/utils/resources.py +++ b/src/utils/resources.py @@ -374,17 +374,15 @@ class InstalldirAppResource(AppResource): default_properties = { "dir": "/var/www/__APP__", # FIXME or choose to move this elsewhere nowadays idk... - "alias": None, "owner": "__APP__:rx", "group": "__APP__:rx", } # FIXME: change default dir to /opt/stuff if app ain't a webapp ... - # FIXME: what do in a scenario where the location changed def provision_or_update(self, context: Dict): - current_install_dir = self.get_setting("install_dir") + current_install_dir = self.get_setting("install_dir") or self.get_setting("final_path") # If during install, /var/www/$app already exists, assume that it's okay to remove and recreate it # FIXME : is this the right thing to do ? @@ -393,6 +391,7 @@ class InstalldirAppResource(AppResource): if not os.path.isdir(self.dir): # Handle case where install location changed, in which case we shall move the existing install dir + # FIXME: confirm that's what we wanna do if current_install_dir and os.path.isdir(current_install_dir): shutil.move(current_install_dir, self.dir) else: @@ -406,10 +405,10 @@ class InstalldirAppResource(AppResource): chmod(self.dir, int(perm_octal)) chown(self.dir, owner, group) + # FIXME: shall we apply permissions recursively ? self.set_setting("install_dir", self.dir) - if self.alias: - self.set_setting(self.alias, self.dir) + self.delete_setting("final_path") # Legacy def deprovision(self, context: Dict): # FIXME : check that self.dir has a sensible value to prevent catastrophes From b68e99b2c0e4d43f2cfad184c3bc9ef38ccdd37a Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 14 Jan 2022 23:02:50 +0100 Subject: [PATCH 20/89] app resources: Yoloimplement support for db resources --- src/utils/resources.py | 107 ++++++++++++++++++++++++++++++----------- 1 file changed, 79 insertions(+), 28 deletions(-) diff --git a/src/utils/resources.py b/src/utils/resources.py index 73dd98380..45c76acd8 100644 --- a/src/utils/resources.py +++ b/src/utils/resources.py @@ -593,33 +593,84 @@ class PortResource(AppResource): self.delete_setting("port") -#class DBAppResource(AppResource): -# """ -# is_provisioned -> setting db_user, db_name, db_pwd exists -# is_available -> db doesn't already exists ( ... also gotta make sure that mysql / postgresql is indeed installed ... or will be after apt provisions it) -# -# provision -> setup the db + init the setting -# update -> ?? -# -# deprovision -> delete the db -# -# deep_clean -> ... idk look into any db name that would not be related to any app ... -# -# backup -> dump db -# restore -> setup + inject db dump -# """ -# -# type = "db" -# -# default_properties = { -# "type": "mysql" -# } -# -# def provision_or_update(self, context: str): -# raise NotImplementedError() -# -# def deprovision(self, context: Dict): -# raise NotImplementedError() -# +class DBAppResource(AppResource): + """ + is_provisioned -> setting db_user, db_name, db_pwd exists + is_available -> db doesn't already exists ( ... also gotta make sure that mysql / postgresql is indeed installed ... or will be after apt provisions it) + + provision -> setup the db + init the setting + update -> ?? + + deprovision -> delete the db + + deep_clean -> ... idk look into any db name that would not be related to any app ... + + backup -> dump db + restore -> setup + inject db dump + """ + + type = "db" + + default_properties = { + "type": None, + } + + def __init__(self, properties: Dict[str, Any], *args, **kwargs): + + if "type" not in properties or properties["type"] not in ["mysql", "postgresql"]: + raise YunohostError("Specifying the type of db ('mysql' or 'postgresql') is mandatory for db resources") + + super().__init__(properties, *args, **kwargs) + + def db_exists(self, db_name): + + if self.type == "mysql": + return os.system(f"mysqlshow '{db_name}' >/dev/null 2>/dev/null") == 0 + elif self.type == "postgresql": + return os.system(f"sudo --login --user=postgres psql -c '' '{db_name}' >/dev/null 2>/dev/null") == 0 + else: + return False + + def provision_or_update(self, context: str): + + # This is equivalent to ynh_sanitize_dbid + db_name = self.app.replace('-', '_').replace('.', '_') + db_user = db_name + self.set_setting("db_name", db_name) + self.set_setting("db_user", db_user) + + db_pwd = None + if self.get_setting("db_pwd"): + db_pwd = self.get_setting("db_pwd") + else: + # Legacy setting migration + legacypasswordsetting = "psqlpwd" if self.type == "postgresql" else "mysqlpwd" + if self.get_setting(legacypasswordsetting): + db_pwd = self.get_setting(legacypasswordsetting) + self.delete_setting(legacypasswordsetting) + self.set_setting("db_pwd", db_pwd) + + if not db_pwd: + from moulinette.utils.text import random_ascii + db_pwd = random_ascii(24) + self.set_setting("db_pwd", db_pwd) + + if not self.db_exists(db_name): + + if self.type == "mysql": + self._run_script("provision", f"ynh_mysql_create_db '{db_name}' '{db_user}' '{db_pwd}'") + elif self.type == "postgresql": + self._run_script("provision", f"ynh_psql_create_user '{db_user}' '{db_pwd}'; ynh_psql_create_db '{db_name}' '{db_user}'") + + def deprovision(self, context: Dict): + + db_name = self.app.replace('-', '_').replace('.', '_') + db_user = db_name + + if self.type == "mysql": + self._run_script("deprovision", f"ynh_mysql_remove_db '{db_name}' '{db_user}'") + elif self.type == "postgresql": + self._run_script("deprovision", f"ynh_psql_remove_db '{db_name}' '{db_user}'") + AppResourceClassesByType = {c.type: c for c in AppResource.__subclasses__()} From 8bc23e6f595f3563eac0389c0efaada1e8d15296 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Sat, 15 Jan 2022 19:18:21 +0100 Subject: [PATCH 21/89] app resources: Yoloimplement some tests for each resources --- src/tests/test_app_resources.py | 197 ++++++++++++++++++++++++++++++++ src/utils/resources.py | 16 ++- 2 files changed, 208 insertions(+), 5 deletions(-) diff --git a/src/tests/test_app_resources.py b/src/tests/test_app_resources.py index d3abddc7f..69e93a5ed 100644 --- a/src/tests/test_app_resources.py +++ b/src/tests/test_app_resources.py @@ -1,6 +1,9 @@ import os import pytest +from moulinette.utils.process import check_output + +from yunohost.app import app_setting from yunohost.utils.resources import AppResource, AppResourceManager, AppResourceClassesByType dummyfile = "/tmp/dummyappresource-testapp" @@ -43,6 +46,7 @@ def teardown_function(function): def clean(): os.system(f"rm -f {dummyfile}") + os.system("apt remove lolcat sl nyancat yarn") def test_provision_dummy(): @@ -113,3 +117,196 @@ def test_update_dummy_failwithrollback(): with pytest.raises(Exception): AppResourceManager("testapp", current=current, wanted=wanted).apply(rollback_if_failure=True) assert open(dummyfile).read().strip() == "foo" + + +def test_resource_system_user(): + + r = AppResourceClassesByType["system_user"] + + conf = {} + + assert os.system("getent passwd testapp &>/dev/null") != 0 + + r(conf, "testapp").provision_or_update() + + assert os.system("getent passwd testapp &>/dev/null") == 0 + assert os.system("getent group testapp | grep -q sftp.app") != 0 + + conf["allow_sftp"] = True + r(conf, "testapp").provision_or_update() + + assert os.system("getent passwd testapp &>/dev/null") == 0 + assert os.system("getent group testapp | grep -q sftp.app") == 0 + + r(conf, "testapp").deprovision() + + assert os.system("getent passwd testapp &>/dev/null") != 0 + + +def test_resource_install_dir(): + + r = AppResourceClassesByType["install_dir"] + conf = {} + + # FIXME: should also check settings ? + # FIXME: should also check automigrate from final_path + # FIXME: should also test changing the install folder location ? + + assert not os.path.exists("/var/www/testapp") + + r(conf, "testapp").provision_or_update() + + assert os.path.exists("/var/www/testapp") + unixperms = check_output("ls -ld /var/www/testapp").split() + assert unixperms[0] == "dr-xr-x---" + assert unixperms[2] == "testapp" + assert unixperms[3] == "testapp" + + conf["group"] = "__APP__:rwx" + conf["group"] = "www-data:x" + + r(conf, "testapp").provision_or_update() + + assert os.path.exists("/var/www/testapp") + unixperms = check_output("ls -ld /var/www/testapp").split() + assert unixperms[0] == "drwx--x---" + assert unixperms[2] == "testapp" + assert unixperms[3] == "www-data" + + r(conf, "testapp").deprovision() + + assert not os.path.exists("/var/www/testapp") + + +def test_resource_data_dir(): + + r = AppResourceClassesByType["data_dir"] + conf = {} + + assert not os.path.exists("/home/yunohost.app/testapp") + + r(conf, "testapp").provision_or_update() + + assert os.path.exists("/home/yunohost.app/testapp") + unixperms = check_output("ls -ld /home/yunohost.app/testapp").split() + assert unixperms[0] == "dr-xr-x---" + assert unixperms[2] == "testapp" + assert unixperms[3] == "testapp" + + conf["group"] = "__APP__:rwx" + conf["group"] = "www-data:x" + + r(conf, "testapp").provision_or_update() + + assert os.path.exists("/home/yunohost.app/testapp") + unixperms = check_output("ls -ld /home/yunohost.app/testapp").split() + assert unixperms[0] == "drwx--x---" + assert unixperms[2] == "testapp" + assert unixperms[3] == "www-data" + + r(conf, "testapp").deprovision() + + assert not os.path.exists("/home/yunohost.app/testapp") + + +def test_resource_port(): + + r = AppResourceClassesByType["port"] + conf = {} + + assert not app_setting("testapp", "port") + + r(conf, "testapp").provision_or_update() + + assert app_setting("testapp", "port") + + r(conf, "testapp").deprovision() + + assert not app_setting("testapp", "port") + + +def test_resource_database(): + + r = AppResourceClassesByType["database"] + conf = {"type": "mysql"} + + assert os.system("mysqlshow 'testapp' >/dev/null 2>/dev/null") != 0 + assert not app_setting("testapp", "db_name") + assert not app_setting("testapp", "db_user") + assert not app_setting("testapp", "db_pwd") + + r(conf, "testapp").provision_or_update() + + assert os.system("mysqlshow 'testapp' >/dev/null 2>/dev/null") == 0 + assert app_setting("testapp", "db_name") + assert app_setting("testapp", "db_user") + assert app_setting("testapp", "db_pwd") + + r(conf, "testapp").deprovision() + + assert os.system("mysqlshow 'testapp' >/dev/null 2>/dev/null") != 0 + assert not app_setting("testapp", "db_name") + assert not app_setting("testapp", "db_user") + assert not app_setting("testapp", "db_pwd") + + +def test_resource_apt(): + + r = AppResourceClassesByType["apt"] + conf = { + "packages": "nyancat, sl", + "extras": { + "yarn": { + "repo": "deb https://dl.yarnpkg.com/debian/ stable main", + "key": "https://dl.yarnpkg.com/debian/pubkey.gpg", + "packages": "yarn", + } + } + } + + assert os.system("dpkg --list | grep -q 'ii *nyancat'") != 0 + assert os.system("dpkg --list | grep -q 'ii *sl'") != 0 + assert os.system("dpkg --list | grep -q 'ii *yarn'") != 0 + assert os.system("dpkg --list | grep -q 'ii *lolcat'") != 0 + assert os.system("dpkg --list | grep -q 'ii *testapp-ynh-deps'") != 0 + + r(conf, "testapp").provision_or_update() + + assert os.system("dpkg --list | grep -q 'ii *nyancat'") == 0 + assert os.system("dpkg --list | grep -q 'ii *sl'") == 0 + assert os.system("dpkg --list | grep -q 'ii *yarn'") == 0 + assert os.system("dpkg --list | grep -q 'ii *lolcat'") != 0 # Lolcat shouldnt be installed yet + assert os.system("dpkg --list | grep -q 'ii *testapp-ynh-deps'") == 0 + + conf["packages"] += ", lolcat" + r(conf, "testapp").provision_or_update() + + assert os.system("dpkg --list | grep -q 'ii *nyancat'") != 0 + assert os.system("dpkg --list | grep -q 'ii *sl'") != 0 + assert os.system("dpkg --list | grep -q 'ii *yarn'") != 0 + assert os.system("dpkg --list | grep -q 'ii *lolcat'") == 0 + assert os.system("dpkg --list | grep -q 'ii *testapp-ynh-deps'") != 0 + + r(conf, "testapp").deprovision() + + assert os.system("dpkg --list | grep -q 'ii *nyancat'") != 0 + assert os.system("dpkg --list | grep -q 'ii *sl'") != 0 + assert os.system("dpkg --list | grep -q 'ii *yarn'") != 0 + assert os.system("dpkg --list | grep -q 'ii *lolcat'") != 0 + assert os.system("dpkg --list | grep -q 'ii *testapp-ynh-deps'") != 0 + + +def test_resource_permissions(): + + r = AppResourceClassesByType["permissions"] + conf = { + "main": { + "url": "/", + "allowed": "visitors" + # protected? + } + } + + pass + + diff --git a/src/utils/resources.py b/src/utils/resources.py index 45c76acd8..b4ec95bf8 100644 --- a/src/utils/resources.py +++ b/src/utils/resources.py @@ -116,7 +116,7 @@ class AppResourceManager: class AppResource: - def __init__(self, properties: Dict[str, Any], app: str, manager: str): + def __init__(self, properties: Dict[str, Any], app: str, manager=None): self.app = app self.manager = manager @@ -203,6 +203,8 @@ class PermissionsResource(AppResource): def __init__(self, properties: Dict[str, Any], *args, **kwargs): + # FIXME : if url != None, we should check that there's indeed a domain/path defined ? ie that app is a webapp + for perm, infos in properties.items(): properties[perm] = copy.copy(self.default_perm_properties) properties[perm].update(infos) @@ -210,7 +212,7 @@ class PermissionsResource(AppResource): properties[perm]["show_tile"] = bool(properties[perm]["url"]) if isinstance(properties["main"]["url"], str) and properties["main"]["url"] != "/": - raise YunohostValidationError("URL for the 'main' permission should be '/' for webapps (or undefined/None for non-webapps). Note that / refers to the install url of the app") + raise YunohostError("URL for the 'main' permission should be '/' for webapps (or undefined/None for non-webapps). Note that / refers to the install url of the app") super().__init__({"permissions": properties}, *args, **kwargs) @@ -414,6 +416,7 @@ class InstalldirAppResource(AppResource): # FIXME : check that self.dir has a sensible value to prevent catastrophes if os.path.isdir(self.dir): rm(self.dir, recursive=True) + # FIXME : in fact we should delete settings to be consistent class DatadirAppResource(AppResource): @@ -468,6 +471,7 @@ class DatadirAppResource(AppResource): pass #if os.path.isdir(self.dir): # rm(self.dir, recursive=True) + # FIXME : in fact we should delete settings to be consistent # @@ -563,7 +567,7 @@ class PortResource(AppResource): priority = 70 default_properties = { - "default": 1000, + "default": 5000, "expose": False, # FIXME : implement logic for exposed port (allow/disallow in firewall ?) # "protocol": "tcp", } @@ -593,7 +597,7 @@ class PortResource(AppResource): self.delete_setting("port") -class DBAppResource(AppResource): +class DatabaseAppResource(AppResource): """ is_provisioned -> setting db_user, db_name, db_pwd exists is_available -> db doesn't already exists ( ... also gotta make sure that mysql / postgresql is indeed installed ... or will be after apt provisions it) @@ -609,7 +613,7 @@ class DBAppResource(AppResource): restore -> setup + inject db dump """ - type = "db" + type = "database" default_properties = { "type": None, @@ -672,5 +676,7 @@ class DBAppResource(AppResource): elif self.type == "postgresql": self._run_script("deprovision", f"ynh_psql_remove_db '{db_name}' '{db_user}'") + # FIXME : in fact we should delete settings to be consistent + AppResourceClassesByType = {c.type: c for c in AppResource.__subclasses__()} From 011c2059a55b10a56ce78e2d5cb17bd3d128b47a Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Sun, 16 Jan 2022 03:34:53 +0100 Subject: [PATCH 22/89] appresources: fixes /o\ --- src/tests/test_app_resources.py | 88 +++++++++++++++++++-------------- src/utils/resources.py | 43 ++++++++-------- 2 files changed, 73 insertions(+), 58 deletions(-) diff --git a/src/tests/test_app_resources.py b/src/tests/test_app_resources.py index 69e93a5ed..638f6b119 100644 --- a/src/tests/test_app_resources.py +++ b/src/tests/test_app_resources.py @@ -37,6 +37,11 @@ def setup_function(function): clean() + os.system("mkdir /etc/yunohost/apps/testapp") + os.system("echo 'id: testapp' > /etc/yunohost/apps/testapp/settings.yml") + os.system("echo 'packaging_format = 2' > /etc/yunohost/apps/testapp/manifest.toml") + os.system("echo 'id = \"testapp\"' >> /etc/yunohost/apps/testapp/manifest.toml") + def teardown_function(function): @@ -46,7 +51,11 @@ def teardown_function(function): def clean(): os.system(f"rm -f {dummyfile}") - os.system("apt remove lolcat sl nyancat yarn") + os.system("rm -rf /etc/yunohost/apps/testapp") + os.system("rm -rf /var/www/testapp") + os.system("rm -rf /home/yunohost.app/testapp") + os.system("apt remove lolcat sl nyancat yarn >/dev/null 2>/dev/null") + os.system("userdel testapp 2>/dev/null") def test_provision_dummy(): @@ -125,28 +134,28 @@ def test_resource_system_user(): conf = {} - assert os.system("getent passwd testapp &>/dev/null") != 0 + assert os.system("getent passwd testapp 2>/dev/null") != 0 r(conf, "testapp").provision_or_update() - assert os.system("getent passwd testapp &>/dev/null") == 0 - assert os.system("getent group testapp | grep -q sftp.app") != 0 + assert os.system("getent passwd testapp >/dev/null") == 0 + assert os.system("groups testapp | grep -q 'sftp.app'") != 0 conf["allow_sftp"] = True r(conf, "testapp").provision_or_update() - assert os.system("getent passwd testapp &>/dev/null") == 0 - assert os.system("getent group testapp | grep -q sftp.app") == 0 + assert os.system("getent passwd testapp >/dev/null") == 0 + assert os.system("groups testapp | grep -q 'sftp.app'") == 0 r(conf, "testapp").deprovision() - assert os.system("getent passwd testapp &>/dev/null") != 0 + assert os.system("getent passwd testapp 2>/dev/null") != 0 def test_resource_install_dir(): r = AppResourceClassesByType["install_dir"] - conf = {} + conf = {"owner": "nobody:rx", "group": "nogroup:rx"} # FIXME: should also check settings ? # FIXME: should also check automigrate from final_path @@ -159,10 +168,10 @@ def test_resource_install_dir(): assert os.path.exists("/var/www/testapp") unixperms = check_output("ls -ld /var/www/testapp").split() assert unixperms[0] == "dr-xr-x---" - assert unixperms[2] == "testapp" - assert unixperms[3] == "testapp" + assert unixperms[2] == "nobody" + assert unixperms[3] == "nogroup" - conf["group"] = "__APP__:rwx" + conf["owner"] = "nobody:rwx" conf["group"] = "www-data:x" r(conf, "testapp").provision_or_update() @@ -170,7 +179,7 @@ def test_resource_install_dir(): assert os.path.exists("/var/www/testapp") unixperms = check_output("ls -ld /var/www/testapp").split() assert unixperms[0] == "drwx--x---" - assert unixperms[2] == "testapp" + assert unixperms[2] == "nobody" assert unixperms[3] == "www-data" r(conf, "testapp").deprovision() @@ -181,7 +190,7 @@ def test_resource_install_dir(): def test_resource_data_dir(): r = AppResourceClassesByType["data_dir"] - conf = {} + conf = {"owner": "nobody:rx", "group": "nogroup:rx"} assert not os.path.exists("/home/yunohost.app/testapp") @@ -190,10 +199,10 @@ def test_resource_data_dir(): assert os.path.exists("/home/yunohost.app/testapp") unixperms = check_output("ls -ld /home/yunohost.app/testapp").split() assert unixperms[0] == "dr-xr-x---" - assert unixperms[2] == "testapp" - assert unixperms[3] == "testapp" + assert unixperms[2] == "nobody" + assert unixperms[3] == "nogroup" - conf["group"] = "__APP__:rwx" + conf["owner"] = "nobody:rwx" conf["group"] = "www-data:x" r(conf, "testapp").provision_or_update() @@ -201,12 +210,13 @@ def test_resource_data_dir(): assert os.path.exists("/home/yunohost.app/testapp") unixperms = check_output("ls -ld /home/yunohost.app/testapp").split() assert unixperms[0] == "drwx--x---" - assert unixperms[2] == "testapp" + assert unixperms[2] == "nobody" assert unixperms[3] == "www-data" r(conf, "testapp").deprovision() - assert not os.path.exists("/home/yunohost.app/testapp") + # FIXME : implement and check purge option + #assert not os.path.exists("/home/yunohost.app/testapp") def test_resource_port(): @@ -264,40 +274,42 @@ def test_resource_apt(): } } - assert os.system("dpkg --list | grep -q 'ii *nyancat'") != 0 - assert os.system("dpkg --list | grep -q 'ii *sl'") != 0 - assert os.system("dpkg --list | grep -q 'ii *yarn'") != 0 - assert os.system("dpkg --list | grep -q 'ii *lolcat'") != 0 - assert os.system("dpkg --list | grep -q 'ii *testapp-ynh-deps'") != 0 + assert os.system("dpkg --list | grep -q 'ii *nyancat '") != 0 + assert os.system("dpkg --list | grep -q 'ii *sl '") != 0 + assert os.system("dpkg --list | grep -q 'ii *yarn '") != 0 + assert os.system("dpkg --list | grep -q 'ii *lolcat '") != 0 + assert os.system("dpkg --list | grep -q 'ii *testapp-ynh-deps '") != 0 r(conf, "testapp").provision_or_update() - assert os.system("dpkg --list | grep -q 'ii *nyancat'") == 0 - assert os.system("dpkg --list | grep -q 'ii *sl'") == 0 - assert os.system("dpkg --list | grep -q 'ii *yarn'") == 0 - assert os.system("dpkg --list | grep -q 'ii *lolcat'") != 0 # Lolcat shouldnt be installed yet - assert os.system("dpkg --list | grep -q 'ii *testapp-ynh-deps'") == 0 + assert os.system("dpkg --list | grep -q 'ii *nyancat '") == 0 + assert os.system("dpkg --list | grep -q 'ii *sl '") == 0 + assert os.system("dpkg --list | grep -q 'ii *yarn '") == 0 + assert os.system("dpkg --list | grep -q 'ii *lolcat '") != 0 # Lolcat shouldnt be installed yet + assert os.system("dpkg --list | grep -q 'ii *testapp-ynh-deps '") == 0 conf["packages"] += ", lolcat" r(conf, "testapp").provision_or_update() - assert os.system("dpkg --list | grep -q 'ii *nyancat'") != 0 - assert os.system("dpkg --list | grep -q 'ii *sl'") != 0 - assert os.system("dpkg --list | grep -q 'ii *yarn'") != 0 - assert os.system("dpkg --list | grep -q 'ii *lolcat'") == 0 - assert os.system("dpkg --list | grep -q 'ii *testapp-ynh-deps'") != 0 + assert os.system("dpkg --list | grep -q 'ii *nyancat '") == 0 + assert os.system("dpkg --list | grep -q 'ii *sl '") == 0 + assert os.system("dpkg --list | grep -q 'ii *yarn '") == 0 + assert os.system("dpkg --list | grep -q 'ii *lolcat '") == 0 + assert os.system("dpkg --list | grep -q 'ii *testapp-ynh-deps '") == 0 r(conf, "testapp").deprovision() - assert os.system("dpkg --list | grep -q 'ii *nyancat'") != 0 - assert os.system("dpkg --list | grep -q 'ii *sl'") != 0 - assert os.system("dpkg --list | grep -q 'ii *yarn'") != 0 - assert os.system("dpkg --list | grep -q 'ii *lolcat'") != 0 - assert os.system("dpkg --list | grep -q 'ii *testapp-ynh-deps'") != 0 + assert os.system("dpkg --list | grep -q 'ii *nyancat '") != 0 + assert os.system("dpkg --list | grep -q 'ii *sl '") != 0 + assert os.system("dpkg --list | grep -q 'ii *yarn '") != 0 + assert os.system("dpkg --list | grep -q 'ii *lolcat '") != 0 + assert os.system("dpkg --list | grep -q 'ii *testapp-ynh-deps '") != 0 def test_resource_permissions(): + raise NotImplementedError() + r = AppResourceClassesByType["permissions"] conf = { "main": { diff --git a/src/utils/resources.py b/src/utils/resources.py index b4ec95bf8..1391e9c4a 100644 --- a/src/utils/resources.py +++ b/src/utils/resources.py @@ -216,7 +216,7 @@ class PermissionsResource(AppResource): super().__init__({"permissions": properties}, *args, **kwargs) - def provision_or_update(self, context: Dict): + def provision_or_update(self, context: Dict={}): from yunohost.permission import ( permission_create, @@ -267,7 +267,7 @@ class PermissionsResource(AppResource): permission_sync_to_user() - def deprovision(self, context: Dict): + def deprovision(self, context: Dict={}): from yunohost.permission import ( permission_delete, @@ -306,7 +306,7 @@ class SystemuserAppResource(AppResource): "allow_sftp": False } - def provision_or_update(self, context: Dict): + def provision_or_update(self, context: Dict={}): # FIXME : validate that no yunohost user exists with that name? # and/or that no system user exists during install ? @@ -328,7 +328,7 @@ class SystemuserAppResource(AppResource): os.system(f"usermod -G {','.join(groups)} {self.app}") - def deprovision(self, context: Dict): + def deprovision(self, context: Dict={}): if check_output(f"getent passwd {self.app} &>/dev/null || true").strip(): os.system(f"deluser {self.app} >/dev/null") @@ -382,7 +382,7 @@ class InstalldirAppResource(AppResource): # FIXME: change default dir to /opt/stuff if app ain't a webapp ... - def provision_or_update(self, context: Dict): + def provision_or_update(self, context: Dict={}): current_install_dir = self.get_setting("install_dir") or self.get_setting("final_path") @@ -403,16 +403,17 @@ class InstalldirAppResource(AppResource): group, group_perm = self.group.split(":") owner_perm_octal = (4 if "r" in owner_perm else 0) + (2 if "w" in owner_perm else 0) + (1 if "x" in owner_perm else 0) group_perm_octal = (4 if "r" in group_perm else 0) + (2 if "w" in group_perm else 0) + (1 if "x" in group_perm else 0) - perm_octal = str(owner_perm_octal) + str(group_perm_octal) + "0" - chmod(self.dir, int(perm_octal)) + perm_octal = 0o100 * owner_perm_octal + 0o010 * group_perm_octal + + chmod(self.dir, perm_octal) chown(self.dir, owner, group) # FIXME: shall we apply permissions recursively ? self.set_setting("install_dir", self.dir) self.delete_setting("final_path") # Legacy - def deprovision(self, context: Dict): + def deprovision(self, context: Dict={}): # FIXME : check that self.dir has a sensible value to prevent catastrophes if os.path.isdir(self.dir): rm(self.dir, recursive=True) @@ -444,7 +445,7 @@ class DatadirAppResource(AppResource): "group": "__APP__:rx", } - def provision_or_update(self, context: Dict): + def provision_or_update(self, context: Dict={}): current_data_dir = self.get_setting("data_dir") @@ -459,14 +460,14 @@ class DatadirAppResource(AppResource): group, group_perm = self.group.split(":") owner_perm_octal = (4 if "r" in owner_perm else 0) + (2 if "w" in owner_perm else 0) + (1 if "x" in owner_perm else 0) group_perm_octal = (4 if "r" in group_perm else 0) + (2 if "w" in group_perm else 0) + (1 if "x" in group_perm else 0) - perm_octal = str(owner_perm_octal) + str(group_perm_octal) + "0" + perm_octal = 0o100 * owner_perm_octal + 0o010 * group_perm_octal - chmod(self.dir, int(perm_octal)) + chmod(self.dir, perm_octal) chown(self.dir, owner, group) self.set_setting("data_dir", self.dir) - def deprovision(self, context: Dict): + def deprovision(self, context: Dict={}): # FIXME: This should rm the datadir only if purge is enabled pass #if os.path.isdir(self.dir): @@ -497,7 +498,7 @@ class DatadirAppResource(AppResource): # "main": {"url": "?", "sha256sum": "?", "predownload": True} # } # -# def provision_or_update(self, context: Dict): +# def provision_or_update(self, context: Dict={}): # # FIXME # return # @@ -534,7 +535,7 @@ class AptDependenciesAppResource(AppResource): super().__init__(properties, *args, **kwargs) - def provision_or_update(self, context: Dict): + def provision_or_update(self, context: Dict={}): script = [f"ynh_install_app_dependencies {self.packages}"] for repo, values in self.extras.items(): @@ -542,7 +543,7 @@ class AptDependenciesAppResource(AppResource): self._run_script("provision_or_update", '\n'.join(script)) - def deprovision(self, context: Dict): + def deprovision(self, context: Dict={}): self._run_script("deprovision", "ynh_remove_app_dependencies") @@ -580,7 +581,7 @@ class PortResource(AppResource): cmd2 = f"grep --quiet \"port: '{port}'\" /etc/yunohost/apps/*/settings.yml" return os.system(cmd1) == 0 and os.system(cmd2) == 0 - def provision_or_update(self, context: str): + def provision_or_update(self, context: Dict={}): # Don't do anything if port already defined ? if self.get_setting("port"): @@ -592,7 +593,7 @@ class PortResource(AppResource): self.set_setting("port", port) - def deprovision(self, context: Dict): + def deprovision(self, context: Dict={}): self.delete_setting("port") @@ -635,7 +636,7 @@ class DatabaseAppResource(AppResource): else: return False - def provision_or_update(self, context: str): + def provision_or_update(self, context: Dict={}): # This is equivalent to ynh_sanitize_dbid db_name = self.app.replace('-', '_').replace('.', '_') @@ -666,7 +667,7 @@ class DatabaseAppResource(AppResource): elif self.type == "postgresql": self._run_script("provision", f"ynh_psql_create_user '{db_user}' '{db_pwd}'; ynh_psql_create_db '{db_name}' '{db_user}'") - def deprovision(self, context: Dict): + def deprovision(self, context: Dict={}): db_name = self.app.replace('-', '_').replace('.', '_') db_user = db_name @@ -676,7 +677,9 @@ class DatabaseAppResource(AppResource): elif self.type == "postgresql": self._run_script("deprovision", f"ynh_psql_remove_db '{db_name}' '{db_user}'") - # FIXME : in fact we should delete settings to be consistent + self.delete_setting("db_name") + self.delete_setting("db_user") + self.delete_setting("db_pwd") AppResourceClassesByType = {c.type: c for c in AppResource.__subclasses__()} From 9ed5b66bb403874c3b8f18b84900950e6680414d Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Sat, 22 Jan 2022 16:21:47 +0100 Subject: [PATCH 23/89] Fixes /o\ --- src/migrations/0021_migrate_to_bullseye.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/migrations/0021_migrate_to_bullseye.py b/src/migrations/0021_migrate_to_bullseye.py index f4361cb19..b2abbb026 100644 --- a/src/migrations/0021_migrate_to_bullseye.py +++ b/src/migrations/0021_migrate_to_bullseye.py @@ -15,8 +15,8 @@ from yunohost.tools import ( ) from yunohost.app import unstable_apps from yunohost.regenconf import manually_modified_files, _force_clear_hashes -from yunohost.utils.filesystem import free_space_in_directory -from yunohost.utils.packages import ( +from yunohost.utils.system import ( + free_space_in_directory, get_ynh_package_version, _list_upgradable_apt_packages, ) From d9873e085d5327147633525ca3485a0993cbd235 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 28 Jan 2022 21:21:41 +0100 Subject: [PATCH 24/89] app resources: Support several ports --- src/tests/test_app_resources.py | 23 ++++++++++++-- src/utils/resources.py | 55 +++++++++++++++++++++++++-------- 2 files changed, 63 insertions(+), 15 deletions(-) diff --git a/src/tests/test_app_resources.py b/src/tests/test_app_resources.py index 638f6b119..f53cf373e 100644 --- a/src/tests/test_app_resources.py +++ b/src/tests/test_app_resources.py @@ -219,9 +219,9 @@ def test_resource_data_dir(): #assert not os.path.exists("/home/yunohost.app/testapp") -def test_resource_port(): +def test_resource_ports(): - r = AppResourceClassesByType["port"] + r = AppResourceClassesByType["ports"] conf = {} assert not app_setting("testapp", "port") @@ -235,6 +235,25 @@ def test_resource_port(): assert not app_setting("testapp", "port") +def test_resource_ports_several(): + + r = AppResourceClassesByType["ports"] + conf = {"main.default": 12345, "foobar.default": 23456} + + assert not app_setting("testapp", "port") + assert not app_setting("testapp", "port_foobar") + + r(conf, "testapp").provision_or_update() + + assert app_setting("testapp", "port") + assert app_setting("testapp", "port_foobar") + + r(conf, "testapp").deprovision() + + assert not app_setting("testapp", "port") + assert not app_setting("testapp", "port_foobar") + + def test_resource_database(): r = AppResourceClassesByType["database"] diff --git a/src/utils/resources.py b/src/utils/resources.py index 1391e9c4a..b7d3c1694 100644 --- a/src/utils/resources.py +++ b/src/utils/resources.py @@ -21,6 +21,7 @@ import os import copy import shutil +import random from typing import Dict, Any from moulinette.utils.process import check_output @@ -548,7 +549,7 @@ class AptDependenciesAppResource(AppResource): self._run_script("deprovision", "ynh_remove_app_dependencies") -class PortResource(AppResource): +class PortsResource(AppResource): """ is_provisioned -> port setting exists and is not the port used by another app (ie not in another app setting) is_available -> true @@ -564,15 +565,32 @@ class PortResource(AppResource): restore -> nothing (restore port setting) """ - type = "port" + type = "ports" priority = 70 default_properties = { - "default": 5000, - "expose": False, # FIXME : implement logic for exposed port (allow/disallow in firewall ?) - # "protocol": "tcp", } + default_port_properties = { + "default": None, + "exposed": False, # or True(="Both"), "TCP", "UDP" # FIXME : implement logic for exposed port (allow/disallow in firewall ?) + "fixed": False, # FIXME: implement logic. Corresponding to wether or not the port is "fixed" or any random port is ok + } + + def __init__(self, properties: Dict[str, Any], *args, **kwargs): + + if "main" not in properties: + properties["main"] = {} + + for port, infos in properties.items(): + properties[port] = copy.copy(self.default_port_properties) + properties[port].update(infos) + + if properties[port]["default"] is None: + properties[port]["default"] = random.randint(10000, 60000) + + super().__init__({"ports": properties}, *args, **kwargs) + def _port_is_used(self, port): # FIXME : this could be less brutal than two os.system ... @@ -583,19 +601,30 @@ class PortResource(AppResource): def provision_or_update(self, context: Dict={}): - # Don't do anything if port already defined ? - if self.get_setting("port"): - return + for name, infos in self.ports.items(): - port = self.default - while self._port_is_used(port): - port += 1 + setting_name = f"port_{name}" if name != "main" else "port" + port_value = self.get_setting(setting_name) + if not port_value and name != "main": + # Automigrate from legacy setting foobar_port (instead of port_foobar) + legacy_setting_name = "{name}_port" + port_value = self.get_setting(legacy_setting_name) + self.set_setting(setting_name, port_value) + self.delete_setting(legacy_setting_name) + continue - self.set_setting("port", port) + if not port_value: + port_value = self.infos["default"] + while self._port_is_used(port_value): + port_value += 1 + + self.set_setting(setting_name, port_value) def deprovision(self, context: Dict={}): - self.delete_setting("port") + for name, infos in self.ports.items(): + setting_name = f"port_{name}" if name != "main" else "port" + self.delete_setting(setting_name) class DatabaseAppResource(AppResource): From 9cb97640b941867fde2b1fb0ca981913e915ea0e Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 28 Jan 2022 22:12:01 +0100 Subject: [PATCH 25/89] manifestv2: misc fixes + add test for manifestv2 install --- src/app.py | 5 +++-- src/tests/test_apps.py | 35 ++++++++++++++++++++++++++++++++++- src/utils/resources.py | 7 ++++++- 3 files changed, 43 insertions(+), 4 deletions(-) diff --git a/src/app.py b/src/app.py index f1abffd16..58ee7e017 100644 --- a/src/app.py +++ b/src/app.py @@ -1949,7 +1949,7 @@ def _convert_v1_manifest_to_v2(manifest): "ldap": "?", "sso": "?", "disk": "50M", - "ram": {"build": "50M", "runtime": "10M", "include_swap": False} + "ram": {"build": "50M", "runtime": "10M"} } maintainer = manifest.get("maintainer", {}).get("name") @@ -2301,7 +2301,8 @@ def _check_manifest_requirements(manifest: Dict, action: str): # Ram for build ram_build_requirement = manifest["integration"]["ram"]["build"] - ram_include_swap = manifest["integration"]["ram"]["include_swap"] + # Is "include_swap" really useful ? We should probably decide wether to always include it or not instead + ram_include_swap = manifest["integration"]["ram"].get("include_swap", False) ram, swap = ram_available() if ram_include_swap: diff --git a/src/tests/test_apps.py b/src/tests/test_apps.py index 2a808b5bd..6ff2c5271 100644 --- a/src/tests/test_apps.py +++ b/src/tests/test_apps.py @@ -45,6 +45,7 @@ def clean(): "break_yo_system", "legacy_app", "legacy_app__2", + "manifestv2_app", "full_domain_app", "my_webapp", ] @@ -115,7 +116,10 @@ def app_expected_files(domain, app): if app.startswith("legacy_app"): yield "/var/www/%s/index.html" % app yield "/etc/yunohost/apps/%s/settings.yml" % app - yield "/etc/yunohost/apps/%s/manifest.json" % app + if "manifestv2" in app: + yield "/etc/yunohost/apps/%s/manifest.toml" % app + else: + yield "/etc/yunohost/apps/%s/manifest.json" % app yield "/etc/yunohost/apps/%s/scripts/install" % app yield "/etc/yunohost/apps/%s/scripts/remove" % app @@ -157,6 +161,15 @@ def install_legacy_app(domain, path, public=True): ) +def install_manifestv2_app(domain, path, public=True): + + app_install( + os.path.join(get_test_apps_dir(), "manivestv2_app_ynh"), + args="domain={}&path={}&init_main_permission={}".format(domain, path, "visitors" if public else "all_users"), + force=True, + ) + + def install_full_domain_app(domain): app_install( @@ -195,6 +208,26 @@ def test_legacy_app_install_main_domain(): assert app_is_not_installed(main_domain, "legacy_app") +def test_manifestv2_app_install_main_domain(): + + main_domain = _get_maindomain() + + install_manifestv2_app(main_domain, "/manifestv2") + + app_map_ = app_map(raw=True) + assert main_domain in app_map_ + assert "/manifestv2" in app_map_[main_domain] + assert "id" in app_map_[main_domain]["/manifestv2"] + assert app_map_[main_domain]["/manifestv2"]["id"] == "manifestv2_app" + + assert app_is_installed(main_domain, "manifestv2_app") + assert app_is_exposed_on_http(main_domain, "/manifestv2", "Hextris") + + app_remove("manifestv2_app") + + assert app_is_not_installed(main_domain, "manifestv2_app") + + def test_app_from_catalog(): main_domain = _get_maindomain() diff --git a/src/utils/resources.py b/src/utils/resources.py index b7d3c1694..f64ad6134 100644 --- a/src/utils/resources.py +++ b/src/utils/resources.py @@ -45,6 +45,11 @@ class AppResourceManager: self.current = current self.wanted = wanted + if "resources" not in self.current: + self.current["resources"] = {} + if "resources" not in self.wanted: + self.wanted["resources"] = {} + def apply(self, rollback_if_failure, **context): todos = list(self.compute_todos()) @@ -233,7 +238,7 @@ class PermissionsResource(AppResource): existing_perms = user_permission_list(short=True, apps=[self.app])["permissions"] for perm in existing_perms: - if perm.split(".") not in self.permissions.keys(): + if perm.split(".")[0] not in self.permissions.keys(): permission_delete(perm, force=True, sync_perm=False) for perm, infos in self.permissions.items(): From 6316b94af4bade40c50012eddda128d7ab058a73 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Tue, 1 Feb 2022 14:30:15 +0100 Subject: [PATCH 26/89] helpers: missing ynh_requirement definition --- helpers/utils | 2 ++ 1 file changed, 2 insertions(+) diff --git a/helpers/utils b/helpers/utils index c1c8b9fc6..e40d4dd8a 100644 --- a/helpers/utils +++ b/helpers/utils @@ -927,6 +927,8 @@ ynh_compare_current_package_version() { _ynh_apply_default_permissions() { local target=$1 + local ynh_requirement=$(ynh_read_manifest --key=".requirements.yunohost") + if dpkg --compare-versions ${YNH_APP_PACKAGING_FORMAT:-0} ge 2 || [ -z "$ynh_requirement" ] || [ "$ynh_requirement" == "null" ] || dpkg --compare-versions $ynh_requirement ge 4.2; then chmod o-rwx $target chmod g-w $target From 05a459d4df6cd2b10d6ea5e9e13882fdfe80b1ef Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Tue, 1 Feb 2022 14:59:24 +0100 Subject: [PATCH 27/89] Fix tests --- src/tests/test_questions.py | 651 +++++++++++++++--------------------- src/utils/config.py | 1 + 2 files changed, 277 insertions(+), 375 deletions(-) diff --git a/src/tests/test_questions.py b/src/tests/test_questions.py index 5917d32d4..e49047469 100644 --- a/src/tests/test_questions.py +++ b/src/tests/test_questions.py @@ -23,37 +23,38 @@ from yunohost.utils.error import YunohostError, YunohostValidationError """ Argument default format: { - "name": "the_name", - "type": "one_of_the_available_type", // "sting" is not specified - "ask": { - "en": "the question in english", - "fr": "the question in french" - }, - "help": { - "en": "some help text in english", - "fr": "some help text in french" - }, - "example": "an example value", // optional - "default", "some stuff", // optional, not available for all types - "optional": true // optional, will skip if not answered + "the_name": { + "type": "one_of_the_available_type", // "sting" is not specified + "ask": { + "en": "the question in english", + "fr": "the question in french" + }, + "help": { + "en": "some help text in english", + "fr": "some help text in french" + }, + "example": "an example value", // optional + "default", "some stuff", // optional, not available for all types + "optional": true // optional, will skip if not answered + } } User answers: -{"name": "value", ...} +{"the_name": "value", ...} """ def test_question_empty(): - ask_questions_and_parse_answers([], {}) == [] + ask_questions_and_parse_answers({}, {}) == [] def test_question_string(): - questions = [ - { - "name": "some_string", + + questions = { + "some_string": { "type": "string", } - ] + } answers = {"some_string": "some_value"} out = ask_questions_and_parse_answers(questions, answers)[0] @@ -65,12 +66,11 @@ def test_question_string(): def test_question_string_from_query_string(): - questions = [ - { - "name": "some_string", + questions = { + "some_string": { "type": "string", } - ] + } answers = "foo=bar&some_string=some_value&lorem=ipsum" out = ask_questions_and_parse_answers(questions, answers)[0] @@ -81,11 +81,7 @@ def test_question_string_from_query_string(): def test_question_string_default_type(): - questions = [ - { - "name": "some_string", - } - ] + questions = {"some_string": {}} answers = {"some_string": "some_value"} out = ask_questions_and_parse_answers(questions, answers)[0] @@ -96,11 +92,7 @@ def test_question_string_default_type(): def test_question_string_no_input(): - questions = [ - { - "name": "some_string", - } - ] + questions = {"some_string": {}} answers = {} with pytest.raises(YunohostError), patch.object(os, "isatty", return_value=False): @@ -108,12 +100,11 @@ def test_question_string_no_input(): def test_question_string_input(): - questions = [ - { - "name": "some_string", + questions = { + "some_string": { "ask": "some question", } - ] + } answers = {} with patch.object(Moulinette, "prompt", return_value="some_value"), patch.object( @@ -127,11 +118,7 @@ def test_question_string_input(): def test_question_string_input_no_ask(): - questions = [ - { - "name": "some_string", - } - ] + questions = {"some_string": {}} answers = {} with patch.object(Moulinette, "prompt", return_value="some_value"), patch.object( @@ -145,12 +132,7 @@ def test_question_string_input_no_ask(): def test_question_string_no_input_optional(): - questions = [ - { - "name": "some_string", - "optional": True, - } - ] + questions = {"some_string": {"optional": True}} answers = {} with patch.object(os, "isatty", return_value=False): out = ask_questions_and_parse_answers(questions, answers)[0] @@ -161,13 +143,12 @@ def test_question_string_no_input_optional(): def test_question_string_optional_with_input(): - questions = [ - { - "name": "some_string", + questions = { + "some_string": { "ask": "some question", "optional": True, } - ] + } answers = {} with patch.object(Moulinette, "prompt", return_value="some_value"), patch.object( @@ -181,13 +162,12 @@ def test_question_string_optional_with_input(): def test_question_string_optional_with_empty_input(): - questions = [ - { - "name": "some_string", + questions = { + "some_string": { "ask": "some question", "optional": True, } - ] + } answers = {} with patch.object(Moulinette, "prompt", return_value=""), patch.object( @@ -201,12 +181,11 @@ def test_question_string_optional_with_empty_input(): def test_question_string_optional_with_input_without_ask(): - questions = [ - { - "name": "some_string", + questions = { + "some_string": { "optional": True, } - ] + } answers = {} with patch.object(Moulinette, "prompt", return_value="some_value"), patch.object( @@ -220,13 +199,12 @@ def test_question_string_optional_with_input_without_ask(): def test_question_string_no_input_default(): - questions = [ - { - "name": "some_string", + questions = { + "some_string": { "ask": "some question", "default": "some_value", } - ] + } answers = {} with patch.object(os, "isatty", return_value=False): out = ask_questions_and_parse_answers(questions, answers)[0] @@ -238,12 +216,11 @@ def test_question_string_no_input_default(): def test_question_string_input_test_ask(): ask_text = "some question" - questions = [ - { - "name": "some_string", + questions = { + "some_string": { "ask": ask_text, } - ] + } answers = {} with patch.object( @@ -264,13 +241,12 @@ def test_question_string_input_test_ask(): def test_question_string_input_test_ask_with_default(): ask_text = "some question" default_text = "some example" - questions = [ - { - "name": "some_string", + questions = { + "some_string": { "ask": ask_text, "default": default_text, } - ] + } answers = {} with patch.object( @@ -292,13 +268,12 @@ def test_question_string_input_test_ask_with_default(): def test_question_string_input_test_ask_with_example(): ask_text = "some question" example_text = "some example" - questions = [ - { - "name": "some_string", + questions = { + "some_string": { "ask": ask_text, "example": example_text, } - ] + } answers = {} with patch.object( @@ -313,13 +288,12 @@ def test_question_string_input_test_ask_with_example(): def test_question_string_input_test_ask_with_help(): ask_text = "some question" help_text = "some_help" - questions = [ - { - "name": "some_string", + questions = { + "some_string": { "ask": ask_text, "help": help_text, } - ] + } answers = {} with patch.object( @@ -331,7 +305,7 @@ def test_question_string_input_test_ask_with_help(): def test_question_string_with_choice(): - questions = [{"name": "some_string", "type": "string", "choices": ["fr", "en"]}] + questions = {"some_string": {"type": "string", "choices": ["fr", "en"]}} answers = {"some_string": "fr"} out = ask_questions_and_parse_answers(questions, answers)[0] @@ -341,7 +315,7 @@ def test_question_string_with_choice(): def test_question_string_with_choice_prompt(): - questions = [{"name": "some_string", "type": "string", "choices": ["fr", "en"]}] + questions = {"some_string": {"type": "string", "choices": ["fr", "en"]}} answers = {"some_string": "fr"} with patch.object(Moulinette, "prompt", return_value="fr"), patch.object( os, "isatty", return_value=True @@ -354,7 +328,7 @@ def test_question_string_with_choice_prompt(): def test_question_string_with_choice_bad(): - questions = [{"name": "some_string", "type": "string", "choices": ["fr", "en"]}] + questions = {"some_string": {"type": "string", "choices": ["fr", "en"]}} answers = {"some_string": "bad"} with pytest.raises(YunohostError), patch.object(os, "isatty", return_value=False): @@ -364,13 +338,12 @@ def test_question_string_with_choice_bad(): def test_question_string_with_choice_ask(): ask_text = "some question" choices = ["fr", "en", "es", "it", "ru"] - questions = [ - { - "name": "some_string", + questions = { + "some_string": { "ask": ask_text, "choices": choices, } - ] + } answers = {} with patch.object(Moulinette, "prompt", return_value="ru") as prompt, patch.object( @@ -384,14 +357,13 @@ def test_question_string_with_choice_ask(): def test_question_string_with_choice_default(): - questions = [ - { - "name": "some_string", + questions = { + "some_string": { "type": "string", "choices": ["fr", "en"], "default": "en", } - ] + } answers = {} with patch.object(os, "isatty", return_value=False): out = ask_questions_and_parse_answers(questions, answers)[0] @@ -402,12 +374,11 @@ def test_question_string_with_choice_default(): def test_question_password(): - questions = [ - { - "name": "some_password", + questions = { + "some_password": { "type": "password", } - ] + } answers = {"some_password": "some_value"} out = ask_questions_and_parse_answers(questions, answers)[0] @@ -417,12 +388,11 @@ def test_question_password(): def test_question_password_no_input(): - questions = [ - { - "name": "some_password", + questions = { + "some_password": { "type": "password", } - ] + } answers = {} with pytest.raises(YunohostError), patch.object(os, "isatty", return_value=False): @@ -430,13 +400,12 @@ def test_question_password_no_input(): def test_question_password_input(): - questions = [ - { - "name": "some_password", + questions = { + "some_password": { "type": "password", "ask": "some question", } - ] + } answers = {} with patch.object(Moulinette, "prompt", return_value="some_value"), patch.object( @@ -450,12 +419,11 @@ def test_question_password_input(): def test_question_password_input_no_ask(): - questions = [ - { - "name": "some_password", + questions = { + "some_password": { "type": "password", } - ] + } answers = {} with patch.object(Moulinette, "prompt", return_value="some_value"), patch.object( @@ -469,13 +437,12 @@ def test_question_password_input_no_ask(): def test_question_password_no_input_optional(): - questions = [ - { - "name": "some_password", + questions = { + "some_password": { "type": "password", "optional": True, } - ] + } answers = {} with patch.object(os, "isatty", return_value=False): @@ -485,9 +452,7 @@ def test_question_password_no_input_optional(): assert out.type == "password" assert out.value == "" - questions = [ - {"name": "some_password", "type": "password", "optional": True, "default": ""} - ] + questions = {"some_password": {"type": "password", "optional": True, "default": ""}} with patch.object(os, "isatty", return_value=False): out = ask_questions_and_parse_answers(questions, answers)[0] @@ -498,14 +463,13 @@ def test_question_password_no_input_optional(): def test_question_password_optional_with_input(): - questions = [ - { - "name": "some_password", + questions = { + "some_password": { "ask": "some question", "type": "password", "optional": True, } - ] + } answers = {} with patch.object(Moulinette, "prompt", return_value="some_value"), patch.object( @@ -519,14 +483,13 @@ def test_question_password_optional_with_input(): def test_question_password_optional_with_empty_input(): - questions = [ - { - "name": "some_password", + questions = { + "some_password": { "ask": "some question", "type": "password", "optional": True, } - ] + } answers = {} with patch.object(Moulinette, "prompt", return_value=""), patch.object( @@ -540,13 +503,12 @@ def test_question_password_optional_with_empty_input(): def test_question_password_optional_with_input_without_ask(): - questions = [ - { - "name": "some_password", + questions = { + "some_password": { "type": "password", "optional": True, } - ] + } answers = {} with patch.object(Moulinette, "prompt", return_value="some_value"), patch.object( @@ -560,14 +522,13 @@ def test_question_password_optional_with_input_without_ask(): def test_question_password_no_input_default(): - questions = [ - { - "name": "some_password", + questions = { + "some_password": { "type": "password", "ask": "some question", "default": "some_value", } - ] + } answers = {} # no default for password! @@ -577,14 +538,13 @@ def test_question_password_no_input_default(): @pytest.mark.skip # this should raises def test_question_password_no_input_example(): - questions = [ - { - "name": "some_password", + questions = { + "some_password": { "type": "password", "ask": "some question", "example": "some_value", } - ] + } answers = {"some_password": "some_value"} # no example for password! @@ -594,13 +554,12 @@ def test_question_password_no_input_example(): def test_question_password_input_test_ask(): ask_text = "some question" - questions = [ - { - "name": "some_password", + questions = { + "some_password": { "type": "password", "ask": ask_text, } - ] + } answers = {} with patch.object( @@ -622,14 +581,13 @@ def test_question_password_input_test_ask(): def test_question_password_input_test_ask_with_example(): ask_text = "some question" example_text = "some example" - questions = [ - { - "name": "some_password", + questions = { + "some_password": { "type": "password", "ask": ask_text, "example": example_text, } - ] + } answers = {} with patch.object( @@ -644,14 +602,13 @@ def test_question_password_input_test_ask_with_example(): def test_question_password_input_test_ask_with_help(): ask_text = "some question" help_text = "some_help" - questions = [ - { - "name": "some_password", + questions = { + "some_password": { "type": "password", "ask": ask_text, "help": help_text, } - ] + } answers = {} with patch.object( @@ -663,14 +620,13 @@ def test_question_password_input_test_ask_with_help(): def test_question_password_bad_chars(): - questions = [ - { - "name": "some_password", + questions = { + "some_password": { "type": "password", "ask": "some question", "example": "some_value", } - ] + } for i in PasswordQuestion.forbidden_chars: with pytest.raises(YunohostError), patch.object( @@ -680,14 +636,13 @@ def test_question_password_bad_chars(): def test_question_password_strong_enough(): - questions = [ - { - "name": "some_password", + questions = { + "some_password": { "type": "password", "ask": "some question", "example": "some_value", } - ] + } with pytest.raises(YunohostError), patch.object(os, "isatty", return_value=False): # too short @@ -698,14 +653,13 @@ def test_question_password_strong_enough(): def test_question_password_optional_strong_enough(): - questions = [ - { - "name": "some_password", + questions = { + "some_password": { "ask": "some question", "type": "password", "optional": True, } - ] + } with pytest.raises(YunohostError), patch.object(os, "isatty", return_value=False): # too short @@ -716,12 +670,11 @@ def test_question_password_optional_strong_enough(): def test_question_path(): - questions = [ - { - "name": "some_path", + questions = { + "some_path": { "type": "path", } - ] + } answers = {"some_path": "/some_value"} out = ask_questions_and_parse_answers(questions, answers)[0] @@ -731,12 +684,11 @@ def test_question_path(): def test_question_path_no_input(): - questions = [ - { - "name": "some_path", + questions = { + "some_path": { "type": "path", } - ] + } answers = {} with pytest.raises(YunohostError), patch.object(os, "isatty", return_value=False): @@ -744,13 +696,12 @@ def test_question_path_no_input(): def test_question_path_input(): - questions = [ - { - "name": "some_path", + questions = { + "some_path": { "type": "path", "ask": "some question", } - ] + } answers = {} with patch.object(Moulinette, "prompt", return_value="/some_value"), patch.object( @@ -764,12 +715,11 @@ def test_question_path_input(): def test_question_path_input_no_ask(): - questions = [ - { - "name": "some_path", + questions = { + "some_path": { "type": "path", } - ] + } answers = {} with patch.object(Moulinette, "prompt", return_value="/some_value"), patch.object( @@ -783,13 +733,12 @@ def test_question_path_input_no_ask(): def test_question_path_no_input_optional(): - questions = [ - { - "name": "some_path", + questions = { + "some_path": { "type": "path", "optional": True, } - ] + } answers = {} with patch.object(os, "isatty", return_value=False): out = ask_questions_and_parse_answers(questions, answers)[0] @@ -800,14 +749,13 @@ def test_question_path_no_input_optional(): def test_question_path_optional_with_input(): - questions = [ - { - "name": "some_path", + questions = { + "some_path": { "ask": "some question", "type": "path", "optional": True, } - ] + } answers = {} with patch.object(Moulinette, "prompt", return_value="/some_value"), patch.object( @@ -821,14 +769,13 @@ def test_question_path_optional_with_input(): def test_question_path_optional_with_empty_input(): - questions = [ - { - "name": "some_path", + questions = { + "some_path": { "ask": "some question", "type": "path", "optional": True, } - ] + } answers = {} with patch.object(Moulinette, "prompt", return_value=""), patch.object( @@ -842,13 +789,12 @@ def test_question_path_optional_with_empty_input(): def test_question_path_optional_with_input_without_ask(): - questions = [ - { - "name": "some_path", + questions = { + "some_path": { "type": "path", "optional": True, } - ] + } answers = {} with patch.object(Moulinette, "prompt", return_value="/some_value"), patch.object( @@ -862,14 +808,13 @@ def test_question_path_optional_with_input_without_ask(): def test_question_path_no_input_default(): - questions = [ - { - "name": "some_path", + questions = { + "some_path": { "ask": "some question", "type": "path", "default": "some_value", } - ] + } answers = {} with patch.object(os, "isatty", return_value=False): out = ask_questions_and_parse_answers(questions, answers)[0] @@ -881,13 +826,12 @@ def test_question_path_no_input_default(): def test_question_path_input_test_ask(): ask_text = "some question" - questions = [ - { - "name": "some_path", + questions = { + "some_path": { "type": "path", "ask": ask_text, } - ] + } answers = {} with patch.object( @@ -908,14 +852,13 @@ def test_question_path_input_test_ask(): def test_question_path_input_test_ask_with_default(): ask_text = "some question" default_text = "someexample" - questions = [ - { - "name": "some_path", + questions = { + "some_path": { "type": "path", "ask": ask_text, "default": default_text, } - ] + } answers = {} with patch.object( @@ -937,14 +880,13 @@ def test_question_path_input_test_ask_with_default(): def test_question_path_input_test_ask_with_example(): ask_text = "some question" example_text = "some example" - questions = [ - { - "name": "some_path", + questions = { + "some_path": { "type": "path", "ask": ask_text, "example": example_text, } - ] + } answers = {} with patch.object( @@ -959,14 +901,13 @@ def test_question_path_input_test_ask_with_example(): def test_question_path_input_test_ask_with_help(): ask_text = "some question" help_text = "some_help" - questions = [ - { - "name": "some_path", + questions = { + "some_path": { "type": "path", "ask": ask_text, "help": help_text, } - ] + } answers = {} with patch.object( @@ -978,12 +919,11 @@ def test_question_path_input_test_ask_with_help(): def test_question_boolean(): - questions = [ - { - "name": "some_boolean", + questions = { + "some_boolean": { "type": "boolean", } - ] + } answers = {"some_boolean": "y"} out = ask_questions_and_parse_answers(questions, answers)[0] @@ -993,12 +933,11 @@ def test_question_boolean(): def test_question_boolean_all_yes(): - questions = [ - { - "name": "some_boolean", + questions = { + "some_boolean": { "type": "boolean", } - ] + } for value in ["Y", "yes", "Yes", "YES", "1", 1, True, "True", "TRUE", "true"]: out = ask_questions_and_parse_answers(questions, {"some_boolean": value})[0] @@ -1008,12 +947,11 @@ def test_question_boolean_all_yes(): def test_question_boolean_all_no(): - questions = [ - { - "name": "some_boolean", + questions = { + "some_boolean": { "type": "boolean", } - ] + } for value in ["n", "N", "no", "No", "No", "0", 0, False, "False", "FALSE", "false"]: out = ask_questions_and_parse_answers(questions, {"some_boolean": value})[0] @@ -1024,12 +962,11 @@ def test_question_boolean_all_no(): # XXX apparently boolean are always False (0) by default, I'm not sure what to think about that def test_question_boolean_no_input(): - questions = [ - { - "name": "some_boolean", + questions = { + "some_boolean": { "type": "boolean", } - ] + } answers = {} with patch.object(os, "isatty", return_value=False): @@ -1039,12 +976,11 @@ def test_question_boolean_no_input(): def test_question_boolean_bad_input(): - questions = [ - { - "name": "some_boolean", + questions = { + "some_boolean": { "type": "boolean", } - ] + } answers = {"some_boolean": "stuff"} with pytest.raises(YunohostError), patch.object(os, "isatty", return_value=False): @@ -1052,13 +988,12 @@ def test_question_boolean_bad_input(): def test_question_boolean_input(): - questions = [ - { - "name": "some_boolean", + questions = { + "some_boolean": { "type": "boolean", "ask": "some question", } - ] + } answers = {} with patch.object(Moulinette, "prompt", return_value="y"), patch.object( @@ -1075,12 +1010,11 @@ def test_question_boolean_input(): def test_question_boolean_input_no_ask(): - questions = [ - { - "name": "some_boolean", + questions = { + "some_boolean": { "type": "boolean", } - ] + } answers = {} with patch.object(Moulinette, "prompt", return_value="y"), patch.object( @@ -1091,13 +1025,12 @@ def test_question_boolean_input_no_ask(): def test_question_boolean_no_input_optional(): - questions = [ - { - "name": "some_boolean", + questions = { + "some_boolean": { "type": "boolean", "optional": True, } - ] + } answers = {} with patch.object(os, "isatty", return_value=False): out = ask_questions_and_parse_answers(questions, answers)[0] @@ -1105,14 +1038,13 @@ def test_question_boolean_no_input_optional(): def test_question_boolean_optional_with_input(): - questions = [ - { - "name": "some_boolean", + questions = { + "some_boolean": { "ask": "some question", "type": "boolean", "optional": True, } - ] + } answers = {} with patch.object(Moulinette, "prompt", return_value="y"), patch.object( @@ -1123,14 +1055,13 @@ def test_question_boolean_optional_with_input(): def test_question_boolean_optional_with_empty_input(): - questions = [ - { - "name": "some_boolean", + questions = { + "some_boolean": { "ask": "some question", "type": "boolean", "optional": True, } - ] + } answers = {} with patch.object(Moulinette, "prompt", return_value=""), patch.object( @@ -1142,13 +1073,12 @@ def test_question_boolean_optional_with_empty_input(): def test_question_boolean_optional_with_input_without_ask(): - questions = [ - { - "name": "some_boolean", + questions = { + "some_boolean": { "type": "boolean", "optional": True, } - ] + } answers = {} with patch.object(Moulinette, "prompt", return_value="n"), patch.object( @@ -1160,14 +1090,13 @@ def test_question_boolean_optional_with_input_without_ask(): def test_question_boolean_no_input_default(): - questions = [ - { - "name": "some_boolean", + questions = { + "some_boolean": { "ask": "some question", "type": "boolean", "default": 0, } - ] + } answers = {} with patch.object(os, "isatty", return_value=False): @@ -1177,14 +1106,13 @@ def test_question_boolean_no_input_default(): def test_question_boolean_bad_default(): - questions = [ - { - "name": "some_boolean", + questions = { + "some_boolean": { "ask": "some question", "type": "boolean", "default": "bad default", } - ] + } answers = {} with pytest.raises(YunohostError): ask_questions_and_parse_answers(questions, answers) @@ -1192,13 +1120,12 @@ def test_question_boolean_bad_default(): def test_question_boolean_input_test_ask(): ask_text = "some question" - questions = [ - { - "name": "some_boolean", + questions = { + "some_boolean": { "type": "boolean", "ask": ask_text, } - ] + } answers = {} with patch.object(Moulinette, "prompt", return_value=0) as prompt, patch.object( @@ -1219,14 +1146,13 @@ def test_question_boolean_input_test_ask(): def test_question_boolean_input_test_ask_with_default(): ask_text = "some question" default_text = 1 - questions = [ - { - "name": "some_boolean", + questions = { + "some_boolean": { "type": "boolean", "ask": ask_text, "default": default_text, } - ] + } answers = {} with patch.object(Moulinette, "prompt", return_value=1) as prompt, patch.object( @@ -1245,12 +1171,11 @@ def test_question_boolean_input_test_ask_with_default(): def test_question_domain_empty(): - questions = [ - { - "name": "some_domain", + questions = { + "some_domain": { "type": "domain", } - ] + } main_domain = "my_main_domain.com" answers = {} @@ -1271,12 +1196,11 @@ def test_question_domain_empty(): def test_question_domain(): main_domain = "my_main_domain.com" domains = [main_domain] - questions = [ - { - "name": "some_domain", + questions = { + "some_domain": { "type": "domain", } - ] + } answers = {"some_domain": main_domain} @@ -1295,12 +1219,11 @@ def test_question_domain_two_domains(): other_domain = "some_other_domain.tld" domains = [main_domain, other_domain] - questions = [ - { - "name": "some_domain", + questions = { + "some_domain": { "type": "domain", } - ] + } answers = {"some_domain": other_domain} with patch.object( @@ -1329,12 +1252,11 @@ def test_question_domain_two_domains_wrong_answer(): other_domain = "some_other_domain.tld" domains = [main_domain, other_domain] - questions = [ - { - "name": "some_domain", + questions = { + "some_domain": { "type": "domain", } - ] + } answers = {"some_domain": "doesnt_exist.pouet"} with patch.object( @@ -1351,12 +1273,11 @@ def test_question_domain_two_domains_default_no_ask(): other_domain = "some_other_domain.tld" domains = [main_domain, other_domain] - questions = [ - { - "name": "some_domain", + questions = { + "some_domain": { "type": "domain", } - ] + } answers = {} with patch.object( @@ -1378,7 +1299,7 @@ def test_question_domain_two_domains_default(): other_domain = "some_other_domain.tld" domains = [main_domain, other_domain] - questions = [{"name": "some_domain", "type": "domain", "ask": "choose a domain"}] + questions = {"some_domain": {"type": "domain", "ask": "choose a domain"}} answers = {} with patch.object( @@ -1400,7 +1321,7 @@ def test_question_domain_two_domains_default_input(): other_domain = "some_other_domain.tld" domains = [main_domain, other_domain] - questions = [{"name": "some_domain", "type": "domain", "ask": "choose a domain"}] + questions = {"some_domain": {"type": "domain", "ask": "choose a domain"}} answers = {} with patch.object( @@ -1436,12 +1357,11 @@ def test_question_user_empty(): } } - questions = [ - { - "name": "some_user", + questions = { + "some_user": { "type": "user", } - ] + } answers = {} with patch.object(user, "user_list", return_value={"users": users}): @@ -1463,12 +1383,11 @@ def test_question_user(): } } - questions = [ - { - "name": "some_user", + questions = { + "some_user": { "type": "user", } - ] + } answers = {"some_user": username} with patch.object(user, "user_list", return_value={"users": users}), patch.object( @@ -1501,12 +1420,11 @@ def test_question_user_two_users(): }, } - questions = [ - { - "name": "some_user", + questions = { + "some_user": { "type": "user", } - ] + } answers = {"some_user": other_user} with patch.object(user, "user_list", return_value={"users": users}), patch.object( @@ -1550,12 +1468,11 @@ def test_question_user_two_users_wrong_answer(): }, } - questions = [ - { - "name": "some_user", + questions = { + "some_user": { "type": "user", } - ] + } answers = {"some_user": "doesnt_exist.pouet"} with patch.object(user, "user_list", return_value={"users": users}): @@ -1585,7 +1502,7 @@ def test_question_user_two_users_no_default(): }, } - questions = [{"name": "some_user", "type": "user", "ask": "choose a user"}] + questions = {"some_user": {"type": "user", "ask": "choose a user"}} answers = {} with patch.object(user, "user_list", return_value={"users": users}): @@ -1615,7 +1532,7 @@ def test_question_user_two_users_default_input(): }, } - questions = [{"name": "some_user", "type": "user", "ask": "choose a user"}] + questions = {"some_user": {"type": "user", "ask": "choose a user"}} answers = {} with patch.object(user, "user_list", return_value={"users": users}), patch.object( @@ -1639,12 +1556,11 @@ def test_question_user_two_users_default_input(): def test_question_number(): - questions = [ - { - "name": "some_number", + questions = { + "some_number": { "type": "number", } - ] + } answers = {"some_number": 1337} out = ask_questions_and_parse_answers(questions, answers)[0] @@ -1654,12 +1570,11 @@ def test_question_number(): def test_question_number_no_input(): - questions = [ - { - "name": "some_number", + questions = { + "some_number": { "type": "number", } - ] + } answers = {} with pytest.raises(YunohostError), patch.object(os, "isatty", return_value=False): @@ -1667,12 +1582,11 @@ def test_question_number_no_input(): def test_question_number_bad_input(): - questions = [ - { - "name": "some_number", + questions = { + "some_number": { "type": "number", } - ] + } answers = {"some_number": "stuff"} with pytest.raises(YunohostError), patch.object(os, "isatty", return_value=False): @@ -1684,13 +1598,12 @@ def test_question_number_bad_input(): def test_question_number_input(): - questions = [ - { - "name": "some_number", + questions = { + "some_number": { "type": "number", "ask": "some question", } - ] + } answers = {} with patch.object(Moulinette, "prompt", return_value="1337"), patch.object( @@ -1722,12 +1635,11 @@ def test_question_number_input(): def test_question_number_input_no_ask(): - questions = [ - { - "name": "some_number", + questions = { + "some_number": { "type": "number", } - ] + } answers = {} with patch.object(Moulinette, "prompt", return_value="1337"), patch.object( @@ -1741,13 +1653,12 @@ def test_question_number_input_no_ask(): def test_question_number_no_input_optional(): - questions = [ - { - "name": "some_number", + questions = { + "some_number": { "type": "number", "optional": True, } - ] + } answers = {} with patch.object(os, "isatty", return_value=False): out = ask_questions_and_parse_answers(questions, answers)[0] @@ -1758,14 +1669,13 @@ def test_question_number_no_input_optional(): def test_question_number_optional_with_input(): - questions = [ - { - "name": "some_number", + questions = { + "some_number": { "ask": "some question", "type": "number", "optional": True, } - ] + } answers = {} with patch.object(Moulinette, "prompt", return_value="1337"), patch.object( @@ -1779,13 +1689,12 @@ def test_question_number_optional_with_input(): def test_question_number_optional_with_input_without_ask(): - questions = [ - { - "name": "some_number", + questions = { + "some_number": { "type": "number", "optional": True, } - ] + } answers = {} with patch.object(Moulinette, "prompt", return_value="0"), patch.object( @@ -1799,14 +1708,13 @@ def test_question_number_optional_with_input_without_ask(): def test_question_number_no_input_default(): - questions = [ - { - "name": "some_number", + questions = { + "some_number": { "ask": "some question", "type": "number", "default": 1337, } - ] + } answers = {} with patch.object(os, "isatty", return_value=False): out = ask_questions_and_parse_answers(questions, answers)[0] @@ -1817,14 +1725,13 @@ def test_question_number_no_input_default(): def test_question_number_bad_default(): - questions = [ - { - "name": "some_number", + questions = { + "some_number": { "ask": "some question", "type": "number", "default": "bad default", } - ] + } answers = {} with pytest.raises(YunohostError), patch.object(os, "isatty", return_value=False): ask_questions_and_parse_answers(questions, answers) @@ -1832,13 +1739,12 @@ def test_question_number_bad_default(): def test_question_number_input_test_ask(): ask_text = "some question" - questions = [ - { - "name": "some_number", + questions = { + "some_number": { "type": "number", "ask": ask_text, } - ] + } answers = {} with patch.object( @@ -1859,14 +1765,13 @@ def test_question_number_input_test_ask(): def test_question_number_input_test_ask_with_default(): ask_text = "some question" default_value = 1337 - questions = [ - { - "name": "some_number", + questions = { + "some_number": { "type": "number", "ask": ask_text, "default": default_value, } - ] + } answers = {} with patch.object( @@ -1888,14 +1793,13 @@ def test_question_number_input_test_ask_with_default(): def test_question_number_input_test_ask_with_example(): ask_text = "some question" example_value = 1337 - questions = [ - { - "name": "some_number", + questions = { + "some_number": { "type": "number", "ask": ask_text, "example": example_value, } - ] + } answers = {} with patch.object( @@ -1910,14 +1814,13 @@ def test_question_number_input_test_ask_with_example(): def test_question_number_input_test_ask_with_help(): ask_text = "some question" help_value = 1337 - questions = [ - { - "name": "some_number", + questions = { + "some_number": { "type": "number", "ask": ask_text, "help": help_value, } - ] + } answers = {} with patch.object( @@ -1929,7 +1832,7 @@ def test_question_number_input_test_ask_with_help(): def test_question_display_text(): - questions = [{"name": "some_app", "type": "display_text", "ask": "foobar"}] + questions = {"some_app": {"type": "display_text", "ask": "foobar"}} answers = {} with patch.object(sys, "stdout", new_callable=StringIO) as stdout, patch.object( @@ -1947,12 +1850,11 @@ def test_question_file_from_cli(): os.system(f"rm -f {filename}") os.system(f"echo helloworld > {filename}") - questions = [ - { - "name": "some_file", + questions = { + "some_file": { "type": "file", } - ] + } answers = {"some_file": filename} out = ask_questions_and_parse_answers(questions, answers)[0] @@ -1978,12 +1880,11 @@ def test_question_file_from_api(): from base64 import b64encode b64content = b64encode(b"helloworld") - questions = [ - { - "name": "some_file", + questions = { + "some_file": { "type": "file", } - ] + } answers = {"some_file": b64content} interface_type_bkp = Moulinette.interface.type diff --git a/src/utils/config.py b/src/utils/config.py index 9ae75969b..eb5f9b683 100644 --- a/src/utils/config.py +++ b/src/utils/config.py @@ -1408,6 +1408,7 @@ def ask_questions_and_parse_answers( out = [] for name, raw_question in raw_questions.items(): + raw_question['name'] = name question_class = ARGUMENTS_TYPE_PARSERS[raw_question.get("type", "string")] raw_question["value"] = answers.get(name) question = question_class(raw_question, context=context, hooks=hooks) From d8a924353226360de5466f2b605d49e66c99d93e Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Tue, 1 Feb 2022 15:26:45 +0100 Subject: [PATCH 28/89] =?UTF-8?q?Typo=20=C3=A9=5F=C3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/tests/test_apps.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tests/test_apps.py b/src/tests/test_apps.py index 6ff2c5271..76397093d 100644 --- a/src/tests/test_apps.py +++ b/src/tests/test_apps.py @@ -164,7 +164,7 @@ def install_legacy_app(domain, path, public=True): def install_manifestv2_app(domain, path, public=True): app_install( - os.path.join(get_test_apps_dir(), "manivestv2_app_ynh"), + os.path.join(get_test_apps_dir(), "manifestv2_app_ynh"), args="domain={}&path={}&init_main_permission={}".format(domain, path, "visitors" if public else "all_users"), force=True, ) From e4863830c90e23c89c044b5f503219c5444f7a63 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Tue, 1 Feb 2022 15:32:34 +0100 Subject: [PATCH 29/89] Fix call to ask_questions_and_parse_answers --- src/utils/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/config.py b/src/utils/config.py index eb5f9b683..aa6586baa 100644 --- a/src/utils/config.py +++ b/src/utils/config.py @@ -580,7 +580,7 @@ class ConfigPanel: prefilled_answers.update(self.new_values) questions = ask_questions_and_parse_answers( - section["options"], + {question["name"]: question for question in section["options"]}, prefilled_answers=prefilled_answers, current_values=self.values, hooks=self.hooks, From f9e15ff8a39b5a44efe61e374de2378cff277dc3 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Tue, 1 Feb 2022 15:36:13 +0100 Subject: [PATCH 30/89] Add app-resources tests to ci --- .gitlab/ci/test.gitlab-ci.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.gitlab/ci/test.gitlab-ci.yml b/.gitlab/ci/test.gitlab-ci.yml index 27b9b4913..519ae427a 100644 --- a/.gitlab/ci/test.gitlab-ci.yml +++ b/.gitlab/ci/test.gitlab-ci.yml @@ -125,6 +125,15 @@ test-app-config: - src/app.py - src/utils/config.py +test-app-resources: + extends: .test-stage + script: + - python3 -m pytest src/tests/test_app_resources.py + only: + changes: + - src/app.py + - src/utils/resources.py + test-changeurl: extends: .test-stage script: From b6085fef8d2bdeb2de85d1e22f470fbf10995355 Mon Sep 17 00:00:00 2001 From: Tagadda <36127788+Tagadda@users.noreply.github.com> Date: Sat, 29 Jan 2022 22:59:28 +0000 Subject: [PATCH 31/89] wip --- locales/en.json | 22 +-- share/actionsmap.yml | 24 ++- share/config_settings.toml | 125 ++++++++++++ src/settings.py | 378 +++++++++++-------------------------- src/utils/config.py | 5 + src/utils/legacy.py | 25 +++ 6 files changed, 294 insertions(+), 285 deletions(-) create mode 100644 share/config_settings.toml diff --git a/locales/en.json b/locales/en.json index 2b2f10179..e50e0f7d9 100644 --- a/locales/en.json +++ b/locales/en.json @@ -374,26 +374,26 @@ "global_settings_cant_write_settings": "Could not save settings file, reason: {reason}", "global_settings_key_doesnt_exists": "The key '{settings_key}' does not exist in the global settings, you can see all the available keys by running 'yunohost settings list'", "global_settings_reset_success": "Previous settings now backed up to {path}", + "global_settings_setting_admin_strength": "Admin password strength", "global_settings_setting_backup_compress_tar_archives": "When creating new backups, compress the archives (.tar.gz) instead of uncompressed archives (.tar). N.B. : enabling this option means create lighter backup archives, but the initial backup procedure will be significantly longer and heavy on CPU.", + "global_settings_setting_nginx_compatibility": "Compatibility vs. security tradeoff for the web server NGINX. Affects the ciphers (and other security-related aspects)", + "global_settings_setting_nginx_redirect_to_https": "Redirect HTTP requests to HTTPs by default (DO NOT TURN OFF unless you really know what you're doing!)", "global_settings_setting_pop3_enabled": "Enable the POP3 protocol for the mail server", + "global_settings_setting_postfix_compatibility": "Compatibility vs. security tradeoff for the Postfix server. Affects the ciphers (and other security-related aspects)", "global_settings_setting_security_experimental_enabled": "Enable experimental security features (don't enable this if you don't know what you're doing!)", - "global_settings_setting_security_nginx_compatibility": "Compatibility vs. security tradeoff for the web server NGINX. Affects the ciphers (and other security-related aspects)", - "global_settings_setting_security_nginx_redirect_to_https": "Redirect HTTP requests to HTTPs by default (DO NOT TURN OFF unless you really know what you're doing!)", - "global_settings_setting_security_password_admin_strength": "Admin password strength", - "global_settings_setting_security_password_user_strength": "User password strength", - "global_settings_setting_security_postfix_compatibility": "Compatibility vs. security tradeoff for the Postfix server. Affects the ciphers (and other security-related aspects)", - "global_settings_setting_security_ssh_compatibility": "Compatibility vs. security tradeoff for the SSH server. Affects the ciphers (and other security-related aspects)", - "global_settings_setting_security_ssh_password_authentication": "Allow password authentication for SSH", - "global_settings_setting_security_ssh_port": "SSH port", - "global_settings_setting_security_webadmin_allowlist": "IP adresses allowed to access the webadmin. Comma-separated.", - "global_settings_setting_security_webadmin_allowlist_enabled": "Allow only some IPs to access the webadmin.", - "global_settings_setting_service_ssh_allow_deprecated_dsa_hostkey": "Allow the use of (deprecated) DSA hostkey for the SSH daemon configuration", "global_settings_setting_smtp_allow_ipv6": "Allow the use of IPv6 to receive and send mail", "global_settings_setting_smtp_relay_host": "SMTP relay host to use in order to send mail instead of this yunohost instance. Useful if you are in one of this situation: your 25 port is blocked by your ISP or VPS provider, you have a residential IP listed on DUHL, you are not able to configure reverse DNS or this server is not directly exposed on the internet and you want use an other one to send mails.", "global_settings_setting_smtp_relay_password": "SMTP relay host password", "global_settings_setting_smtp_relay_port": "SMTP relay port", "global_settings_setting_smtp_relay_user": "SMTP relay user account", + "global_settings_setting_ssh_allow_deprecated_dsa_hostkey": "Allow the use of (deprecated) DSA hostkey for the SSH daemon configuration", + "global_settings_setting_ssh_compatibility": "Compatibility vs. security tradeoff for the SSH server. Affects the ciphers (and other security-related aspects)", + "global_settings_setting_ssh_password_authentication": "Allow password authentication for SSH", + "global_settings_setting_ssh_port": "SSH port", "global_settings_setting_ssowat_panel_overlay_enabled": "Enable SSOwat panel overlay", + "global_settings_setting_user_strength": "User password strength", + "global_settings_setting_webadmin_allowlist": "IP adresses allowed to access the webadmin. Comma-separated.", + "global_settings_setting_webadmin_allowlist_enabled": "Allow only some IPs to access the webadmin.", "global_settings_unknown_setting_from_settings_file": "Unknown key in settings: '{setting_key}', discard it and save it in /etc/yunohost/settings-unknown.json", "global_settings_unknown_type": "Unexpected situation, the setting {setting} appears to have the type {unknown_type} but it is not a type supported by the system.", "good_practices_about_admin_password": "You are now about to define a new administration password. The password should be at least 8 characters long—though it is good practice to use a longer password (i.e. a passphrase) and/or to use a variation of characters (uppercase, lowercase, digits and special characters).", diff --git a/share/actionsmap.yml b/share/actionsmap.yml index 89c6e914d..d4cf2d590 100644 --- a/share/actionsmap.yml +++ b/share/actionsmap.yml @@ -1093,6 +1093,11 @@ settings: list: action_help: list all entries of the settings api: GET /settings + arguments: + -f: + full: --full + help: Display all details (meant to be used by the API) + action: store_true ### settings_get() get: @@ -1101,22 +1106,29 @@ settings: arguments: key: help: Settings key - --full: - help: Show more details + -f: + full: --full + help: Display all details (meant to be used by the API) + action: store_true + -e: + full: --export + help: Only export key/values, meant to be reimported using "config set --args-file" action: store_true ### settings_set() set: action_help: set an entry value in the settings - api: POST /settings/ + api: PUT /settings arguments: key: - help: Settings key + help: The question or form key + nargs: '?' -v: full: --value help: new value - extra: - required: True + -a: + full: --args + help: Serialized arguments for new configuration (i.e. "mail_in=0&mail_out=0") ### settings_reset_all() reset-all: diff --git a/share/config_settings.toml b/share/config_settings.toml new file mode 100644 index 000000000..61f0a5725 --- /dev/null +++ b/share/config_settings.toml @@ -0,0 +1,125 @@ +version = "1.0" +i18n = "global_settings" + +[security] +name = "Security" + [security.password] + name = "Passwords" + [security.password.admin_strength] + type = "number" + default = 1 + + [security.password.user_strength] + type = "number" + default = 1 + + [security.ssh] + name = "SSH" + [security.ssh.ssh_compatibility] + type = "select" + default = "modern" + choices = ["intermediate", "modern"] + + [security.ssh.ssh_port] + type = "number" + default = 22 + + [security.ssh.ssh_password_authentication] + type = "boolean" + default = "false" + + [security.ssh.ssh_allow_deprecated_dsa_hostkey] + type = "boolean" + default = "false" + + [security.nginx] + name = "NGINX" + [security.nginx.nginx_redirect_to_https] + type = "boolean" + default = "true" + + [security.nginx.nginx_compatibility] + type = "select" + default = "intermediate" + choices = ["intermediate", "modern"] + + [security.postfix] + name = "Postfix" + [security.postfix.postfix_compatibility] + type = "select" + default = "intermediate" + choices = ["intermediate", "modern"] + + [security.webadmin] + name = "Webadmin" + [security.webadmin.webadmin_allowlist_enabled] + type = "boolean" + default = "false" + + [security.webadmin.webadmin_allowlist] + type = "tags" + visible = "webadmin_allowlist_enabled" + optional = true + default = "" + + [security.experimental] + name = "Experimental" + [security.experimental.security_experimental_enabled] + type = "boolean" + default = "false" + + +[email] +name = "Email" + [email.pop3] + name = "POP3" + [email.pop3.pop3_enabled] + type = "boolean" + default = "false" + + [email.smtp] + name = "SMTP" + [email.smtp.smtp_allow_ipv6] + type = "boolean" + default = "true" + + [email.smtp.smtp_relay_enabled] + type = "boolean" + default = "false" + + [email.smtp.smtp_relay_host] + type = "string" + default = "" + optional = true + visible="smtp_relay_enabled" + + [email.smtp.smtp_relay_port] + type = "number" + default = 587 + visible="smtp_relay_enabled" + + [email.smtp.smtp_relay_user] + type = "string" + default = "" + optional = true + visible="smtp_relay_enabled" + + [email.smtp.smtp_relay_password] + type = "password" + default = "" + optional = true + visible="smtp_relay_enabled" + +[misc] +name = "Other" + [misc.ssowat] + name = "SSOwat" + [misc.ssowat.ssowat_panel_overlay_enabled] + type = "boolean" + default = "true" + + [misc.backup] + name = "Backup" + [misc.backup.backup_compress_tar_archives] + type = "boolean" + default = "false" diff --git a/src/settings.py b/src/settings.py index cec416550..0701cd906 100644 --- a/src/settings.py +++ b/src/settings.py @@ -7,14 +7,17 @@ from collections import OrderedDict from moulinette import m18n from yunohost.utils.error import YunohostError, YunohostValidationError +from yunohost.utils.config import ConfigPanel, Question from moulinette.utils.log import getActionLogger from yunohost.regenconf import regen_conf from yunohost.firewall import firewall_reload +from yunohost.log import is_unit_operation +from yunohost.utils.legacy import translate_legacy_settings_to_configpanel_settings logger = getActionLogger("yunohost.settings") -SETTINGS_PATH = "/etc/yunohost/settings.json" -SETTINGS_PATH_OTHER_LOCATION = "/etc/yunohost/settings-%s.json" +SETTINGS_PATH = "/etc/yunohost/settings.yaml" +SETTINGS_PATH_OTHER_LOCATION = "/etc/yunohost/settings-%s.yaml" def is_boolean(value): @@ -59,71 +62,7 @@ def is_boolean(value): # * string # * enum (in the form of a python list) -DEFAULTS = OrderedDict( - [ - # Password Validation - # -1 disabled, 0 alert if listed, 1 8-letter, 2 normal, 3 strong, 4 strongest - ("security.password.admin.strength", {"type": "int", "default": 1}), - ("security.password.user.strength", {"type": "int", "default": 1}), - ( - "service.ssh.allow_deprecated_dsa_hostkey", - {"type": "bool", "default": False}, - ), - ( - "security.ssh.compatibility", - { - "type": "enum", - "default": "modern", - "choices": ["intermediate", "modern"], - }, - ), - ( - "security.ssh.port", - {"type": "int", "default": 22}, - ), - ( - "security.ssh.password_authentication", - {"type": "bool", "default": True}, - ), - ( - "security.nginx.redirect_to_https", - { - "type": "bool", - "default": True, - }, - ), - ( - "security.nginx.compatibility", - { - "type": "enum", - "default": "intermediate", - "choices": ["intermediate", "modern"], - }, - ), - ( - "security.postfix.compatibility", - { - "type": "enum", - "default": "intermediate", - "choices": ["intermediate", "modern"], - }, - ), - ("pop3.enabled", {"type": "bool", "default": False}), - ("smtp.allow_ipv6", {"type": "bool", "default": True}), - ("smtp.relay.host", {"type": "string", "default": ""}), - ("smtp.relay.port", {"type": "int", "default": 587}), - ("smtp.relay.user", {"type": "string", "default": ""}), - ("smtp.relay.password", {"type": "string", "default": ""}), - ("backup.compress_tar_archives", {"type": "bool", "default": False}), - ("ssowat.panel_overlay.enabled", {"type": "bool", "default": True}), - ("security.webadmin.allowlist.enabled", {"type": "bool", "default": False}), - ("security.webadmin.allowlist", {"type": "string", "default": ""}), - ("security.experimental.enabled", {"type": "bool", "default": False}), - ] -) - - -def settings_get(key, full=False): +def settings_get(key="", full=False, export=False): """ Get an entry value in the settings @@ -131,28 +70,42 @@ def settings_get(key, full=False): key -- Settings key """ - settings = _get_settings() - - if key not in settings: + if full and export: raise YunohostValidationError( - "global_settings_key_doesnt_exists", settings_key=key + "You can't use --full and --export together.", raw_msg=True ) if full: - return settings[key] + mode = "full" + elif export: + mode = "export" + else: + mode = "classic" - return settings[key]["value"] + if mode == "classic" and key == "": + raise YunohostValidationError( + "Missing key" + ) + + settings = SettingsConfigPanel() + key = translate_legacy_settings_to_configpanel_settings(key) + return settings.get(key, mode) -def settings_list(): +def settings_list(full=False, export=True): """ List all entries of the settings """ - return _get_settings() + + if full: + export = False + + return settings_get(full=full, export=export) -def settings_set(key, value): +@is_unit_operation() +def settings_set(operation_logger, key=None, value=None, args=None, args_file=None): """ Set an entry value in the settings @@ -161,78 +114,14 @@ def settings_set(key, value): value -- New value """ - settings = _get_settings() - - if key not in settings: - raise YunohostValidationError( - "global_settings_key_doesnt_exists", settings_key=key - ) - - key_type = settings[key]["type"] - - if key_type == "bool": - boolean_value = is_boolean(value) - if boolean_value[0]: - value = boolean_value[1] - else: - raise YunohostValidationError( - "global_settings_bad_type_for_setting", - setting=key, - received_type=type(value).__name__, - expected_type=key_type, - ) - elif key_type == "int": - if not isinstance(value, int) or isinstance(value, bool): - if isinstance(value, str): - try: - value = int(value) - except Exception: - raise YunohostValidationError( - "global_settings_bad_type_for_setting", - setting=key, - received_type=type(value).__name__, - expected_type=key_type, - ) - else: - raise YunohostValidationError( - "global_settings_bad_type_for_setting", - setting=key, - received_type=type(value).__name__, - expected_type=key_type, - ) - elif key_type == "string": - if not isinstance(value, str): - raise YunohostValidationError( - "global_settings_bad_type_for_setting", - setting=key, - received_type=type(value).__name__, - expected_type=key_type, - ) - elif key_type == "enum": - if value not in settings[key]["choices"]: - raise YunohostValidationError( - "global_settings_bad_choice_for_enum", - setting=key, - choice=str(value), - available_choices=", ".join(settings[key]["choices"]), - ) - else: - raise YunohostValidationError( - "global_settings_unknown_type", setting=key, unknown_type=key_type - ) - - old_value = settings[key].get("value") - settings[key]["value"] = value - _save_settings(settings) - - try: - trigger_post_change_hook(key, old_value, value) - except Exception as e: - logger.error(f"Post-change hook for setting {key} failed : {e}") - raise + Question.operation_logger = operation_logger + settings = SettingsConfigPanel() + key = translate_legacy_settings_to_configpanel_settings(key) + return settings.set(key, value, args, args_file, operation_logger=operation_logger) -def settings_reset(key): +@is_unit_operation() +def settings_reset(operation_logger, key): """ Set an entry value to its default one @@ -240,18 +129,14 @@ def settings_reset(key): key -- Settings key """ - settings = _get_settings() - if key not in settings: - raise YunohostValidationError( - "global_settings_key_doesnt_exists", settings_key=key - ) - - settings[key]["value"] = settings[key]["default"] - _save_settings(settings) + settings = SettingsConfigPanel() + key = translate_legacy_settings_to_configpanel_settings(key) + return settings.reset(key, operation_logger=operation_logger) -def settings_reset_all(): +@is_unit_operation() +def settings_reset_all(operation_logger): """ Reset all settings to their default value @@ -259,110 +144,72 @@ def settings_reset_all(): yes -- Yes I'm sure I want to do that """ - settings = _get_settings() - - # For now on, we backup the previous settings in case of but we don't have - # any mecanism to take advantage of those backups. It could be a nice - # addition but we'll see if this is a common need. - # Another solution would be to use etckeeper and integrate those - # modification inside of it and take advantage of its git history - old_settings_backup_path = ( - SETTINGS_PATH_OTHER_LOCATION % datetime.utcnow().strftime("%F_%X") - ) - _save_settings(settings, location=old_settings_backup_path) - - for value in settings.values(): - value["value"] = value["default"] - - _save_settings(settings) - - return { - "old_settings_backup_path": old_settings_backup_path, - "message": m18n.n( - "global_settings_reset_success", path=old_settings_backup_path - ), - } + settings = SettingsConfigPanel() + return settings.reset(operation_logger=operation_logger) def _get_setting_description(key): - return m18n.n(f"global_settings_setting_{key}".replace(".", "_")) + return m18n.n(f"global_settings_setting_{key.split('.')[-1]}") -def _get_settings(): +class SettingsConfigPanel(ConfigPanel): + entity_type = "settings" + save_path_tpl = SETTINGS_PATH + save_mode = "diff" - settings = {} + def __init__( + self, config_path=None, save_path=None, creation=False + ): + super().__init__("settings") - for key, value in DEFAULTS.copy().items(): - settings[key] = value - settings[key]["value"] = value["default"] - settings[key]["description"] = _get_setting_description(key) + def _apply(self): + super()._apply() - if not os.path.exists(SETTINGS_PATH): - return settings + settings = { k: v for k, v in self.future_values.items() if self.values.get(k) != v } + for setting_name, value in settings.items(): + try: + trigger_post_change_hook(setting_name, self.values.get(setting_name), value) + except Exception as e: + logger.error(f"Post-change hook for setting failed : {e}") + raise - # we have a very strict policy on only allowing settings that we know in - # the OrderedDict DEFAULTS - # For various reason, while reading the local settings we might encounter - # settings that aren't in DEFAULTS, those can come from settings key that - # we have removed, errors or the user trying to modify - # /etc/yunohost/settings.json - # To avoid to simply overwrite them, we store them in - # /etc/yunohost/settings-unknown.json in case of - unknown_settings = {} - unknown_settings_path = SETTINGS_PATH_OTHER_LOCATION % "unknown" + def reset(self, key = "", operation_logger=None): + self.filter_key = key + + # Read config panel toml + self._get_config_panel() + + if not self.config: + raise YunohostValidationError("config_no_panel") + + # Replace all values with default values + self.values = self._get_default_values() + + Question.operation_logger = operation_logger + + if operation_logger: + operation_logger.start() - if os.path.exists(unknown_settings_path): try: - unknown_settings = json.load(open(unknown_settings_path, "r")) - except Exception as e: - logger.warning(f"Error while loading unknown settings {e}") + self._apply() + except YunohostError: + raise + # Script got manually interrupted ... + # N.B. : KeyboardInterrupt does not inherit from Exception + except (KeyboardInterrupt, EOFError): + error = m18n.n("operation_interrupted") + logger.error(m18n.n("config_apply_failed", error=error)) + raise + # Something wrong happened in Yunohost's code (most probably hook_exec) + except Exception: + import traceback - try: - with open(SETTINGS_PATH) as settings_fd: - local_settings = json.load(settings_fd) + error = m18n.n("unexpected_error", error="\n" + traceback.format_exc()) + logger.error(m18n.n("config_apply_failed", error=error)) + raise - for key, value in local_settings.items(): - if key in settings: - settings[key] = value - settings[key]["description"] = _get_setting_description(key) - else: - logger.warning( - m18n.n( - "global_settings_unknown_setting_from_settings_file", - setting_key=key, - ) - ) - unknown_settings[key] = value - except Exception as e: - raise YunohostValidationError("global_settings_cant_open_settings", reason=e) - - if unknown_settings: - try: - _save_settings(unknown_settings, location=unknown_settings_path) - _save_settings(settings) - except Exception as e: - logger.warning(f"Failed to save unknown settings (because {e}), aborting.") - - return settings - - -def _save_settings(settings, location=SETTINGS_PATH): - settings_without_description = {} - for key, value in settings.items(): - settings_without_description[key] = value - if "description" in value: - del settings_without_description[key]["description"] - - try: - result = json.dumps(settings_without_description, indent=4) - except Exception as e: - raise YunohostError("global_settings_cant_serialize_settings", reason=e) - - try: - with open(location, "w") as settings_fd: - settings_fd.write(result) - except Exception as e: - raise YunohostError("global_settings_cant_write_settings", reason=e) + logger.success("Config updated as expected") + operation_logger.success() # Meant to be a dict of setting_name -> function to call @@ -370,13 +217,8 @@ post_change_hooks = {} def post_change_hook(setting_name): + # TODO: Check that setting_name exists def decorator(func): - assert ( - setting_name in DEFAULTS.keys() - ), f"The setting {setting_name} does not exists" - assert ( - setting_name not in post_change_hooks - ), f"You can only register one post change hook per setting (in particular for {setting_name})" post_change_hooks[setting_name] = func return func @@ -404,48 +246,48 @@ def trigger_post_change_hook(setting_name, old_value, new_value): # =========================================== -@post_change_hook("ssowat.panel_overlay.enabled") -@post_change_hook("security.nginx.redirect_to_https") -@post_change_hook("security.nginx.compatibility") -@post_change_hook("security.webadmin.allowlist.enabled") -@post_change_hook("security.webadmin.allowlist") +@post_change_hook("ssowat_panel_overlay_enabled") +@post_change_hook("nginx_redirect_to_https") +@post_change_hook("nginx_compatibility") +@post_change_hook("webadmin_allowlist_enabled") +@post_change_hook("webadmin_allowlist") def reconfigure_nginx(setting_name, old_value, new_value): if old_value != new_value: regen_conf(names=["nginx"]) -@post_change_hook("security.experimental.enabled") +@post_change_hook("security_experimental_enabled") def reconfigure_nginx_and_yunohost(setting_name, old_value, new_value): if old_value != new_value: regen_conf(names=["nginx", "yunohost"]) -@post_change_hook("security.ssh.compatibility") -@post_change_hook("security.ssh.password_authentication") +@post_change_hook("ssh_compatibility") +@post_change_hook("ssh_password_authentication") def reconfigure_ssh(setting_name, old_value, new_value): if old_value != new_value: regen_conf(names=["ssh"]) -@post_change_hook("security.ssh.port") +@post_change_hook("ssh_port") def reconfigure_ssh_and_fail2ban(setting_name, old_value, new_value): if old_value != new_value: regen_conf(names=["ssh", "fail2ban"]) firewall_reload() -@post_change_hook("smtp.allow_ipv6") -@post_change_hook("smtp.relay.host") -@post_change_hook("smtp.relay.port") -@post_change_hook("smtp.relay.user") -@post_change_hook("smtp.relay.password") -@post_change_hook("security.postfix.compatibility") +@post_change_hook("smtp_allow_ipv6") +@post_change_hook("smtp_relay_host") +@post_change_hook("smtp_relay_port") +@post_change_hook("smtp_relay_user") +@post_change_hook("smtp_relay_password") +@post_change_hook("postfix_compatibility") def reconfigure_postfix(setting_name, old_value, new_value): if old_value != new_value: regen_conf(names=["postfix"]) -@post_change_hook("pop3.enabled") +@post_change_hook("pop3_enabled") def reconfigure_dovecot(setting_name, old_value, new_value): dovecot_package = "dovecot-pop3d" diff --git a/src/utils/config.py b/src/utils/config.py index 56f632b09..e265527e7 100644 --- a/src/utils/config.py +++ b/src/utils/config.py @@ -801,6 +801,11 @@ class Question: def _prevalidate(self): if self.value in [None, ""] and not self.optional: + import traceback + error = m18n.n("unexpected_error", error="\n" + traceback.format_exc()) + msg = m18n.n("unexpected_error", app=app_instance_name, error=error) + logger.error(msg) + operation_logger.error(msg) raise YunohostValidationError("app_argument_required", name=self.name) # we have an answer, do some post checks diff --git a/src/utils/legacy.py b/src/utils/legacy.py index 85898f28d..74e6c24c3 100644 --- a/src/utils/legacy.py +++ b/src/utils/legacy.py @@ -62,6 +62,31 @@ LEGACY_PERMISSION_LABEL = { ): "api", # $excaped_domain$excaped_path/[%w-.]*/[%w-.]*/git%-receive%-pack,$excaped_domain$excaped_path/[%w-.]*/[%w-.]*/git%-upload%-pack,$excaped_domain$excaped_path/[%w-.]*/[%w-.]*/info/refs } +LEGACY_SETTINGS = { + "security.password.admin.strength": "security.password.admin_strength", + "security.password.user.strength": "security.password.user_strength", + "security.ssh.compatibility": "security.ssh.ssh_compatibility", + "security.ssh.port": "security.ssh.ssh_port", + "security.ssh.password_authentication": "security.ssh.ssh_password_authentication", + "service.ssh.allow_deprecated_dsa_hostkey": "security.ssh.ssh_allow_deprecated_dsa_hostkey", + "security.nginx.redirect_to_https": "security.nginx.nginx_redirect_to_https", + "security.nginx.compatibility": "security.nginx.nginx_compatibility", + "security.postfix.compatibility": "security.postfix.postfix_compatibility", + "pop3.enabled": "email.pop3.pop3_enabled", + "smtp.allow_ipv6": "email.smtp.smtp_allow_ipv6", + "smtp.relay.host": "email.smtp.smtp_relay_host", + "smtp.relay.port": "email.smtp.smtp_relay_port", + "smtp.relay.user": "email.smtp.smtp_relay_user", + "smtp.relay.password": "email.smtp.smtp_relay_password", + "backup.compress_tar_archives": "misc.backup.backup_compress_tar_archives", + "ssowat.panel_overlay.enabled": "misc.ssowat.ssowat_panel_overlay_enabled", + "security.webadmin.allowlist.enabled": "security.webadmin.webadmin_allowlist_enabled", + "security.webadmin.allowlist": "security.webadmin.webadmin_allowlist", + "security.experimental.enabled": "security.experimental.security_experimental_enabled" +} + +def translate_legacy_settings_to_configpanel_settings(settings): + return LEGACY_SETTINGS.get(settings, settings) def legacy_permission_label(app, permission_type): return LEGACY_PERMISSION_LABEL.get( From 3fd14a420eabeb8cb7f97ee539b4f737a9713c5f Mon Sep 17 00:00:00 2001 From: Tagadda <36127788+Tagadda@users.noreply.github.com> Date: Sun, 30 Jan 2022 00:37:07 +0000 Subject: [PATCH 32/89] wip --- locales/en.json | 48 ++++++++++++++++++++++++-------------- share/config_settings.toml | 2 +- src/settings.py | 15 ++++++++---- src/utils/config.py | 5 ---- 4 files changed, 43 insertions(+), 27 deletions(-) diff --git a/locales/en.json b/locales/en.json index e50e0f7d9..98ca26545 100644 --- a/locales/en.json +++ b/locales/en.json @@ -375,25 +375,39 @@ "global_settings_key_doesnt_exists": "The key '{settings_key}' does not exist in the global settings, you can see all the available keys by running 'yunohost settings list'", "global_settings_reset_success": "Previous settings now backed up to {path}", "global_settings_setting_admin_strength": "Admin password strength", - "global_settings_setting_backup_compress_tar_archives": "When creating new backups, compress the archives (.tar.gz) instead of uncompressed archives (.tar). N.B. : enabling this option means create lighter backup archives, but the initial backup procedure will be significantly longer and heavy on CPU.", - "global_settings_setting_nginx_compatibility": "Compatibility vs. security tradeoff for the web server NGINX. Affects the ciphers (and other security-related aspects)", - "global_settings_setting_nginx_redirect_to_https": "Redirect HTTP requests to HTTPs by default (DO NOT TURN OFF unless you really know what you're doing!)", - "global_settings_setting_pop3_enabled": "Enable the POP3 protocol for the mail server", - "global_settings_setting_postfix_compatibility": "Compatibility vs. security tradeoff for the Postfix server. Affects the ciphers (and other security-related aspects)", - "global_settings_setting_security_experimental_enabled": "Enable experimental security features (don't enable this if you don't know what you're doing!)", - "global_settings_setting_smtp_allow_ipv6": "Allow the use of IPv6 to receive and send mail", - "global_settings_setting_smtp_relay_host": "SMTP relay host to use in order to send mail instead of this yunohost instance. Useful if you are in one of this situation: your 25 port is blocked by your ISP or VPS provider, you have a residential IP listed on DUHL, you are not able to configure reverse DNS or this server is not directly exposed on the internet and you want use an other one to send mails.", - "global_settings_setting_smtp_relay_password": "SMTP relay host password", - "global_settings_setting_smtp_relay_port": "SMTP relay port", - "global_settings_setting_smtp_relay_user": "SMTP relay user account", - "global_settings_setting_ssh_allow_deprecated_dsa_hostkey": "Allow the use of (deprecated) DSA hostkey for the SSH daemon configuration", - "global_settings_setting_ssh_compatibility": "Compatibility vs. security tradeoff for the SSH server. Affects the ciphers (and other security-related aspects)", - "global_settings_setting_ssh_password_authentication": "Allow password authentication for SSH", + "global_settings_setting_backup_compress_tar_archives": "Compress backups", + "global_settings_setting_backup_compress_tar_archives_help": "When creating new backups, compress the archives (.tar.gz) instead of uncompressed archives (.tar). N.B. : enabling this option means create lighter backup archives, but the initial backup procedure will be significantly longer and heavy on CPU.", + "global_settings_setting_nginx_compatibility": "Compatibility", + "global_settings_setting_nginx_compatibility_help": "Compatibility vs. security tradeoff for the web server NGINX. Affects the ciphers (and other security-related aspects)", + "global_settings_setting_nginx_redirect_to_https": "Force HTTPS", + "global_settings_setting_nginx_redirect_to_https_help": "Redirect HTTP requests to HTTPs by default (DO NOT TURN OFF unless you really know what you're doing!)", + "global_settings_setting_pop3_enabled": "Enable POP3", + "global_settings_setting_pop3_enabled_help": "Enable the POP3 protocol for the mail server", + "global_settings_setting_postfix_compatibility": "Compatibility", + "global_settings_setting_postfix_compatibility_help": "Compatibility vs. security tradeoff for the Postfix server. Affects the ciphers (and other security-related aspects)", + "global_settings_setting_security_experimental_enabled": "Experimental security features", + "global_settings_setting_security_experimental_enabled_help": "Enable experimental security features (don't enable this if you don't know what you're doing!)", + "global_settings_setting_smtp_allow_ipv6": "Allow IPv6", + "global_settings_setting_smtp_allow_ipv6_help": "Allow the use of IPv6 to receive and send mail", + "global_settings_setting_smtp_relay_enabled": "Enable SMTP relay", + "global_settings_setting_smtp_relay_enabled_help": "Enable the SMTP relay to use in order to send mail instead of this yunohost instance. Useful if you are in one of this situation: your 25 port is blocked by your ISP or VPS provider, you have a residential IP listed on DUHL, you are not able to configure reverse DNS or this server is not directly exposed on the internet and you want use an other one to send mails.", + "global_settings_setting_smtp_relay_host": "Relay host", + "global_settings_setting_smtp_relay_password": "Relay password", + "global_settings_setting_smtp_relay_port": "Relay port", + "global_settings_setting_smtp_relay_user": "Relay user", + "global_settings_setting_ssh_allow_deprecated_dsa_hostkey": "Allow DSA hostkey", + "global_settings_setting_ssh_allow_deprecated_dsa_hostkey_help": "Allow the use of (deprecated) DSA hostkey for the SSH daemon configuration", + "global_settings_setting_ssh_compatibility": "Compatibility", + "global_settings_setting_ssh_compatibility_help": "Compatibility vs. security tradeoff for the SSH server. Affects the ciphers (and other security-related aspects)", + "global_settings_setting_ssh_password_authentication": "Password authentication", + "global_settings_setting_ssh_password_authentication_help": "Allow password authentication for SSH", "global_settings_setting_ssh_port": "SSH port", - "global_settings_setting_ssowat_panel_overlay_enabled": "Enable SSOwat panel overlay", + "global_settings_setting_ssowat_panel_overlay_enabled": "SSOwat panel overlay", "global_settings_setting_user_strength": "User password strength", - "global_settings_setting_webadmin_allowlist": "IP adresses allowed to access the webadmin. Comma-separated.", - "global_settings_setting_webadmin_allowlist_enabled": "Allow only some IPs to access the webadmin.", + "global_settings_setting_webadmin_allowlist": "Webadmin IP allowlist", + "global_settings_setting_webadmin_allowlist_help": "IP adresses allowed to access the webadmin.", + "global_settings_setting_webadmin_allowlist_enabled": "Enable Webadmin IP allowlist", + "global_settings_setting_webadmin_allowlist_enabled_help": "Allow only some IPs to access the webadmin.", "global_settings_unknown_setting_from_settings_file": "Unknown key in settings: '{setting_key}', discard it and save it in /etc/yunohost/settings-unknown.json", "global_settings_unknown_type": "Unexpected situation, the setting {setting} appears to have the type {unknown_type} but it is not a type supported by the system.", "good_practices_about_admin_password": "You are now about to define a new administration password. The password should be at least 8 characters long—though it is good practice to use a longer password (i.e. a passphrase) and/or to use a variation of characters (uppercase, lowercase, digits and special characters).", diff --git a/share/config_settings.toml b/share/config_settings.toml index 61f0a5725..1b2a59bc4 100644 --- a/share/config_settings.toml +++ b/share/config_settings.toml @@ -1,5 +1,5 @@ version = "1.0" -i18n = "global_settings" +i18n = "global_settings_setting" [security] name = "Security" diff --git a/src/settings.py b/src/settings.py index 0701cd906..89321e296 100644 --- a/src/settings.py +++ b/src/settings.py @@ -148,10 +148,6 @@ def settings_reset_all(operation_logger): return settings.reset(operation_logger=operation_logger) -def _get_setting_description(key): - return m18n.n(f"global_settings_setting_{key.split('.')[-1]}") - - class SettingsConfigPanel(ConfigPanel): entity_type = "settings" save_path_tpl = SETTINGS_PATH @@ -173,6 +169,17 @@ class SettingsConfigPanel(ConfigPanel): logger.error(f"Post-change hook for setting failed : {e}") raise + def get(self, key="", mode="classic"): + result = super().get(key=key, mode=mode) + + if mode == "full": + for panel, section, option in self._iterate(): + if m18n.key_exists(self.config["i18n"] + "_" + option["id"] + "_help"): + option["help"] = m18n.n(self.config["i18n"] + "_" + option["id"] + "_help") + return self.config + + return result + def reset(self, key = "", operation_logger=None): self.filter_key = key diff --git a/src/utils/config.py b/src/utils/config.py index e265527e7..56f632b09 100644 --- a/src/utils/config.py +++ b/src/utils/config.py @@ -801,11 +801,6 @@ class Question: def _prevalidate(self): if self.value in [None, ""] and not self.optional: - import traceback - error = m18n.n("unexpected_error", error="\n" + traceback.format_exc()) - msg = m18n.n("unexpected_error", app=app_instance_name, error=error) - logger.error(msg) - operation_logger.error(msg) raise YunohostValidationError("app_argument_required", name=self.name) # we have an answer, do some post checks From 35c5015db228f8f917d5c9f0f7804021ba29efa4 Mon Sep 17 00:00:00 2001 From: Tagadda <36127788+Tagadda@users.noreply.github.com> Date: Sun, 30 Jan 2022 19:29:00 +0000 Subject: [PATCH 33/89] Update locales --- locales/en.json | 10 +++------- src/settings.py | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/locales/en.json b/locales/en.json index 98ca26545..e4e14772c 100644 --- a/locales/en.json +++ b/locales/en.json @@ -367,13 +367,6 @@ "firewall_reload_failed": "Could not reload the firewall", "firewall_reloaded": "Firewall reloaded", "firewall_rules_cmd_failed": "Some firewall rule commands have failed. More info in log.", - "global_settings_bad_choice_for_enum": "Bad choice for setting {setting}, received '{choice}', but available choices are: {available_choices}", - "global_settings_bad_type_for_setting": "Bad type for setting {setting}, received {received_type}, expected {expected_type}", - "global_settings_cant_open_settings": "Could not open settings file, reason: {reason}", - "global_settings_cant_serialize_settings": "Could not serialize settings data, reason: {reason}", - "global_settings_cant_write_settings": "Could not save settings file, reason: {reason}", - "global_settings_key_doesnt_exists": "The key '{settings_key}' does not exist in the global settings, you can see all the available keys by running 'yunohost settings list'", - "global_settings_reset_success": "Previous settings now backed up to {path}", "global_settings_setting_admin_strength": "Admin password strength", "global_settings_setting_backup_compress_tar_archives": "Compress backups", "global_settings_setting_backup_compress_tar_archives_help": "When creating new backups, compress the archives (.tar.gz) instead of uncompressed archives (.tar). N.B. : enabling this option means create lighter backup archives, but the initial backup procedure will be significantly longer and heavy on CPU.", @@ -492,6 +485,9 @@ "log_user_permission_reset": "Reset permission '{}'", "log_user_permission_update": "Update accesses for permission '{}'", "log_user_update": "Update info for user '{}'", + "log_settings_set": "Apply setting '{}'", + "log_settings_reset": "Reset setting '{}'", + "log_settings_reset_all": "Reset all setting", "mail_alias_remove_failed": "Could not remove e-mail alias '{mail}'", "mail_domain_unknown": "Invalid e-mail address for domain '{domain}'. Please, use a domain administrated by this server.", "mail_forward_remove_failed": "Could not remove e-mail forwarding '{mail}'", diff --git a/src/settings.py b/src/settings.py index 89321e296..e50fd2256 100644 --- a/src/settings.py +++ b/src/settings.py @@ -215,7 +215,7 @@ class SettingsConfigPanel(ConfigPanel): logger.error(m18n.n("config_apply_failed", error=error)) raise - logger.success("Config updated as expected") + logger.success(m18n.("global_settings_reset_success")) operation_logger.success() From 6428417aa0a73de7b9c8e1900d74be8feb92a45a Mon Sep 17 00:00:00 2001 From: Tagadda <36127788+Tagadda@users.noreply.github.com> Date: Sun, 30 Jan 2022 23:05:38 +0000 Subject: [PATCH 34/89] clean unused code and a typo :D --- src/settings.py | 48 +----------------------------------------------- 1 file changed, 1 insertion(+), 47 deletions(-) diff --git a/src/settings.py b/src/settings.py index e50fd2256..a6b65b095 100644 --- a/src/settings.py +++ b/src/settings.py @@ -2,9 +2,6 @@ import os import json import subprocess -from datetime import datetime -from collections import OrderedDict - from moulinette import m18n from yunohost.utils.error import YunohostError, YunohostValidationError from yunohost.utils.config import ConfigPanel, Question @@ -17,51 +14,8 @@ from yunohost.utils.legacy import translate_legacy_settings_to_configpanel_setti logger = getActionLogger("yunohost.settings") SETTINGS_PATH = "/etc/yunohost/settings.yaml" -SETTINGS_PATH_OTHER_LOCATION = "/etc/yunohost/settings-%s.yaml" -def is_boolean(value): - TRUE = ["true", "on", "yes", "y", "1"] - FALSE = ["false", "off", "no", "n", "0"] - - """ - Ensure a string value is intended as a boolean - - Keyword arguments: - arg -- The string to check - - Returns: - (is_boolean, boolean_value) - - """ - if isinstance(value, bool): - return True, value - if value in [0, 1]: - return True, bool(value) - elif isinstance(value, str): - if str(value).lower() in TRUE + FALSE: - return True, str(value).lower() in TRUE - else: - return False, None - else: - return False, None - - -# a settings entry is in the form of: -# namespace.subnamespace.name: {type, value, default, description, [choices]} -# choices is only for enum -# the keyname can have as many subnamespace as needed but should have at least -# one level of namespace - -# description is implied from the translated strings -# the key is "global_settings_setting_%s" % key.replace(".", "_") - -# type can be: -# * bool -# * int -# * string -# * enum (in the form of a python list) - def settings_get(key="", full=False, export=False): """ Get an entry value in the settings @@ -215,7 +169,7 @@ class SettingsConfigPanel(ConfigPanel): logger.error(m18n.n("config_apply_failed", error=error)) raise - logger.success(m18n.("global_settings_reset_success")) + logger.success(m18n.n("global_settings_reset_success")) operation_logger.success() From f3349d4b3d8a3b88cc4f1236676e735a5ca5a383 Mon Sep 17 00:00:00 2001 From: Tagadda <36127788+Tagadda@users.noreply.github.com> Date: Sun, 30 Jan 2022 23:35:32 +0000 Subject: [PATCH 35/89] settings migration wip --- .../0024_global_settings_to_configpanel.py | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 src/migrations/0024_global_settings_to_configpanel.py diff --git a/src/migrations/0024_global_settings_to_configpanel.py b/src/migrations/0024_global_settings_to_configpanel.py new file mode 100644 index 000000000..b165b75b9 --- /dev/null +++ b/src/migrations/0024_global_settings_to_configpanel.py @@ -0,0 +1,32 @@ +import subprocess +import time + +from yunohost.utils.error import YunohostError +from moulinette.utils.log import getActionLogger + +from yunohost.tools import Migration +from yunohost.utils.legacy import LEGACY_SETTINGS, translate_legacy_settings_to_configpanel_settings +from yunohost.settings import settings_set + +logger = getActionLogger("yunohost.migration") + +SETTINGS_PATH = "/etc/yunohost/settings.json" + +class MyMigration(Migration): + + "Migrate old global settings to the new ConfigPanel global settings" + + dependencies = ["migrate_to_bullseye"] + + def run(self): + if not os.path.exists(SETTINGS_PATH): + return + + try: + old_settings = json.load(open(SETTINGS_PATH)) + except Exception as e: + raise YunohostError("global_settings_cant_open_settings", reason=e) + + for key, value in old_settings.items(): + if key in LEGACY_SETTINGS: + settings_set(key=key, value=value) From 2156fb402b560058dca4ffec87e10b26e6dffdff Mon Sep 17 00:00:00 2001 From: Tagadda <36127788+Tagadda@users.noreply.github.com> Date: Mon, 31 Jan 2022 00:57:00 +0000 Subject: [PATCH 36/89] settings migration --- locales/en.json | 4 ++-- .../0024_global_settings_to_configpanel.py | 16 +++++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/locales/en.json b/locales/en.json index e4e14772c..8be16738a 100644 --- a/locales/en.json +++ b/locales/en.json @@ -485,8 +485,8 @@ "log_user_permission_reset": "Reset permission '{}'", "log_user_permission_update": "Update accesses for permission '{}'", "log_user_update": "Update info for user '{}'", - "log_settings_set": "Apply setting '{}'", - "log_settings_reset": "Reset setting '{}'", + "log_settings_set": "Apply settings", + "log_settings_reset": "Reset setting", "log_settings_reset_all": "Reset all setting", "mail_alias_remove_failed": "Could not remove e-mail alias '{mail}'", "mail_domain_unknown": "Invalid e-mail address for domain '{domain}'. Please, use a domain administrated by this server.", diff --git a/src/migrations/0024_global_settings_to_configpanel.py b/src/migrations/0024_global_settings_to_configpanel.py index b165b75b9..7283f168b 100644 --- a/src/migrations/0024_global_settings_to_configpanel.py +++ b/src/migrations/0024_global_settings_to_configpanel.py @@ -1,16 +1,16 @@ import subprocess import time +import urllib from yunohost.utils.error import YunohostError from moulinette.utils.log import getActionLogger from yunohost.tools import Migration -from yunohost.utils.legacy import LEGACY_SETTINGS, translate_legacy_settings_to_configpanel_settings from yunohost.settings import settings_set logger = getActionLogger("yunohost.migration") -SETTINGS_PATH = "/etc/yunohost/settings.json" +OLD_SETTINGS_PATH = "/etc/yunohost/settings.json" class MyMigration(Migration): @@ -19,14 +19,16 @@ class MyMigration(Migration): dependencies = ["migrate_to_bullseye"] def run(self): - if not os.path.exists(SETTINGS_PATH): + if not os.path.exists(OLD_SETTINGS_PATH): return try: - old_settings = json.load(open(SETTINGS_PATH)) + old_settings = json.load(open(OLD_SETTINGS_PATH)) except Exception as e: raise YunohostError("global_settings_cant_open_settings", reason=e) - for key, value in old_settings.items(): - if key in LEGACY_SETTINGS: - settings_set(key=key, value=value) + settings = { k: v['values'] for k,v in old_settings.items() } + + args = urllib.parse.urlencode(settings) + settings_set(args=args) + From 1d782b3a66c2ee866bee8391e40537eb37b6c050 Mon Sep 17 00:00:00 2001 From: Tagadda <36127788+Tagadda@users.noreply.github.com> Date: Mon, 14 Feb 2022 11:33:54 +0000 Subject: [PATCH 37/89] Update locales again --- locales/en.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locales/en.json b/locales/en.json index 8be16738a..3973c1745 100644 --- a/locales/en.json +++ b/locales/en.json @@ -251,7 +251,7 @@ "diagnosis_mail_fcrdns_different_from_ehlo_domain_details": "Current reverse DNS: {rdns_domain}
Expected value: {ehlo_domain}", "diagnosis_mail_fcrdns_dns_missing": "No reverse DNS is defined in IPv{ipversion}. Some emails may fail to get delivered or may get flagged as spam.", "diagnosis_mail_fcrdns_nok_alternatives_4": "Some providers won't let you configure your reverse DNS (or their feature might be broken...). If you are experiencing issues because of this, consider the following solutions:
- Some ISP provide the alternative of using a mail server relay though it implies that the relay will be able to spy on your email traffic.
- A privacy-friendly alternative is to use a VPN *with a dedicated public IP* to bypass this kind of limits. See https://yunohost.org/#/vpn_advantage
- Or it's possible to switch to a different provider", - "diagnosis_mail_fcrdns_nok_alternatives_6": "Some providers won't let you configure your reverse DNS (or their feature might be broken...). If your reverse DNS is correctly configured for IPv4, you can try disabling the use of IPv6 when sending emails by running yunohost settings set smtp.allow_ipv6 -v off. Note: this last solution means that you won't be able to send or receive emails from the few IPv6-only servers out there.", + "diagnosis_mail_fcrdns_nok_alternatives_6": "Some providers won't let you configure your reverse DNS (or their feature might be broken...). If your reverse DNS is correctly configured for IPv4, you can try disabling the use of IPv6 when sending emails by running yunohost settings set email.smtp.smtp_allow_ipv6 -v off. Note: this last solution means that you won't be able to send or receive emails from the few IPv6-only servers out there.", "diagnosis_mail_fcrdns_nok_details": "You should first try to configure the reverse DNS with {ehlo_domain} in your internet router interface or your hosting provider interface. (Some hosting provider may require you to send them a support ticket for this).", "diagnosis_mail_fcrdns_ok": "Your reverse DNS is correctly configured!", "diagnosis_mail_outgoing_port_25_blocked": "The SMTP mail server cannot send emails to other servers because outgoing port 25 is blocked in IPv{ipversion}.", @@ -288,8 +288,8 @@ "diagnosis_services_bad_status_tip": "You can try to restart the service, and if it doesn't work, have a look at the service logs in the webadmin (from the command line, you can do this with yunohost service restart {service} and yunohost service log {service}).", "diagnosis_services_conf_broken": "Configuration is broken for service {service}!", "diagnosis_services_running": "Service {service} is running!", - "diagnosis_sshd_config_inconsistent": "It looks like the SSH port was manually modified in /etc/ssh/sshd_config. Since YunoHost 4.2, a new global setting 'security.ssh.port' is available to avoid manually editing the configuration.", - "diagnosis_sshd_config_inconsistent_details": "Please run yunohost settings set security.ssh.port -v YOUR_SSH_PORT to define the SSH port, and check yunohost tools regen-conf ssh --dry-run --with-diff and yunohost tools regen-conf ssh --force to reset your conf to the YunoHost recommendation.", + "diagnosis_sshd_config_inconsistent": "It looks like the SSH port was manually modified in /etc/ssh/sshd_config. Since YunoHost 4.2, a new global setting 'security.ssh.ssh_port' is available to avoid manually editing the configuration.", + "diagnosis_sshd_config_inconsistent_details": "Please run yunohost settings set security.ssh.ssh_port -v YOUR_SSH_PORT to define the SSH port, and check yunohost tools regen-conf ssh --dry-run --with-diff and yunohost tools regen-conf ssh --force to reset your conf to the YunoHost recommendation.", "diagnosis_sshd_config_insecure": "The SSH configuration appears to have been manually modified, and is insecure because it contains no 'AllowGroups' or 'AllowUsers' directive to limit access to authorized users.", "diagnosis_swap_none": "The system has no swap at all. You should consider adding at least {recommended} of swap to avoid situations where the system runs out of memory.", "diagnosis_swap_notsomuch": "The system has only {total} swap. You should consider having at least {recommended} to avoid situations where the system runs out of memory.", From eb747cc15e90436d3d0a1a3765b067287c39ba3d Mon Sep 17 00:00:00 2001 From: Tagadda <36127788+Tagadda@users.noreply.github.com> Date: Mon, 14 Feb 2022 11:37:13 +0000 Subject: [PATCH 38/89] Search and replace old settings, first pass --- conf/ssh/sshd_config | 4 ++-- hooks/conf_regen/03-ssh | 8 ++++---- hooks/conf_regen/15-nginx | 12 ++++++------ hooks/conf_regen/25-dovecot | 2 +- hooks/conf_regen/52-fail2ban | 2 +- maintenance/missing_i18n_keys.py | 2 +- src/backup.py | 2 +- src/diagnosers/24-mail.py | 2 +- src/diagnosers/70-regenconf.py | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/conf/ssh/sshd_config b/conf/ssh/sshd_config index b6d4111ee..eaa0c7380 100644 --- a/conf/ssh/sshd_config +++ b/conf/ssh/sshd_config @@ -3,7 +3,7 @@ Protocol 2 # PLEASE: if you wish to change the ssh port properly in YunoHost, use this command: -# yunohost settings set security.ssh.port -v +# yunohost settings set security.ssh.ssh_port -v Port {{ port }} {% if ipv6_enabled == "true" %}ListenAddress ::{% endif %} @@ -56,7 +56,7 @@ ChallengeResponseAuthentication no UsePAM yes # PLEASE: if you wish to force everybody to authenticate using ssh keys, run this command: -# yunohost settings set security.ssh.password_authentication -v no +# yunohost settings set security.ssh.ssh_password_authentication -v no {% if password_authentication == "False" %} PasswordAuthentication no {% else %} diff --git a/hooks/conf_regen/03-ssh b/hooks/conf_regen/03-ssh index 9a7f5ce4d..eb548d4f4 100755 --- a/hooks/conf_regen/03-ssh +++ b/hooks/conf_regen/03-ssh @@ -15,14 +15,14 @@ do_pre_regen() { ssh_keys=$(ls /etc/ssh/ssh_host_{ed25519,rsa,ecdsa}_key 2>/dev/null || true) # Support legacy setting (this setting might be disabled by a user during a migration) - if [[ "$(yunohost settings get 'service.ssh.allow_deprecated_dsa_hostkey')" == "True" ]]; then + if [[ "$(yunohost settings get 'security.ssh.ssh_allow_deprecated_dsa_hostkey')" == "True" ]]; then ssh_keys="$ssh_keys $(ls /etc/ssh/ssh_host_dsa_key 2>/dev/null || true)" fi # Support different strategy for security configurations - export compatibility="$(yunohost settings get 'security.ssh.compatibility')" - export port="$(yunohost settings get 'security.ssh.port')" - export password_authentication="$(yunohost settings get 'security.ssh.password_authentication')" + export compatibility="$(yunohost settings get 'security.ssh.ssh_compatibility')" + export port="$(yunohost settings get 'security.ssh.ssh_port')" + export password_authentication="$(yunohost settings get 'security.ssh.ssh_password_authentication')" export ssh_keys export ipv6_enabled ynh_render_template "sshd_config" "${pending_dir}/etc/ssh/sshd_config" diff --git a/hooks/conf_regen/15-nginx b/hooks/conf_regen/15-nginx index c1d943681..482784d8d 100755 --- a/hooks/conf_regen/15-nginx +++ b/hooks/conf_regen/15-nginx @@ -56,7 +56,7 @@ do_pre_regen() { # install / update plain conf files cp plain/* "$nginx_conf_dir" # remove the panel overlay if this is specified in settings - panel_overlay=$(yunohost settings get 'ssowat.panel_overlay.enabled') + panel_overlay=$(yunohost settings get 'misc.ssowat.ssowat_panel_overlay_enabled') if [ "$panel_overlay" == "false" ] || [ "$panel_overlay" == "False" ]; then echo "#" >"${nginx_conf_dir}/yunohost_panel.conf.inc" fi @@ -65,9 +65,9 @@ do_pre_regen() { main_domain=$(cat /etc/yunohost/current_host) # Support different strategy for security configurations - export redirect_to_https="$(yunohost settings get 'security.nginx.redirect_to_https')" - export compatibility="$(yunohost settings get 'security.nginx.compatibility')" - export experimental="$(yunohost settings get 'security.experimental.enabled')" + export redirect_to_https="$(yunohost settings get 'security.nginx.nginx_redirect_to_https')" + export compatibility="$(yunohost settings get 'security.nginx.nginx_compatibility')" + export experimental="$(yunohost settings get 'security.experimental.security_experimental_enabled')" ynh_render_template "security.conf.inc" "${nginx_conf_dir}/security.conf.inc" cert_status=$(yunohost domain cert status --json) @@ -92,9 +92,9 @@ do_pre_regen() { done - export webadmin_allowlist_enabled=$(yunohost settings get security.webadmin.allowlist.enabled) + export webadmin_allowlist_enabled=$(yunohost settings get security.webadmin.webadmin_allowlist_enabled) if [ "$webadmin_allowlist_enabled" == "True" ]; then - export webadmin_allowlist=$(yunohost settings get security.webadmin.allowlist) + export webadmin_allowlist=$(yunohost settings get security.webadmin.webadmin_allowlist) fi ynh_render_template "yunohost_admin.conf.inc" "${nginx_conf_dir}/yunohost_admin.conf.inc" ynh_render_template "yunohost_api.conf.inc" "${nginx_conf_dir}/yunohost_api.conf.inc" diff --git a/hooks/conf_regen/25-dovecot b/hooks/conf_regen/25-dovecot index 37c73b6d8..da7e0fa75 100755 --- a/hooks/conf_regen/25-dovecot +++ b/hooks/conf_regen/25-dovecot @@ -16,7 +16,7 @@ do_pre_regen() { cp dovecot-ldap.conf "${dovecot_dir}/dovecot-ldap.conf" cp dovecot.sieve "${dovecot_dir}/global_script/dovecot.sieve" - export pop3_enabled="$(yunohost settings get 'pop3.enabled')" + export pop3_enabled="$(yunohost settings get 'email.pop3.pop3_enabled')" export main_domain=$(cat /etc/yunohost/current_host) export domain_list="$YNH_DOMAINS" diff --git a/hooks/conf_regen/52-fail2ban b/hooks/conf_regen/52-fail2ban index 8129e977d..8ef20f979 100755 --- a/hooks/conf_regen/52-fail2ban +++ b/hooks/conf_regen/52-fail2ban @@ -16,7 +16,7 @@ do_pre_regen() { cp yunohost.conf "${fail2ban_dir}/filter.d/yunohost.conf" cp jail.conf "${fail2ban_dir}/jail.conf" - export ssh_port="$(yunohost settings get 'security.ssh.port')" + export ssh_port="$(yunohost settings get 'security.ssh.ssh_port')" ynh_render_template "yunohost-jails.conf" "${fail2ban_dir}/jail.d/yunohost-jails.conf" } diff --git a/maintenance/missing_i18n_keys.py b/maintenance/missing_i18n_keys.py index 3dbca8027..817c73c61 100644 --- a/maintenance/missing_i18n_keys.py +++ b/maintenance/missing_i18n_keys.py @@ -100,7 +100,7 @@ def find_expected_string_keys(): yield m # Global settings descriptions - # Will be on a line like : ("service.ssh.allow_deprecated_dsa_hostkey", {"type": "bool", ... + # Will be on a line like : ("security.ssh.ssh_allow_deprecated_dsa_hostkey", {"type": "bool", ... p5 = re.compile(r" \(\n*\s*[\"\'](\w[\w\.]+)[\"\'],") content = open(ROOT + "src/settings.py").read() for m in ( diff --git a/src/backup.py b/src/backup.py index bba60b895..10b876244 100644 --- a/src/backup.py +++ b/src/backup.py @@ -1928,7 +1928,7 @@ class TarBackupMethod(BackupMethod): def _archive_file(self): if isinstance(self.manager, BackupManager) and settings_get( - "backup.compress_tar_archives" + "misc.backup.backup_compress_tar_archives" ): return os.path.join(self.repo, self.name + ".tar.gz") diff --git a/src/diagnosers/24-mail.py b/src/diagnosers/24-mail.py index 7fe7a08db..4b370a2b4 100644 --- a/src/diagnosers/24-mail.py +++ b/src/diagnosers/24-mail.py @@ -291,7 +291,7 @@ class MyDiagnoser(Diagnoser): if global_ipv4: outgoing_ips.append(global_ipv4) - if settings_get("smtp.allow_ipv6"): + if settings_get("email.smtp.smtp_allow_ipv6"): ipv6 = Diagnoser.get_cached_report("ip", {"test": "ipv6"}) or {} if ipv6.get("status") == "SUCCESS": outgoing_ipversions.append(6) diff --git a/src/diagnosers/70-regenconf.py b/src/diagnosers/70-regenconf.py index 591f883a4..787fb257d 100644 --- a/src/diagnosers/70-regenconf.py +++ b/src/diagnosers/70-regenconf.py @@ -53,7 +53,7 @@ class MyDiagnoser(Diagnoser): ) # Check consistency between actual ssh port in sshd_config vs. setting - ssh_port_setting = settings_get("security.ssh.port") + ssh_port_setting = settings_get("security.ssh.ssh_port") ssh_port_line = re.findall( r"\bPort *([0-9]{2,5})\b", read_file("/etc/ssh/sshd_config") ) From f0bf8dd1fdfe923d7c39a85b679f728f731b3df4 Mon Sep 17 00:00:00 2001 From: Tagadda <36127788+Tagadda@users.noreply.github.com> Date: Mon, 14 Feb 2022 12:24:43 +0000 Subject: [PATCH 39/89] settings: use email.smtp.smtp_relay_enabled --- conf/postfix/main.cf | 4 ++-- hooks/conf_regen/19-postfix | 16 +++++++++------- .../0024_global_settings_to_configpanel.py | 6 ++++-- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/conf/postfix/main.cf b/conf/postfix/main.cf index 3e53714d0..13b68cafa 100644 --- a/conf/postfix/main.cf +++ b/conf/postfix/main.cf @@ -81,7 +81,7 @@ alias_maps = hash:/etc/aliases alias_database = hash:/etc/aliases mydomain = {{ main_domain }} mydestination = localhost -{% if relay_host == "" %} +{% if relay_enabled != "True" %} relayhost = {% else %} relayhost = [{{ relay_host }}]:{{ relay_port }} @@ -198,7 +198,7 @@ smtpd_client_recipient_rate_limit=150 # and after to send spam disable_vrfy_command = yes -{% if relay_user != "" %} +{% if relay_enabled == "True" %} # Relay email through an other smtp account # enable SASL authentication smtp_sasl_auth_enable = yes diff --git a/hooks/conf_regen/19-postfix b/hooks/conf_regen/19-postfix index 177ea23e9..8a767c404 100755 --- a/hooks/conf_regen/19-postfix +++ b/hooks/conf_regen/19-postfix @@ -22,17 +22,19 @@ do_pre_regen() { main_domain=$(cat /etc/yunohost/current_host) # Support different strategy for security configurations - export compatibility="$(yunohost settings get 'security.postfix.compatibility')" + export compatibility="$(yunohost settings get 'security.postfix.postfix_compatibility')" # Add possibility to specify a relay # Could be useful with some isp with no 25 port open or more complex setup export relay_port="" export relay_user="" - export relay_host="$(yunohost settings get 'smtp.relay.host')" - if [ -n "${relay_host}" ]; then - relay_port="$(yunohost settings get 'smtp.relay.port')" - relay_user="$(yunohost settings get 'smtp.relay.user')" - relay_password="$(yunohost settings get 'smtp.relay.password')" + export relay_host="" + export relay_enabled="$(yunohost settings get 'email.smtp.smtp_relay_enabled')" + if [ "${relay_enabled}" == "True" ]; then + relay_host="$(yunohost settings get 'email.smtp.smtp_relay_host')" + relay_port="$(yunohost settings get 'email.smtp.smtp_relay_port')" + relay_user="$(yunohost settings get 'email.smtp.smtp_relay_user')" + relay_password="$(yunohost settings get 'email.smtp.smtp_relay_password')" # Avoid to display "Relay account paswword" to other users touch ${postfix_dir}/sasl_passwd @@ -54,7 +56,7 @@ do_pre_regen() { >"${default_dir}/postsrsd" # adapt it for IPv4-only hosts - ipv6="$(yunohost settings get 'smtp.allow_ipv6')" + ipv6="$(yunohost settings get 'email.smtp.smtp_allow_ipv6')" if [ "$ipv6" == "False" ] || [ ! -f /proc/net/if_inet6 ]; then sed -i \ 's/ \[::ffff:127.0.0.0\]\/104 \[::1\]\/128//g' \ diff --git a/src/migrations/0024_global_settings_to_configpanel.py b/src/migrations/0024_global_settings_to_configpanel.py index 7283f168b..977e1349f 100644 --- a/src/migrations/0024_global_settings_to_configpanel.py +++ b/src/migrations/0024_global_settings_to_configpanel.py @@ -28,7 +28,9 @@ class MyMigration(Migration): raise YunohostError("global_settings_cant_open_settings", reason=e) settings = { k: v['values'] for k,v in old_settings.items() } - + + if settings.get('smtp.relay.host') != "": + settings['email.smtp.smtp_relay_enabled'] == "True" + args = urllib.parse.urlencode(settings) settings_set(args=args) - From 133ba3f14f3c90dddafbcd457b99c1950ee6c700 Mon Sep 17 00:00:00 2001 From: Tagadda <36127788+Tagadda@users.noreply.github.com> Date: Mon, 14 Feb 2022 12:25:19 +0000 Subject: [PATCH 40/89] settings: backup settings.yml --- hooks/backup/20-conf_ynh_settings | 2 +- hooks/restore/20-conf_ynh_settings | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hooks/backup/20-conf_ynh_settings b/hooks/backup/20-conf_ynh_settings index 76ab0aaca..0820978e7 100644 --- a/hooks/backup/20-conf_ynh_settings +++ b/hooks/backup/20-conf_ynh_settings @@ -13,6 +13,6 @@ backup_dir="${1}/conf/ynh" ynh_backup "/etc/yunohost/firewall.yml" "${backup_dir}/firewall.yml" ynh_backup "/etc/yunohost/current_host" "${backup_dir}/current_host" [ ! -d "/etc/yunohost/domains" ] || ynh_backup "/etc/yunohost/domains" "${backup_dir}/domains" -[ ! -e "/etc/yunohost/settings.json" ] || ynh_backup "/etc/yunohost/settings.json" "${backup_dir}/settings.json" +[ ! -e "/etc/yunohost/settings.yml" ] || ynh_backup "/etc/yunohost/settings.yml" "${backup_dir}/settings.yml" [ ! -d "/etc/yunohost/dyndns" ] || ynh_backup "/etc/yunohost/dyndns" "${backup_dir}/dyndns" [ ! -d "/etc/dkim" ] || ynh_backup "/etc/dkim" "${backup_dir}/dkim" diff --git a/hooks/restore/20-conf_ynh_settings b/hooks/restore/20-conf_ynh_settings index 2d731bd54..aba2b7a46 100644 --- a/hooks/restore/20-conf_ynh_settings +++ b/hooks/restore/20-conf_ynh_settings @@ -3,6 +3,6 @@ backup_dir="$1/conf/ynh" cp -a "${backup_dir}/current_host" /etc/yunohost/current_host cp -a "${backup_dir}/firewall.yml" /etc/yunohost/firewall.yml [ ! -d "${backup_dir}/domains" ] || cp -a "${backup_dir}/domains" /etc/yunohost/domains -[ ! -e "${backup_dir}/settings.json" ] || cp -a "${backup_dir}/settings.json" "/etc/yunohost/settings.json" +[ ! -e "${backup_dir}/settings.yml" ] || cp -a "${backup_dir}/settings.yml" "/etc/yunohost/settings.yml" [ ! -d "${backup_dir}/dyndns" ] || cp -raT "${backup_dir}/dyndns" "/etc/yunohost/dyndns" [ ! -d "${backup_dir}/dkim" ] || cp -raT "${backup_dir}/dkim" "/etc/dkim" From 6563ebb1ca147f0160e60f2e1f1d42715f55e483 Mon Sep 17 00:00:00 2001 From: Tagadda <36127788+Tagadda@users.noreply.github.com> Date: Mon, 14 Feb 2022 12:25:58 +0000 Subject: [PATCH 41/89] typo --- src/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/settings.py b/src/settings.py index a6b65b095..45c077fa3 100644 --- a/src/settings.py +++ b/src/settings.py @@ -13,7 +13,7 @@ from yunohost.utils.legacy import translate_legacy_settings_to_configpanel_setti logger = getActionLogger("yunohost.settings") -SETTINGS_PATH = "/etc/yunohost/settings.yaml" +SETTINGS_PATH = "/etc/yunohost/settings.yml" def settings_get(key="", full=False, export=False): From 2bf3fed6e6cd04ef66065b964abff10999a5a5f5 Mon Sep 17 00:00:00 2001 From: Tagadda <36127788+Tagadda@users.noreply.github.com> Date: Mon, 14 Feb 2022 12:26:54 +0000 Subject: [PATCH 42/89] settings: password stength...what could go wrong ? --- src/utils/password.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/utils/password.py b/src/utils/password.py index 5b8372962..26f7adad7 100644 --- a/src/utils/password.py +++ b/src/utils/password.py @@ -25,6 +25,8 @@ import json import string import subprocess +from yunohost.settings import settings_get + SMALL_PWD_LIST = [ "yunohost", "olinuxino", @@ -58,7 +60,7 @@ class PasswordValidator: The profile shall be either "user" or "admin" and will correspond to a validation strength - defined via the setting "security.password..strength" + defined via the setting "security.password._strength" """ self.profile = profile @@ -67,9 +69,10 @@ class PasswordValidator: # from settings.py because this file is also meant to be # use as a script by ssowat. # (or at least that's my understanding -- Alex) - settings = json.load(open("/etc/yunohost/settings.json", "r")) - setting_key = "security.password." + profile + ".strength" - self.validation_strength = int(settings[setting_key]["value"]) + # Meh... I'll try to use settings_get() anyway... What could go + # wrong ? And who even change password from SSOwat ? -- Tagada + setting_key = "security.password." + profile + "_strength" + self.validation_strength = settings_get(setting_key) except Exception: # Fallback to default value if we can't fetch settings for some reason self.validation_strength = 1 From fbadceb72a5fb745fd26d1f914857c0f2d90d127 Mon Sep 17 00:00:00 2001 From: Tagadda <36127788+Tagadda@users.noreply.github.com> Date: Mon, 14 Feb 2022 12:27:28 +0000 Subject: [PATCH 43/89] settings: use True and False for booleans --- share/config_settings.toml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/share/config_settings.toml b/share/config_settings.toml index 1b2a59bc4..4274658c5 100644 --- a/share/config_settings.toml +++ b/share/config_settings.toml @@ -26,16 +26,22 @@ name = "Security" [security.ssh.ssh_password_authentication] type = "boolean" + yes = "True" + no = "False" default = "false" [security.ssh.ssh_allow_deprecated_dsa_hostkey] type = "boolean" + yes = "True" + no = "False" default = "false" [security.nginx] name = "NGINX" [security.nginx.nginx_redirect_to_https] type = "boolean" + yes = "True" + no = "False" default = "true" [security.nginx.nginx_compatibility] @@ -54,6 +60,8 @@ name = "Security" name = "Webadmin" [security.webadmin.webadmin_allowlist_enabled] type = "boolean" + yes = "True" + no = "False" default = "false" [security.webadmin.webadmin_allowlist] @@ -66,6 +74,8 @@ name = "Security" name = "Experimental" [security.experimental.security_experimental_enabled] type = "boolean" + yes = "True" + no = "False" default = "false" @@ -75,16 +85,22 @@ name = "Email" name = "POP3" [email.pop3.pop3_enabled] type = "boolean" + yes = "True" + no = "False" default = "false" [email.smtp] name = "SMTP" [email.smtp.smtp_allow_ipv6] type = "boolean" + yes = "True" + no = "False" default = "true" [email.smtp.smtp_relay_enabled] type = "boolean" + yes = "True" + no = "False" default = "false" [email.smtp.smtp_relay_host] @@ -116,10 +132,14 @@ name = "Other" name = "SSOwat" [misc.ssowat.ssowat_panel_overlay_enabled] type = "boolean" + yes = "True" + no = "False" default = "true" [misc.backup] name = "Backup" [misc.backup.backup_compress_tar_archives] type = "boolean" + yes = "True" + no = "False" default = "false" From 0bad639b3dea0634cb5dfc270fc9567088ad8a02 Mon Sep 17 00:00:00 2001 From: Tagadda <36127788+Tagadda@users.noreply.github.com> Date: Tue, 15 Feb 2022 22:21:00 +0000 Subject: [PATCH 44/89] migration wip --- src/migrations/0024_global_settings_to_configpanel.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/migrations/0024_global_settings_to_configpanel.py b/src/migrations/0024_global_settings_to_configpanel.py index 977e1349f..bb232ab94 100644 --- a/src/migrations/0024_global_settings_to_configpanel.py +++ b/src/migrations/0024_global_settings_to_configpanel.py @@ -1,12 +1,15 @@ import subprocess import time import urllib +import os +import json from yunohost.utils.error import YunohostError from moulinette.utils.log import getActionLogger from yunohost.tools import Migration from yunohost.settings import settings_set +from yunohost.utils.legacy import translate_legacy_settings_to_configpanel_settings logger = getActionLogger("yunohost.migration") @@ -27,10 +30,10 @@ class MyMigration(Migration): except Exception as e: raise YunohostError("global_settings_cant_open_settings", reason=e) - settings = { k: v['values'] for k,v in old_settings.items() } + settings = { translate_legacy_settings_to_configpanel_settings(k): v['value'] for k,v in old_settings.items() } - if settings.get('smtp.relay.host') != "": - settings['email.smtp.smtp_relay_enabled'] == "True" + if settings.get('email.smtp.smtp_relay_host') != "": + settings['email.smtp.smtp_relay_enabled'] = "True" args = urllib.parse.urlencode(settings) settings_set(args=args) From 2d92c93af155283cf16b251ca083cf1128126a03 Mon Sep 17 00:00:00 2001 From: Tagadda <36127788+Tagadda@users.noreply.github.com> Date: Wed, 16 Feb 2022 12:18:16 +0000 Subject: [PATCH 45/89] settings: use the yml when necessary --- .../0024_global_settings_to_configpanel.py | 13 +++++++++---- src/utils/password.py | 9 +++------ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/migrations/0024_global_settings_to_configpanel.py b/src/migrations/0024_global_settings_to_configpanel.py index bb232ab94..25339a47c 100644 --- a/src/migrations/0024_global_settings_to_configpanel.py +++ b/src/migrations/0024_global_settings_to_configpanel.py @@ -2,10 +2,13 @@ import subprocess import time import urllib import os -import json from yunohost.utils.error import YunohostError from moulinette.utils.log import getActionLogger +from moulinette.utils.filesystem import ( + read_json, + write_to_yaml +) from yunohost.tools import Migration from yunohost.settings import settings_set @@ -13,6 +16,7 @@ from yunohost.utils.legacy import translate_legacy_settings_to_configpanel_setti logger = getActionLogger("yunohost.migration") +SETTINGS_PATH = "/etc/yunohost/settings.yml" OLD_SETTINGS_PATH = "/etc/yunohost/settings.json" class MyMigration(Migration): @@ -26,7 +30,7 @@ class MyMigration(Migration): return try: - old_settings = json.load(open(OLD_SETTINGS_PATH)) + old_settings = read_json(OLD_SETTINGS_PATH) except Exception as e: raise YunohostError("global_settings_cant_open_settings", reason=e) @@ -35,5 +39,6 @@ class MyMigration(Migration): if settings.get('email.smtp.smtp_relay_host') != "": settings['email.smtp.smtp_relay_enabled'] = "True" - args = urllib.parse.urlencode(settings) - settings_set(args=args) + # Here we don't use settings_set() from settings.py to prevent + # Questions to be asked when one run the migration from CLI. + write_to_yaml(SETTINGS_PATH, settings) diff --git a/src/utils/password.py b/src/utils/password.py index 26f7adad7..7b6c864ee 100644 --- a/src/utils/password.py +++ b/src/utils/password.py @@ -21,11 +21,9 @@ import sys import os -import json import string import subprocess - -from yunohost.settings import settings_get +import yaml SMALL_PWD_LIST = [ "yunohost", @@ -69,10 +67,9 @@ class PasswordValidator: # from settings.py because this file is also meant to be # use as a script by ssowat. # (or at least that's my understanding -- Alex) - # Meh... I'll try to use settings_get() anyway... What could go - # wrong ? And who even change password from SSOwat ? -- Tagada + settings = yaml.load(open("/etc/yunohost/settings.yml", "r")) setting_key = "security.password." + profile + "_strength" - self.validation_strength = settings_get(setting_key) + self.validation_strength = int(settings[setting_key]) except Exception: # Fallback to default value if we can't fetch settings for some reason self.validation_strength = 1 From dcb01a249bbc613a46cf14fadaac21068e2134b3 Mon Sep 17 00:00:00 2001 From: Tagadda <36127788+Tagadda@users.noreply.github.com> Date: Thu, 17 Feb 2022 22:07:25 +0000 Subject: [PATCH 46/89] wip unit tests --- src/tests/test_settings.py | 225 ++++++++++++++++++++----------------- 1 file changed, 122 insertions(+), 103 deletions(-) diff --git a/src/tests/test_settings.py b/src/tests/test_settings.py index 1a9063e56..5072f406a 100644 --- a/src/tests/test_settings.py +++ b/src/tests/test_settings.py @@ -10,66 +10,94 @@ import yunohost.settings as settings from yunohost.settings import ( settings_get, settings_list, - _get_settings, settings_set, settings_reset, settings_reset_all, - SETTINGS_PATH_OTHER_LOCATION, - SETTINGS_PATH, - DEFAULTS, + SETTINGS_PATH ) -DEFAULTS["example.bool"] = {"type": "bool", "default": True} -DEFAULTS["example.int"] = {"type": "int", "default": 42} -DEFAULTS["example.string"] = {"type": "string", "default": "yolo swag"} -DEFAULTS["example.enum"] = {"type": "enum", "default": "a", "choices": ["a", "b", "c"]} +EXAMPLE_SETTINGS = """ +[example] + [example.example] + [example.example.boolean] + type = "boolean" + yes = "True" + no = "False" + default = "True" + [example.example.number] + type = "number" + default = "42" + + [example.example.string] + type = "string" + default = "yolo swag" + + [example.example.select] + type = "select" + choices = ["a", "b", "c"] + default = "a" +""" def setup_function(function): - os.system("mv /etc/yunohost/settings.json /etc/yunohost/settings.json.saved") + os.system("mv /etc/yunohost/settings.yml /etc/yunohost/settings.yml.saved") + os.system("cp /usr/share/yunohost/config_settings.toml /usr/share/yunohost/config_settings.toml.saved") + with open("/usr/share/yunohost/config_settings.py", "a") as file: + file.write(EXAMPLE_SETTINGS) def teardown_function(function): - os.system("mv /etc/yunohost/settings.json.saved /etc/yunohost/settings.json") - for filename in glob.glob("/etc/yunohost/settings-*.json"): - os.remove(filename) + os.system("mv /etc/yunohost/settings.yml.saved /etc/yunohost/settings.yml") + os.system("mv /usr/share/yunohost/config_settings.toml.saved /usr/share/yunohost/config_settings.toml") -def monkey_get_setting_description(key): - return "Dummy %s setting" % key.split(".")[-1] - - -settings._get_setting_description = monkey_get_setting_description +def _get_settings(): + return yaml.load(open(SETTINGS_PATH, "r")) def test_settings_get_bool(): - assert settings_get("example.bool") + assert settings_get("example.example.boolean") -def test_settings_get_full_bool(): - assert settings_get("example.bool", True) == { - "type": "bool", - "value": True, - "default": True, - "description": "Dummy bool setting", - } +# FIXME : Testing this doesn't make sense ? This should be tested in a test_config.py ? +#def test_settings_get_full_bool(): +# assert settings_get("example.example.boolean", True) == {'version': '1.0', +# 'i18n': 'global_settings_setting', +# 'panels': [{'services': [], +# 'actions': {'apply': {'en': 'Apply'}}, +# 'sections': [{'name': '', +# 'services': [], +# 'optional': True, +# 'options': [{'type': 'boolean', +# 'yes': 'True', +# 'no': 'False', +# 'default': 'True', +# 'id': 'boolean', +# 'name': 'boolean', +# 'optional': True, +# 'current_value': 'True', +# 'ask': 'global_settings_setting_boolean', +# 'choices': []}], +# 'id': 'example'}], +# 'id': 'example', +# 'name': {'en': 'Example'}}]} def test_settings_get_int(): - assert settings_get("example.int") == 42 + assert settings_get("example.example.number") == 42 -def test_settings_get_full_int(): - assert settings_get("example.int", True) == { - "type": "int", - "value": 42, - "default": 42, - "description": "Dummy int setting", - } +#def test_settings_get_full_int(): +# assert settings_get("example.int", True) == { +# "type": "int", +# "value": 42, +# "default": 42, +# "description": "Dummy int setting", +# } def test_settings_get_string(): - assert settings_get("example.string") == "yolo swag" + assert settings_get("example.example.string") == "yolo swag" def test_settings_get_full_string(): @@ -86,94 +114,85 @@ def test_settings_get_enum(): def test_settings_get_full_enum(): - assert settings_get("example.enum", True) == { - "type": "enum", - "value": "a", - "default": "a", - "description": "Dummy enum setting", - "choices": ["a", "b", "c"], - } + option = settings_get("example.enum", full=True).get('panels')[0].get('sections')[0].get('options')[0] + assert option.get('choices') == ["a", "b", "c"] def test_settings_get_doesnt_exists(): - with pytest.raises(YunohostError): + with pytest.raises(YunohostValidationError): settings_get("doesnt.exists") -def test_settings_list(): - assert settings_list() == _get_settings() +#def test_settings_list(): +# assert settings_list() == _get_settings() def test_settings_set(): - settings_set("example.bool", False) - assert settings_get("example.bool") is False + settings_set("example.example.boolean", False) + assert settings_get("example.example.boolean") is False - settings_set("example.bool", "on") - assert settings_get("example.bool") is True + settings_set("example.example.boolean", "on") + assert settings_get("example.example.boolean") is True def test_settings_set_int(): - settings_set("example.int", 21) - assert settings_get("example.int") == 21 + settings_set("example.example.number", 21) + assert settings_get("example.example.number") == 21 def test_settings_set_enum(): - settings_set("example.enum", "c") - assert settings_get("example.enum") == "c" + settings_set("example.example.select", "c") + assert settings_get("example.example.select") == "c" def test_settings_set_doesexit(): - with pytest.raises(YunohostError): + with pytest.raises(YunohostValidationError): settings_set("doesnt.exist", True) def test_settings_set_bad_type_bool(): with pytest.raises(YunohostError): - settings_set("example.bool", 42) + settings_set("example.example.boolean", 42) with pytest.raises(YunohostError): - settings_set("example.bool", "pouet") + settings_set("example.example.boolean", "pouet") def test_settings_set_bad_type_int(): with pytest.raises(YunohostError): - settings_set("example.int", True) + settings_set("example.example.number", True) with pytest.raises(YunohostError): - settings_set("example.int", "pouet") + settings_set("example.example.number", "pouet") def test_settings_set_bad_type_string(): with pytest.raises(YunohostError): - settings_set("example.string", True) + settings_set("example.example.string", True) with pytest.raises(YunohostError): - settings_set("example.string", 42) + settings_set("example.example.string", 42) def test_settings_set_bad_value_enum(): with pytest.raises(YunohostError): - settings_set("example.enum", True) + settings_set("example.example.select", True) with pytest.raises(YunohostError): - settings_set("example.enum", "e") + settings_set("example.example.select", "e") with pytest.raises(YunohostError): - settings_set("example.enum", 42) + settings_set("example.example.select", 42) with pytest.raises(YunohostError): - settings_set("example.enum", "pouet") + settings_set("example.example.select", "pouet") def test_settings_list_modified(): - settings_set("example.int", 21) - assert settings_list()["example.int"] == { - "default": 42, - "description": "Dummy int setting", - "type": "int", - "value": 21, - } + settings_set("example.example.number", 21) + assert settings_list()["number"] == 42 def test_reset(): - settings_set("example.int", 21) - assert settings_get("example.int") == 21 - settings_reset("example.int") - assert settings_get("example.int") == settings_get("example.int", True)["default"] + option = settings_get("example.example.number", full=True).get('panels')[0].get('sections')[0].get('options')[0] + settings_set("example.example.number", 21) + assert settings_get("number") == 21 + settings_reset("example.example.number") + assert settings_get("example.example.number") == option["default"] def test_settings_reset_doesexit(): @@ -183,10 +202,10 @@ def test_settings_reset_doesexit(): def test_reset_all(): settings_before = settings_list() - settings_set("example.bool", False) - settings_set("example.int", 21) - settings_set("example.string", "pif paf pouf") - settings_set("example.enum", "c") + settings_set("example.example.boolean", False) + settings_set("example.example.number", 21) + settings_set("example.example.string", "pif paf pouf") + settings_set("example.example.select", "c") assert settings_before != settings_list() settings_reset_all() if settings_before != settings_list(): @@ -194,30 +213,30 @@ def test_reset_all(): assert settings_before[i] == settings_list()[i] -def test_reset_all_backup(): - settings_before = settings_list() - settings_set("example.bool", False) - settings_set("example.int", 21) - settings_set("example.string", "pif paf pouf") - settings_set("example.enum", "c") - settings_after_modification = settings_list() - assert settings_before != settings_after_modification - old_settings_backup_path = settings_reset_all()["old_settings_backup_path"] - - for i in settings_after_modification: - del settings_after_modification[i]["description"] - - assert settings_after_modification == json.load(open(old_settings_backup_path, "r")) +#def test_reset_all_backup(): +# settings_before = settings_list() +# settings_set("example.bool", False) +# settings_set("example.int", 21) +# settings_set("example.string", "pif paf pouf") +# settings_set("example.enum", "c") +# settings_after_modification = settings_list() +# assert settings_before != settings_after_modification +# old_settings_backup_path = settings_reset_all()["old_settings_backup_path"] +# +# for i in settings_after_modification: +# del settings_after_modification[i]["description"] +# +# assert settings_after_modification == json.load(open(old_settings_backup_path, "r")) -def test_unknown_keys(): - unknown_settings_path = SETTINGS_PATH_OTHER_LOCATION % "unknown" - unknown_setting = { - "unkown_key": {"value": 42, "default": 31, "type": "int"}, - } - open(SETTINGS_PATH, "w").write(json.dumps(unknown_setting)) - - # stimulate a write - settings_reset_all() - - assert unknown_setting == json.load(open(unknown_settings_path, "r")) +#def test_unknown_keys(): +# unknown_settings_path = SETTINGS_PATH_OTHER_LOCATION % "unknown" +# unknown_setting = { +# "unkown_key": {"value": 42, "default": 31, "type": "int"}, +# } +# open(SETTINGS_PATH, "w").write(json.dumps(unknown_setting)) +# +# # stimulate a write +# settings_reset_all() +# +# assert unknown_setting == json.load(open(unknown_settings_path, "r")) From 607a22de00da3bb4c756cb4c541e2c7954c4570c Mon Sep 17 00:00:00 2001 From: Tagadda <36127788+Tagadda@users.noreply.github.com> Date: Fri, 25 Feb 2022 15:51:14 +0000 Subject: [PATCH 47/89] use moulinette instead of os.system, os.chown, os.chmod --- src/certificate.py | 9 +++------ src/diagnosers/21-web.py | 6 +++--- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/certificate.py b/src/certificate.py index 2a9fb4ce9..05c4efaa6 100644 --- a/src/certificate.py +++ b/src/certificate.py @@ -34,7 +34,7 @@ from datetime import datetime from moulinette import m18n from moulinette.utils.log import getActionLogger -from moulinette.utils.filesystem import read_file +from moulinette.utils.filesystem import read_file, chown, chmod from yunohost.vendor.acme_tiny.acme_tiny import get_crt as sign_certificate from yunohost.utils.error import YunohostError, YunohostValidationError @@ -719,11 +719,8 @@ def _generate_key(destination_path): def _set_permissions(path, user, group, permissions): - uid = pwd.getpwnam(user).pw_uid - gid = grp.getgrnam(group).gr_gid - - os.chown(path, uid, gid) - os.chmod(path, permissions) + chown(path, user, group) + chmod(path, permissions) def _enable_certificate(domain, new_cert_folder): diff --git a/src/diagnosers/21-web.py b/src/diagnosers/21-web.py index 584505ad1..5106e26cc 100644 --- a/src/diagnosers/21-web.py +++ b/src/diagnosers/21-web.py @@ -5,7 +5,7 @@ import random import requests from typing import List -from moulinette.utils.filesystem import read_file +from moulinette.utils.filesystem import read_file, mkdir, rm from yunohost.diagnosis import Diagnoser from yunohost.domain import domain_list @@ -46,8 +46,8 @@ class MyDiagnoser(Diagnoser): domains_to_check.append(domain) self.nonce = "".join(random.choice("0123456789abcedf") for i in range(16)) - os.system("rm -rf /tmp/.well-known/ynh-diagnosis/") - os.system("mkdir -p /tmp/.well-known/ynh-diagnosis/") + rm("/tmp/.well-known/ynh-diagnosis/", recursive=True, force=True) + mkdir("/tmp/.well-known/ynh-diagnosis/", parents=True) os.system("touch /tmp/.well-known/ynh-diagnosis/%s" % self.nonce) if not domains_to_check: From c4d188200c4a24dfc0d43700da3f3cfff9a661d9 Mon Sep 17 00:00:00 2001 From: Tagadda <36127788+Tagadda@users.noreply.github.com> Date: Sat, 26 Feb 2022 20:21:49 +0000 Subject: [PATCH 48/89] wip tests --- locales/en.json | 1 + share/config_settings.toml | 20 ++++++------ src/settings.py | 13 ++++++-- src/tests/test_settings.py | 63 +++++++++++++++++++++++++------------- 4 files changed, 62 insertions(+), 35 deletions(-) diff --git a/locales/en.json b/locales/en.json index 3973c1745..68174d49f 100644 --- a/locales/en.json +++ b/locales/en.json @@ -367,6 +367,7 @@ "firewall_reload_failed": "Could not reload the firewall", "firewall_reloaded": "Firewall reloaded", "firewall_rules_cmd_failed": "Some firewall rule commands have failed. More info in log.", + "global_settings_reset_success": "Reset global settings", "global_settings_setting_admin_strength": "Admin password strength", "global_settings_setting_backup_compress_tar_archives": "Compress backups", "global_settings_setting_backup_compress_tar_archives_help": "When creating new backups, compress the archives (.tar.gz) instead of uncompressed archives (.tar). N.B. : enabling this option means create lighter backup archives, but the initial backup procedure will be significantly longer and heavy on CPU.", diff --git a/share/config_settings.toml b/share/config_settings.toml index 4274658c5..f13072704 100644 --- a/share/config_settings.toml +++ b/share/config_settings.toml @@ -28,13 +28,13 @@ name = "Security" type = "boolean" yes = "True" no = "False" - default = "false" + default = "False" [security.ssh.ssh_allow_deprecated_dsa_hostkey] type = "boolean" yes = "True" no = "False" - default = "false" + default = "False" [security.nginx] name = "NGINX" @@ -42,7 +42,7 @@ name = "Security" type = "boolean" yes = "True" no = "False" - default = "true" + default = "True" [security.nginx.nginx_compatibility] type = "select" @@ -62,7 +62,7 @@ name = "Security" type = "boolean" yes = "True" no = "False" - default = "false" + default = "False" [security.webadmin.webadmin_allowlist] type = "tags" @@ -76,7 +76,7 @@ name = "Security" type = "boolean" yes = "True" no = "False" - default = "false" + default = "False" [email] @@ -87,7 +87,7 @@ name = "Email" type = "boolean" yes = "True" no = "False" - default = "false" + default = "False" [email.smtp] name = "SMTP" @@ -95,13 +95,13 @@ name = "Email" type = "boolean" yes = "True" no = "False" - default = "true" + default = "True" [email.smtp.smtp_relay_enabled] type = "boolean" yes = "True" no = "False" - default = "false" + default = "False" [email.smtp.smtp_relay_host] type = "string" @@ -134,7 +134,7 @@ name = "Other" type = "boolean" yes = "True" no = "False" - default = "true" + default = "True" [misc.backup] name = "Backup" @@ -142,4 +142,4 @@ name = "Other" type = "boolean" yes = "True" no = "False" - default = "false" + default = "False" diff --git a/src/settings.py b/src/settings.py index 45c077fa3..d15ab371f 100644 --- a/src/settings.py +++ b/src/settings.py @@ -15,6 +15,11 @@ logger = getActionLogger("yunohost.settings") SETTINGS_PATH = "/etc/yunohost/settings.yml" +BOOLEANS = { + "True": True, + "False": False, +} + def settings_get(key="", full=False, export=False): """ @@ -37,9 +42,7 @@ def settings_get(key="", full=False, export=False): mode = "classic" if mode == "classic" and key == "": - raise YunohostValidationError( - "Missing key" - ) + raise YunohostValidationError("Missing key", raw_msg=True) settings = SettingsConfigPanel() key = translate_legacy_settings_to_configpanel_settings(key) @@ -132,6 +135,10 @@ class SettingsConfigPanel(ConfigPanel): option["help"] = m18n.n(self.config["i18n"] + "_" + option["id"] + "_help") return self.config + # Dirty hack to let settings_get() to work from a python script + if isinstance(result, str) and result in BOOLEANS: + result = BOOLEANS[result] + return result def reset(self, key = "", operation_logger=None): diff --git a/src/tests/test_settings.py b/src/tests/test_settings.py index 5072f406a..d65ccc77c 100644 --- a/src/tests/test_settings.py +++ b/src/tests/test_settings.py @@ -3,7 +3,8 @@ import json import glob import pytest -from yunohost.utils.error import YunohostError +import moulinette +from yunohost.utils.error import YunohostError, YunohostValidationError import yunohost.settings as settings @@ -27,7 +28,7 @@ EXAMPLE_SETTINGS = """ [example.example.number] type = "number" - default = "42" + default = 42 [example.example.string] type = "string" @@ -40,17 +41,35 @@ EXAMPLE_SETTINGS = """ """ def setup_function(function): - os.system("mv /etc/yunohost/settings.yml /etc/yunohost/settings.yml.saved") + # Backup settings + if os.path.exists(SETTINGS_PATH): + os.system(f"mv {SETTINGS_PATH} {SETTINGS_PATH}.saved") + # Add example settings to config panel os.system("cp /usr/share/yunohost/config_settings.toml /usr/share/yunohost/config_settings.toml.saved") - with open("/usr/share/yunohost/config_settings.py", "a") as file: + with open("/usr/share/yunohost/config_settings.toml", "a") as file: file.write(EXAMPLE_SETTINGS) def teardown_function(function): - os.system("mv /etc/yunohost/settings.yml.saved /etc/yunohost/settings.yml") + if os.path.exists("/etc/yunohost/settings.yml.saved"): + os.system(f"mv {SETTINGS_PATH}.saved {SETTINGS_PATH}") + elif os.path.exists(SETTINGS_PATH): + os.remove(SETTINGS_PATH) os.system("mv /usr/share/yunohost/config_settings.toml.saved /usr/share/yunohost/config_settings.toml") +old_translate = moulinette.core.Translator.translate + +def _monkeypatch_translator(self, key, *args, **kwargs): + + if key.startswith("global_settings_setting_"): + return f"Dummy translation for {key}" + + return old_translate(self, key, *args, **kwargs) + +moulinette.core.Translator.translate = _monkeypatch_translator + + def _get_settings(): return yaml.load(open(SETTINGS_PATH, "r")) @@ -59,7 +78,7 @@ def test_settings_get_bool(): assert settings_get("example.example.boolean") -# FIXME : Testing this doesn't make sense ? This should be tested in a test_config.py ? +# FIXME : Testing this doesn't make sense ? This should be tested in test_config.py ? #def test_settings_get_full_bool(): # assert settings_get("example.example.boolean", True) == {'version': '1.0', # 'i18n': 'global_settings_setting', @@ -100,22 +119,22 @@ def test_settings_get_string(): assert settings_get("example.example.string") == "yolo swag" -def test_settings_get_full_string(): - assert settings_get("example.string", True) == { - "type": "string", - "value": "yolo swag", - "default": "yolo swag", - "description": "Dummy string setting", - } +#def test_settings_get_full_string(): +# assert settings_get("example.example.string", True) == { +# "type": "string", +# "value": "yolo swag", +# "default": "yolo swag", +# "description": "Dummy string setting", +# } -def test_settings_get_enum(): - assert settings_get("example.enum") == "a" +def test_settings_get_select(): + assert settings_get("example.example.select") == "a" -def test_settings_get_full_enum(): - option = settings_get("example.enum", full=True).get('panels')[0].get('sections')[0].get('options')[0] - assert option.get('choices') == ["a", "b", "c"] +#def test_settings_get_full_select(): +# option = settings_get("example.example.select", full=True).get('panels')[0].get('sections')[0].get('options')[0] +# assert option.get('choices') == ["a", "b", "c"] def test_settings_get_doesnt_exists(): @@ -140,7 +159,7 @@ def test_settings_set_int(): assert settings_get("example.example.number") == 21 -def test_settings_set_enum(): +def test_settings_set_select(): settings_set("example.example.select", "c") assert settings_get("example.example.select") == "c" @@ -171,7 +190,7 @@ def test_settings_set_bad_type_string(): settings_set("example.example.string", 42) -def test_settings_set_bad_value_enum(): +def test_settings_set_bad_value_select(): with pytest.raises(YunohostError): settings_set("example.example.select", True) with pytest.raises(YunohostError): @@ -184,7 +203,7 @@ def test_settings_set_bad_value_enum(): def test_settings_list_modified(): settings_set("example.example.number", 21) - assert settings_list()["number"] == 42 + assert settings_list()["number"] == 21 def test_reset(): @@ -218,7 +237,7 @@ def test_reset_all(): # settings_set("example.bool", False) # settings_set("example.int", 21) # settings_set("example.string", "pif paf pouf") -# settings_set("example.enum", "c") +# settings_set("example.select", "c") # settings_after_modification = settings_list() # assert settings_before != settings_after_modification # old_settings_backup_path = settings_reset_all()["old_settings_backup_path"] From 61d7ba1e40178bb408e86b1c69afe11c03889183 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Wed, 27 Apr 2022 22:06:50 +0200 Subject: [PATCH 49/89] manifestv2: fix ports resource test --- src/tests/test_app_resources.py | 2 +- src/utils/resources.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tests/test_app_resources.py b/src/tests/test_app_resources.py index f53cf373e..820ad6cb7 100644 --- a/src/tests/test_app_resources.py +++ b/src/tests/test_app_resources.py @@ -238,7 +238,7 @@ def test_resource_ports(): def test_resource_ports_several(): r = AppResourceClassesByType["ports"] - conf = {"main.default": 12345, "foobar.default": 23456} + conf = {"main": {"default": 12345}, "foobar": {"default": 23456}} assert not app_setting("testapp", "port") assert not app_setting("testapp", "port_foobar") diff --git a/src/utils/resources.py b/src/utils/resources.py index f64ad6134..3d3d06cca 100644 --- a/src/utils/resources.py +++ b/src/utils/resources.py @@ -619,7 +619,7 @@ class PortsResource(AppResource): continue if not port_value: - port_value = self.infos["default"] + port_value = infos["default"] while self._port_is_used(port_value): port_value += 1 From d5fcc3828182cc09330be72437a37ab90e7fbd73 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Wed, 27 Apr 2022 22:18:24 +0200 Subject: [PATCH 50/89] manifestv2: fix backup tests --- src/backup.py | 2 +- src/tests/test_backuprestore.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/backup.py b/src/backup.py index a4be27eb2..bfada89e2 100644 --- a/src/backup.py +++ b/src/backup.py @@ -1513,7 +1513,7 @@ class RestoreManager: operation_logger.extra["env"] = env_dict operation_logger.flush() - manifest = _get_manifest_of_app(app_dir_in_archive) + manifest = _get_manifest_of_app(app_settings_in_archive) if manifest["packaging_format"] >= 2: from yunohost.utils.resources import AppResourceManager try: diff --git a/src/tests/test_backuprestore.py b/src/tests/test_backuprestore.py index 03c3aa0c7..17147f586 100644 --- a/src/tests/test_backuprestore.py +++ b/src/tests/test_backuprestore.py @@ -355,13 +355,13 @@ def test_backup_script_failure_handling(monkeypatch, mocker): @pytest.mark.with_backup_recommended_app_installed def test_backup_not_enough_free_space(monkeypatch, mocker): - def custom_disk_usage(path): + def custom_space_used_by_directory(path, *args, **kwargs): return 99999999999999999 def custom_free_space_in_directory(dirpath): return 0 - monkeypatch.setattr("yunohost.backup.disk_usage", custom_disk_usage) + monkeypatch.setattr("yunohost.backup.space_used_by_directory", custom_space_used_by_directory) monkeypatch.setattr( "yunohost.backup.free_space_in_directory", custom_free_space_in_directory ) From 3675daf26d26059650b015e798a648a55627858f Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 6 May 2022 16:43:58 +0200 Subject: [PATCH 51/89] Fix broken test, having install questions is mandatory --- src/app.py | 1 + src/tests/test_permission.py | 1 + 2 files changed, 2 insertions(+) diff --git a/src/app.py b/src/app.py index d92e3c5ae..d8e0086a9 100644 --- a/src/app.py +++ b/src/app.py @@ -1984,6 +1984,7 @@ def _convert_v1_manifest_to_v2(manifest): manifest["maintainers"] = [maintainer] if maintainer else [] install_questions = manifest["arguments"]["install"] + manifest["install"] = {} for question in install_questions: name = question.pop("name") diff --git a/src/tests/test_permission.py b/src/tests/test_permission.py index 4e7f9f53d..f2bff5507 100644 --- a/src/tests/test_permission.py +++ b/src/tests/test_permission.py @@ -78,6 +78,7 @@ def _permission_create_with_dummy_app( "name": app, "id": app, "description": {"en": "Dummy app to test permissions"}, + "arguments": {"install": []} }, f, ) From dd6c8976f877c289ffc7f785e5be265d9999c09c Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 6 May 2022 21:14:44 +0200 Subject: [PATCH 52/89] manifestv2: drafty implementation for notifications/doc inside the manifest --- src/app.py | 51 +++++++++++++++++++++++++++++++++++++++++++++ src/utils/system.py | 2 +- 2 files changed, 52 insertions(+), 1 deletion(-) diff --git a/src/app.py b/src/app.py index d8e0086a9..7d6efbc0d 100644 --- a/src/app.py +++ b/src/app.py @@ -23,6 +23,7 @@ Manage apps """ +import glob import os import toml import json @@ -174,6 +175,9 @@ def app_info(app, full=False, upgradable=False): ret["setting_path"] = setting_path ret["manifest"] = local_manifest + + # FIXME: maybe this is not needed ? default ask questions are + # already set during the _get_manifest_of_app earlier ? ret["manifest"]["install"] = _set_default_ask_questions( ret["manifest"].get("install", {}) ) @@ -181,6 +185,13 @@ def app_info(app, full=False, upgradable=False): ret["from_catalog"] = from_catalog + # Hydrate app notifications and doc + for pagename, pagecontent in ret["manifest"]["doc"].items(): + ret["manifest"]["doc"][pagename] = _hydrate_app_template(pagecontent, settings) + for step, notifications in ret["manifest"]["notifications"].items(): + for name, notification in notifications.items(): + notifications[name] = _hydrate_app_template(notification, settings) + ret["is_webapp"] = "domain" in settings and "path" in settings if ret["is_webapp"]: @@ -1954,9 +1965,49 @@ def _get_manifest_of_app(path): manifest = _convert_v1_manifest_to_v2(manifest) manifest["install"] = _set_default_ask_questions(manifest.get("install", {})) + manifest["doc"], manifest["notifications"] = _parse_app_doc_and_notifications(path) + return manifest +def _parse_app_doc_and_notifications(path): + + # FIXME: need to find a way to handle i18n in there (file named FOOBAR_fr.md etc.) + + doc = {} + + for pagename in glob.glob(os.path.join(path, "doc") + "/*.md"): + name = os.path.basename(pagename)[:-len('.md')] + doc[name] = read_file(pagename) + + notifications = {} + + for step in ["pre_install", "post_install", "pre_upgrade", "post_upgrade"]: + notifications[step] = {} + if os.path.exists(os.path.join(path, "doc", "notifications", f"{step}.md")): + notifications[step]["main"] = read_file(os.path.join(path, "doc", "notifications", f"{step}.md")) + else: + for notification in glob.glob(os.path.join(path, "doc", "notifications", f"{step}.d") + "/*.md"): + name = os.path.basename(notification)[:-len('.md')] + notifications[step][name].append(read_file(notification)) + + return doc, notifications + + +def _hydrate_app_template(template, data): + + stuff_to_replace = set(re.findall(r'__[A-Z0-9]+?[A-Z0-9_]*?[A-Z0-9]*?__', template)) + + for stuff in stuff_to_replace: + + varname = stuff.strip("_").lower() + + if varname in data: + template = template.replace(stuff, data[varname]) + + return template + + def _convert_v1_manifest_to_v2(manifest): manifest = copy.deepcopy(manifest) diff --git a/src/utils/system.py b/src/utils/system.py index f7d37cf1c..2aaf0fa35 100644 --- a/src/utils/system.py +++ b/src/utils/system.py @@ -57,7 +57,7 @@ def space_used_by_directory(dirpath, follow_symlinks=True): return int(du_output.split()[0]) stat = os.statvfs(dirpath) - return stat.f_frsize * stat.f_blocks + return stat.f_frsize * stat.f_blocks # FIXME : this doesnt do what the function name suggest this does ... def human_to_binary(size: str) -> int: From ddd10f630c8a3dc20087f5b2a497e062b808c035 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 13 May 2022 22:14:20 +0200 Subject: [PATCH 53/89] manifestv2: implement test for permission ressource --- src/tests/test_app_resources.py | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/src/tests/test_app_resources.py b/src/tests/test_app_resources.py index 820ad6cb7..3640adde0 100644 --- a/src/tests/test_app_resources.py +++ b/src/tests/test_app_resources.py @@ -4,7 +4,9 @@ import pytest from moulinette.utils.process import check_output from yunohost.app import app_setting +from yunohost.domain import _get_maindomain from yunohost.utils.resources import AppResource, AppResourceManager, AppResourceClassesByType +from yunohost.permission import user_permission_list, permission_delete dummyfile = "/tmp/dummyappresource-testapp" @@ -57,6 +59,10 @@ def clean(): os.system("apt remove lolcat sl nyancat yarn >/dev/null 2>/dev/null") os.system("userdel testapp 2>/dev/null") + for p in user_permission_list()["permissions"]: + if p.startswith("testapp."): + permission_delete(p, force=True, sync_perm=False) + def test_provision_dummy(): @@ -327,17 +333,35 @@ def test_resource_apt(): def test_resource_permissions(): - raise NotImplementedError() + maindomain = _get_maindomain() + os.system(f"echo 'domain: {maindomain}' >> /etc/yunohost/apps/testapp/settings.yml") + os.system("echo 'path: /testapp' >> /etc/yunohost/apps/testapp/settings.yml") + # A manager object is required to set the label of the app... + manager = AppResourceManager("testapp", current={}, wanted={"name": "Test App"}) r = AppResourceClassesByType["permissions"] conf = { "main": { "url": "/", "allowed": "visitors" # protected? + }, + "admin": { + "url": "/admin", + "allowed": "" } } - pass + res = user_permission_list(full=True)["permissions"] + assert not any(key.startswith("testapp.") for key in res) + r(conf, "testapp", manager).provision_or_update() + res = user_permission_list(full=True)["permissions"] + assert "testapp.main" in res + assert "visitors" in res["testapp.main"]["allowed"] + assert res["testapp.main"]["url"] == "/" + + assert "testapp.admin" in res + assert not res["testapp.admin"]["allowed"] + assert res["testapp.admin"]["url"] == "/admin" From 9902d191aa7cef5fc615697135fbc0932347c9f7 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Sat, 14 May 2022 00:15:42 +0200 Subject: [PATCH 54/89] manifestv2: improve permission resouce test --- src/tests/test_app_resources.py | 35 ++++++++++++++++++++++++++++----- src/utils/resources.py | 2 +- 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/src/tests/test_app_resources.py b/src/tests/test_app_resources.py index 3640adde0..4f7651067 100644 --- a/src/tests/test_app_resources.py +++ b/src/tests/test_app_resources.py @@ -344,12 +344,8 @@ def test_resource_permissions(): "main": { "url": "/", "allowed": "visitors" - # protected? + # TODO: test protected? }, - "admin": { - "url": "/admin", - "allowed": "" - } } res = user_permission_list(full=True)["permissions"] @@ -361,7 +357,36 @@ def test_resource_permissions(): assert "testapp.main" in res assert "visitors" in res["testapp.main"]["allowed"] assert res["testapp.main"]["url"] == "/" + assert "testapp.admin" not in res + + conf["admin"] = { + "url": "/admin", + "allowed": "" + } + + r(conf, "testapp", manager).provision_or_update() + + res = user_permission_list(full=True)["permissions"] + + assert "testapp.main" in list(res.keys()) + assert "visitors" in res["testapp.main"]["allowed"] + assert res["testapp.main"]["url"] == "/" assert "testapp.admin" in res assert not res["testapp.admin"]["allowed"] assert res["testapp.admin"]["url"] == "/admin" + + conf["admin"]["url"] = "/adminpanel" + + r(conf, "testapp", manager).provision_or_update() + + res = user_permission_list(full=True)["permissions"] + + # FIXME FIXME FIXME : this is the current behavior but + # it is NOT okay. c.f. comment in the code + assert res["testapp.admin"]["url"] == "/admin" # should be '/adminpanel' + + r(conf, "testapp").deprovision() + + res = user_permission_list(full=True)["permissions"] + assert "testapp.main" not in res diff --git a/src/utils/resources.py b/src/utils/resources.py index 3d3d06cca..5bde70e83 100644 --- a/src/utils/resources.py +++ b/src/utils/resources.py @@ -238,7 +238,7 @@ class PermissionsResource(AppResource): existing_perms = user_permission_list(short=True, apps=[self.app])["permissions"] for perm in existing_perms: - if perm.split(".")[0] not in self.permissions.keys(): + if perm.split(".")[1] not in self.permissions.keys(): permission_delete(perm, force=True, sync_perm=False) for perm, infos in self.permissions.items(): From 8b1333a83747d52c1c7478319b6334d78f4e8071 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Sat, 21 May 2022 14:23:08 +0200 Subject: [PATCH 55/89] manifestv2: iterate on notifications/doc + implement tests for it --- src/app.py | 10 +++--- src/app_catalog.py | 2 ++ src/tests/test_apps.py | 75 ++++++++++++++++++++++++++++++++++++++++++ src/utils/resources.py | 1 + 4 files changed, 83 insertions(+), 5 deletions(-) diff --git a/src/app.py b/src/app.py index 7d6efbc0d..0eb06d33b 100644 --- a/src/app.py +++ b/src/app.py @@ -760,8 +760,8 @@ def app_manifest(app): shutil.rmtree(extracted_app_folder) - raw_questions = manifest.get("arguments", {}).get("install", []) - manifest["arguments"]["install"] = hydrate_questions_with_choices(raw_questions) + raw_questions = manifest.get("install", {}).values() + manifest["install"] = hydrate_questions_with_choices(raw_questions) return manifest @@ -1978,18 +1978,18 @@ def _parse_app_doc_and_notifications(path): for pagename in glob.glob(os.path.join(path, "doc") + "/*.md"): name = os.path.basename(pagename)[:-len('.md')] - doc[name] = read_file(pagename) + doc[name] = read_file(pagename).strip() notifications = {} for step in ["pre_install", "post_install", "pre_upgrade", "post_upgrade"]: notifications[step] = {} if os.path.exists(os.path.join(path, "doc", "notifications", f"{step}.md")): - notifications[step]["main"] = read_file(os.path.join(path, "doc", "notifications", f"{step}.md")) + notifications[step]["main"] = read_file(os.path.join(path, "doc", "notifications", f"{step}.md")).strip() else: for notification in glob.glob(os.path.join(path, "doc", "notifications", f"{step}.d") + "/*.md"): name = os.path.basename(notification)[:-len('.md')] - notifications[step][name].append(read_file(notification)) + notifications[step][name].append(read_file(notification).strip()) return doc, notifications diff --git a/src/app_catalog.py b/src/app_catalog.py index 5244d4d81..d635f8ba4 100644 --- a/src/app_catalog.py +++ b/src/app_catalog.py @@ -232,6 +232,8 @@ def _load_apps_catalog(): ) continue + # FIXME: we may want to autoconvert all v0/v1 manifest to v2 here + # so that everything is consistent in terms of APIs, datastructure format etc info["repository"] = apps_catalog_id merged_catalog["apps"][app] = info diff --git a/src/tests/test_apps.py b/src/tests/test_apps.py index 76397093d..2c6deac7d 100644 --- a/src/tests/test_apps.py +++ b/src/tests/test_apps.py @@ -15,6 +15,8 @@ from yunohost.app import ( _is_installed, app_upgrade, app_map, + app_manifest, + app_info, ) from yunohost.domain import _get_maindomain, domain_add, domain_remove, domain_list from yunohost.utils.error import YunohostError @@ -208,6 +210,32 @@ def test_legacy_app_install_main_domain(): assert app_is_not_installed(main_domain, "legacy_app") +def test_legacy_app_manifest_preinstall(): + + m = app_manifest(os.path.join(get_test_apps_dir(), "legacy_app_ynh")) + # v1 manifesto are expected to have been autoconverted to v2 + + assert "id" in m + assert "description" in m + assert "integration" in m + assert "install" in m + assert "doc" in m and not m["doc"] + assert "notifications" in m and not m["notifications"] + + +def test_manifestv2_app_manifest_preinstall(): + + m = app_manifest(os.path.join(get_test_apps_dir(), "manifestv2_app_ynh")) + + assert "id" in m + assert "install" in m + assert "description" in m + assert "doc" in m + assert "This is a dummy description of this app features" in m["doc"]["DESCRIPTION"] + assert "notifications" in m + assert "This is a dummy disclaimer to display prior to the install" in m["notifications"]["pre_install"] + + def test_manifestv2_app_install_main_domain(): main_domain = _get_maindomain() @@ -228,6 +256,53 @@ def test_manifestv2_app_install_main_domain(): assert app_is_not_installed(main_domain, "manifestv2_app") +def test_manifestv2_app_info_postinstall(): + + main_domain = _get_maindomain() + install_manifestv2_app(main_domain, "/manifestv2") + m = app_info("manifestv2_app", full=True)["manifest"] + + assert "id" in m + assert "install" in m + assert "description" in m + assert "doc" in m + assert "The app install dir is /var/www/manifestv2_app" in m["doc"]["ADMIN"] + assert "notifications" in m + assert "The app install dir is /var/www/manifestv2_app" in m["notifications"]["post_install"] + assert "The app id is manifestv2_app" in m["notifications"]["post_install"] + assert f"The app url is {main_domain}/manifestv2" in m["notifications"]["post_install"] + + +def test_manifestv2_app_info_preupgrade(monkeypatch): + + from yunohost.app_catalog import _load_apps_catalog as original_load_apps_catalog + def custom_load_apps_catalog(*args, **kwargs): + + res = original_load_apps_catalog(*args, **kwargs) + res["apps"]["manifestv2_app"] = { + "id": "manifestv2_app", + "level": 10, + "lastUpdate": 999999999, + "maintained": True, + "manifest": app_manifest(os.path.join(get_test_apps_dir(), "manifestv2_app_ynh")), + } + res["apps"]["manifestv2_app"]["manifest"]["version"] = "99999~ynh1" + + return res + monkeypatch.setattr("yunohost.app._load_apps_catalog", custom_load_apps_catalog) + + main_domain = _get_maindomain() + install_manifestv2_app(main_domain, "/manifestv2") + i = app_info("manifestv2_app", full=True) + + assert i["upgradable"] == "yes" + assert i["new_version"] == "99999~ynh1" + # FIXME : as I write this test, I realize that this implies the catalog API + # does provide the notifications, which means the list builder script + # should parse the files in the original app repo, possibly with proper i18n etc + assert "This is a dummy disclaimer to display prior to any upgrade" \ + in i["from_catalog"]["manifest"]["notifications"]["pre_upgrade"] + def test_app_from_catalog(): main_domain = _get_maindomain() diff --git a/src/utils/resources.py b/src/utils/resources.py index 5bde70e83..46f2eba33 100644 --- a/src/utils/resources.py +++ b/src/utils/resources.py @@ -69,6 +69,7 @@ class AppResourceManager: elif todo == "update": logger.info(f"Updating {name} ...") new.provision_or_update(context=context) + # FIXME FIXME FIXME : this exception doesnt catch Ctrl+C ?!?! except Exception as e: exception = e # FIXME: better error handling ? display stacktrace ? From 2ccb0c8db6691a1d485d3a4be1f4fe197c5742b5 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Sat, 21 May 2022 16:38:51 +0200 Subject: [PATCH 56/89] manifestv2: add some i18n support for doc/notifications --- src/app.py | 45 +++++++++++++++++++++++++++++++----------- src/tests/test_apps.py | 19 ++++++++++-------- 2 files changed, 45 insertions(+), 19 deletions(-) diff --git a/src/app.py b/src/app.py index 0eb06d33b..01d5cc7eb 100644 --- a/src/app.py +++ b/src/app.py @@ -1972,24 +1972,47 @@ def _get_manifest_of_app(path): def _parse_app_doc_and_notifications(path): - # FIXME: need to find a way to handle i18n in there (file named FOOBAR_fr.md etc.) - doc = {} - for pagename in glob.glob(os.path.join(path, "doc") + "/*.md"): - name = os.path.basename(pagename)[:-len('.md')] - doc[name] = read_file(pagename).strip() + for filepath in glob.glob(os.path.join(path, "doc") + "/*.md"): + + # to be improved : [a-z]{2,3} is a clumsy way of parsing the + # lang code ... some lang code are more complex that this é_è + m = re.match("([A-Z]*)(_[a-z]{2,3})?.md", filepath.split("/")[-1]) + + if not m: + # FIXME: shall we display a warning ? idk + continue + pagename, lang = m.groups() + lang = lang.strip("_") if lang else "en" + + if pagename not in doc: + doc[pagename] = {} + doc[pagename][lang] = read_file(filepath).strip() notifications = {} for step in ["pre_install", "post_install", "pre_upgrade", "post_upgrade"]: notifications[step] = {} - if os.path.exists(os.path.join(path, "doc", "notifications", f"{step}.md")): - notifications[step]["main"] = read_file(os.path.join(path, "doc", "notifications", f"{step}.md")).strip() - else: - for notification in glob.glob(os.path.join(path, "doc", "notifications", f"{step}.d") + "/*.md"): - name = os.path.basename(notification)[:-len('.md')] - notifications[step][name].append(read_file(notification).strip()) + for filepath in glob.glob(os.path.join(path, "doc", "notifications", f"{step}*.md")): + m = re.match(step + "(_[a-z]{2,3})?.md", filepath.split("/")[-1]) + if not m: + continue + pagename = "main" + lang = m.groups()[0].strip("_") if m.groups()[0] else "en" + if pagename not in notifications[step]: + notifications[step][pagename] = {} + notifications[step][pagename][lang] = read_file(filepath).strip() + + for filepath in glob.glob(os.path.join(path, "doc", "notifications", f"{step}.d") + "/*.md"): + m = re.match(r"([A-Za-z0-9\.\~]*)(_[a-z]{2,3})?.md", filepath.split("/")[-1]) + if not m: + continue + pagename, lang = m.groups() + lang = lang.strip("_") if lang else "en" + if pagename not in notifications[step]: + notifications[step][pagename] = {} + notifications[step][pagename][lang] = read_file(filepath).strip() return doc, notifications diff --git a/src/tests/test_apps.py b/src/tests/test_apps.py index 2c6deac7d..4661e54b2 100644 --- a/src/tests/test_apps.py +++ b/src/tests/test_apps.py @@ -219,8 +219,8 @@ def test_legacy_app_manifest_preinstall(): assert "description" in m assert "integration" in m assert "install" in m - assert "doc" in m and not m["doc"] - assert "notifications" in m and not m["notifications"] + assert m.get("doc") == {} + assert m.get("notifications") == {} def test_manifestv2_app_manifest_preinstall(): @@ -231,9 +231,11 @@ def test_manifestv2_app_manifest_preinstall(): assert "install" in m assert "description" in m assert "doc" in m - assert "This is a dummy description of this app features" in m["doc"]["DESCRIPTION"] + assert "This is a dummy description of this app features" in m["doc"]["DESCRIPTION"]["en"] + assert "Ceci est une fausse description des fonctionalités de l'app" in m["doc"]["DESCRIPTION"]["fr"] assert "notifications" in m - assert "This is a dummy disclaimer to display prior to the install" in m["notifications"]["pre_install"] + assert "This is a dummy disclaimer to display prior to the install" in m["notifications"]["pre_install"]["en"] + assert "Ceci est un faux disclaimer à présenter avant l'installation" in m["notifications"]["pre_install"]["fr"] def test_manifestv2_app_install_main_domain(): @@ -266,11 +268,12 @@ def test_manifestv2_app_info_postinstall(): assert "install" in m assert "description" in m assert "doc" in m - assert "The app install dir is /var/www/manifestv2_app" in m["doc"]["ADMIN"] + assert "The app install dir is /var/www/manifestv2_app" in m["doc"]["ADMIN"]["en"] + assert "Le dossier d'install de l'app est /var/www/manifestv2_app" in m["doc"]["ADMIN"]["fr"] assert "notifications" in m - assert "The app install dir is /var/www/manifestv2_app" in m["notifications"]["post_install"] - assert "The app id is manifestv2_app" in m["notifications"]["post_install"] - assert f"The app url is {main_domain}/manifestv2" in m["notifications"]["post_install"] + assert "The app install dir is /var/www/manifestv2_app" in m["notifications"]["post_install"]["en"] + assert "The app id is manifestv2_app" in m["notifications"]["post_install"]["en"] + assert f"The app url is {main_domain}/manifestv2" in m["notifications"]["post_install"]["en"] def test_manifestv2_app_info_preupgrade(monkeypatch): From d9e326f2cdf4643bd5aa5d4b39e2b497e2e21df7 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Sat, 21 May 2022 17:11:41 +0200 Subject: [PATCH 57/89] manifestv2: print pre/post install notices during install in cli --- src/app.py | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/src/app.py b/src/app.py index 01d5cc7eb..720c65905 100644 --- a/src/app.py +++ b/src/app.py @@ -186,11 +186,13 @@ def app_info(app, full=False, upgradable=False): ret["from_catalog"] = from_catalog # Hydrate app notifications and doc - for pagename, pagecontent in ret["manifest"]["doc"].items(): - ret["manifest"]["doc"][pagename] = _hydrate_app_template(pagecontent, settings) + for pagename, content_per_lang in ret["manifest"]["doc"].items(): + for lang, content in content_per_lang.items(): + ret["manifest"]["doc"][pagename][lang] = _hydrate_app_template(content, settings) for step, notifications in ret["manifest"]["notifications"].items(): - for name, notification in notifications.items(): - notifications[name] = _hydrate_app_template(notification, settings) + for name, content_per_lang in notifications.items(): + for lang, content in content_per_lang.items(): + notifications[name][lang] = _hydrate_app_template(content, settings) ret["is_webapp"] = "domain" in settings and "path" in settings @@ -840,6 +842,15 @@ def app_install( _confirm_app_install(app, force) manifest, extracted_app_folder = _extract_app(app) + + # Display pre_install notices in cli mode + if manifest["notifications"]["pre_install"] and Moulinette.interface.type == "cli": + for notice in manifest["notifications"]["pre_install"].values(): + # Should we render the markdown maybe? idk + print("==========") + print(_value_for_locale(notice)) + print("==========") + packaging_format = manifest["packaging_format"] # Check ID @@ -1090,6 +1101,17 @@ def app_install( logger.success(m18n.n("installation_complete")) + # Display post_install notices in cli mode + if manifest["notifications"]["post_install"] and Moulinette.interface.type == "cli": + # (Call app_info to get the version hydrated with settings) + infos = app_info(app_instance_name, full=True) + for notice in infos["manifest"]["notifications"]["post_install"].values(): + # Should we render the markdown maybe? idk + print("==========") + print(_value_for_locale(notice)) + print("==========") + + # Call postinstall hook hook_callback("post_app_install", env=env_dict) From 6da5c21cffd0bd83060967c711818cfe63a3f804 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 16 Jul 2022 05:14:00 +0000 Subject: [PATCH 58/89] Upgrade n to v9.0.0 --- helpers/nodejs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helpers/nodejs b/helpers/nodejs index 42c25e51f..4b8cff17e 100644 --- a/helpers/nodejs +++ b/helpers/nodejs @@ -1,7 +1,7 @@ #!/bin/bash -n_version=8.2.0 -n_checksum=75efd9e583836f3e6cc6d793df1501462fdceeb3460d5a2dbba99993997383b9 +n_version=9.0.0 +n_checksum=37a987230d1ed0392a83f9c02c1e535a524977c00c64a4adb771ab60237be1c6 n_install_dir="/opt/node_n" node_version_path="$n_install_dir/n/versions/node" # N_PREFIX is the directory of n, it needs to be loaded as a environment variable. From dc1f5725d004075027fb745956a5113cb0342a10 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Wed, 3 Aug 2022 21:47:02 +0200 Subject: [PATCH 59/89] manifestv2: fix v1/v2 conversion for maintainers --- src/app.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/app.py b/src/app.py index 720c65905..b691b563b 100644 --- a/src/app.py +++ b/src/app.py @@ -2076,8 +2076,13 @@ def _convert_v1_manifest_to_v2(manifest): "ram": {"build": "50M", "runtime": "10M"} } - maintainer = manifest.get("maintainer", {}).get("name") - manifest["maintainers"] = [maintainer] if maintainer else [] + maintainers = manifest.get("maintainer", {}) + if isinstance(maintainers, list): + maintainers = [m['name'] for m in maintainers] + else: + maintainers = [maintainers["name"]] if maintainers.get("name") else [] + + manifest["maintainers"] = maintainers install_questions = manifest["arguments"]["install"] From 0022abe896ef5025bbf5dadc3891af822f7bf170 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Wed, 3 Aug 2022 22:11:17 +0200 Subject: [PATCH 60/89] manifestv2: switch to API v3 for catalog which includes v2 manifests --- src/app_catalog.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app_catalog.py b/src/app_catalog.py index d635f8ba4..12bb4e6d7 100644 --- a/src/app_catalog.py +++ b/src/app_catalog.py @@ -19,7 +19,7 @@ logger = getActionLogger("yunohost.app_catalog") APPS_CATALOG_CACHE = "/var/cache/yunohost/repo" APPS_CATALOG_CONF = "/etc/yunohost/apps_catalog.yml" -APPS_CATALOG_API_VERSION = 2 +APPS_CATALOG_API_VERSION = 3 APPS_CATALOG_DEFAULT_URL = "https://app.yunohost.org/default" From 7c97045fb662bdaf068c852f8ff3941241058c26 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Thu, 4 Aug 2022 18:20:02 +0200 Subject: [PATCH 61/89] More explicit setting description --- locales/en.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locales/en.json b/locales/en.json index 68174d49f..9042ab063 100644 --- a/locales/en.json +++ b/locales/en.json @@ -371,13 +371,13 @@ "global_settings_setting_admin_strength": "Admin password strength", "global_settings_setting_backup_compress_tar_archives": "Compress backups", "global_settings_setting_backup_compress_tar_archives_help": "When creating new backups, compress the archives (.tar.gz) instead of uncompressed archives (.tar). N.B. : enabling this option means create lighter backup archives, but the initial backup procedure will be significantly longer and heavy on CPU.", - "global_settings_setting_nginx_compatibility": "Compatibility", + "global_settings_setting_nginx_compatibility": "NGINX Compatibility", "global_settings_setting_nginx_compatibility_help": "Compatibility vs. security tradeoff for the web server NGINX. Affects the ciphers (and other security-related aspects)", "global_settings_setting_nginx_redirect_to_https": "Force HTTPS", "global_settings_setting_nginx_redirect_to_https_help": "Redirect HTTP requests to HTTPs by default (DO NOT TURN OFF unless you really know what you're doing!)", "global_settings_setting_pop3_enabled": "Enable POP3", "global_settings_setting_pop3_enabled_help": "Enable the POP3 protocol for the mail server", - "global_settings_setting_postfix_compatibility": "Compatibility", + "global_settings_setting_postfix_compatibility": "Postfix Compatibility", "global_settings_setting_postfix_compatibility_help": "Compatibility vs. security tradeoff for the Postfix server. Affects the ciphers (and other security-related aspects)", "global_settings_setting_security_experimental_enabled": "Experimental security features", "global_settings_setting_security_experimental_enabled_help": "Enable experimental security features (don't enable this if you don't know what you're doing!)", @@ -391,7 +391,7 @@ "global_settings_setting_smtp_relay_user": "Relay user", "global_settings_setting_ssh_allow_deprecated_dsa_hostkey": "Allow DSA hostkey", "global_settings_setting_ssh_allow_deprecated_dsa_hostkey_help": "Allow the use of (deprecated) DSA hostkey for the SSH daemon configuration", - "global_settings_setting_ssh_compatibility": "Compatibility", + "global_settings_setting_ssh_compatibility": "SSH Compatibility", "global_settings_setting_ssh_compatibility_help": "Compatibility vs. security tradeoff for the SSH server. Affects the ciphers (and other security-related aspects)", "global_settings_setting_ssh_password_authentication": "Password authentication", "global_settings_setting_ssh_password_authentication_help": "Allow password authentication for SSH", From 5494ce5def9d9e705a9f442085804f65abb602d4 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Thu, 4 Aug 2022 18:21:24 +0200 Subject: [PATCH 62/89] Simplify code --- locales/en.json | 2 +- src/settings.py | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/locales/en.json b/locales/en.json index 9042ab063..d0eb794c3 100644 --- a/locales/en.json +++ b/locales/en.json @@ -488,7 +488,7 @@ "log_user_update": "Update info for user '{}'", "log_settings_set": "Apply settings", "log_settings_reset": "Reset setting", - "log_settings_reset_all": "Reset all setting", + "log_settings_reset_all": "Reset all settings", "mail_alias_remove_failed": "Could not remove e-mail alias '{mail}'", "mail_domain_unknown": "Invalid e-mail address for domain '{domain}'. Please, use a domain administrated by this server.", "mail_forward_remove_failed": "Could not remove e-mail forwarding '{mail}'", diff --git a/src/settings.py b/src/settings.py index d15ab371f..a5a0d3625 100644 --- a/src/settings.py +++ b/src/settings.py @@ -15,10 +15,6 @@ logger = getActionLogger("yunohost.settings") SETTINGS_PATH = "/etc/yunohost/settings.yml" -BOOLEANS = { - "True": True, - "False": False, -} def settings_get(key="", full=False, export=False): @@ -136,8 +132,8 @@ class SettingsConfigPanel(ConfigPanel): return self.config # Dirty hack to let settings_get() to work from a python script - if isinstance(result, str) and result in BOOLEANS: - result = BOOLEANS[result] + if isinstance(result, str) and result in ["True", "False"]: + result = bool(result) return result From 91b56187438bee4b1a5f574738e5d844f74ca276 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Thu, 4 Aug 2022 18:24:47 +0200 Subject: [PATCH 63/89] Set 'entity_type' as 'global' for global config panel --- src/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/settings.py b/src/settings.py index a5a0d3625..a4fbedae6 100644 --- a/src/settings.py +++ b/src/settings.py @@ -102,7 +102,7 @@ def settings_reset_all(operation_logger): class SettingsConfigPanel(ConfigPanel): - entity_type = "settings" + entity_type = "global" save_path_tpl = SETTINGS_PATH save_mode = "diff" From 5d685cebf054fd793117c628d8ca4393d02d4759 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Thu, 4 Aug 2022 18:32:27 +0200 Subject: [PATCH 64/89] Unused imports, black --- .../0024_global_settings_to_configpanel.py | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/migrations/0024_global_settings_to_configpanel.py b/src/migrations/0024_global_settings_to_configpanel.py index 25339a47c..d23e7fa9c 100644 --- a/src/migrations/0024_global_settings_to_configpanel.py +++ b/src/migrations/0024_global_settings_to_configpanel.py @@ -1,17 +1,10 @@ -import subprocess -import time -import urllib import os from yunohost.utils.error import YunohostError from moulinette.utils.log import getActionLogger -from moulinette.utils.filesystem import ( - read_json, - write_to_yaml -) +from moulinette.utils.filesystem import read_json, write_to_yaml from yunohost.tools import Migration -from yunohost.settings import settings_set from yunohost.utils.legacy import translate_legacy_settings_to_configpanel_settings logger = getActionLogger("yunohost.migration") @@ -19,6 +12,7 @@ logger = getActionLogger("yunohost.migration") SETTINGS_PATH = "/etc/yunohost/settings.yml" OLD_SETTINGS_PATH = "/etc/yunohost/settings.json" + class MyMigration(Migration): "Migrate old global settings to the new ConfigPanel global settings" @@ -34,11 +28,14 @@ class MyMigration(Migration): except Exception as e: raise YunohostError("global_settings_cant_open_settings", reason=e) - settings = { translate_legacy_settings_to_configpanel_settings(k): v['value'] for k,v in old_settings.items() } + settings = { + translate_legacy_settings_to_configpanel_settings(k): v["value"] + for k, v in old_settings.items() + } - if settings.get('email.smtp.smtp_relay_host') != "": - settings['email.smtp.smtp_relay_enabled'] = "True" + if settings.get("email.smtp.smtp_relay_host") != "": + settings["email.smtp.smtp_relay_enabled"] = "True" - # Here we don't use settings_set() from settings.py to prevent + # Here we don't use settings_set() from settings.py to prevent # Questions to be asked when one run the migration from CLI. write_to_yaml(SETTINGS_PATH, settings) From 76238db4bbc00e239e1e6ec6eb25551308ed3903 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Thu, 4 Aug 2022 19:09:47 +0200 Subject: [PATCH 65/89] config_settings.toml -> config_global.toml --- share/{config_settings.toml => config_global.toml} | 0 src/domain.py | 1 - src/tests/test_settings.py | 8 +++----- 3 files changed, 3 insertions(+), 6 deletions(-) rename share/{config_settings.toml => config_global.toml} (100%) diff --git a/share/config_settings.toml b/share/config_global.toml similarity index 100% rename from share/config_settings.toml rename to share/config_global.toml diff --git a/src/domain.py b/src/domain.py index e40b4f03c..d86760e84 100644 --- a/src/domain.py +++ b/src/domain.py @@ -44,7 +44,6 @@ from yunohost.log import is_unit_operation logger = getActionLogger("yunohost.domain") -DOMAIN_CONFIG_PATH = "/usr/share/yunohost/config_domain.toml" DOMAIN_SETTINGS_DIR = "/etc/yunohost/domains" # Lazy dev caching to avoid re-query ldap every time we need the domain list diff --git a/src/tests/test_settings.py b/src/tests/test_settings.py index d65ccc77c..4ce54b5cb 100644 --- a/src/tests/test_settings.py +++ b/src/tests/test_settings.py @@ -6,8 +6,6 @@ import pytest import moulinette from yunohost.utils.error import YunohostError, YunohostValidationError -import yunohost.settings as settings - from yunohost.settings import ( settings_get, settings_list, @@ -45,8 +43,8 @@ def setup_function(function): if os.path.exists(SETTINGS_PATH): os.system(f"mv {SETTINGS_PATH} {SETTINGS_PATH}.saved") # Add example settings to config panel - os.system("cp /usr/share/yunohost/config_settings.toml /usr/share/yunohost/config_settings.toml.saved") - with open("/usr/share/yunohost/config_settings.toml", "a") as file: + os.system("cp /usr/share/yunohost/config_global.toml /usr/share/yunohost/config_global.toml.saved") + with open("/usr/share/yunohost/config_global.toml", "a") as file: file.write(EXAMPLE_SETTINGS) @@ -55,7 +53,7 @@ def teardown_function(function): os.system(f"mv {SETTINGS_PATH}.saved {SETTINGS_PATH}") elif os.path.exists(SETTINGS_PATH): os.remove(SETTINGS_PATH) - os.system("mv /usr/share/yunohost/config_settings.toml.saved /usr/share/yunohost/config_settings.toml") + os.system("mv /usr/share/yunohost/config_global.toml.saved /usr/share/yunohost/config_global.toml") old_translate = moulinette.core.Translator.translate From ce0362eef8ff77def20a61e8408ce0470321417c Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Thu, 4 Aug 2022 19:10:52 +0200 Subject: [PATCH 66/89] black settings.py --- src/settings.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/settings.py b/src/settings.py index a4fbedae6..29c7f64c0 100644 --- a/src/settings.py +++ b/src/settings.py @@ -16,7 +16,6 @@ logger = getActionLogger("yunohost.settings") SETTINGS_PATH = "/etc/yunohost/settings.yml" - def settings_get(key="", full=False, export=False): """ Get an entry value in the settings @@ -50,7 +49,7 @@ def settings_list(full=False, export=True): List all entries of the settings """ - + if full: export = False @@ -106,18 +105,20 @@ class SettingsConfigPanel(ConfigPanel): save_path_tpl = SETTINGS_PATH save_mode = "diff" - def __init__( - self, config_path=None, save_path=None, creation=False - ): + def __init__(self, config_path=None, save_path=None, creation=False): super().__init__("settings") def _apply(self): super()._apply() - settings = { k: v for k, v in self.future_values.items() if self.values.get(k) != v } + settings = { + k: v for k, v in self.future_values.items() if self.values.get(k) != v + } for setting_name, value in settings.items(): try: - trigger_post_change_hook(setting_name, self.values.get(setting_name), value) + trigger_post_change_hook( + setting_name, self.values.get(setting_name), value + ) except Exception as e: logger.error(f"Post-change hook for setting failed : {e}") raise @@ -128,7 +129,9 @@ class SettingsConfigPanel(ConfigPanel): if mode == "full": for panel, section, option in self._iterate(): if m18n.key_exists(self.config["i18n"] + "_" + option["id"] + "_help"): - option["help"] = m18n.n(self.config["i18n"] + "_" + option["id"] + "_help") + option["help"] = m18n.n( + self.config["i18n"] + "_" + option["id"] + "_help" + ) return self.config # Dirty hack to let settings_get() to work from a python script @@ -137,7 +140,7 @@ class SettingsConfigPanel(ConfigPanel): return result - def reset(self, key = "", operation_logger=None): + def reset(self, key="", operation_logger=None): self.filter_key = key # Read config panel toml From 9482373e906c36191cadb8daf650b91dbf64133d Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Thu, 4 Aug 2022 19:26:41 +0200 Subject: [PATCH 67/89] Fix tests for global settings --- src/tests/test_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tests/test_settings.py b/src/tests/test_settings.py index 4ce54b5cb..cb2132780 100644 --- a/src/tests/test_settings.py +++ b/src/tests/test_settings.py @@ -207,7 +207,7 @@ def test_settings_list_modified(): def test_reset(): option = settings_get("example.example.number", full=True).get('panels')[0].get('sections')[0].get('options')[0] settings_set("example.example.number", 21) - assert settings_get("number") == 21 + assert settings_get("example.example.number") == 21 settings_reset("example.example.number") assert settings_get("example.example.number") == option["default"] From 7f45b3890ebf9b48461984f94bf29fe71c57bf62 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Thu, 4 Aug 2022 22:03:06 +0200 Subject: [PATCH 68/89] =?UTF-8?q?Fix=20logic=20bug,=20bool('False')=20in?= =?UTF-8?q?=20fact=20equals=20True=20=C3=A9=5F=C3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/settings.py b/src/settings.py index 29c7f64c0..ed9df9761 100644 --- a/src/settings.py +++ b/src/settings.py @@ -136,7 +136,7 @@ class SettingsConfigPanel(ConfigPanel): # Dirty hack to let settings_get() to work from a python script if isinstance(result, str) and result in ["True", "False"]: - result = bool(result) + result = bool(result == "True") return result From 73ed031661c282c148cf061b2fcfbae7a422c137 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Thu, 4 Aug 2022 23:18:18 +0200 Subject: [PATCH 69/89] global settings: fix moar tests ... disabling the failing ones because it's apparently sort-of a feature that those work though debattable ... (though they dont when you're in interactive mode ..) --- src/certificate.py | 2 -- src/settings.py | 1 - src/tests/test_settings.py | 14 +++++++------- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/certificate.py b/src/certificate.py index 05c4efaa6..30d1587b8 100644 --- a/src/certificate.py +++ b/src/certificate.py @@ -25,8 +25,6 @@ import os import sys import shutil -import pwd -import grp import subprocess import glob diff --git a/src/settings.py b/src/settings.py index ed9df9761..17fe97bf5 100644 --- a/src/settings.py +++ b/src/settings.py @@ -1,5 +1,4 @@ import os -import json import subprocess from moulinette import m18n diff --git a/src/tests/test_settings.py b/src/tests/test_settings.py index cb2132780..e943c41f5 100644 --- a/src/tests/test_settings.py +++ b/src/tests/test_settings.py @@ -175,17 +175,17 @@ def test_settings_set_bad_type_bool(): def test_settings_set_bad_type_int(): - with pytest.raises(YunohostError): - settings_set("example.example.number", True) +# with pytest.raises(YunohostError): +# settings_set("example.example.number", True) with pytest.raises(YunohostError): settings_set("example.example.number", "pouet") -def test_settings_set_bad_type_string(): - with pytest.raises(YunohostError): - settings_set("example.example.string", True) - with pytest.raises(YunohostError): - settings_set("example.example.string", 42) +#def test_settings_set_bad_type_string(): +# with pytest.raises(YunohostError): +# settings_set("example.example.string", True) +# with pytest.raises(YunohostError): +# settings_set("example.example.string", 42) def test_settings_set_bad_value_select(): From fded695b451452b2322da7198b76289c6229284f Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 5 Aug 2022 14:09:14 +0200 Subject: [PATCH 70/89] Adapt script for missing i18n key following the change in setting nomenclature --- locales/en.json | 5 ++-- maintenance/missing_i18n_keys.py | 28 +++++++++++++------ .../0024_global_settings_to_configpanel.py | 2 +- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/locales/en.json b/locales/en.json index d0eb794c3..c86a57553 100644 --- a/locales/en.json +++ b/locales/en.json @@ -402,8 +402,6 @@ "global_settings_setting_webadmin_allowlist_help": "IP adresses allowed to access the webadmin.", "global_settings_setting_webadmin_allowlist_enabled": "Enable Webadmin IP allowlist", "global_settings_setting_webadmin_allowlist_enabled_help": "Allow only some IPs to access the webadmin.", - "global_settings_unknown_setting_from_settings_file": "Unknown key in settings: '{setting_key}', discard it and save it in /etc/yunohost/settings-unknown.json", - "global_settings_unknown_type": "Unexpected situation, the setting {setting} appears to have the type {unknown_type} but it is not a type supported by the system.", "good_practices_about_admin_password": "You are now about to define a new administration password. The password should be at least 8 characters long—though it is good practice to use a longer password (i.e. a passphrase) and/or to use a variation of characters (uppercase, lowercase, digits and special characters).", "good_practices_about_user_password": "You are now about to define a new user password. The password should be at least 8 characters long—though it is good practice to use a longer password (i.e. a passphrase) and/or to a variation of characters (uppercase, lowercase, digits and special characters).", "group_already_exist": "Group {group} already exists", @@ -516,6 +514,7 @@ "migration_description_0021_migrate_to_bullseye": "Upgrade the system to Debian Bullseye and YunoHost 11.x", "migration_description_0022_php73_to_php74_pools": "Migrate php7.3-fpm 'pool' conf files to php7.4", "migration_description_0023_postgresql_11_to_13": "Migrate databases from PostgreSQL 11 to 13", + "migration_description_0024_global_settings_to_configpanel": "Migrate legacy global settings nomenclature to the new, modern nomenclature", "migration_ldap_backup_before_migration": "Creating a backup of LDAP database and apps settings prior to the actual migration.", "migration_ldap_can_not_backup_before_migration": "The backup of the system could not be completed before the migration failed. Error: {error}", "migration_ldap_migration_failed_trying_to_rollback": "Could not migrate... trying to roll back the system.", @@ -696,4 +695,4 @@ "yunohost_installing": "Installing YunoHost...", "yunohost_not_installed": "YunoHost is not correctly installed. Please run 'yunohost tools postinstall'", "yunohost_postinstall_end_tip": "The post-install completed! To finalize your setup, please consider:\n - adding a first user through the 'Users' section of the webadmin (or 'yunohost user create ' in command-line);\n - diagnose potential issues through the 'Diagnosis' section of the webadmin (or 'yunohost diagnosis run' in command-line);\n - reading the 'Finalizing your setup' and 'Getting to know YunoHost' parts in the admin documentation: https://yunohost.org/admindoc." -} \ No newline at end of file +} diff --git a/maintenance/missing_i18n_keys.py b/maintenance/missing_i18n_keys.py index 817c73c61..e152710ef 100644 --- a/maintenance/missing_i18n_keys.py +++ b/maintenance/missing_i18n_keys.py @@ -99,15 +99,6 @@ def find_expected_string_keys(): for m in ("log_" + match for match in p4.findall(content)): yield m - # Global settings descriptions - # Will be on a line like : ("security.ssh.ssh_allow_deprecated_dsa_hostkey", {"type": "bool", ... - p5 = re.compile(r" \(\n*\s*[\"\'](\w[\w\.]+)[\"\'],") - content = open(ROOT + "src/settings.py").read() - for m in ( - "global_settings_setting_" + s.replace(".", "_") for s in p5.findall(content) - ): - yield m - # Keys for the actionmap ... for category in yaml.safe_load(open(ROOT + "share/actionsmap.yml")).values(): if "actions" not in category.keys(): @@ -143,6 +134,7 @@ def find_expected_string_keys(): for key in registrars[registrar].keys(): yield f"domain_config_{key}" + # Domain config panel domain_config = toml.load(open(ROOT + "share/config_domain.toml")) for panel in domain_config.values(): if not isinstance(panel, dict): @@ -155,6 +147,24 @@ def find_expected_string_keys(): continue yield f"domain_config_{key}" + # Global settings + global_config = toml.load(open(ROOT + "share/config_global.toml")) + # Boring hard-coding because there's no simple other way idk + settings_without_help_key = ["admin_strength", "smtp_relay_host", "smtp_relay_password", "smtp_relay_port", "smtp_relay_user", "ssh_port", "ssowat_panel_overlay_enabled", "user_strength"] + + for panel in global_config.values(): + if not isinstance(panel, dict): + continue + for section in panel.values(): + if not isinstance(section, dict): + continue + for key, values in section.items(): + if not isinstance(values, dict): + continue + yield f"global_settings_setting_{key}" + if key not in settings_without_help_key: + yield f"global_settings_setting_{key}_help" + ############################################################################### # Compare keys used and keys defined # diff --git a/src/migrations/0024_global_settings_to_configpanel.py b/src/migrations/0024_global_settings_to_configpanel.py index d23e7fa9c..82b5580ae 100644 --- a/src/migrations/0024_global_settings_to_configpanel.py +++ b/src/migrations/0024_global_settings_to_configpanel.py @@ -26,7 +26,7 @@ class MyMigration(Migration): try: old_settings = read_json(OLD_SETTINGS_PATH) except Exception as e: - raise YunohostError("global_settings_cant_open_settings", reason=e) + raise YunohostError(f"Can't open setting file : {e}", raw_msg=True) settings = { translate_legacy_settings_to_configpanel_settings(k): v["value"] From ed865dd3c0b056403c4a100862e147238fed8a15 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 5 Aug 2022 15:47:13 +0200 Subject: [PATCH 71/89] global settings: various fixes --- locales/en.json | 4 +- maintenance/missing_i18n_keys.py | 2 +- share/config_global.toml | 64 ++++++++----------- .../0024_global_settings_to_configpanel.py | 6 +- src/utils/password.py | 2 +- 5 files changed, 36 insertions(+), 42 deletions(-) diff --git a/locales/en.json b/locales/en.json index c86a57553..6cfab9109 100644 --- a/locales/en.json +++ b/locales/en.json @@ -369,6 +369,7 @@ "firewall_rules_cmd_failed": "Some firewall rule commands have failed. More info in log.", "global_settings_reset_success": "Reset global settings", "global_settings_setting_admin_strength": "Admin password strength", + "global_settings_setting_admin_strength_help": "These requirements are only enforced when defining the password", "global_settings_setting_backup_compress_tar_archives": "Compress backups", "global_settings_setting_backup_compress_tar_archives_help": "When creating new backups, compress the archives (.tar.gz) instead of uncompressed archives (.tar). N.B. : enabling this option means create lighter backup archives, but the initial backup procedure will be significantly longer and heavy on CPU.", "global_settings_setting_nginx_compatibility": "NGINX Compatibility", @@ -392,12 +393,13 @@ "global_settings_setting_ssh_allow_deprecated_dsa_hostkey": "Allow DSA hostkey", "global_settings_setting_ssh_allow_deprecated_dsa_hostkey_help": "Allow the use of (deprecated) DSA hostkey for the SSH daemon configuration", "global_settings_setting_ssh_compatibility": "SSH Compatibility", - "global_settings_setting_ssh_compatibility_help": "Compatibility vs. security tradeoff for the SSH server. Affects the ciphers (and other security-related aspects)", + "global_settings_setting_ssh_compatibility_help": "Compatibility vs. security tradeoff for the SSH server. Affects the ciphers (and other security-related aspects). See https://infosec.mozilla.org/guidelines/openssh for more info.", "global_settings_setting_ssh_password_authentication": "Password authentication", "global_settings_setting_ssh_password_authentication_help": "Allow password authentication for SSH", "global_settings_setting_ssh_port": "SSH port", "global_settings_setting_ssowat_panel_overlay_enabled": "SSOwat panel overlay", "global_settings_setting_user_strength": "User password strength", + "global_settings_setting_user_strength_help": "These requirements are only enforced when defining the password", "global_settings_setting_webadmin_allowlist": "Webadmin IP allowlist", "global_settings_setting_webadmin_allowlist_help": "IP adresses allowed to access the webadmin.", "global_settings_setting_webadmin_allowlist_enabled": "Enable Webadmin IP allowlist", diff --git a/maintenance/missing_i18n_keys.py b/maintenance/missing_i18n_keys.py index e152710ef..f85b49219 100644 --- a/maintenance/missing_i18n_keys.py +++ b/maintenance/missing_i18n_keys.py @@ -150,7 +150,7 @@ def find_expected_string_keys(): # Global settings global_config = toml.load(open(ROOT + "share/config_global.toml")) # Boring hard-coding because there's no simple other way idk - settings_without_help_key = ["admin_strength", "smtp_relay_host", "smtp_relay_password", "smtp_relay_port", "smtp_relay_user", "ssh_port", "ssowat_panel_overlay_enabled", "user_strength"] + settings_without_help_key = ["smtp_relay_host", "smtp_relay_password", "smtp_relay_port", "smtp_relay_user", "ssh_port", "ssowat_panel_overlay_enabled"] for panel in global_config.values(): if not isinstance(panel, dict): diff --git a/share/config_global.toml b/share/config_global.toml index f13072704..775f02cdf 100644 --- a/share/config_global.toml +++ b/share/config_global.toml @@ -5,20 +5,30 @@ i18n = "global_settings_setting" name = "Security" [security.password] name = "Passwords" + [security.password.admin_strength] - type = "number" + type = "select" + choices.1 = "Require at least 8 chars" + choices.2 = "ditto, but also require at least one digit, one lower and one upper char" + choices.3 = "ditto, but also require at least one special char" + choices.4 = "ditto, but also require at least 12 chars" default = 1 [security.password.user_strength] - type = "number" + type = "select" + choices.1 = "Require at least 8 chars" + choices.2 = "ditto, but also require at least one digit, one lower and one upper char" + choices.3 = "ditto, but also require at least one special char" + choices.4 = "ditto, but also require at least 12 chars" default = 1 - + [security.ssh] name = "SSH" [security.ssh.ssh_compatibility] type = "select" + choices.intermediate = "Intermediate (compatible with older softwares)" + choices.modern = "Modern (recommended)" default = "modern" - choices = ["intermediate", "modern"] [security.ssh.ssh_port] type = "number" @@ -26,43 +36,37 @@ name = "Security" [security.ssh.ssh_password_authentication] type = "boolean" - yes = "True" - no = "False" - default = "False" + default = true [security.ssh.ssh_allow_deprecated_dsa_hostkey] type = "boolean" - yes = "True" - no = "False" - default = "False" + default = false [security.nginx] name = "NGINX" [security.nginx.nginx_redirect_to_https] type = "boolean" - yes = "True" - no = "False" - default = "True" + default = true [security.nginx.nginx_compatibility] type = "select" + choices.intermediate = "Intermediate (compatible with Firefox 27, Android 4.4.2, Chrome 31, Edge, IE 11, Opera 20, and Safari 9)" + choices.modern = "Modern (compatible with Firefox 63, Android 10.0, Chrome 70, Edge 75, Opera 57, and Safari 12.1)" default = "intermediate" - choices = ["intermediate", "modern"] [security.postfix] name = "Postfix" [security.postfix.postfix_compatibility] type = "select" + choices.intermediate = "Intermediate (allows TLS 1.2)" + choices.modern = "Modern (TLS 1.3 only)" default = "intermediate" - choices = ["intermediate", "modern"] [security.webadmin] name = "Webadmin" [security.webadmin.webadmin_allowlist_enabled] type = "boolean" - yes = "True" - no = "False" - default = "False" + default = false [security.webadmin.webadmin_allowlist] type = "tags" @@ -74,9 +78,7 @@ name = "Security" name = "Experimental" [security.experimental.security_experimental_enabled] type = "boolean" - yes = "True" - no = "False" - default = "False" + default = false [email] @@ -85,23 +87,17 @@ name = "Email" name = "POP3" [email.pop3.pop3_enabled] type = "boolean" - yes = "True" - no = "False" - default = "False" + default = false [email.smtp] name = "SMTP" [email.smtp.smtp_allow_ipv6] type = "boolean" - yes = "True" - no = "False" - default = "True" + default = true [email.smtp.smtp_relay_enabled] type = "boolean" - yes = "True" - no = "False" - default = "False" + default = false [email.smtp.smtp_relay_host] type = "string" @@ -132,14 +128,10 @@ name = "Other" name = "SSOwat" [misc.ssowat.ssowat_panel_overlay_enabled] type = "boolean" - yes = "True" - no = "False" - default = "True" + default = true [misc.backup] name = "Backup" [misc.backup.backup_compress_tar_archives] type = "boolean" - yes = "True" - no = "False" - default = "False" + default = false diff --git a/src/migrations/0024_global_settings_to_configpanel.py b/src/migrations/0024_global_settings_to_configpanel.py index 82b5580ae..e1d4d190b 100644 --- a/src/migrations/0024_global_settings_to_configpanel.py +++ b/src/migrations/0024_global_settings_to_configpanel.py @@ -29,12 +29,12 @@ class MyMigration(Migration): raise YunohostError(f"Can't open setting file : {e}", raw_msg=True) settings = { - translate_legacy_settings_to_configpanel_settings(k): v["value"] + translate_legacy_settings_to_configpanel_settings(k).split('.')[-1]: v["value"] for k, v in old_settings.items() } - if settings.get("email.smtp.smtp_relay_host") != "": - settings["email.smtp.smtp_relay_enabled"] = "True" + if settings.get("smtp_relay_host"): + settings["smtp_relay_enabled"] = True # Here we don't use settings_set() from settings.py to prevent # Questions to be asked when one run the migration from CLI. diff --git a/src/utils/password.py b/src/utils/password.py index 565a6aca7..42ed45ddd 100644 --- a/src/utils/password.py +++ b/src/utils/password.py @@ -86,7 +86,7 @@ class PasswordValidator: # use as a script by ssowat. # (or at least that's my understanding -- Alex) settings = yaml.load(open("/etc/yunohost/settings.yml", "r")) - setting_key = "security.password." + profile + "_strength" + setting_key = profile + "_strength" self.validation_strength = int(settings[setting_key]) except Exception: # Fallback to default value if we can't fetch settings for some reason From 03eaad4a32b56aeb108058bb809f1e3e096f25b4 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 5 Aug 2022 17:28:57 +0200 Subject: [PATCH 72/89] Rename i18n keys for global settings in translations to not loose previous work --- locales/ar.json | 8 ++++---- locales/ca.json | 21 ++++++++++----------- locales/cs.json | 18 +++++++++--------- locales/de.json | 35 +++++++++++++++++------------------ locales/eo.json | 17 ++++++++--------- locales/es.json | 35 +++++++++++++++++------------------ locales/eu.json | 33 ++++++++++++++++----------------- locales/fa.json | 29 ++++++++++++++--------------- locales/fr.json | 35 +++++++++++++++++------------------ locales/gl.json | 33 ++++++++++++++++----------------- locales/it.json | 31 +++++++++++++++---------------- locales/kab.json | 2 +- locales/nb_NO.json | 6 +++--- locales/oc.json | 15 +++++++-------- locales/ru.json | 14 +++++++------- locales/sk.json | 2 +- locales/te.json | 2 +- locales/uk.json | 33 ++++++++++++++++----------------- locales/zh_Hans.json | 23 +++++++++++------------ 19 files changed, 190 insertions(+), 202 deletions(-) diff --git a/locales/ar.json b/locales/ar.json index c440e442f..fea601e24 100644 --- a/locales/ar.json +++ b/locales/ar.json @@ -120,8 +120,6 @@ "app_upgrade_several_apps": "سوف يتم تحديث التطبيقات التالية: {apps}", "ask_new_domain": "نطاق جديد", "ask_new_path": "مسار جديد", - "global_settings_setting_security_password_admin_strength": "قوة الكلمة السرية الإدارية", - "global_settings_setting_security_password_user_strength": "قوة الكلمة السرية للمستخدم", "password_too_simple_1": "يجب أن يكون طول الكلمة السرية على الأقل 8 حروف", "already_up_to_date": "كل شيء على ما يرام. ليس هناك ما يتطلّب تحديثًا.", "service_description_slapd": "يخزّن المستخدمين والنطاقات والمعلومات المتعلقة بها", @@ -158,5 +156,7 @@ "diagnosis_description_services": "حالة الخدمات", "diagnosis_description_dnsrecords": "تسجيلات خدمة DNS", "diagnosis_description_ip": "الإتصال بالإنترنت", - "diagnosis_description_basesystem": "النظام الأساسي" -} + "diagnosis_description_basesystem": "النظام الأساسي", + "global_settings_setting_admin_strength": "قوة الكلمة السرية الإدارية", + "global_settings_setting_user_strength": "قوة الكلمة السرية للمستخدم" +} \ No newline at end of file diff --git a/locales/ca.json b/locales/ca.json index b660032d2..78dcdf119 100644 --- a/locales/ca.json +++ b/locales/ca.json @@ -155,12 +155,7 @@ "global_settings_cant_write_settings": "No s'ha pogut escriure el fitxer de configuració, raó: {reason}", "global_settings_key_doesnt_exists": "La clau « {settings_key} » no existeix en la configuració global, podeu veure totes les claus disponibles executant « yunohost settings list »", "global_settings_reset_success": "S'ha fet una còpia de seguretat de la configuració anterior a {path}", - "global_settings_setting_security_nginx_compatibility": "Solució de compromís entre compatibilitat i seguretat pel servidor web NGINX. Afecta els criptògrafs (i altres aspectes relacionats amb la seguretat)", - "global_settings_setting_security_password_admin_strength": "Robustesa de la contrasenya d'administrador", - "global_settings_setting_security_password_user_strength": "Robustesa de la contrasenya de l'usuari", - "global_settings_setting_security_ssh_compatibility": "Solució de compromís entre compatibilitat i seguretat pel servidor SSH. Afecta els criptògrafs (i altres aspectes relacionats amb la seguretat)", "global_settings_unknown_setting_from_settings_file": "Clau de configuració desconeguda: «{setting_key}», refusada i guardada a /etc/yunohost/settings-unknown.json", - "global_settings_setting_service_ssh_allow_deprecated_dsa_hostkey": "Permetre la clau d'hoste DSA (obsolet) per la configuració del servei SSH", "global_settings_unknown_type": "Situació inesperada, la configuració {setting} sembla tenir el tipus {unknown_type} però no és un tipus reconegut pel sistema.", "good_practices_about_admin_password": "Esteu a punt de definir una nova contrasenya d'administrador. La contrasenya ha de tenir un mínim de 8 caràcters; tot i que és de bona pràctica utilitzar una contrasenya més llarga (és a dir una frase de contrasenya) i/o utilitzar diferents tipus de caràcters (majúscules, minúscules, dígits i caràcters especials).", "hook_exec_failed": "No s'ha pogut executar el script: {path}", @@ -207,7 +202,6 @@ "log_tools_reboot": "Reinicia el servidor", "already_up_to_date": "No hi ha res a fer. Tot està actualitzat.", "dpkg_lock_not_available": "No es pot utilitzar aquesta comanda en aquest moment ja que sembla que un altre programa està utilitzant el lock de dpkg (el gestor de paquets del sistema)", - "global_settings_setting_security_postfix_compatibility": "Solució de compromís entre compatibilitat i seguretat pel servidor Postfix. Afecta els criptògrafs (i altres aspectes relacionats amb la seguretat)", "mail_alias_remove_failed": "No s'han pogut eliminar els àlies del correu «{mail}»", "mail_domain_unknown": "El domini «{domain}» de l'adreça de correu no és vàlid. Utilitzeu un domini administrat per aquest servidor.", "mail_forward_remove_failed": "No s'han pogut eliminar el reenviament de correu «{mail}»", @@ -471,7 +465,6 @@ "diagnosis_services_running": "El servei {service} s'està executant!", "diagnosis_services_conf_broken": "La configuració pel servei {service} està trencada!", "diagnosis_ports_needed_by": "És necessari exposar aquest port per a les funcions {category} (servei {service})", - "global_settings_setting_pop3_enabled": "Activa el protocol POP3 per al servidor de correu", "log_app_action_run": "Executa l'acció de l'aplicació «{}»", "diagnosis_never_ran_yet": "Sembla que el servidor s'ha configurat recentment i encara no hi cap informe de diagnòstic per mostrar. S'ha d'executar un diagnòstic complet primer, ja sigui des de la pàgina web d'administració o utilitzant la comanda «yunohost diagnosis run» al terminal.", "diagnosis_description_web": "Web", @@ -506,7 +499,6 @@ "diagnosis_http_hairpinning_issue": "Sembla que la vostra xarxa no té el hairpinning activat.", "diagnosis_http_nginx_conf_not_up_to_date": "La configuració NGINX d'aquest domini sembla que ha estat modificada manualment, i no deixa que YunoHost diagnostiqui si és accessible amb HTTP.", "diagnosis_http_nginx_conf_not_up_to_date_details": "Per arreglar el problema, mireu les diferències amb la línia d'ordres utilitzant yunohost tools regen-conf nginx --dry-run --with-diff i si els canvis us semblen bé els podeu fer efectius utilitzant yunohost tools regen-conf nginx --force.", - "global_settings_setting_smtp_allow_ipv6": "Permet l'ús de IPv6 per rebre i enviar correus electrònics", "diagnosis_mail_ehlo_unreachable_details": "No s'ha pogut establir una connexió amb el vostre servidor en el port 25 amb IPv{ipversion}. Sembla que el servidor no és accessible.
1. La causa més comú per aquest problema és que el port 25 no està correctament redireccionat cap al vostre servidor.
2. També us hauríeu d'assegurar que el servei postfix estigui funcionant.
3. En configuracions més complexes: assegureu-vos que que no hi hagi cap tallafoc ni reverse-proxy interferint.", "diagnosis_mail_ehlo_wrong_details": "El EHLO rebut pel servidor de diagnòstic remot amb IPv{ipversion} és diferent al domini del vostre servidor.
EHLO rebut: {wrong_ehlo}
Esperat: {right_ehlo}
La causa més habitual d'aquest problema és que el port 25 no està correctament reenviat cap al vostre servidor. També podeu comprovar que no hi hagi un tallafocs o un reverse-proxy interferint.", "diagnosis_mail_fcrdns_dns_missing": "No hi ha cap DNS invers definit per IPv{ipversion}. Alguns correus electrònics poden no entregar-se o poden ser marcats com a correu brossa.", @@ -533,8 +525,6 @@ "app_packaging_format_not_supported": "No es pot instal·lar aquesta aplicació ja que el format del paquet no és compatible amb la versió de YunoHost del sistema. Hauríeu de considerar actualitzar el sistema.", "diagnosis_dns_try_dyndns_update_force": "La configuració DNS d'aquest domini hauria de ser gestionada automàticament per YunoHost. Si aquest no és el cas, podeu intentar forçar-ne l'actualització utilitzant yunohost dyndns update --force.", "regenconf_need_to_explicitly_specify_ssh": "La configuració ssh ha estat modificada manualment, però heu d'especificar explícitament la categoria «ssh» amb --force per fer realment els canvis.", - "global_settings_setting_backup_compress_tar_archives": "Comprimir els arxius (.tar.gz) en lloc d'arxius no comprimits (.tar) al crear noves còpies de seguretat. N.B.: activar aquesta opció permet fer arxius de còpia de seguretat més lleugers, però el procés inicial de còpia de seguretat serà significativament més llarg i més exigent a nivell de CPU.", - "global_settings_setting_smtp_relay_host": "L'amfitrió de tramesa SMTP que s'ha d'utilitzar per enviar correus electrònics en lloc d'aquesta instància de YunoHost. És útil si esteu en una de les següents situacions: el port 25 està bloquejat per el vostre proveïdor d'accés a internet o proveïdor de servidor privat virtual, si teniu una IP residencial llistada a DUHL, si no podeu configurar el DNS invers o si el servidor no està directament exposat a internet i voleu utilitzar-ne un altre per enviar correus electrònics.", "unknown_main_domain_path": "Domini o ruta desconeguda per a «{app}». Heu d'especificar un domini i una ruta per a poder especificar una URL per al permís.", "show_tile_cant_be_enabled_for_regex": "No podeu activar «show_title» ara, perquè la URL per al permís «{permission}» és una expressió regular", "show_tile_cant_be_enabled_for_url_not_defined": "No podeu activar «show_title» ara, perquè primer s'ha de definir una URL per al permís «{permission}»", @@ -568,5 +558,14 @@ "diagnosis_sshd_config_inconsistent": "Sembla que el port SSH s'ha modificat manualment a /etc/ssh/sshd_config. Des de YunoHost 4.2, hi ha un nou paràmetre global «security.ssh.port» per evitar modificar manualment la configuració.", "diagnosis_sshd_config_insecure": "Sembla que la configuració SSH s'ha modificat manualment, i no es segura ha que no conté la directiva «AllowGroups» o «AllowUsers» per limitar l'accés a usuaris autoritzats.", "backup_create_size_estimation": "L'arxiu tindrà aproximadament {size} de dades.", - "app_restore_script_failed": "S'ha produït un error en el script de restauració de l'aplicació" + "app_restore_script_failed": "S'ha produït un error en el script de restauració de l'aplicació", + "global_settings_setting_backup_compress_tar_archives_help": "Comprimir els arxius (.tar.gz) en lloc d'arxius no comprimits (.tar) al crear noves còpies de seguretat. N.B.: activar aquesta opció permet fer arxius de còpia de seguretat més lleugers, però el procés inicial de còpia de seguretat serà significativament més llarg i més exigent a nivell de CPU.", + "global_settings_setting_nginx_compatibility_help": "Solució de compromís entre compatibilitat i seguretat pel servidor web NGINX. Afecta els criptògrafs (i altres aspectes relacionats amb la seguretat)", + "global_settings_setting_admin_strength": "Robustesa de la contrasenya d'administrador", + "global_settings_setting_user_strength": "Robustesa de la contrasenya de l'usuari", + "global_settings_setting_postfix_compatibility_help": "Solució de compromís entre compatibilitat i seguretat pel servidor Postfix. Afecta els criptògrafs (i altres aspectes relacionats amb la seguretat)", + "global_settings_setting_ssh_compatibility_help": "Solució de compromís entre compatibilitat i seguretat pel servidor SSH. Afecta els criptògrafs (i altres aspectes relacionats amb la seguretat)", + "global_settings_setting_ssh_allow_deprecated_dsa_hostkey_help": "Permetre la clau d'hoste DSA (obsolet) per la configuració del servei SSH", + "global_settings_setting_smtp_allow_ipv6_help": "Permet l'ús de IPv6 per rebre i enviar correus electrònics", + "global_settings_setting_smtp_relay_enabled_help": "L'amfitrió de tramesa SMTP que s'ha d'utilitzar per enviar correus electrònics en lloc d'aquesta instància de YunoHost. És útil si esteu en una de les següents situacions: el port 25 està bloquejat per el vostre proveïdor d'accés a internet o proveïdor de servidor privat virtual, si teniu una IP residencial llistada a DUHL, si no podeu configurar el DNS invers o si el servidor no està directament exposat a internet i voleu utilitzar-ne un altre per enviar correus electrònics." } \ No newline at end of file diff --git a/locales/cs.json b/locales/cs.json index 47262064e..ddc6d5f99 100644 --- a/locales/cs.json +++ b/locales/cs.json @@ -50,18 +50,18 @@ "good_practices_about_user_password": "Nyní zvolte nové heslo uživatele. Heslo by mělo být minimálně 8 znaků dlouhé, avšak je dobrou taktikou jej mít delší (např. použít více slov) a použít kombinaci znaků (velké, malé, čísla a speciální znaky).", "good_practices_about_admin_password": "Nyní zvolte nové administrační heslo. Heslo by mělo být minimálně 8 znaků dlouhé, avšak je dobrou taktikou jej mít delší (např. použít více slov) a použít kombinaci znaků (velké, malé, čísla a speciílní znaky).", "global_settings_unknown_type": "Neočekávaná situace, nastavení {setting} deklaruje typ {unknown_type} ale toto není systémem podporováno.", - "global_settings_setting_backup_compress_tar_archives": "Komprimovat nové zálohy (.tar.gz) namísto nekomprimovaných (.tar). Poznámka: povolení této volby znamená objemově menší soubory záloh, avšak zálohování bude trvat déle a bude více zatěžovat CPU.", "global_settings_setting_smtp_relay_password": "SMTP relay heslo uživatele/hostitele", "global_settings_setting_smtp_relay_user": "SMTP relay uživatelské jméno/účet", "global_settings_setting_smtp_relay_port": "SMTP relay port", - "global_settings_setting_smtp_relay_host": "Použít SMTP relay hostitele pro odesílání emailů místo této YunoHost instance. Užitečné v různých situacích: port 25 je blokován vaším ISP nebo VPS poskytovatelem, IP adresa je na blacklistu (např. DUHL), nemůžete nastavit reverzní DNS záznam nebo tento server není přímo připojen do internetu a vy chcete použít jiný server k odesílání emailů.", - "global_settings_setting_smtp_allow_ipv6": "Povolit použití IPv6 pro příjem a odesílání emailů", "global_settings_setting_ssowat_panel_overlay_enabled": "Povolit SSOwat překryvný panel", - "global_settings_setting_service_ssh_allow_deprecated_dsa_hostkey": "Povolit použití (zastaralého) DSA klíče hostitele pro konfiguraci SSH služby", "global_settings_unknown_setting_from_settings_file": "Neznámý klíč v nastavení: '{setting_key}', zrušte jej a uložte v /etc/yunohost/settings-unknown.json", - "global_settings_setting_security_ssh_port": "SSH port", - "global_settings_setting_security_postfix_compatibility": "Kompromis mezi kompatibilitou a bezpečností Postfix serveru. Ovlivní šifry a další související bezpečnostní nastavení", - "global_settings_setting_security_ssh_compatibility": "Kompromis mezi kompatibilitou a bezpečností SSH serveru. Ovlivní šifry a další související bezpečnostní nastavení", - "global_settings_setting_security_password_user_strength": "Síla uživatelského hesla", - "global_settings_setting_security_password_admin_strength": "Síla administračního hesla" + "global_settings_setting_backup_compress_tar_archives_help": "Komprimovat nové zálohy (.tar.gz) namísto nekomprimovaných (.tar). Poznámka: povolení této volby znamená objemově menší soubory záloh, avšak zálohování bude trvat déle a bude více zatěžovat CPU.", + "global_settings_setting_admin_strength": "Síla administračního hesla", + "global_settings_setting_user_strength": "Síla uživatelského hesla", + "global_settings_setting_postfix_compatibility_help": "Kompromis mezi kompatibilitou a bezpečností Postfix serveru. Ovlivní šifry a další související bezpečnostní nastavení", + "global_settings_setting_ssh_compatibility_help": "Kompromis mezi kompatibilitou a bezpečností SSH serveru. Ovlivní šifry a další související bezpečnostní nastavení", + "global_settings_setting_ssh_port": "SSH port", + "global_settings_setting_ssh_allow_deprecated_dsa_hostkey_help": "Povolit použití (zastaralého) DSA klíče hostitele pro konfiguraci SSH služby", + "global_settings_setting_smtp_allow_ipv6_help": "Povolit použití IPv6 pro příjem a odesílání emailů", + "global_settings_setting_smtp_relay_enabled_help": "Použít SMTP relay hostitele pro odesílání emailů místo této YunoHost instance. Užitečné v různých situacích: port 25 je blokován vaším ISP nebo VPS poskytovatelem, IP adresa je na blacklistu (např. DUHL), nemůžete nastavit reverzní DNS záznam nebo tento server není přímo připojen do internetu a vy chcete použít jiný server k odesílání emailů." } \ No newline at end of file diff --git a/locales/de.json b/locales/de.json index 4aa75270b..e2b5e2d34 100644 --- a/locales/de.json +++ b/locales/de.json @@ -221,7 +221,6 @@ "app_action_broke_system": "Diese Aktion scheint diese wichtigen Dienste unterbrochen zu haben: {services}", "apps_already_up_to_date": "Alle Apps sind bereits aktuell", "backup_copying_to_organize_the_archive": "Kopieren von {size} MB, um das Archiv zu organisieren", - "global_settings_setting_security_ssh_compatibility": "Kompatibilitäts- vs. Sicherheits-Kompromiss für den SSH-Server. Betrifft die Ciphers (und andere sicherheitsrelevante Aspekte)", "group_deleted": "Gruppe '{group}' gelöscht", "group_deletion_failed": "Konnte Gruppe '{group}' nicht löschen: {error}", "dyndns_provider_unreachable": "DynDNS-Anbieter {provider} kann nicht erreicht werden: Entweder ist dein YunoHost nicht korrekt mit dem Internet verbunden oder der Dynette-Server ist ausgefallen.", @@ -232,14 +231,11 @@ "group_update_failed": "Kann Gruppe '{group}' nicht aktualisieren: {error}", "log_does_exists": "Es gibt kein Operationsprotokoll mit dem Namen'{log}', verwende 'yunohost log list', um alle verfügbaren Operationsprotokolle anzuzeigen", "log_operation_unit_unclosed_properly": "Die Operationseinheit wurde nicht richtig geschlossen", - "global_settings_setting_security_postfix_compatibility": "Kompatibilitäts- vs. Sicherheits-Kompromiss für den Postfix-Server. Betrifft die Ciphers (und andere sicherheitsrelevante Aspekte)", "global_settings_unknown_type": "Unerwartete Situation, die Einstellung {setting} scheint den Typ {unknown_type} zu haben, ist aber kein vom System unterstützter Typ.", "dpkg_is_broken": "Du kannst das gerade nicht tun, weil dpkg/APT (der Systempaketmanager) in einem defekten Zustand zu sein scheint... Du kannst versuchen, dieses Problem zu lösen, indem du dich über SSH verbindest und `sudo apt install --fix-broken` sowie/oder `sudo dpkg --configure -a` ausführst.", "global_settings_unknown_setting_from_settings_file": "Unbekannter Schlüssel in den Einstellungen: '{setting_key}', verwerfen und speichern in /etc/yunohost/settings-unknown.json", "log_link_to_log": "Vollständiges Log dieser Operation: '{desc}'", "log_help_to_get_log": "Um das Protokoll der Operation '{desc}' anzuzeigen, verwende den Befehl 'yunohost log show {name}'", - "global_settings_setting_security_nginx_compatibility": "Kompatibilitäts- vs. Sicherheits-Kompromiss für den Webserver NGINX. Betrifft die Ciphers (und andere sicherheitsrelevante Aspekte)", - "global_settings_setting_service_ssh_allow_deprecated_dsa_hostkey": "Erlaubt die Verwendung eines (veralteten) DSA-Hostkeys für die SSH-Daemon-Konfiguration", "log_app_remove": "Entferne die Applikation '{}'", "global_settings_cant_open_settings": "Einstellungsdatei konnte nicht geöffnet werden, Grund: {reason}", "global_settings_cant_write_settings": "Einstellungsdatei konnte nicht gespeichert werden, Grund: {reason}", @@ -252,12 +248,10 @@ "log_help_to_get_failed_log": "Der Vorgang'{desc}' konnte nicht abgeschlossen werden. Bitte teile das vollständige Protokoll dieser Operation mit dem Befehl 'yunohost log share {name}', um Hilfe zu erhalten", "backup_no_uncompress_archive_dir": "Dieses unkomprimierte Archivverzeichnis gibt es nicht", "log_app_change_url": "Ändere die URL der Applikation '{}'", - "global_settings_setting_security_password_user_strength": "Stärke des Anmeldepassworts", "good_practices_about_user_password": "Du bist nun dabei, ein neues Nutzerpasswort zu definieren. Das Passwort sollte mindestens 8 Zeichen lang sein - es ist jedoch empfehlenswert, ein längeres Passwort (z.B. eine Passphrase) und/oder verschiedene Arten von Zeichen (Groß- und Kleinschreibung, Ziffern und Sonderzeichen) zu verwenden.", "log_link_to_failed_log": "Der Vorgang konnte nicht abgeschlossen werden '{desc}'. Bitte gib das vollständige Protokoll dieser Operation mit Klicken Sie hier an, um Hilfe zu erhalten", "backup_cant_mount_uncompress_archive": "Das unkomprimierte Archiv konnte nicht als schreibgeschützt gemountet werden", "backup_csv_addition_failed": "Es konnten keine Dateien zur Sicherung in die CSV-Datei hinzugefügt werden", - "global_settings_setting_security_password_admin_strength": "Stärke des Admin-Passworts", "global_settings_key_doesnt_exists": "Der Schlüssel'{settings_key}' existiert nicht in den globalen Einstellungen, du kannst alle verfügbaren Schlüssel sehen, indem du 'yunohost settings list' ausführst", "log_app_makedefault": "Mache '{}' zur Standard-Applikation", "hook_json_return_error": "Konnte die Rückkehr vom Einsprungpunkt {path} nicht lesen. Fehler: {msg}. Unformatierter Inhalt: {raw_content}", @@ -436,13 +430,9 @@ "global_settings_setting_smtp_relay_password": "SMTP Relay Host Passwort", "global_settings_setting_smtp_relay_user": "SMTP Relay Benutzer Account", "global_settings_setting_smtp_relay_port": "SMTP Relay Port", - "global_settings_setting_smtp_allow_ipv6": "Erlaube die Nutzung von IPv6 um Mails zu empfangen und zu versenden", - "global_settings_setting_pop3_enabled": "Aktiviere das POP3 Protokoll für den Mailserver", "domain_cannot_remove_main_add_new_one": "Sie können '{domain}' nicht entfernen, da es die Hauptdomäne und Ihre einzige Domäne ist. Sie müssen zuerst eine andere Domäne mit 'yunohost domain add ' hinzufügen, dann als Hauptdomäne mit 'yunohost domain main-domain -n ' festlegen und dann können Sie die Domäne '{domain}' mit 'yunohost domain remove {domain}' entfernen'.'", "diagnosis_rootfstotalspace_critical": "Das Root-Filesystem hat noch freien Speicher von {space}. Das ist besorngiserregend! Der Speicher wird schnell aufgebraucht sein. 16 GB für das Root-Filesystem werden empfohlen.", "diagnosis_rootfstotalspace_warning": "Das Root-Filesystem hat noch freien Speicher von {space}. Möglich, dass das in Ordnung ist. Vielleicht ist er aber auch schneller aufgebraucht. 16 GB für das Root-Filesystem werden empfohlen.", - "global_settings_setting_smtp_relay_host": "Zu verwendender SMTP-Relay-Host um E-Mails zu versenden. Er wird anstelle dieser YunoHost-Instanz verwendet. Nützlich, wenn du in einer der folgenden Situationen bist: Dein ISP- oder VPS-Provider hat deinen Port 25 geblockt, eine deinen residentiellen IPs ist auf DUHL gelistet, du kannst keinen Reverse-DNS konfigurieren oder dieser Server ist nicht direkt mit dem Internet verbunden und du möchtest einen anderen verwenden, um E-Mails zu versenden.", - "global_settings_setting_backup_compress_tar_archives": "Beim Erstellen von Backups die Archive komprimieren (.tar.gz) anstelle von unkomprimierten Archiven (.tar). N.B. : Diese Option ergibt leichtere Backup-Archive, aber das initiale Backupprozedere wird länger dauern und mehr CPU brauchen.", "log_remove_on_failed_restore": "Entfernen von '{}' nach einer fehlgeschlagenen Wiederherstellung aus einem Sicherungsarchiv", "log_backup_restore_app": "Wiederherstellen von '{}' aus einem Sicherungsarchiv", "log_backup_restore_system": "System aus einem Sicherungsarchiv wiederherstellen", @@ -548,7 +538,6 @@ "migration_ldap_migration_failed_trying_to_rollback": "Migrieren war nicht möglich... Versuch, ein Rollback des Systems durchzuführen.", "migration_ldap_backup_before_migration": "Vor der eigentlichen Migration ein Backup der LDAP-Datenbank und der Applikations-Einstellungen erstellen.", "global_settings_setting_ssowat_panel_overlay_enabled": "Das SSOwat-Overlay-Panel aktivieren", - "global_settings_setting_security_ssh_port": "SSH-Port", "diagnosis_sshd_config_inconsistent_details": "Bitte führe yunohost settings set security.ssh.port -v YOUR_SSH_PORT aus, um den SSH-Port festzulegen, und prüfe yunohost tools regen-conf ssh --dry-run --with-diff und yunohost tools regen-conf ssh --force um deine Konfiguration auf die YunoHost-Empfehlung zurückzusetzen.", "regex_incompatible_with_tile": "/!\\ Packagers! Für Berechtigung '{permission}' ist show_tile auf 'true' gesetzt und deshalb kannst du keine regex-URL als Hauptdomäne setzen", "permission_cant_add_to_all_users": "Die Berechtigung {permission} kann nicht für allen Konten hinzugefügt werden.", @@ -580,8 +569,6 @@ "yunohost_postinstall_end_tip": "Post-install ist fertig! Um das Setup abzuschliessen, wird empfohlen:\n - ein erstes Konto über den Bereich 'Konto' im Adminbereich hinzuzufügen (oder mit 'yunohost user create ' in der Kommandezeile);\n - mögliche Fehler zu diagnostizieren über den Bereich 'Diagnose' im Adminbereich (oder mit 'yunohost diagnosis run' in der Kommandozeile;\n - Die Abschnitte 'Install YunoHost' und 'Geführte Tour' im Administratorenhandbuch zu lesen: https://yunohost.org/admindoc.", "user_already_exists": "Das Konto '{user}' ist bereits vorhanden", "update_apt_cache_warning": "Beim Versuch den Cache für APT (Debians Paketmanager) zu aktualisieren, ist etwas schief gelaufen. Hier ist ein Dump der Zeilen aus sources.list, die Ihnen vielleicht dabei helfen, das Problem zu identifizieren:\n{sourceslist}", - "global_settings_setting_security_webadmin_allowlist": "IP-Adressen, die auf die Verwaltungsseite zugreifen dürfen. Kommasepariert.", - "global_settings_setting_security_webadmin_allowlist_enabled": "Erlaube nur bestimmten IP-Adressen den Zugriff auf die Verwaltungsseite.", "disk_space_not_sufficient_update": "Es ist nicht genügend Speicherplatz frei, um diese Applikation zu aktualisieren", "disk_space_not_sufficient_install": "Es ist nicht genügend Speicherplatz frei, um diese Applikation zu installieren", "danger": "Warnung:", @@ -618,8 +605,6 @@ "domain_unknown": "Domäne '{domain}' unbekannt", "ldap_server_is_down_restart_it": "Der LDAP-Dienst ist nicht erreichbar, versuche ihn neu zu starten...", "user_import_bad_file": "Deine CSV-Datei ist nicht korrekt formatiert und wird daher ignoriert, um einen möglichen Datenverlust zu vermeiden", - "global_settings_setting_security_experimental_enabled": "Aktiviere experimentelle Sicherheitsfunktionen (nur aktivieren, wenn Du weißt was Du tust!)", - "global_settings_setting_security_nginx_redirect_to_https": "HTTP-Anfragen standardmäßig auf HTTPs umleiten (NICHT AUSSCHALTEN, sofern Du nicht weißt was Du tust!)", "user_import_missing_columns": "Die folgenden Spalten fehlen: {columns}", "user_import_nothing_to_do": "Es muss kein Konto importiert werden", "user_import_partial_failed": "Der Import von Konten ist teilweise fehlgeschlagen", @@ -673,7 +658,6 @@ "migration_0021_modified_files": "Bitte beachte, dass die folgenden Dateien manuell geändert wurden und nach dem Update möglicherweise überschrieben werden: {manually_modified_files}", "migration_0021_cleaning_up": "Bereinigung von Cache und Paketen nicht mehr nötig...", "migration_0021_patch_yunohost_conflicts": "Patch anwenden, um das Konfliktproblem zu umgehen...", - "global_settings_setting_security_ssh_password_authentication": "Passwort-Authentifizierung für SSH zulassen", "migration_description_0021_migrate_to_bullseye": "Upgrade des Systems auf Debian Bullseye und YunoHost 11.x", "migration_0021_general_warning": "Bitte beachte, dass diese Migration ein heikler Vorgang ist. Das YunoHost-Team hat sein Bestes getan, um sie zu überprüfen und zu testen, aber die Migration könnte immer noch Teile des Systems oder seiner Anwendungen beschädigen.\n\nEs wird daher empfohlen,:\n - Führe eine Sicherung aller kritischen Daten oder Applikationen durch. Mehr Informationen unter https://yunohost.org/backup;\n - Habe Geduld, nachdem du die Migration gestartet hast: Je nach Internetverbindung und Hardware kann es bis zu ein paar Stunden dauern, bis alles aktualisiert ist.", "tools_upgrade": "Aktualisieren von Systempaketen", @@ -684,5 +668,20 @@ "migration_description_0022_php73_to_php74_pools": "Migriere php7.3-fpm 'pool' Konfiguration nach php7.4", "migration_description_0023_postgresql_11_to_13": "Migrieren von Datenbanken von PostgreSQL 11 nach 13", "service_description_postgresql": "Speichert Applikations-Daten (SQL Datenbank)", - "migration_0023_not_enough_space": "Stelle sicher, dass unter {path} genug Speicherplatz zur Verfügung steht, um die Migration auszuführen." -} + "migration_0023_not_enough_space": "Stelle sicher, dass unter {path} genug Speicherplatz zur Verfügung steht, um die Migration auszuführen.", + "global_settings_setting_backup_compress_tar_archives_help": "Beim Erstellen von Backups die Archive komprimieren (.tar.gz) anstelle von unkomprimierten Archiven (.tar). N.B. : Diese Option ergibt leichtere Backup-Archive, aber das initiale Backupprozedere wird länger dauern und mehr CPU brauchen.", + "global_settings_setting_security_experimental_enabled_help": "Aktiviere experimentelle Sicherheitsfunktionen (nur aktivieren, wenn Du weißt was Du tust!)", + "global_settings_setting_nginx_compatibility_help": "Kompatibilitäts- vs. Sicherheits-Kompromiss für den Webserver NGINX. Betrifft die Ciphers (und andere sicherheitsrelevante Aspekte)", + "global_settings_setting_nginx_redirect_to_https_help": "HTTP-Anfragen standardmäßig auf HTTPs umleiten (NICHT AUSSCHALTEN, sofern Du nicht weißt was Du tust!)", + "global_settings_setting_admin_strength": "Stärke des Admin-Passworts", + "global_settings_setting_user_strength": "Stärke des Anmeldepassworts", + "global_settings_setting_postfix_compatibility_help": "Kompatibilitäts- vs. Sicherheits-Kompromiss für den Postfix-Server. Betrifft die Ciphers (und andere sicherheitsrelevante Aspekte)", + "global_settings_setting_ssh_compatibility_help": "Kompatibilitäts- vs. Sicherheits-Kompromiss für den SSH-Server. Betrifft die Ciphers (und andere sicherheitsrelevante Aspekte)", + "global_settings_setting_ssh_password_authentication_help": "Passwort-Authentifizierung für SSH zulassen", + "global_settings_setting_ssh_port": "SSH-Port", + "global_settings_setting_webadmin_allowlist_help": "IP-Adressen, die auf die Verwaltungsseite zugreifen dürfen. Kommasepariert.", + "global_settings_setting_webadmin_allowlist_enabled_help": "Erlaube nur bestimmten IP-Adressen den Zugriff auf die Verwaltungsseite.", + "global_settings_setting_ssh_allow_deprecated_dsa_hostkey_help": "Erlaubt die Verwendung eines (veralteten) DSA-Hostkeys für die SSH-Daemon-Konfiguration", + "global_settings_setting_smtp_allow_ipv6_help": "Erlaube die Nutzung von IPv6 um Mails zu empfangen und zu versenden", + "global_settings_setting_smtp_relay_enabled_help": "Zu verwendender SMTP-Relay-Host um E-Mails zu versenden. Er wird anstelle dieser YunoHost-Instanz verwendet. Nützlich, wenn du in einer der folgenden Situationen bist: Dein ISP- oder VPS-Provider hat deinen Port 25 geblockt, eine deinen residentiellen IPs ist auf DUHL gelistet, du kannst keinen Reverse-DNS konfigurieren oder dieser Server ist nicht direkt mit dem Internet verbunden und du möchtest einen anderen verwenden, um E-Mails zu versenden." +} \ No newline at end of file diff --git a/locales/eo.json b/locales/eo.json index 8ac32d4ce..d9f84e82a 100644 --- a/locales/eo.json +++ b/locales/eo.json @@ -105,7 +105,6 @@ "field_invalid": "Nevalida kampo '{}'", "log_app_makedefault": "Faru '{}' la defaŭlta apliko", "backup_system_part_failed": "Ne eblis sekurkopi la sistemon de '{part}'", - "global_settings_setting_security_postfix_compatibility": "Kongruo vs sekureca kompromiso por la Postfix-servilo. Afektas la ĉifradojn (kaj aliajn aspektojn pri sekureco)", "group_unknown": "La grupo '{group}' estas nekonata", "mailbox_disabled": "Retpoŝto malŝaltita por uzanto {user}", "migrations_dependencies_not_satisfied": "Rulu ĉi tiujn migradojn: '{dependencies_id}', antaŭ migrado {id}.", @@ -238,7 +237,6 @@ "dyndns_unavailable": "La domajno '{domain}' ne haveblas.", "experimental_feature": "Averto: Ĉi tiu funkcio estas eksperimenta kaj ne konsiderata stabila, vi ne uzu ĝin krom se vi scias kion vi faras.", "root_password_replaced_by_admin_password": "Via radika pasvorto estis anstataŭigita per via administra pasvorto.", - "global_settings_setting_security_password_user_strength": "Uzanto pasvorta forto", "restore_may_be_not_enough_disk_space": "Via sistemo ne ŝajnas havi sufiĉe da spaco (libera: {free_space} B, necesa spaco: {needed_space} B, sekureca marĝeno: {margin} B)", "log_corrupted_md_file": "La YAD-metadata dosiero asociita kun protokoloj estas damaĝita: '{md_file}\nEraro: {error} '", "downloading": "Elŝutante …", @@ -264,7 +262,6 @@ "log_user_delete": "Forigi uzanton '{}'", "dyndns_ip_updated": "Ĝisdatigis vian IP sur DynDNS", "regenconf_up_to_date": "La agordo jam estas ĝisdatigita por kategorio '{category}'", - "global_settings_setting_security_ssh_compatibility": "Kongruo vs sekureca kompromiso por la SSH-servilo. Afektas la ĉifradojn (kaj aliajn aspektojn pri sekureco)", "migrations_need_to_accept_disclaimer": "Por funkciigi la migradon {id}, via devas akcepti la sekvan malakcepton:\n---\n{disclaimer}\n---\nSe vi akceptas funkcii la migradon, bonvolu rekonduki la komandon kun la opcio '--accept-disclaimer'.", "regenconf_file_remove_failed": "Ne povis forigi la agordodosieron '{conf}'", "not_enough_disk_space": "Ne sufiĉe libera spaco sur '{path}'", @@ -295,7 +292,6 @@ "log_backup_restore_system": "Restarigi sistemon de rezerva arkivo", "log_app_change_url": "Ŝanĝu la URL de la apliko '{}'", "service_already_started": "La servo '{service}' jam funkcias", - "global_settings_setting_security_password_admin_strength": "Admin pasvorta forto", "service_reload_or_restart_failed": "Ne povis reŝargi aŭ rekomenci la servon '{service}'\n\nLastatempaj servaj protokoloj: {logs}", "migrations_list_conflict_pending_done": "Vi ne povas uzi ambaŭ '--previous' kaj '--done' samtempe.", "server_shutdown_confirm": "La servilo haltos tuj, ĉu vi certas? [{answers}]", @@ -310,7 +306,6 @@ "password_too_simple_4": "La pasvorto bezonas almenaŭ 12 signojn kaj enhavas ciferon, majuskle, pli malaltan kaj specialajn signojn", "regenconf_file_updated": "Agordodosiero '{conf}' ĝisdatigita", "log_help_to_get_log": "Por vidi la protokolon de la operacio '{desc}', uzu la komandon 'yunohost log show {name}'", - "global_settings_setting_security_nginx_compatibility": "Kongruo vs sekureca kompromiso por la TTT-servilo NGINX. Afektas la ĉifradojn (kaj aliajn aspektojn pri sekureco)", "restore_complete": "Restarigita", "hook_exec_failed": "Ne povis funkcii skripto: {path}", "global_settings_cant_open_settings": "Ne eblis malfermi agordojn, tial: {reason}", @@ -352,7 +347,6 @@ "log_domain_remove": "Forigi domon '{}' de agordo de sistemo", "hook_list_by_invalid": "Ĉi tiu posedaĵo ne povas esti uzata por listigi hokojn", "confirm_app_install_thirdparty": "Danĝero! Ĉi tiu apliko ne estas parto de la aplika katalogo de Yunohost. Instali triajn aplikojn povas kompromiti la integrecon kaj sekurecon de via sistemo. Vi probable ne devas instali ĝin krom se vi scias kion vi faras. NENIU SUBTENO estos provizita se ĉi tiu app ne funkcias aŭ rompas vian sistemon ... Se vi pretas riski ĉiuokaze, tajpu '{answers}'", - "global_settings_setting_service_ssh_allow_deprecated_dsa_hostkey": "Permesu uzon de (malaktuala) DSA-hostkey por la agordo de daemon SSH", "dyndns_domain_not_provided": "Provizanto DynDNS {provider} ne povas provizi domajnon {domain}.", "backup_unable_to_organize_files": "Ne povis uzi la rapidan metodon por organizi dosierojn en la ar archiveivo", "password_too_simple_2": "La pasvorto bezonas almenaŭ 8 signojn kaj enhavas ciferon, majusklojn kaj minusklojn", @@ -454,7 +448,6 @@ "diagnosis_found_errors_and_warnings": "Trovis {errors} signifaj problemo (j) (kaj {warnings} averto) rilataj al {category}!", "diagnosis_diskusage_low": "Stokado {mountpoint} (sur aparato {device}) nur restas {free} ({free_percent}%) spaco restanta (el {total}). Estu zorgema.", "diagnosis_diskusage_ok": "Stokado {mountpoint} (sur aparato {device}) ankoraŭ restas {free} ({free_percent}%) spaco (el {total})!", - "global_settings_setting_pop3_enabled": "Ebligu la protokolon POP3 por la poŝta servilo", "diagnosis_unknown_categories": "La jenaj kategorioj estas nekonataj: {categories}", "diagnosis_services_running": "Servo {service} funkcias!", "diagnosis_ports_unreachable": "Haveno {port} ne atingeblas de ekstere.", @@ -516,7 +509,6 @@ "diagnosis_http_partially_unreachable": "Domajno {domain} ŝajnas neatingebla per HTTP de ekster la loka reto en IPv {failed}, kvankam ĝi funkcias en IPv {passed}.", "diagnosis_http_nginx_conf_not_up_to_date": "La nginx-agordo de ĉi tiu domajno ŝajnas esti modifita permane, kaj malhelpas YunoHost diagnozi ĉu ĝi atingeblas per HTTP.", "diagnosis_http_nginx_conf_not_up_to_date_details": "Por solvi la situacion, inspektu la diferencon per la komandlinio per yunohost tools regen-conf nginx --dry-run --with-diff kaj se vi aranĝas, apliku la ŝanĝojn per yunohost tools regen-conf nginx --force.", - "global_settings_setting_smtp_allow_ipv6": "Permesu la uzon de IPv6 por ricevi kaj sendi poŝton", "backup_archive_corrupted": "I aspektas kiel la rezerva arkivo '{archive}' estas koruptita: {error}", "backup_archive_cant_retrieve_info_json": "Ne povis ŝarĝi infos por arkivo '{archive}' ... la info.json ne povas esti reprenita (aŭ ne estas valida JSON).", "ask_user_domain": "Domajno uzi por la retpoŝta adreso de la uzanto kaj XMPP-konto", @@ -530,5 +522,12 @@ "app_label_deprecated": "Ĉi tiu komando estas malrekomendita! Bonvolu uzi la novan komandon 'yunohost user permission update' por administri la app etikedo.", "app_argument_password_no_default": "Eraro dum analiza pasvorta argumento '{name}': pasvorta argumento ne povas havi defaŭltan valoron por sekureca kialo", "additional_urls_already_removed": "Plia URL '{url}' jam forigita en la aldona URL por permeso '{permission}'", - "additional_urls_already_added": "Plia URL '{url}' jam aldonita en la aldona URL por permeso '{permission}'" + "additional_urls_already_added": "Plia URL '{url}' jam aldonita en la aldona URL por permeso '{permission}'", + "global_settings_setting_nginx_compatibility_help": "Kongruo vs sekureca kompromiso por la TTT-servilo NGINX. Afektas la ĉifradojn (kaj aliajn aspektojn pri sekureco)", + "global_settings_setting_admin_strength": "Admin pasvorta forto", + "global_settings_setting_user_strength": "Uzanto pasvorta forto", + "global_settings_setting_postfix_compatibility_help": "Kongruo vs sekureca kompromiso por la Postfix-servilo. Afektas la ĉifradojn (kaj aliajn aspektojn pri sekureco)", + "global_settings_setting_ssh_compatibility_help": "Kongruo vs sekureca kompromiso por la SSH-servilo. Afektas la ĉifradojn (kaj aliajn aspektojn pri sekureco)", + "global_settings_setting_ssh_allow_deprecated_dsa_hostkey_help": "Permesu uzon de (malaktuala) DSA-hostkey por la agordo de daemon SSH", + "global_settings_setting_smtp_allow_ipv6_help": "Permesu la uzon de IPv6 por ricevi kaj sendi poŝton" } \ No newline at end of file diff --git a/locales/es.json b/locales/es.json index aebb959a8..ec513fb52 100644 --- a/locales/es.json +++ b/locales/es.json @@ -320,13 +320,7 @@ "group_created": "Creado el grupo «{group}»", "good_practices_about_admin_password": "Ahora está a punto de definir una nueva contraseña de usuario. La contraseña debe tener al menos 8 caracteres, aunque es una buena práctica usar una contraseña más larga (es decir, una frase de contraseña) y / o una variación de caracteres (mayúsculas, minúsculas, dígitos y caracteres especiales).", "global_settings_unknown_type": "Situación imprevista, la configuración {setting} parece tener el tipo {unknown_type} pero no es un tipo compatible con el sistema.", - "global_settings_setting_service_ssh_allow_deprecated_dsa_hostkey": "Permitir el uso de la llave (obsoleta) DSA para la configuración del demonio SSH", "global_settings_unknown_setting_from_settings_file": "Clave desconocida en la configuración: «{setting_key}», desechada y guardada en /etc/yunohost/settings-unknown.json", - "global_settings_setting_security_postfix_compatibility": "Compromiso entre compatibilidad y seguridad para el servidor Postfix. Afecta al cifrado (y otros aspectos relacionados con la seguridad)", - "global_settings_setting_security_ssh_compatibility": "Compromiso entre compatibilidad y seguridad para el servidor SSH. Afecta al cifrado (y otros aspectos relacionados con la seguridad)", - "global_settings_setting_security_password_user_strength": "Seguridad de la contraseña de usuario", - "global_settings_setting_security_password_admin_strength": "Seguridad de la contraseña del administrador", - "global_settings_setting_security_nginx_compatibility": "Compromiso entre compatibilidad y seguridad para el servidor web NGINX. Afecta al cifrado (y otros aspectos relacionados con la seguridad)", "global_settings_reset_success": "Respaldada la configuración previa en {path}", "global_settings_key_doesnt_exists": "La clave «{settings_key}» no existe en la configuración global, puede ver todas las claves disponibles ejecutando «yunohost settings list»", "global_settings_cant_write_settings": "No se pudo guardar el archivo de configuración, motivo: {reason}", @@ -464,7 +458,6 @@ "log_domain_main_domain": "Hacer de '{}' el dominio principal", "log_app_action_run": "Inicializa la acción de la aplicación '{}'", "group_already_exist_on_system_but_removing_it": "El grupo {group} ya existe en los grupos del sistema, pero YunoHost lo suprimirá …", - "global_settings_setting_pop3_enabled": "Habilita el protocolo POP3 para el servidor de correo electrónico", "domain_cannot_remove_main_add_new_one": "No se puede remover '{domain}' porque es su principal y único dominio. Primero debe agregar un nuevo dominio con la linea de comando 'yunohost domain add ', entonces configurarlo como dominio principal con 'yunohost domain main-domain -n ' y finalmente borrar el dominio '{domain}' con 'yunohost domain remove {domain}'.'", "diagnosis_never_ran_yet": "Este servidor todavía no tiene reportes de diagnostico. Puede iniciar un diagnostico completo desde la interface administrador web o con la linea de comando 'yunohost diagnosis run'.", "diagnosis_unknown_categories": "Las siguientes categorías están desconocidas: {categories}", @@ -510,12 +503,9 @@ "app_label_deprecated": "Este comando está depreciado! Favor usar el nuevo comando 'yunohost user permission update' para administrar la etiqueta de app.", "app_argument_password_no_default": "Error al interpretar argumento de contraseña'{name}': El argumento de contraseña no puede tener un valor por defecto por razón de seguridad", "invalid_regex": "Regex no valido: «{regex}»", - "global_settings_setting_backup_compress_tar_archives": "Cuando se creen nuevas copias de respaldo, comprimir los archivos (.tar.gz) en lugar de descomprimir los archivos (.tar). N.B.: activar esta opción quiere decir que los archivos serán más pequeños pero que el proceso tardará más y utilizará más CPU.", "global_settings_setting_smtp_relay_password": "Clave de uso del SMTP", "global_settings_setting_smtp_relay_user": "Cuenta de uso de SMTP", "global_settings_setting_smtp_relay_port": "Puerto de envio / relay SMTP", - "global_settings_setting_smtp_relay_host": "El servidor relay de SMTP para enviar correo en lugar de esta instalación YunoHost. Útil si estás en una de estas situaciones: tu puerto 25 esta bloqueado por tu ISP o VPS, si estás en usado una IP marcada como residencial o DUHL, si no puedes configurar un DNS inverso o si el servidor no está directamente expuesto a internet y quieres utilizar otro servidor para enviar correos.", - "global_settings_setting_smtp_allow_ipv6": "Permitir el uso de IPv6 para enviar y recibir correo", "diagnosis_processes_killed_by_oom_reaper": "Algunos procesos fueron terminados por el sistema recientemente porque se quedó sin memoria. Típicamente es sintoma de falta de memoria o de un proceso que se adjudicó demasiada memoria.
Resumen de los procesos terminados:
\n{kills_summary}", "diagnosis_http_nginx_conf_not_up_to_date_details": "Para arreglar este asunto, estudia las diferencias mediante el comando yunohost tools regen-conf nginx --dry-run --with-diff y si te parecen bien aplica los cambios mediante yunohost tools regen-conf nginx --force.", "diagnosis_http_nginx_conf_not_up_to_date": "Parece que la configuración nginx de este dominio haya sido modificada manualmente, esto no deja que YunoHost pueda diagnosticar si es accesible mediante HTTP.", @@ -618,10 +608,7 @@ "domain_dns_registrar_managed_in_parent_domain": "Este dominio es un subdominio de {parent_domain_link}. La configuración del registrador de DNS debe administrarse en el panel de configuración de {parent_domain}.", "domain_dns_registrar_yunohost": "Este dominio es un nohost.me / nohost.st / ynh.fr y, por lo tanto, YunoHost maneja automáticamente su configuración de DNS sin ninguna configuración adicional. (vea el comando 'yunohost dyndns update')", "domain_dns_registrar_not_supported": "YunoHost no pudo detectar automáticamente el registrador que maneja este dominio. Debe configurar manualmente sus registros DNS siguiendo la documentación en https://yunohost.org/dns.", - "global_settings_setting_security_nginx_redirect_to_https": "Redirija las solicitudes HTTP a HTTPs de forma predeterminada (¡NO LO DESACTIVE a menos que realmente sepa lo que está haciendo!)", - "global_settings_setting_security_webadmin_allowlist": "Direcciones IP permitidas para acceder al webadmin. Separado por comas.", "migration_ldap_backup_before_migration": "Creación de una copia de seguridad de la base de datos LDAP y la configuración de las aplicaciones antes de la migración real.", - "global_settings_setting_security_ssh_port": "Puerto SSH", "invalid_number": "Debe ser un miembro", "ldap_server_is_down_restart_it": "El servicio LDAP está inactivo, intente reiniciarlo...", "invalid_password": "Contraseña inválida", @@ -645,7 +632,6 @@ "migration_0021_modified_files": "Tenga en cuenta que se encontró que los siguientes archivos se modificaron manualmente y podrían sobrescribirse después de la actualización: {manually_modified_files}", "invalid_number_min": "Debe ser mayor que {min}", "pattern_email_forward": "Debe ser una dirección de correo electrónico válida, se acepta el símbolo '+' (por ejemplo, alguien+etiqueta@ejemplo.com)", - "global_settings_setting_security_ssh_password_authentication": "Permitir autenticación de contraseña para SSH", "invalid_number_max": "Debe ser menor que {max}", "ldap_attribute_already_exists": "El atributo LDAP '{attribute}' ya existe con el valor '{value}'", "log_app_config_set": "Aplicar configuración a la aplicación '{}'", @@ -657,8 +643,6 @@ "ldap_server_down": "No se puede conectar con el servidor LDAP", "log_backup_create": "Crear un archivo de copia de seguridad", "migration_ldap_can_not_backup_before_migration": "La copia de seguridad del sistema no se pudo completar antes de que fallara la migración. Error: {error}", - "global_settings_setting_security_experimental_enabled": "Habilite las funciones de seguridad experimentales (¡no habilite esto si no sabe lo que está haciendo!)", - "global_settings_setting_security_webadmin_allowlist_enabled": "Permita que solo algunas IP accedan al administrador web.", "migration_ldap_migration_failed_trying_to_rollback": "No se pudo migrar... intentando revertir el sistema.", "migration_0023_not_enough_space": "Deje suficiente espacio disponible en {path} para ejecutar la migración.", "migration_0023_postgresql_11_not_installed": "PostgreSQL no estaba instalado en su sistema. Nada que hacer.", @@ -684,5 +668,20 @@ "service_description_yunomdns": "Le permite llegar a su servidor usando 'yunohost.local' en su red local", "show_tile_cant_be_enabled_for_regex": "No puede habilitar 'show_tile' en este momento porque la URL para el permiso '{permission}' es una expresión regular", "show_tile_cant_be_enabled_for_url_not_defined": "No puede habilitar 'show_tile' en este momento, porque primero debe definir una URL para el permiso '{permission}'", - "regex_incompatible_with_tile": "/!\\ Empaquetadores! El permiso '{permission}' tiene show_tile establecido en 'true' y, por lo tanto, no puede definir una URL de expresión regular como la URL principal" -} + "regex_incompatible_with_tile": "/!\\ Empaquetadores! El permiso '{permission}' tiene show_tile establecido en 'true' y, por lo tanto, no puede definir una URL de expresión regular como la URL principal", + "global_settings_setting_backup_compress_tar_archives_help": "Cuando se creen nuevas copias de respaldo, comprimir los archivos (.tar.gz) en lugar de descomprimir los archivos (.tar). N.B.: activar esta opción quiere decir que los archivos serán más pequeños pero que el proceso tardará más y utilizará más CPU.", + "global_settings_setting_security_experimental_enabled_help": "Habilite las funciones de seguridad experimentales (¡no habilite esto si no sabe lo que está haciendo!)", + "global_settings_setting_nginx_compatibility_help": "Compromiso entre compatibilidad y seguridad para el servidor web NGINX. Afecta al cifrado (y otros aspectos relacionados con la seguridad)", + "global_settings_setting_nginx_redirect_to_https_help": "Redirija las solicitudes HTTP a HTTPs de forma predeterminada (¡NO LO DESACTIVE a menos que realmente sepa lo que está haciendo!)", + "global_settings_setting_admin_strength": "Seguridad de la contraseña del administrador", + "global_settings_setting_user_strength": "Seguridad de la contraseña de usuario", + "global_settings_setting_postfix_compatibility_help": "Compromiso entre compatibilidad y seguridad para el servidor Postfix. Afecta al cifrado (y otros aspectos relacionados con la seguridad)", + "global_settings_setting_ssh_compatibility_help": "Compromiso entre compatibilidad y seguridad para el servidor SSH. Afecta al cifrado (y otros aspectos relacionados con la seguridad)", + "global_settings_setting_ssh_password_authentication_help": "Permitir autenticación de contraseña para SSH", + "global_settings_setting_ssh_port": "Puerto SSH", + "global_settings_setting_webadmin_allowlist_help": "Direcciones IP permitidas para acceder al webadmin. Separado por comas.", + "global_settings_setting_webadmin_allowlist_enabled_help": "Permita que solo algunas IP accedan al administrador web.", + "global_settings_setting_ssh_allow_deprecated_dsa_hostkey_help": "Permitir el uso de la llave (obsoleta) DSA para la configuración del demonio SSH", + "global_settings_setting_smtp_allow_ipv6_help": "Permitir el uso de IPv6 para enviar y recibir correo", + "global_settings_setting_smtp_relay_enabled_help": "El servidor relay de SMTP para enviar correo en lugar de esta instalación YunoHost. Útil si estás en una de estas situaciones: tu puerto 25 esta bloqueado por tu ISP o VPS, si estás en usado una IP marcada como residencial o DUHL, si no puedes configurar un DNS inverso o si el servidor no está directamente expuesto a internet y quieres utilizar otro servidor para enviar correos." +} \ No newline at end of file diff --git a/locales/eu.json b/locales/eu.json index e0ce226d5..d35a0875c 100644 --- a/locales/eu.json +++ b/locales/eu.json @@ -254,7 +254,6 @@ "firewall_reloaded": "Suebakia birkargatu da", "domain_unknown": "'{domain}' domeinua ezezaguna da", "global_settings_cant_serialize_settings": "Ezinezkoa izan da konfikurazio-datuak serializatzea, zergatia: {reason}", - "global_settings_setting_security_nginx_redirect_to_https": "Birbideratu HTTP eskaerak HTTPSra (EZ ITZALI hau ez badakizu zertan ari zaren!)", "group_deleted": "'{group}' taldea ezabatu da", "invalid_password": "Pasahitza ez da zuzena", "log_domain_main_domain": "Lehenetsi '{}' domeinua", @@ -284,18 +283,13 @@ "global_settings_cant_write_settings": "Ezinezkoa izan da konfigurazio fitxategia gordetzea, zergatia: {reason}", "dyndns_domain_not_provided": "{provider} DynDNS enpresak ezin du {domain} domeinua eskaini.", "firewall_reload_failed": "Ezinezkoa izan da suebakia birkargatzea", - "global_settings_setting_security_password_admin_strength": "Administrazio-pasahitzaren segurtasuna", "hook_name_unknown": "'{name}' 'hook' izen ezezaguna", "domain_deletion_failed": "Ezinezkoa izan da {domain} ezabatzea: {error}", - "global_settings_setting_security_nginx_compatibility": "Bateragarritasun eta segurtasun arteko gatazka NGINX web zerbitzarirako. Zifraketari eragiten dio (eta segurtasunari lotutako beste kontu batzuei)", "log_regen_conf": "Berregin '{}' sistemaren konfigurazioa", "dpkg_lock_not_available": "Ezin da komando hau une honetan exekutatu beste aplikazio batek dpkg (sistemaren paketeen kudeatzailea) blokeatuta duelako, erabiltzen ari baita", "group_created": "'{group}' taldea sortu da", - "global_settings_setting_security_password_user_strength": "Erabiltzaile-pasahitzaren segurtasuna", - "global_settings_setting_security_experimental_enabled": "Gaitu segurtasun funtzio esperimentalak (ez ezazu egin ez badakizu zertan ari zaren!)", "good_practices_about_admin_password": "Administrazio-pasahitz berria ezartzear zaude. Pasahitzak zortzi karaktere izan beharko lituzke gutxienez, baina gomendagarria da pasahitz luzeagoa erabiltzea (esaldi bat, esaterako) edota karaktere desberdinak erabiltzea (hizki larriak, txikiak, zenbakiak eta karaktere bereziak).", "log_help_to_get_failed_log": "Ezin izan da '{desc}' eragiketa exekutatu. Mesedez, laguntza nahi baduzu partekatu eragiketa honen erregistro osoa 'yunohost log share {name}' komandoa erabiliz", - "global_settings_setting_security_webadmin_allowlist_enabled": "Baimendu IP zehatz batzuk bakarrik administrazio-atarian.", "group_unknown": "'{group}' taldea ezezaguna da", "group_updated": "'{group}' taldea eguneratu da", "group_update_failed": "Ezinezkoa izan da '{group}' taldea eguneratzea: {error}", @@ -317,7 +311,6 @@ "domain_dns_push_success": "DNS ezarpenak eguneratu dira!", "domain_dns_push_failed": "DNS ezarpenen eguneratzeak kale egin du.", "domain_dns_push_partial_failure": "DNS ezarpenak erdipurdi eguneratu dira: jakinarazpen/errore batzuk egon dira.", - "global_settings_setting_smtp_relay_host": "YunoHosten ordez posta elektronikoa bidaltzeko SMTP relay helbidea. Erabilgarri izan daiteke egoera hauetan: operadore edo VPS enpresak 25. ataka blokeatzen badu, DUHLen zure etxeko IPa ageri bada, ezin baduzu alderantzizko DNSa ezarri edo zerbitzari hau ez badago zuzenean internetera konektatuta baina posta elektronikoa bidali nahi baduzu.", "group_deletion_failed": "Ezinezkoa izan da '{group}' taldea ezabatzea: {error}", "invalid_number_min": "{min} baino handiagoa izan behar da", "invalid_number_max": "{max} baino txikiagoa izan behar da", @@ -345,7 +338,6 @@ "domain_config_auth_application_key": "Aplikazioaren gakoa", "domain_config_auth_application_secret": "Aplikazioaren gako sekretua", "domain_config_auth_consumer_key": "Erabiltzailearen gakoa", - "global_settings_setting_smtp_allow_ipv6": "Baimendu IPv6 posta elektronikoa jaso eta bidaltzeko", "group_cannot_be_deleted": "{group} taldea ezin da eskuz ezabatu.", "log_domain_config_set": "Aldatu '{}' domeinuko ezarpenak", "log_domain_dns_push": "Bidali '{}' domeinuaren DNS ezarpenak", @@ -359,8 +351,6 @@ "domain_config_mail_out": "Bidalitako mezuak", "domain_config_xmpp": "Bat-bateko mezularitza (XMPP)", "global_settings_bad_choice_for_enum": "{setting} ezarpenerako aukera okerra. '{choice}' ezarri da baina hauek dira aukerak: {available_choices}", - "global_settings_setting_security_postfix_compatibility": "Bateragarritasun eta segurtasun arteko gatazka Postfix zerbitzarirako. Zifraketari eragiten dio (eta segurtasunari lotutako beste kontu batzuei)", - "global_settings_setting_security_ssh_compatibility": "Bateragarritasun eta segurtasun arteko gatazka SSH zerbitzarirako. Zifraketari eragiten dio (eta segurtasunari lotutako beste kontu batzuei)", "good_practices_about_user_password": "Erabiltzaile-pasahitz berria ezartzear zaude. Pasahitzak zortzi karaktere izan beharko lituzke gutxienez, baina gomendagarria da pasahitz luzeagoa erabiltzea (esaldi bat, esaterako) edota karaktere desberdinak erabiltzea (hizki larriak, txikiak, zenbakiak eta karaktere bereziak).", "group_cannot_edit_all_users": "'all_users' taldea ezin da eskuz moldatu. YunoHosten izena emanda dauden erabiltzaile guztiak barne dituen talde berezia da", "invalid_number": "Zenbaki bat izan behar da", @@ -416,8 +406,6 @@ "diagnosis_ports_forwarding_tip": "Arazoa konpontzeko, litekeena da operadorearen routerrean ataken birbideraketa konfiguratu behar izatea, https://yunohost.org/isp_box_config-n agertzen den bezala", "domain_creation_failed": "Ezinezkoa izan da {domain} domeinua sortzea: {error}", "domains_available": "Erabilgarri dauden domeinuak:", - "global_settings_setting_pop3_enabled": "Gaitu POP3 protokoloa posta zerbitzarirako", - "global_settings_setting_security_ssh_port": "SSH ataka", "global_settings_unknown_type": "Gertaera ezezaguna, {setting} ezarpenak {unknown_type} mota duela dirudi baina mota hori ez da sistemarekin bateragarria.", "group_already_exist_on_system": "{group} taldea existitzen da dagoeneko sistemaren taldeetan", "diagnosis_processes_killed_by_oom_reaper": "Memoria agortu eta sistemak prozesu batzuk amaituarazi behar izan ditu. Honek esan nahi du sistemak ez duela memoria nahikoa edo prozesuren batek memoria gehiegi behar duela. Amaituarazi d(ir)en prozesua(k):\n{kills_summary}", @@ -440,7 +428,6 @@ "global_settings_reset_success": "Lehengo ezarpenak {path}-n gorde dira", "global_settings_unknown_setting_from_settings_file": "Gako ezezaguna ezarpenetan: '{setting_key}', baztertu eta gorde ezazu hemen: /etc/yunohost/settings-unknown.json", "domain_remove_confirm_apps_removal": "Domeinu hau ezabatzean aplikazio hauek desinstalatuko dira:\n{apps}\n\nZiur al zaude? [{answers}]", - "global_settings_setting_service_ssh_allow_deprecated_dsa_hostkey": "Baimendu DSA gakoa (zaharkitua) SSH zerbitzuaren konfiguraziorako", "hook_list_by_invalid": "Aukera hau ezin da 'hook'ak zerrendatzeko erabili", "installation_complete": "Instalazioa amaitu da", "hook_exec_failed": "Ezinezkoa izan da agindua exekutatzea: {path}", @@ -468,8 +455,6 @@ "global_settings_bad_type_for_setting": "{setting} ezarpenerako mota okerra. {received_type} ezarri da, {expected_type} espero zen", "diagnosis_mail_fcrdns_dns_missing": "Ez da alderantzizko DNSrik ezarri IPv{ipversion}rako. Litekeena da hartzaileak posta elektroniko batzuk jaso ezin izatea edo mezuok spam modura etiketatuak izatea.", "log_backup_create": "Sortu babeskopia fitxategia", - "global_settings_setting_backup_compress_tar_archives": "Babeskopia berriak sortzean, konprimitu fitxategiak (.tar.gz) konprimitu gabeko fitxategien (.tar) ordez. Aukera hau gaitzean babeskopiek espazio gutxiago beharko dute, baina hasierako prozesua luzeagoa izango da eta CPUari lan handiagoa eragingo dio.", - "global_settings_setting_security_webadmin_allowlist": "Administrazio-ataria bisita dezaketen IP helbideak, koma bidez bereiziak.", "global_settings_key_doesnt_exists": "'{settings_key}' gakoa ez da existitzen konfigurazio orokorrean; erabilgarri dauden gakoak ikus ditzakezu 'yunohost settings list' exekutatuz", "global_settings_setting_ssowat_panel_overlay_enabled": "Gaitu SSOwat paneleko \"overlay\"a", "log_backup_restore_system": "Lehengoratu sistema babeskopia fitxategi batetik", @@ -678,11 +663,25 @@ "migration_0021_cleaning_up": "Cachea eta erabilgarriak ez diren paketeak garbitzen…", "migration_0021_patch_yunohost_conflicts": "Arazo gatazkatsu bati adabakia jartzen…", "migration_description_0021_migrate_to_bullseye": "Eguneratu sistema Debian Bullseye eta Yunohost 11.x-ra", - "global_settings_setting_security_ssh_password_authentication": "Baimendu pasahitz bidezko autentikazioa SSHrako", "migration_0021_problematic_apps_warning": "Mesedez, kontuan izan ziur asko gatazkatsuak izango diren odorengo aplikazioak aurkitu direla. Badirudi ez zirela YunoHost aplikazioen katalogotik instalatu, edo ez daude 'badabiltza' bezala etiketatuak. Ondorioz, ezin da bermatu eguneratu ondoren funtzionatzen jarraituko dutenik: {problematic_apps}", "migration_0023_not_enough_space": "{path}-en ez dago toki nahikorik migrazioa abiarazteko.", "migration_0023_postgresql_11_not_installed": "PostgreSQL ez zegoen zure isteman instalatuta. Ez dago egitekorik.", "migration_0023_postgresql_13_not_installed": "PostgreSQL 11 dago instalatuta baina PostgreSQL 13 ez!? Zerbait arraroa gertatu omen zaio zure sistemari :( …", "migration_description_0022_php73_to_php74_pools": "Migratu php7.3-fpm 'pool' ezarpen-fitxategiak php7.4ra", - "migration_description_0023_postgresql_11_to_13": "Migratu datubaseak PostgreSQL 11tik 13ra" + "migration_description_0023_postgresql_11_to_13": "Migratu datubaseak PostgreSQL 11tik 13ra", + "global_settings_setting_backup_compress_tar_archives_help": "Babeskopia berriak sortzean, konprimitu fitxategiak (.tar.gz) konprimitu gabeko fitxategien (.tar) ordez. Aukera hau gaitzean babeskopiek espazio gutxiago beharko dute, baina hasierako prozesua luzeagoa izango da eta CPUari lan handiagoa eragingo dio.", + "global_settings_setting_security_experimental_enabled_help": "Gaitu segurtasun funtzio esperimentalak (ez ezazu egin ez badakizu zertan ari zaren!)", + "global_settings_setting_nginx_compatibility_help": "Bateragarritasun eta segurtasun arteko gatazka NGINX web zerbitzarirako. Zifraketari eragiten dio (eta segurtasunari lotutako beste kontu batzuei)", + "global_settings_setting_nginx_redirect_to_https_help": "Birbideratu HTTP eskaerak HTTPSra (EZ ITZALI hau ez badakizu zertan ari zaren!)", + "global_settings_setting_admin_strength": "Administrazio-pasahitzaren segurtasuna", + "global_settings_setting_user_strength": "Erabiltzaile-pasahitzaren segurtasuna", + "global_settings_setting_postfix_compatibility_help": "Bateragarritasun eta segurtasun arteko gatazka Postfix zerbitzarirako. Zifraketari eragiten dio (eta segurtasunari lotutako beste kontu batzuei)", + "global_settings_setting_ssh_compatibility_help": "Bateragarritasun eta segurtasun arteko gatazka SSH zerbitzarirako. Zifraketari eragiten dio (eta segurtasunari lotutako beste kontu batzuei)", + "global_settings_setting_ssh_password_authentication_help": "Baimendu pasahitz bidezko autentikazioa SSHrako", + "global_settings_setting_ssh_port": "SSH ataka", + "global_settings_setting_webadmin_allowlist_help": "Administrazio-ataria bisita dezaketen IP helbideak, koma bidez bereiziak.", + "global_settings_setting_webadmin_allowlist_enabled_help": "Baimendu IP zehatz batzuk bakarrik administrazio-atarian.", + "global_settings_setting_ssh_allow_deprecated_dsa_hostkey_help": "Baimendu DSA gakoa (zaharkitua) SSH zerbitzuaren konfiguraziorako", + "global_settings_setting_smtp_allow_ipv6_help": "Baimendu IPv6 posta elektronikoa jaso eta bidaltzeko", + "global_settings_setting_smtp_relay_enabled_help": "YunoHosten ordez posta elektronikoa bidaltzeko SMTP relay helbidea. Erabilgarri izan daiteke egoera hauetan: operadore edo VPS enpresak 25. ataka blokeatzen badu, DUHLen zure etxeko IPa ageri bada, ezin baduzu alderantzizko DNSa ezarri edo zerbitzari hau ez badago zuzenean internetera konektatuta baina posta elektronikoa bidali nahi baduzu." } \ No newline at end of file diff --git a/locales/fa.json b/locales/fa.json index 599ab1ea7..9ab48cdfa 100644 --- a/locales/fa.json +++ b/locales/fa.json @@ -302,25 +302,11 @@ "good_practices_about_user_password": "گذرواژه باید حداقل 8 کاراکتر باشد - اگرچه استفاده از گذرواژه طولانی تر تمرین خوبی است (به عنوان مثال عبارت عبور) و/یا استفاده از تنوع کاراکترها (بزرگ ، کوچک ، رقم و کاراکتر های خاص).", "good_practices_about_admin_password": "اکنون می خواهید گذرواژه جدیدی برای مدیریت تعریف کنید. گذرواژه باید حداقل 8 کاراکتر باشد - اگرچه استفاده از گذرواژه طولانی تر تمرین خوبی است (به عنوان مثال عبارت عبور) و/یا استفاده از تنوع کاراکترها (بزرگ ، کوچک ، رقم و کاراکتر های خاص).", "global_settings_unknown_type": "وضعیت غیرمنتظره ، به نظر می رسد که تنظیمات {setting} دارای نوع {unknown_type} است اما از نوع پشتیبانی شده توسط سیستم نیست.", - "global_settings_setting_backup_compress_tar_archives": "هنگام ایجاد پشتیبان جدید ، بایگانی های فشرده (.tar.gz) را به جای بایگانی های فشرده نشده (.tar) انتخاب کنید. N.B. : فعال کردن این گزینه به معنای ایجاد آرشیوهای پشتیبان سبک تر است ، اما روش پشتیبان گیری اولیه به طور قابل توجهی طولانی تر و سنگین تر بر روی CPU خواهد بود.", - "global_settings_setting_security_experimental_enabled": "فعال کردن ویژگی های امنیتی آزمایشی (اگر نمی دانید در حال انجام چه کاری هستید این کار را انجام ندهید!)", - "global_settings_setting_security_webadmin_allowlist": "آدرس های IP که مجاز به دسترسی مدیر وب هستند. جدا شده با ویرگول.", - "global_settings_setting_security_webadmin_allowlist_enabled": "فقط به برخی از IP ها اجازه دسترسی به مدیریت وب را بدهید.", "global_settings_setting_smtp_relay_password": "رمز عبور میزبان رله SMTP", "global_settings_setting_smtp_relay_user": "حساب کاربری رله SMTP", "global_settings_setting_smtp_relay_port": "پورت رله SMTP", - "global_settings_setting_smtp_relay_host": "میزبان رله SMTP برای ارسال نامه به جای این نمونه yunohost استفاده می شود. اگر در یکی از این شرایط قرار دارید مفید است: پورت 25 شما توسط ارائه دهنده ISP یا VPS شما مسدود شده است، شما یک IP مسکونی دارید که در DUHL ذکر شده است، نمی توانید DNS معکوس را پیکربندی کنید یا این سرور مستقیماً در اینترنت نمایش داده نمی شود و می خواهید از یکی دیگر برای ارسال ایمیل استفاده کنید.", - "global_settings_setting_smtp_allow_ipv6": "اجازه دهید از IPv6 برای دریافت و ارسال نامه استفاده شود", "global_settings_setting_ssowat_panel_overlay_enabled": "همپوشانی پانل SSOwat را فعال کنید", - "global_settings_setting_service_ssh_allow_deprecated_dsa_hostkey": "اجازه دهید از کلید میزبان DSA (منسوخ شده) برای پیکربندی SH daemon استفاده شود", "global_settings_unknown_setting_from_settings_file": "کلید ناشناخته در تنظیمات: '{setting_key}'، آن را کنار گذاشته و در /etc/yunohost/settings-unknown.json ذخیره کنید", - "global_settings_setting_security_ssh_port": "درگاه SSH", - "global_settings_setting_security_postfix_compatibility": "سازگاری در مقابل مبادله امنیتی برای سرور Postfix. روی رمزها (و سایر جنبه های مرتبط با امنیت) تأثیر می گذارد", - "global_settings_setting_security_ssh_compatibility": "سازگاری در مقابل مبادله امنیتی برای سرور SSH. روی رمزها (و سایر جنبه های مرتبط با امنیت) تأثیر می گذارد", - "global_settings_setting_security_password_user_strength": "قدرت رمز عبور کاربر", - "global_settings_setting_security_password_admin_strength": "قدرت رمز عبور مدیر", - "global_settings_setting_security_nginx_compatibility": "سازگاری در مقابل مبادله امنیتی برای وب سرور NGINX. روی رمزها (و سایر جنبه های مرتبط با امنیت) تأثیر می گذارد", - "global_settings_setting_pop3_enabled": "پروتکل POP3 را برای سرور ایمیل فعال کنید", "global_settings_reset_success": "تنظیمات قبلی اکنون در {path} پشتیبان گیری شده است", "global_settings_key_doesnt_exists": "کلید '{settings_key}' در تنظیمات جهانی وجود ندارد ، با اجرای 'لیست تنظیمات yunohost' می توانید همه کلیدهای موجود را مشاهده کنید", "global_settings_cant_write_settings": "فایل تنظیمات ذخیره نشد، به دلیل: {reason}", @@ -589,5 +575,18 @@ "permission_deletion_failed": "اجازه '{permission}' حذف نشد: {error}", "permission_deleted": "مجوز '{permission}' حذف شد", "permission_cant_add_to_all_users": "مجوز {permission} را نمی توان به همه کاربران اضافه کرد.", - "permission_currently_allowed_for_all_users": "این مجوز در حال حاضر به همه کاربران علاوه بر آن گروه های دیگر نیز اعطا شده. احتمالاً بخواهید مجوز 'all_users' را حذف کنید یا سایر گروه هایی را که در حال حاضر مجوز به آنها اعطا شده است را هم حذف کنید." + "permission_currently_allowed_for_all_users": "این مجوز در حال حاضر به همه کاربران علاوه بر آن گروه های دیگر نیز اعطا شده. احتمالاً بخواهید مجوز 'all_users' را حذف کنید یا سایر گروه هایی را که در حال حاضر مجوز به آنها اعطا شده است را هم حذف کنید.", + "global_settings_setting_backup_compress_tar_archives_help": "هنگام ایجاد پشتیبان جدید ، بایگانی های فشرده (.tar.gz) را به جای بایگانی های فشرده نشده (.tar) انتخاب کنید. N.B. : فعال کردن این گزینه به معنای ایجاد آرشیوهای پشتیبان سبک تر است ، اما روش پشتیبان گیری اولیه به طور قابل توجهی طولانی تر و سنگین تر بر روی CPU خواهد بود.", + "global_settings_setting_security_experimental_enabled_help": "فعال کردن ویژگی های امنیتی آزمایشی (اگر نمی دانید در حال انجام چه کاری هستید این کار را انجام ندهید!)", + "global_settings_setting_nginx_compatibility_help": "سازگاری در مقابل مبادله امنیتی برای وب سرور NGINX. روی رمزها (و سایر جنبه های مرتبط با امنیت) تأثیر می گذارد", + "global_settings_setting_admin_strength": "قدرت رمز عبور مدیر", + "global_settings_setting_user_strength": "قدرت رمز عبور کاربر", + "global_settings_setting_postfix_compatibility_help": "سازگاری در مقابل مبادله امنیتی برای سرور Postfix. روی رمزها (و سایر جنبه های مرتبط با امنیت) تأثیر می گذارد", + "global_settings_setting_ssh_compatibility_help": "سازگاری در مقابل مبادله امنیتی برای سرور SSH. روی رمزها (و سایر جنبه های مرتبط با امنیت) تأثیر می گذارد", + "global_settings_setting_ssh_port": "درگاه SSH", + "global_settings_setting_webadmin_allowlist_help": "آدرس های IP که مجاز به دسترسی مدیر وب هستند. جدا شده با ویرگول.", + "global_settings_setting_webadmin_allowlist_enabled_help": "فقط به برخی از IP ها اجازه دسترسی به مدیریت وب را بدهید.", + "global_settings_setting_ssh_allow_deprecated_dsa_hostkey_help": "اجازه دهید از کلید میزبان DSA (منسوخ شده) برای پیکربندی SH daemon استفاده شود", + "global_settings_setting_smtp_allow_ipv6_help": "اجازه دهید از IPv6 برای دریافت و ارسال نامه استفاده شود", + "global_settings_setting_smtp_relay_enabled_help": "میزبان رله SMTP برای ارسال نامه به جای این نمونه yunohost استفاده می شود. اگر در یکی از این شرایط قرار دارید مفید است: پورت 25 شما توسط ارائه دهنده ISP یا VPS شما مسدود شده است، شما یک IP مسکونی دارید که در DUHL ذکر شده است، نمی توانید DNS معکوس را پیکربندی کنید یا این سرور مستقیماً در اینترنت نمایش داده نمی شود و می خواهید از یکی دیگر برای ارسال ایمیل استفاده کنید." } \ No newline at end of file diff --git a/locales/fr.json b/locales/fr.json index 2773d0bee..a158d8767 100644 --- a/locales/fr.json +++ b/locales/fr.json @@ -300,9 +300,6 @@ "dpkg_is_broken": "Vous ne pouvez pas faire ça maintenant car dpkg/apt (le gestionnaire de paquets du système) semble avoir laissé des choses non configurées. Vous pouvez essayer de résoudre ce problème en vous connectant via SSH et en exécutant `sudo apt install --fix-broken` et/ou `sudo dpkg --configure -a'.", "dyndns_could_not_check_available": "Impossible de vérifier si {domain} est disponible chez {provider}.", "file_does_not_exist": "Le fichier dont le chemin est {path} n'existe pas.", - "global_settings_setting_security_password_admin_strength": "Qualité du mot de passe administrateur", - "global_settings_setting_security_password_user_strength": "Qualité du mot de passe de l'utilisateur", - "global_settings_setting_service_ssh_allow_deprecated_dsa_hostkey": "Autoriser l'utilisation de la clé hôte DSA (obsolète) pour la configuration du service SSH", "hook_json_return_error": "Échec de la lecture au retour du script {path}. Erreur : {msg}. Contenu brut : {raw_content}", "pattern_password_app": "Désolé, les mots de passe ne peuvent pas contenir les caractères suivants : {forbidden_chars}", "root_password_replaced_by_admin_password": "Votre mot de passe root a été remplacé par votre mot de passe administrateur.", @@ -326,9 +323,6 @@ "regenconf_now_managed_by_yunohost": "Le fichier de configuration '{conf}' est maintenant géré par YunoHost (catégorie {category}).", "regenconf_up_to_date": "La configuration est déjà à jour pour la catégorie '{category}'", "already_up_to_date": "Il n'y a rien à faire. Tout est déjà à jour.", - "global_settings_setting_security_nginx_compatibility": "Compatibilité versus compromis sécuritaire pour le serveur web Nginx. Affecte les cryptogrammes (et d'autres aspects liés à la sécurité)", - "global_settings_setting_security_ssh_compatibility": "Compatibilité versus compromis sécuritaire pour le serveur SSH. Affecte les cryptogrammes (et d'autres aspects liés à la sécurité)", - "global_settings_setting_security_postfix_compatibility": "Compatibilité versus compromis sécuritaire pour le serveur Postfix. Affecte les cryptogrammes (et d'autres aspects liés à la sécurité)", "regenconf_file_kept_back": "Le fichier de configuration '{conf}' devait être supprimé par 'regen-conf' (catégorie {category}) mais a été conservé.", "regenconf_updated": "La configuration a été mise à jour pour '{category}'", "regenconf_would_be_updated": "La configuration aurait dû être mise à jour pour la catégorie '{category}'", @@ -474,7 +468,6 @@ "diagnosis_services_bad_status_tip": "Vous pouvez essayer de redémarrer le service, et si cela ne fonctionne pas, consultez les journaux de service dans le webadmin (à partir de la ligne de commande, vous pouvez le faire avec yunohost service restart {service} et yunohost service log {service} ).", "diagnosis_http_bad_status_code": "Le système de diagnostique n'a pas réussi à contacter votre serveur. Il se peut qu'une autre machine réponde à la place de votre serveur. Vérifiez que le port 80 est correctement redirigé, que votre configuration Nginx est à jour et qu'un reverse-proxy n'interfère pas.", "diagnosis_http_timeout": "Expiration du délai en essayant de contacter votre serveur de l'extérieur. Il semble être inaccessible. Vérifiez que vous transférez correctement le port 80, que Nginx est en cours d'exécution et qu'un pare-feu n'interfère pas.", - "global_settings_setting_pop3_enabled": "Activer le protocole POP3 pour le serveur de messagerie", "log_app_action_run": "Lancer l'action de l'application '{}'", "diagnosis_never_ran_yet": "Il apparaît que le serveur a été installé récemment et qu'il n'y a pas encore eu de diagnostic. Vous devriez en lancer un depuis la webadmin ou en utilisant 'yunohost diagnosis run' depuis la ligne de commande.", "diagnosis_description_web": "Web", @@ -499,7 +492,6 @@ "diagnosis_mail_queue_ok": "{nb_pending} emails en attente dans les files d'attente de messagerie", "diagnosis_mail_queue_unavailable_details": "Erreur : {error}", "diagnosis_mail_queue_too_big": "Trop d'emails en attente dans la file d'attente ({nb_pending} emails)", - "global_settings_setting_smtp_allow_ipv6": "Autoriser l'utilisation d'IPv6 pour recevoir et envoyer du courrier", "diagnosis_display_tip": "Pour voir les problèmes détectés, vous pouvez accéder à la section Diagnostic du webadmin ou exécuter 'yunohost diagnosis show --issues --human-readable' à partir de la ligne de commande.", "diagnosis_ip_global": "IP globale : {global}", "diagnosis_ip_local": "IP locale : {local}", @@ -536,7 +528,6 @@ "regenconf_need_to_explicitly_specify_ssh": "La configuration de ssh a été modifiée manuellement. Vous devez explicitement indiquer la mention --force à \"ssh\" pour appliquer les changements.", "diagnosis_dns_try_dyndns_update_force": "La configuration DNS de ce domaine devrait être automatiquement gérée par YunoHost. Si ce n'est pas le cas, vous pouvez essayer de forcer une mise à jour en utilisant yunohost dyndns update --force.", "app_packaging_format_not_supported": "Cette application ne peut pas être installée car son format n'est pas pris en charge par votre version de YunoHost. Vous devriez probablement envisager de mettre à jour votre système.", - "global_settings_setting_backup_compress_tar_archives": "Lors de la création de nouvelles sauvegardes, compresser automatiquement les archives (.tar.gz) au lieu des archives non compressées (.tar). N.B. : activer cette option permet de créer des archives plus légères, mais la procédure de sauvegarde initiale sera significativement plus longues et plus gourmandes en CPU.", "diagnosis_processes_killed_by_oom_reaper": "Certains processus ont été arrêtés récemment par le système car il manquait de mémoire. Cela apparaît généralement quand le système manque de mémoire ou qu'un processus consomme trop de mémoire. Liste des processus tués :\n{kills_summary}", "ask_user_domain": "Domaine à utiliser pour l'adresse email de l'utilisateur et le compte XMPP", "app_manifest_install_ask_is_public": "Cette application devrait-elle être visible par les visiteurs anonymes ?", @@ -546,7 +537,6 @@ "app_manifest_install_ask_domain": "Choisissez le domaine sur lequel vous souhaitez installer cette application", "global_settings_setting_smtp_relay_user": "Compte utilisateur du relais SMTP", "global_settings_setting_smtp_relay_port": "Port du relais SMTP", - "global_settings_setting_smtp_relay_host": "Un relais SMTP permet d'envoyer du courrier à la place de cette instance YunoHost. Cela est utile si vous êtes dans l'une de ces situations : le port 25 est bloqué par votre FAI ou par votre fournisseur VPS, vous avez une IP résidentielle répertoriée sur DUHL, vous ne pouvez pas configurer de reverse DNS ou le serveur n'est pas directement accessible depuis Internet et que vous voulez en utiliser un autre pour envoyer des mails.", "diagnosis_package_installed_from_sury_details": "Certains paquets ont été installés par inadvertance à partir d'un dépôt tiers appelé Sury. L'équipe YunoHost a amélioré la stratégie de gestion de ces paquets, mais on s'attend à ce que certaines configurations qui ont installé des applications PHP7.3 tout en étant toujours sur Stretch présentent des incohérences. Pour résoudre cette situation, vous devez essayer d'exécuter la commande suivante : {cmd_to_fix}", "app_argument_password_no_default": "Erreur lors de l'analyse de l'argument de mot de passe '{name}' : l'argument de mot de passe ne peut pas avoir de valeur par défaut pour des raisons de sécurité", "pattern_email_forward": "L'adresse électronique doit être valide, le symbole '+' étant accepté (par exemple : johndoe+yunohost@exemple.com)", @@ -578,18 +568,14 @@ "migration_ldap_migration_failed_trying_to_rollback": "Impossible de migrer... tentative de restauration du système.", "migration_ldap_can_not_backup_before_migration": "La sauvegarde du système n'a pas pu être terminée avant l'échec de la migration. Erreur : {error }", "migration_ldap_backup_before_migration": "Création d'une sauvegarde de la base de données LDAP et des paramètres des applications avant la migration proprement dite.", - "global_settings_setting_security_ssh_port": "Port SSH", "diagnosis_sshd_config_inconsistent_details": "Veuillez exécuter yunohost settings set security.ssh.port -v VOTRE_PORT_SSH pour définir le port SSH, et vérifiez yunohost tools regen-conf ssh --dry-run --with-diff et yunohost tools regen-conf ssh --force pour réinitialiser votre configuration aux recommandations YunoHost.", "diagnosis_sshd_config_inconsistent": "Il semble que le port SSH a été modifié manuellement dans /etc/ssh/sshd_config. Depuis YunoHost 4.2, un nouveau paramètre global 'security.ssh.port' est disponible pour éviter de modifier manuellement la configuration.", "diagnosis_sshd_config_insecure": "La configuration SSH semble avoir été modifiée manuellement et n'est pas sécurisée car elle ne contient aucune directive 'AllowGroups' ou 'AllowUsers' pour limiter l'accès aux utilisateurs autorisés.", "backup_create_size_estimation": "L'archive contiendra environ {size} de données.", - "global_settings_setting_security_webadmin_allowlist": "Adresses IP autorisées à accéder à la webadmin. Elles doivent être séparées par une virgule.", - "global_settings_setting_security_webadmin_allowlist_enabled": "Autoriser seulement certaines IP à accéder à la webadmin.", "diagnosis_dns_specialusedomain": "Le domaine {domain} est basé sur un domaine de premier niveau (TLD) à usage spécial comme .local ou .test et ne devrait donc pas avoir d'enregistrements DNS réels.", "invalid_password": "Mot de passe incorrect", "ldap_server_is_down_restart_it": "Le service LDAP est en panne, essayez de le redémarrer...", "ldap_server_down": "Impossible d'atteindre le serveur LDAP", - "global_settings_setting_security_experimental_enabled": "Activer les fonctionnalités de sécurité expérimentales (ne l'activez pas si vous ne savez pas ce que vous faites !)", "diagnosis_apps_deprecated_practices": "La version installée de cette application utilise toujours certaines pratiques de packaging obsolètes. Vous devriez vraiment envisager de mettre l'application à jour.", "diagnosis_apps_outdated_ynh_requirement": "La version installée de cette application nécessite uniquement YunoHost >= 2.x, cela indique que l'application n'est pas à jour avec les bonnes pratiques de packaging et les helpers recommandées. Vous devriez vraiment envisager de mettre l'application à jour.", "diagnosis_apps_bad_quality": "Cette application est actuellement signalée comme cassée dans le catalogue d'applications de YunoHost. Cela peut être un problème temporaire. En attendant que les mainteneurs tentent de résoudre le problème, la mise à jour de cette application est désactivée.", @@ -607,7 +593,6 @@ "user_import_bad_line": "Ligne incorrecte {line} : {details}", "log_user_import": "Importer des utilisateurs", "diagnosis_high_number_auth_failures": "Il y a eu récemment un grand nombre d'échecs d'authentification. Assurez-vous que Fail2Ban est en cours d'exécution et est correctement configuré, ou utilisez un port personnalisé pour SSH comme expliqué dans https://yunohost.org/security.", - "global_settings_setting_security_nginx_redirect_to_https": "Rediriger les requêtes HTTP vers HTTPS par défaut (NE PAS DÉSACTIVER à moins de savoir vraiment ce que vous faites !)", "config_validate_color": "Doit être une couleur hexadécimale RVB valide", "app_config_unable_to_apply": "Échec de l'application des valeurs du panneau de configuration.", "app_config_unable_to_read": "Échec de la lecture des valeurs du panneau de configuration.", @@ -675,7 +660,6 @@ "migration_0021_patch_yunohost_conflicts": "Application du correctif pour contourner le problème de conflit...", "migration_0021_not_buster": "La distribution Debian actuelle n'est pas Buster !", "migration_description_0021_migrate_to_bullseye": "Mise à niveau du système vers Debian Bullseye et YunoHost 11.x", - "global_settings_setting_security_ssh_password_authentication": "Autoriser l'authentification par mot de passe pour SSH", "domain_config_default_app": "Application par défaut", "migration_description_0022_php73_to_php74_pools": "Migration des fichiers de configuration php7.3-fpm 'pool' vers php7.4", "migration_description_0023_postgresql_11_to_13": "Migration des bases de données de PostgreSQL 11 vers 13", @@ -684,5 +668,20 @@ "migration_0023_postgresql_13_not_installed": "PostgreSQL 11 est installé, mais pas PostgreSQL 13 ! ? Quelque chose d'anormal s'est peut-être produit sur votre système :(...", "tools_upgrade_failed": "Impossible de mettre à jour les paquets : {packages_list}", "migration_0023_not_enough_space": "Prévoyez suffisamment d'espace disponible dans {path} pour exécuter la migration.", - "migration_0023_postgresql_11_not_installed": "PostgreSQL n'a pas été installé sur votre système. Il n'y a rien à faire." -} + "migration_0023_postgresql_11_not_installed": "PostgreSQL n'a pas été installé sur votre système. Il n'y a rien à faire.", + "global_settings_setting_backup_compress_tar_archives_help": "Lors de la création de nouvelles sauvegardes, compresser automatiquement les archives (.tar.gz) au lieu des archives non compressées (.tar). N.B. : activer cette option permet de créer des archives plus légères, mais la procédure de sauvegarde initiale sera significativement plus longues et plus gourmandes en CPU.", + "global_settings_setting_security_experimental_enabled_help": "Activer les fonctionnalités de sécurité expérimentales (ne l'activez pas si vous ne savez pas ce que vous faites !)", + "global_settings_setting_nginx_compatibility_help": "Compatibilité versus compromis sécuritaire pour le serveur web Nginx. Affecte les cryptogrammes (et d'autres aspects liés à la sécurité)", + "global_settings_setting_nginx_redirect_to_https_help": "Rediriger les requêtes HTTP vers HTTPS par défaut (NE PAS DÉSACTIVER à moins de savoir vraiment ce que vous faites !)", + "global_settings_setting_admin_strength": "Qualité du mot de passe administrateur", + "global_settings_setting_user_strength": "Qualité du mot de passe de l'utilisateur", + "global_settings_setting_postfix_compatibility_help": "Compatibilité versus compromis sécuritaire pour le serveur Postfix. Affecte les cryptogrammes (et d'autres aspects liés à la sécurité)", + "global_settings_setting_ssh_compatibility_help": "Compatibilité versus compromis sécuritaire pour le serveur SSH. Affecte les cryptogrammes (et d'autres aspects liés à la sécurité)", + "global_settings_setting_ssh_password_authentication_help": "Autoriser l'authentification par mot de passe pour SSH", + "global_settings_setting_ssh_port": "Port SSH", + "global_settings_setting_webadmin_allowlist_help": "Adresses IP autorisées à accéder à la webadmin. Elles doivent être séparées par une virgule.", + "global_settings_setting_webadmin_allowlist_enabled_help": "Autoriser seulement certaines IP à accéder à la webadmin.", + "global_settings_setting_ssh_allow_deprecated_dsa_hostkey_help": "Autoriser l'utilisation de la clé hôte DSA (obsolète) pour la configuration du service SSH", + "global_settings_setting_smtp_allow_ipv6_help": "Autoriser l'utilisation d'IPv6 pour recevoir et envoyer du courrier", + "global_settings_setting_smtp_relay_enabled_help": "Un relais SMTP permet d'envoyer du courrier à la place de cette instance YunoHost. Cela est utile si vous êtes dans l'une de ces situations : le port 25 est bloqué par votre FAI ou par votre fournisseur VPS, vous avez une IP résidentielle répertoriée sur DUHL, vous ne pouvez pas configurer de reverse DNS ou le serveur n'est pas directement accessible depuis Internet et que vous voulez en utiliser un autre pour envoyer des mails." +} \ No newline at end of file diff --git a/locales/gl.json b/locales/gl.json index 4a77645d6..1aa987aac 100644 --- a/locales/gl.json +++ b/locales/gl.json @@ -308,17 +308,8 @@ "domain_cannot_add_xmpp_upload": "Non podes engadir dominios que comecen con 'xmpp-upload.'. Este tipo de nome está reservado para a función se subida de XMPP integrada en YunoHost.", "file_does_not_exist": "O ficheiro {path} non existe.", "firewall_reload_failed": "Non se puido recargar o cortalumes", - "global_settings_setting_smtp_allow_ipv6": "Permitir o uso de IPv6 para recibir e enviar emais", "global_settings_setting_ssowat_panel_overlay_enabled": "Activar as capas no panel SSOwat", - "global_settings_setting_service_ssh_allow_deprecated_dsa_hostkey": "Permitir o uso de DSA hostkey (en desuso) para a configuración do demoño SSH", "global_settings_unknown_setting_from_settings_file": "Chave descoñecida nos axustes: '{setting_key}', descártaa e gárdaa en /etc/yunohost/settings-unknown.json", - "global_settings_setting_security_ssh_port": "Porto SSH", - "global_settings_setting_security_postfix_compatibility": "Compromiso entre compatibilidade e seguridade para o servidor Postfix. Aféctalle ao cifrado (e outros aspectos da seguridade)", - "global_settings_setting_security_ssh_compatibility": "Compromiso entre compatibilidade e seguridade para o servidor SSH. Aféctalle ao cifrado (e outros aspectos da seguridade)", - "global_settings_setting_security_password_user_strength": "Fortaleza do contrasinal da usuaria", - "global_settings_setting_security_password_admin_strength": "Fortaleza do contrasinal de Admin", - "global_settings_setting_security_nginx_compatibility": "Compromiso entre compatiblidade e seguridade para o servidor NGINX. Afecta ao cifrado (e outros aspectos relacionados coa seguridade)", - "global_settings_setting_pop3_enabled": "Activar protocolo POP3 no servidor de email", "global_settings_reset_success": "Fíxose copia de apoio dos axustes en {path}", "global_settings_key_doesnt_exists": "O axuste '{settings_key}' non existe nos axustes globais, podes ver os valores dispoñibles executando 'yunohost settings list'", "global_settings_cant_write_settings": "Non se gardou o ficheiro de configuración, razón: {reason}", @@ -336,11 +327,9 @@ "good_practices_about_user_password": "Vas definir o novo contrasinal de usuaria. O contrasinal debe ter 8 caracteres como mínimo—aínda que se recomenda utilizar un máis longo (ex. unha frase de paso) e/ou utilizar caracteres variados (maiúsculas, minúsculas, números e caracteres especiais).", "good_practices_about_admin_password": "Vas definir o novo contrasinal de administración. O contrasinal debe ter 8 caracteres como mínimo—aínda que se recomenda utilizar un máis longo (ex. unha frase de paso) e/ou utilizar caracteres variados (maiúsculas, minúsculas, números e caracteres especiais).", "global_settings_unknown_type": "Situación non agardada, o axuste {setting} semella ter o tipo {unknown_type} pero non é un valor soportado polo sistema.", - "global_settings_setting_backup_compress_tar_archives": "Ao crear novas copias de apoio, comprime os arquivos (.tar.gz) en lugar de non facelo (.tar). Nota: activando esta opción creas arquivos máis lixeiros, mais o procedemento da primeira copia será significativamente máis longo e esixente coa CPU.", "global_settings_setting_smtp_relay_password": "Contrasinal no repetidor SMTP", "global_settings_setting_smtp_relay_user": "Conta de usuaria no repetidor SMTP", "global_settings_setting_smtp_relay_port": "Porto do repetidor SMTP", - "global_settings_setting_smtp_relay_host": "Servidor repetidor SMTP para enviar emails no lugar da túa instancia yunohost. É útil se estás nunha destas situacións: o teu porto 25 está bloqueado polo teu provedor ISP u VPN, se tes unha IP residencial nunha lista DUHL, se non podes configurar DNS inversa ou se este servidor non ten conexión directa a internet e queres utilizar outro para enviar os emails.", "group_updated": "Grupo '{group}' actualizado", "group_unknown": "Grupo descoñecido '{group}'", "group_deletion_failed": "Non se eliminou o grupo '{group}': {error}", @@ -349,8 +338,6 @@ "group_cannot_edit_primary_group": "O grupo '{group}' non se pode editar manualmente. É o grupo primario que contén só a unha usuaria concreta.", "group_cannot_edit_visitors": "O grupo 'visitors' non se pode editar manualmente. É un grupo especial que representa a tódas visitantes anónimas", "group_cannot_edit_all_users": "O grupo 'all_users' non se pode editar manualmente. É un grupo especial que contén tódalas usuarias rexistradas en YunoHost", - "global_settings_setting_security_webadmin_allowlist": "Enderezos IP con permiso para acceder á webadmin. Separados por vírgulas.", - "global_settings_setting_security_webadmin_allowlist_enabled": "Permitir que só algúns IPs accedan á webadmin.", "disk_space_not_sufficient_update": "Non hai espazo suficiente no disco para actualizar esta aplicación", "disk_space_not_sufficient_install": "Non queda espazo suficiente no disco para instalar esta aplicación", "log_help_to_get_log": "Para ver o rexistro completo da operación '{desc}', usa o comando 'yunohost log show {name}'", @@ -543,7 +530,6 @@ "invalid_password": "Contrasinal non válido", "ldap_server_is_down_restart_it": "O servidor LDAP está caído, intenta reinicialo...", "ldap_server_down": "Non se chegou ao servidor LDAP", - "global_settings_setting_security_experimental_enabled": "Activar características de seguridade experimentais (non actives isto se non sabes o que estás a facer!)", "yunohost_postinstall_end_tip": "Post-install completada! Para rematar a configuración considera:\n- engadir unha primeira usuaria na sección 'Usuarias' na webadmin (ou 'yunohost user create ' na liña de comandos);\n- diagnosticar potenciais problemas na sección 'Diagnóstico' na webadmin (ou 'yunohost diagnosis run' na liña de comandos);\n- ler 'Rematando a configuración' e 'Coñece YunoHost' na documentación da administración: https://yunohost.org/admindoc.", "yunohost_not_installed": "YunoHost non está instalado correctamente. Executa 'yunohost tools postinstall'", "yunohost_installing": "Instalando YunoHost...", @@ -592,7 +578,6 @@ "service_enabled": "O servizo '{service}' vai ser iniciado automáticamente no inicio do sistema.", "diagnosis_apps_allgood": "Tódalas apps instaladas respectan as prácticas básicas de empaquetado", "diagnosis_apps_bad_quality": "Esta aplicación está actualmente marcada como estragada no catálogo de aplicacións de YunoHost. Podería ser un problema temporal mentras as mantedoras intentan arranxar o problema. Ata ese momento a actualización desta app está desactivada.", - "global_settings_setting_security_nginx_redirect_to_https": "Redirixir peticións HTTP a HTTPs por defecto (NON DESACTIVAR ISTO a non ser que realmente saibas o que fas!)", "log_user_import": "Importar usuarias", "user_import_failed": "A operación de importación de usuarias fracasou", "user_import_missing_columns": "Faltan as seguintes columnas: {columns}", @@ -675,7 +660,6 @@ "migration_description_0021_migrate_to_bullseye": "Actualizar o sistema a Debian Bullseye e YunoHost 11.x", "migration_0021_system_not_fully_up_to_date": "O teu sistema non está completamente actualizado. Fai unha actualización normal antes de executar a migración a Bullseye.", "migration_0021_general_warning": "Ten en conta que a migración é unha operación delicada. O equipo de YunoHost fixo todo o que puido para revisalo e probalo, pero aínda así poderían acontecer fallos no sistema ou apps.\n\nAsí as cousas, é recomendable:\n - Facer unha copia de apoio dos datos e apps importantes. Máis info en https://yunohost.org/backup;\n - Ter paciencia unha vez inicias a migración: dependendo da túa conexión a internet e hardware, podería levarlle varias horas completar o proceso.", - "global_settings_setting_security_ssh_password_authentication": "Permitir autenticación con contrasinal para SSH", "tools_upgrade_failed": "Non se actualizaron os paquetes: {packages_list}", "migration_0023_not_enough_space": "Crear espazo suficiente en {path} para realizar a migración.", "migration_0023_postgresql_11_not_installed": "PostgreSQL non estaba instalado no sistema. Nada que facer.", @@ -684,5 +668,20 @@ "migration_description_0023_postgresql_11_to_13": "Migrar bases de datos de PostgreSQL 11 a 13", "service_description_postgresql": "Almacena datos da app (Base datos SQL)", "tools_upgrade": "Actualizando paquetes do sistema", - "domain_config_default_app": "App por defecto" + "domain_config_default_app": "App por defecto", + "global_settings_setting_backup_compress_tar_archives_help": "Ao crear novas copias de apoio, comprime os arquivos (.tar.gz) en lugar de non facelo (.tar). Nota: activando esta opción creas arquivos máis lixeiros, mais o procedemento da primeira copia será significativamente máis longo e esixente coa CPU.", + "global_settings_setting_security_experimental_enabled_help": "Activar características de seguridade experimentais (non actives isto se non sabes o que estás a facer!)", + "global_settings_setting_nginx_compatibility_help": "Compromiso entre compatiblidade e seguridade para o servidor NGINX. Afecta ao cifrado (e outros aspectos relacionados coa seguridade)", + "global_settings_setting_nginx_redirect_to_https_help": "Redirixir peticións HTTP a HTTPs por defecto (NON DESACTIVAR ISTO a non ser que realmente saibas o que fas!)", + "global_settings_setting_admin_strength": "Fortaleza do contrasinal de Admin", + "global_settings_setting_user_strength": "Fortaleza do contrasinal da usuaria", + "global_settings_setting_postfix_compatibility_help": "Compromiso entre compatibilidade e seguridade para o servidor Postfix. Aféctalle ao cifrado (e outros aspectos da seguridade)", + "global_settings_setting_ssh_compatibility_help": "Compromiso entre compatibilidade e seguridade para o servidor SSH. Aféctalle ao cifrado (e outros aspectos da seguridade)", + "global_settings_setting_ssh_password_authentication_help": "Permitir autenticación con contrasinal para SSH", + "global_settings_setting_ssh_port": "Porto SSH", + "global_settings_setting_webadmin_allowlist_help": "Enderezos IP con permiso para acceder á webadmin. Separados por vírgulas.", + "global_settings_setting_webadmin_allowlist_enabled_help": "Permitir que só algúns IPs accedan á webadmin.", + "global_settings_setting_ssh_allow_deprecated_dsa_hostkey_help": "Permitir o uso de DSA hostkey (en desuso) para a configuración do demoño SSH", + "global_settings_setting_smtp_allow_ipv6_help": "Permitir o uso de IPv6 para recibir e enviar emais", + "global_settings_setting_smtp_relay_enabled_help": "Servidor repetidor SMTP para enviar emails no lugar da túa instancia yunohost. É útil se estás nunha destas situacións: o teu porto 25 está bloqueado polo teu provedor ISP u VPN, se tes unha IP residencial nunha lista DUHL, se non podes configurar DNS inversa ou se este servidor non ten conexión directa a internet e queres utilizar outro para enviar os emails." } \ No newline at end of file diff --git a/locales/it.json b/locales/it.json index 844b756ea..a6b341ead 100644 --- a/locales/it.json +++ b/locales/it.json @@ -232,18 +232,12 @@ "global_settings_key_doesnt_exists": "La chiave '{settings_key}' non esiste nelle impostazioni globali, puoi vedere tutte le chiavi disponibili eseguendo 'yunohost settings list'", "global_settings_reset_success": "Le impostazioni precedenti sono state salvate in {path}", "already_up_to_date": "Niente da fare. Tutto è già aggiornato.", - "global_settings_setting_security_nginx_compatibility": "Bilanciamento tra compatibilità e sicurezza per il server web NGIX. Riguarda gli algoritmi di cifratura (e altri aspetti legati alla sicurezza)", - "global_settings_setting_security_password_admin_strength": "Complessità della password di amministratore", - "global_settings_setting_security_password_user_strength": "Complessità della password utente", - "global_settings_setting_security_ssh_compatibility": "Bilanciamento tra compatibilità e sicurezza per il server SSH. Riguarda gli algoritmi di cifratura (e altri aspetti legati alla sicurezza)", "global_settings_unknown_setting_from_settings_file": "Chiave sconosciuta nelle impostazioni: '{setting_key}', scartata e salvata in /etc/yunohost/settings-unknown.json", - "global_settings_setting_service_ssh_allow_deprecated_dsa_hostkey": "Consenti l'uso del hostkey DSA (deprecato) per la configurazione del demone SSH", "global_settings_unknown_type": "Situazione inaspettata, l'impostazione {setting} sembra essere di tipo {unknown_type} ma non è un tipo supportato dal sistema.", "good_practices_about_admin_password": "Stai per impostare una nuova password di amministratore. La password deve essere almeno di 8 caratteri - anche se è buona pratica utilizzare password più lunghe (es. una frase, una serie di parole) e/o utilizzare vari tipi di caratteri (maiuscole, minuscole, numeri e simboli).", "log_corrupted_md_file": "Il file dei metadati YAML associato con i registri è danneggiato: '{md_file}'\nErrore: {error}", "log_link_to_log": "Registro completo di questa operazione: '{desc}'", "log_help_to_get_log": "Per vedere il registro dell'operazione '{desc}', usa il comando 'yunohost log show {name}'", - "global_settings_setting_security_postfix_compatibility": "Bilanciamento tra compatibilità e sicurezza per il server Postfix. Riguarda gli algoritmi di cifratura (e altri aspetti legati alla sicurezza)", "log_link_to_failed_log": "Impossibile completare l'operazione '{desc}'! Per ricevere aiuto, per favore fornisci il registro completo dell'operazione cliccando qui", "log_help_to_get_failed_log": "L'operazione '{desc}' non può essere completata. Per ottenere aiuto, per favore condividi il registro completo dell'operazione utilizzando il comando 'yunohost log share {name}'", "log_does_exists": "Non esiste nessun registro delle operazioni chiamato '{log}', usa 'yunohost log list' per vedere tutti i registri delle operazioni disponibili", @@ -506,13 +500,9 @@ "group_already_exist_on_system_but_removing_it": "Il gruppo {group} esiste già tra i gruppi di sistema, ma YunoHost lo cancellerà...", "group_already_exist_on_system": "Il gruppo {group} esiste già tra i gruppi di sistema", "group_already_exist": "Il gruppo {group} esiste già", - "global_settings_setting_backup_compress_tar_archives": "Quando creo nuovi backup, usa un archivio (.tar.gz) al posto di un archivio non compresso (.tar). NB: abilitare quest'opzione significa create backup più leggeri, ma la procedura durerà di più e il carico CPU sarà maggiore.", "global_settings_setting_smtp_relay_password": "Password del relay SMTP", "global_settings_setting_smtp_relay_user": "User account del relay SMTP", "global_settings_setting_smtp_relay_port": "Porta del relay SMTP", - "global_settings_setting_smtp_relay_host": "Utilizza SMTP relay per inviare mail al posto di questa instanza yunohost. Utile se sei in una di queste situazioni: la tua porta 25 è bloccata dal tuo provider ISP o VPS; hai un IP residenziale listato su DUHL; non sei puoi configurare il DNS inverso; oppure questo server non è direttamente esposto a Internet e vuoi usarne un'altro per spedire email.", - "global_settings_setting_smtp_allow_ipv6": "Permetti l'utilizzo di IPv6 per ricevere e inviare mail", - "global_settings_setting_pop3_enabled": "Abilita il protocollo POP3 per il server mail", "dyndns_provider_unreachable": "Incapace di raggiungere il provider DynDNS {provider}: o il tuo YunoHost non è connesso ad internet o il server dynette è down.", "dpkg_lock_not_available": "Impossibile eseguire il comando in questo momento perché un altro programma sta bloccando dpkg (il package manager di sistema)", "domain_cannot_remove_main_add_new_one": "Non puoi rimuovere '{domain}' visto che è il dominio principale nonché il tuo unico dominio, devi prima aggiungere un altro dominio eseguendo 'yunohost domain add ', impostarlo come dominio principale con 'yunohost domain main-domain n ', e solo allora potrai rimuovere il dominio '{domain}' eseguendo 'yunohost domain remove {domain}'.'", @@ -574,20 +564,16 @@ "migration_ldap_backup_before_migration": "Sto generando il backup del database LDAP e delle impostazioni delle app prima di effettuare la migrazione.", "log_backup_create": "Crea un archivio backup", "global_settings_setting_ssowat_panel_overlay_enabled": "Abilita il pannello sovrapposto SSOwat", - "global_settings_setting_security_ssh_port": "Porta SSH", "diagnosis_sshd_config_inconsistent_details": "Esegui yunohost settings set security.ssh.port -v PORTA_SSH per definire la porta SSH, e controlla con yunohost tools regen-conf ssh --dry-run --with-diff, poi yunohost tools regen-conf ssh --force per resettare la tua configurazione con le raccomandazioni YunoHost.", "diagnosis_sshd_config_inconsistent": "Sembra che la porta SSH sia stata modificata manualmente in /etc/ssh/sshd_config: A partire da YunoHost 4.2, una nuova configurazione globale 'security.ssh.port' è disponibile per evitare di modificare manualmente la configurazione.", "diagnosis_sshd_config_insecure": "Sembra che la configurazione SSH sia stata modificata manualmente, ed non è sicuro dato che non contiene le direttive 'AllowGroups' o 'Allowusers' che limitano l'accesso agli utenti autorizzati.", "backup_create_size_estimation": "L'archivio conterrà circa {size} di dati.", "app_restore_script_failed": "C'è stato un errore all'interno dello script di recupero", - "global_settings_setting_security_webadmin_allowlist": "Indirizzi IP con il permesso di accedere al webadmin, separati da virgola.", - "global_settings_setting_security_webadmin_allowlist_enabled": "Permetti solo ad alcuni IP di accedere al webadmin.", "disk_space_not_sufficient_update": "Non c'è abbastanza spazio libero per aggiornare questa applicazione", "disk_space_not_sufficient_install": "Non c'è abbastanza spazio libero per installare questa applicazione", "app_config_unable_to_apply": "Applicazione dei valori nel pannello di configurazione non riuscita.", "app_config_unable_to_read": "Lettura dei valori nel pannello di configurazione non riuscita.", "diagnosis_apps_issue": "È stato rilevato un errore per l’app {app}", - "global_settings_setting_security_nginx_redirect_to_https": "Reindirizza richieste HTTP a HTTPs di default (NON DISABILITARE a meno che tu non sappia veramente bene cosa stai facendo!)", "diagnosis_http_special_use_tld": "Il dominio {domain} è basato su un dominio di primo livello (TLD) dall’uso speciale, come .local o .test, perciò non è previsto che sia esposto al di fuori della rete locale.", "domain_dns_conf_special_use_tld": "Questo dominio è basato su un dominio di primo livello (TLD) dall’uso speciale, come .local o .test, perciò non è previsto abbia reali record DNS.", "domain_dns_push_not_applicable": "La configurazione automatica del DNS non è applicabile al dominio {domain}. Dovresti configurare i tuoi record DNS manualmente, seguendo la documentazione su https://yunohost.org/dns_config.", @@ -615,7 +601,6 @@ "diagnosis_apps_allgood": "Tutte le applicazioni installate rispettano le pratiche di packaging di base", "config_apply_failed": "L’applicazione della nuova configurazione è fallita: {error}", "diagnosis_apps_outdated_ynh_requirement": "La versione installata di quest’app richiede esclusivamente YunoHost >= 2.x, che tendenzialmente significa che non è aggiornata secondo le pratiche di packaging raccomandate. Dovresti proprio considerare di aggiornarla.", - "global_settings_setting_security_experimental_enabled": "Abilita funzionalità di sicurezza sperimentali (non abilitare se non sai cosa stai facendo!)", "invalid_number_min": "Deve essere più grande di {min}", "invalid_number_max": "Deve essere meno di {max}", "log_app_config_set": "Applica la configurazione all’app '{}'", @@ -659,5 +644,19 @@ "user_import_bad_line": "Linea errata {line}: {details}", "config_validate_url": "È necessario inserire un URL web valido", "ldap_server_down": "Impossibile raggiungere il server LDAP", - "ldap_server_is_down_restart_it": "Il servizio LDAP è down, prova a riavviarlo…" + "ldap_server_is_down_restart_it": "Il servizio LDAP è down, prova a riavviarlo…", + "global_settings_setting_backup_compress_tar_archives_help": "Quando creo nuovi backup, usa un archivio (.tar.gz) al posto di un archivio non compresso (.tar). NB: abilitare quest'opzione significa create backup più leggeri, ma la procedura durerà di più e il carico CPU sarà maggiore.", + "global_settings_setting_security_experimental_enabled_help": "Abilita funzionalità di sicurezza sperimentali (non abilitare se non sai cosa stai facendo!)", + "global_settings_setting_nginx_compatibility_help": "Bilanciamento tra compatibilità e sicurezza per il server web NGIX. Riguarda gli algoritmi di cifratura (e altri aspetti legati alla sicurezza)", + "global_settings_setting_nginx_redirect_to_https_help": "Reindirizza richieste HTTP a HTTPs di default (NON DISABILITARE a meno che tu non sappia veramente bene cosa stai facendo!)", + "global_settings_setting_admin_strength": "Complessità della password di amministratore", + "global_settings_setting_user_strength": "Complessità della password utente", + "global_settings_setting_postfix_compatibility_help": "Bilanciamento tra compatibilità e sicurezza per il server Postfix. Riguarda gli algoritmi di cifratura (e altri aspetti legati alla sicurezza)", + "global_settings_setting_ssh_compatibility_help": "Bilanciamento tra compatibilità e sicurezza per il server SSH. Riguarda gli algoritmi di cifratura (e altri aspetti legati alla sicurezza)", + "global_settings_setting_ssh_port": "Porta SSH", + "global_settings_setting_webadmin_allowlist_help": "Indirizzi IP con il permesso di accedere al webadmin, separati da virgola.", + "global_settings_setting_webadmin_allowlist_enabled_help": "Permetti solo ad alcuni IP di accedere al webadmin.", + "global_settings_setting_ssh_allow_deprecated_dsa_hostkey_help": "Consenti l'uso del hostkey DSA (deprecato) per la configurazione del demone SSH", + "global_settings_setting_smtp_allow_ipv6_help": "Permetti l'utilizzo di IPv6 per ricevere e inviare mail", + "global_settings_setting_smtp_relay_enabled_help": "Utilizza SMTP relay per inviare mail al posto di questa instanza yunohost. Utile se sei in una di queste situazioni: la tua porta 25 è bloccata dal tuo provider ISP o VPS; hai un IP residenziale listato su DUHL; non sei puoi configurare il DNS inverso; oppure questo server non è direttamente esposto a Internet e vuoi usarne un'altro per spedire email." } \ No newline at end of file diff --git a/locales/kab.json b/locales/kab.json index 5daa7cef0..99edca7ad 100644 --- a/locales/kab.json +++ b/locales/kab.json @@ -11,4 +11,4 @@ "diagnosis_description_dnsrecords": "Ikalasen DNS", "diagnosis_description_web": "Réseau", "domain_created": "Taɣult tettwarna" -} +} \ No newline at end of file diff --git a/locales/nb_NO.json b/locales/nb_NO.json index e81d3af05..f6109e8bf 100644 --- a/locales/nb_NO.json +++ b/locales/nb_NO.json @@ -86,9 +86,7 @@ "dyndns_key_generating": "Oppretter DNS-nøkkel… Dette kan ta en stund.", "dyndns_no_domain_registered": "Inget domene registrert med DynDNS", "dyndns_registered": "DynDNS-domene registrert", - "global_settings_setting_security_password_admin_strength": "Admin-passordets styrke", "dyndns_registration_failed": "Kunne ikke registrere DynDNS-domene: {error}", - "global_settings_setting_security_password_user_strength": "Brukerpassordets styrke", "log_backup_restore_app": "Gjenopprett '{}' fra sikkerhetskopiarkiv", "log_remove_on_failed_install": "Fjern '{}' etter mislykket installasjon", "log_selfsigned_cert_install": "Installer selvsignert sertifikat på '{}'-domenet", @@ -115,5 +113,7 @@ "log_help_to_get_log": "For å vise loggen for operasjonen '{desc}', bruk kommandoen 'yunohost log show {name}'", "log_user_create": "Legg til '{}' bruker", "app_change_url_success": "{app} nettadressen er nå {domain}{path}", - "app_install_failed": "Kunne ikke installere {app}: {error}" + "app_install_failed": "Kunne ikke installere {app}: {error}", + "global_settings_setting_admin_strength": "Admin-passordets styrke", + "global_settings_setting_user_strength": "Brukerpassordets styrke" } \ No newline at end of file diff --git a/locales/oc.json b/locales/oc.json index a6afa32e6..857ab09cc 100644 --- a/locales/oc.json +++ b/locales/oc.json @@ -293,8 +293,6 @@ "backup_mount_archive_for_restore": "Preparacion de l’archiu per restauracion...", "dyndns_could_not_check_available": "Verificacion impossibla de la disponibilitat de {domain} sus {provider}.", "file_does_not_exist": "Lo camin {path} existís pas.", - "global_settings_setting_security_password_admin_strength": "Fòrça del senhal administrator", - "global_settings_setting_security_password_user_strength": "Fòrça del senhal utilizaire", "root_password_replaced_by_admin_password": "Lo senhal root es estat remplaçat pel senhal administrator.", "service_restarted": "Lo servici '{service}' es estat reaviat", "admin_password_too_long": "Causissètz un senhal d’almens 127 caractèrs", @@ -308,7 +306,6 @@ "log_regen_conf": "Regenerar las configuracions del sistèma « {} »", "service_reloaded_or_restarted": "Lo servici « {service} » es estat recargat o reaviat", "dpkg_is_broken": "Podètz pas far aquò pel moment perque dpkg/APT (los gestionaris de paquets del sistèma) sembla èsser mal configurat… Podètz ensajar de solucionar aquò en vos connectar via SSH e en executar « sudo dpkg --configure -a ».", - "global_settings_setting_service_ssh_allow_deprecated_dsa_hostkey": "Autorizar l’utilizacion de la clau òst DSA (obsolèta) per la configuracion del servici SSH", "hook_json_return_error": "Fracàs de la lectura del retorn de l’script {path}. Error : {msg}. Contengut brut : {raw_content}", "pattern_password_app": "O planhèm, los senhals devon pas conténer los caractèrs seguents : {forbidden_chars}", "regenconf_file_backed_up": "Lo fichièr de configuracion « {conf} » es estat salvagardat dins « {backup} »", @@ -325,9 +322,6 @@ "regenconf_dry_pending_applying": "Verificacion de la configuracion que seriá estada aplicada a la categoria « {category} »…", "regenconf_failed": "Regeneracion impossibla de la configuracion per la(s) categoria(s) : {categories}", "regenconf_pending_applying": "Aplicacion de la configuracion en espèra per la categoria « {category} »…", - "global_settings_setting_security_nginx_compatibility": "Solucion de compromés entre compatibilitat e seguretat pel servidor web NGINX Afècta los criptografs (e d’autres aspèctes ligats amb la seguretat)", - "global_settings_setting_security_ssh_compatibility": "Solucion de compromés entre compatibilitat e seguretat pel servidor SSH. Afècta los criptografs (e d’autres aspèctes ligats amb la seguretat)", - "global_settings_setting_security_postfix_compatibility": "Solucion de compromés entre compatibilitat e seguretat pel servidor Postfix. Afècta los criptografs (e d’autres aspèctes ligats amb la seguretat)", "service_reload_failed": "Impossible de recargar lo servici « {service} »\n\nJornal d’audit recent : {logs}", "service_restart_failed": "Impossible de reaviar lo servici « {service} »\n\nJornal d’audit recent : {logs}", "service_reload_or_restart_failed": "Impossible de recargar o reaviar lo servici « {service} »\n\nJornal d’audit recent : {logs}", @@ -453,7 +447,6 @@ "diagnosis_ip_broken_resolvconf": "La resolucion del nom de domeni sembla copada sul servidor, poiriá èsser ligada al fait que /etc/resolv.conf manda pas a 127.0.0.1.", "diagnosis_ip_weird_resolvconf": "La resolucion del nom de domeni sembla foncionar, mas sembla qu’utiilizatz un fichièr /etc/resolv.conf personalizat.", "diagnosis_diskusage_verylow": "Lo lòc d’emmagazinatge {mountpoint} (sul periferic {device}) a solament {free} ({free_percent}%). Deuriatz considerar de liberar un pauc d’espaci.", - "global_settings_setting_pop3_enabled": "Activar lo protocòl POP3 pel servidor de corrièr", "diagnosis_diskusage_ok": "Lo lòc d’emmagazinatge {mountpoint} (sul periferic {device}) a encara {free} ({free_percent}%) de liure !", "diagnosis_swap_none": "Lo sistèma a pas cap de memòria d’escambi. Auriatz de considerar d’ajustar almens {recommended} d’escambi per evitar las situacions ont lo sistèma manca de memòria.", "diagnosis_swap_notsomuch": "Lo sistèma a solament {total} de memòria d’escambi. Auriatz de considerar d’ajustar almens {recommended} d’escambi per evitar las situacions ont lo sistèma manca de memòria.", @@ -488,5 +481,11 @@ "diagnosis_domain_not_found_details": "Lo domeni {domain} existís pas a la basa de donadas WHOIS o a expirat !", "diagnosis_domain_expiration_not_found": "Impossible de verificar la data d’expiracion d’unes domenis", "backup_create_size_estimation": "L’archiu contendrà apr’aquí {size} de donadas.", - "app_restore_script_failed": "Una error s’es producha a l’interior del script de restauracion de l’aplicacion" + "app_restore_script_failed": "Una error s’es producha a l’interior del script de restauracion de l’aplicacion", + "global_settings_setting_nginx_compatibility_help": "Solucion de compromés entre compatibilitat e seguretat pel servidor web NGINX Afècta los criptografs (e d’autres aspèctes ligats amb la seguretat)", + "global_settings_setting_admin_strength": "Fòrça del senhal administrator", + "global_settings_setting_user_strength": "Fòrça del senhal utilizaire", + "global_settings_setting_postfix_compatibility_help": "Solucion de compromés entre compatibilitat e seguretat pel servidor Postfix. Afècta los criptografs (e d’autres aspèctes ligats amb la seguretat)", + "global_settings_setting_ssh_compatibility_help": "Solucion de compromés entre compatibilitat e seguretat pel servidor SSH. Afècta los criptografs (e d’autres aspèctes ligats amb la seguretat)", + "global_settings_setting_ssh_allow_deprecated_dsa_hostkey_help": "Autorizar l’utilizacion de la clau òst DSA (obsolèta) per la configuracion del servici SSH" } \ No newline at end of file diff --git a/locales/ru.json b/locales/ru.json index 1546c4d6e..b3042c82e 100644 --- a/locales/ru.json +++ b/locales/ru.json @@ -238,7 +238,6 @@ "regenconf_file_removed": "Файл конфигурации '{conf}' удален", "permission_not_found": "Разрешение '{permission}' не найдено", "group_cannot_edit_all_users": "Группа 'all_users' не может быть отредактирована вручную. Это специальная группа, предназначенная для всех пользователей, зарегистрированных в YunoHost", - "global_settings_setting_smtp_allow_ipv6": "Разрешить использование IPv6 для получения и отправки почты", "log_dyndns_subscribe": "Подписаться на субдомен YunoHost '{}'", "pattern_firstname": "Должно быть настоящее имя", "migrations_pending_cant_rerun": "Эти миграции еще не завершены, поэтому не могут быть запущены снова: {ids}", @@ -269,8 +268,6 @@ "group_cannot_be_deleted": "Группа {group} не может быть удалена вручную.", "log_app_config_set": "Примените конфигурацию приложения '{}'", "log_backup_restore_app": "Восстановление '{}' из резервной копии", - "global_settings_setting_security_webadmin_allowlist": "IP-адреса, разрешенные для доступа к веб-интерфейсу администратора. Разделенные запятыми.", - "global_settings_setting_security_webadmin_allowlist_enabled": "Разрешите доступ к веб-интерфейсу администратора только некоторым IP-адресам.", "log_domain_remove": "Удалить домен '{}' из конфигурации системы", "user_import_success": "Пользователи успешно импортированы", "group_user_already_in_group": "Пользователь {user} уже входит в группу {group}", @@ -284,7 +281,6 @@ "diagnosis_sshd_config_inconsistent_details": "Пожалуйста, выполните yunohost settings set security.ssh.port -v YOUR_SSH_PORT, чтобы определить порт SSH, и проверьте yunohost tools regen-conf ssh --dry-run --with-diff и yunohost tools regen-conf ssh --force, чтобы сбросить ваш conf в соответствии с рекомендациями YunoHost.", "log_domain_main_domain": "Сделать '{}' основным доменом", "diagnosis_sshd_config_insecure": "Похоже, что конфигурация SSH была изменена вручную, и она небезопасна, поскольку не содержит директив 'AllowGroups' или 'AllowUsers' для ограничения доступа авторизованных пользователей.", - "global_settings_setting_security_ssh_port": "SSH порт", "group_already_exist_on_system": "Группа {group} уже существует в системных группах", "group_already_exist_on_system_but_removing_it": "Группа {group} уже существует в системных группах, но YunoHost удалит ее...", "group_unknown": "Группа '{group}' неизвестна", @@ -303,7 +299,6 @@ "regenconf_failed": "Не удалось восстановить конфигурацию для категории(й): {categories}", "diagnosis_services_conf_broken": "Конфигурация нарушена для службы {service}!", "diagnosis_sshd_config_inconsistent": "Похоже, что порт SSH был вручную изменен в /etc/ssh/sshd_config. Начиная с версии YunoHost 4.2, доступен новый глобальный параметр 'security.ssh.port', позволяющий избежать ручного редактирования конфигурации.", - "global_settings_setting_service_ssh_allow_deprecated_dsa_hostkey": "Разрешить использование (устаревшего) ключа хоста DSA для конфигурации демона SSH", "hook_exec_not_terminated": "Скрипт не завершился должным образом: {path}", "ip6tables_unavailable": "Вы не можете играть с ip6tables здесь. Либо Вы находитесь в контейнере, либо ваше ядро это не поддерживает", "iptables_unavailable": "Вы не можете играть с ip6tables здесь. Либо Вы находитесь в контейнере, либо ваше ядро это не поддерживает", @@ -334,5 +329,10 @@ "log_app_remove": "Удалите приложение '{}'", "not_enough_disk_space": "Недостаточно свободного места в '{путь}'", "pattern_email_forward": "Должен быть корректный адрес электронной почты, символ '+' допустим (например, someone+tag@example.com)", - "permission_deletion_failed": "Не удалось удалить разрешение '{permission}': {error}" -} + "permission_deletion_failed": "Не удалось удалить разрешение '{permission}': {error}", + "global_settings_setting_ssh_port": "SSH порт", + "global_settings_setting_webadmin_allowlist_help": "IP-адреса, разрешенные для доступа к веб-интерфейсу администратора. Разделенные запятыми.", + "global_settings_setting_webadmin_allowlist_enabled_help": "Разрешите доступ к веб-интерфейсу администратора только некоторым IP-адресам.", + "global_settings_setting_ssh_allow_deprecated_dsa_hostkey_help": "Разрешить использование (устаревшего) ключа хоста DSA для конфигурации демона SSH", + "global_settings_setting_smtp_allow_ipv6_help": "Разрешить использование IPv6 для получения и отправки почты" +} \ No newline at end of file diff --git a/locales/sk.json b/locales/sk.json index ac9d565bc..a681d84e3 100644 --- a/locales/sk.json +++ b/locales/sk.json @@ -212,4 +212,4 @@ "diagnosis_http_could_not_diagnose_details": "Chyba: {error}", "diagnosis_http_hairpinning_issue": "Zdá sa, že Vaša miestna sieť nemá zapnutý NAT hairpinning.", "diagnosis_high_number_auth_failures": "V poslednom čase bol zistený neobvykle vysoký počet neúspešných prihlásení. Uistite sa, či je služba fail2ban spustená a správne nastavená alebo použite vlastný port pre SSH ako je popísané na https://yunohost.org/security." -} +} \ No newline at end of file diff --git a/locales/te.json b/locales/te.json index fa6ac91c8..0f7621dd7 100644 --- a/locales/te.json +++ b/locales/te.json @@ -15,4 +15,4 @@ "app_action_cannot_be_ran_because_required_services_down": "ఈ చర్యను అమలు చేయడానికి ఈ అవసరమైన సేవలు అమలు చేయబడాలి: {services}. కొనసాగడం కొరకు వాటిని పునఃప్రారంభించడానికి ప్రయత్నించండి (మరియు అవి ఎందుకు పనిచేయడం లేదో పరిశోధించవచ్చు).", "app_argument_choice_invalid": "ఆర్గ్యుమెంట్ '{name}' కొరకు చెల్లుబాటు అయ్యే వైల్యూ ఎంచుకోండి: '{value}' అనేది లభ్యం అవుతున్న ఎంపికల్లో ({Choices}) లేదు", "app_argument_password_no_default": "పాస్వర్డ్ ఆర్గ్యుమెంట్ '{name}'ని పార్సింగ్ చేసేటప్పుడు దోషం: భద్రతా కారణం కొరకు పాస్వర్డ్ ఆర్గ్యుమెంట్ డిఫాల్ట్ విలువను కలిగి ఉండరాదు" -} +} \ No newline at end of file diff --git a/locales/uk.json b/locales/uk.json index 9a32a597b..8c5022e3a 100644 --- a/locales/uk.json +++ b/locales/uk.json @@ -241,24 +241,11 @@ "good_practices_about_user_password": "Зараз ви збираєтеся поставити новий пароль користувача. Пароль повинен складатися не менше ніж з 8 символів, але хорошою практикою є використання більш довгого пароля (тобто гасла) і/або використання різних символів (великих, малих, цифр і спеціальних символів).", "good_practices_about_admin_password": "Зараз ви збираєтеся поставити новий пароль адміністрації. Пароль повинен складатися не менше ніж з 8 символів, але хорошою практикою є використання більш довгого пароля (тобто парольного гасла) і/або використання різних символів (великих, малих, цифр і спеціальних символів).", "global_settings_unknown_type": "Несподівана ситуація, налаштування {setting} має тип {unknown_type}, але це не тип, підтримуваний системою.", - "global_settings_setting_backup_compress_tar_archives": "При створенні нових резервних копій стискати архіви (.tar.gz) замість нестислих архівів (.tar). NB: вмикання цієї опції означає створення легших архівів резервних копій, але початкова процедура резервного копіювання буде значно довшою і важчою для CPU.", - "global_settings_setting_security_webadmin_allowlist": "IP-адреси, яким дозволений доступ до вебадміністрації. Через кому.", - "global_settings_setting_security_webadmin_allowlist_enabled": "Дозволити доступ до вебадміністрації тільки деяким IP-адресам.", "global_settings_setting_smtp_relay_password": "Пароль хоста SMTP-ретрансляції", "global_settings_setting_smtp_relay_user": "Обліковий запис користувача SMTP-ретрансляції", "global_settings_setting_smtp_relay_port": "Порт SMTP-ретрансляції", - "global_settings_setting_smtp_relay_host": "Хост SMTP-ретрансляції, який буде використовуватися для надсилання е-пошти замість цього зразка Yunohost. Корисно, якщо ви знаходитеся в одній із цих ситуацій: ваш 25 порт заблокований вашим провайдером або VPS провайдером, у вас є житловий IP в списку DUHL, ви не можете налаштувати зворотний DNS або цей сервер не доступний безпосередньо в Інтернеті і ви хочете використовувати інший сервер для відправки електронних листів.", - "global_settings_setting_smtp_allow_ipv6": "Дозволити використання IPv6 для отримання і надсилання листів е-пошти", "global_settings_setting_ssowat_panel_overlay_enabled": "Увімкнути накладення панелі SSOwat", - "global_settings_setting_service_ssh_allow_deprecated_dsa_hostkey": "Дозволити використання (застарілого) ключа DSA для конфігурації демона SSH", "global_settings_unknown_setting_from_settings_file": "Невідомий ключ в налаштуваннях: '{setting_key}', відхиліть його і збережіть у /etc/yunohost/settings-unknown.json", - "global_settings_setting_security_ssh_port": "SSH-порт", - "global_settings_setting_security_postfix_compatibility": "Компроміс між сумісністю і безпекою для сервера Postfix. Впливає на шифри (і інші аспекти, пов'язані з безпекою)", - "global_settings_setting_security_ssh_compatibility": "Компроміс між сумісністю і безпекою для SSH-сервера. Впливає на шифри (і інші аспекти, пов'язані з безпекою)", - "global_settings_setting_security_password_user_strength": "Надійність пароля користувача", - "global_settings_setting_security_password_admin_strength": "Надійність пароля адміністратора", - "global_settings_setting_security_nginx_compatibility": "Компроміс між сумісністю і безпекою для вебсервера NGINX. Впливає на шифри (і інші аспекти, пов'язані з безпекою)", - "global_settings_setting_pop3_enabled": "Увімкніть протокол POP3 для поштового сервера", "global_settings_reset_success": "Попередні налаштування тепер збережені в {path}", "global_settings_key_doesnt_exists": "Ключ '{settings_key}' не існує в глобальних налаштуваннях, ви можете побачити всі доступні ключі, виконавши команду 'yunohost settings list'", "global_settings_cant_write_settings": "Неможливо зберегти файл налаштувань, причина: {reason}", @@ -598,7 +585,6 @@ "log_user_import": "Імпорт користувачів", "ldap_server_is_down_restart_it": "Службу LDAP вимкнено, спробуйте перезапустити її...", "ldap_server_down": "Не вдається під'єднатися до сервера LDAP", - "global_settings_setting_security_experimental_enabled": "Увімкнути експериментальні функції безпеки (не вмикайте це, якщо ви не знаєте, що робите!)", "diagnosis_apps_deprecated_practices": "Установлена версія цього застосунку все ще використовує деякі надзастарілі практики упакування. Вам дійсно варто подумати про його оновлення.", "diagnosis_apps_outdated_ynh_requirement": "Установлена версія цього застосунку вимагає лише Yunohost >= 2.x, що, як правило, вказує на те, що воно не відповідає сучасним рекомендаційним практикам упакування та порадникам. Вам дійсно варто подумати про його оновлення.", "diagnosis_apps_bad_quality": "Цей застосунок наразі позначено як зламаний у каталозі застосунків YunoHost. Це може бути тимчасовою проблемою, поки організатори намагаються вирішити цю проблему. Тим часом оновлення цього застосунку вимкнено.", @@ -607,7 +593,6 @@ "diagnosis_apps_issue": "Виявлено проблему із застосунком {app}", "diagnosis_apps_allgood": "Усі встановлені застосунки дотримуються основних способів упакування", "diagnosis_high_number_auth_failures": "Останнім часом сталася підозріло велика кількість помилок автентифікації. Ви можете переконатися, що fail2ban працює і правильно налаштований, або скористатися власним портом для SSH, як описано в https://yunohost.org/security.", - "global_settings_setting_security_nginx_redirect_to_https": "Типово переспрямовувати HTTP-запити до HTTP (НЕ ВИМИКАЙТЕ, якщо ви дійсно не знаєте, що робите!)", "app_config_unable_to_apply": "Не вдалося застосувати значення панелі конфігурації.", "app_config_unable_to_read": "Не вдалося розпізнати значення панелі конфігурації.", "config_apply_failed": "Не вдалося застосувати нову конфігурацію: {error}", @@ -675,7 +660,6 @@ "migration_0021_system_not_fully_up_to_date": "Ваша система не повністю оновлена. Будь ласка, виконайте регулярне оновлення перед запуском міграції на Bullseye.", "migration_0021_general_warning": "Будь ласка, зверніть увагу, що ця міграція є делікатною операцією. Команда YunoHost зробила все можливе, щоб перевірити і протестувати її, але міграція все ще може порушити частину системи або її застосунків.\n\nТому рекомендовано:\n - Виконати резервне копіювання всіх важливих даних або застосунків. Подробиці на сайті https://yunohost.org/backup; \n - Наберіться терпіння після запуску міграції: В залежності від вашого з'єднання з Інтернетом і апаратного забезпечення, оновлення може зайняти до декількох годин.", "migration_description_0021_migrate_to_bullseye": "Оновлення системи до Debian Bullseye і YunoHost 11.x", - "global_settings_setting_security_ssh_password_authentication": "Дозволити автентифікацію паролем для SSH", "service_description_postgresql": "Зберігає дані застосунків (база даних SQL)", "domain_config_default_app": "Типовий застосунок", "migration_0023_postgresql_13_not_installed": "PostgreSQL 11 встановлено, але не PostgreSQL 13!? У вашій системі могло статися щось неприємне :(...", @@ -684,5 +668,20 @@ "tools_upgrade_failed": "Не вдалося оновити наступні пакети: {packages_list}", "migration_0023_not_enough_space": "Звільніть достатньо місця в {path} для виконання міграції.", "migration_0023_postgresql_11_not_installed": "PostgreSQL не було встановлено у вашій системі. Нічого робити.", - "migration_description_0022_php73_to_php74_pools": "Перенесення конфігураційних файлів php7.3-fpm 'pool' на php7.4" + "migration_description_0022_php73_to_php74_pools": "Перенесення конфігураційних файлів php7.3-fpm 'pool' на php7.4", + "global_settings_setting_backup_compress_tar_archives_help": "При створенні нових резервних копій стискати архіви (.tar.gz) замість нестислих архівів (.tar). NB: вмикання цієї опції означає створення легших архівів резервних копій, але початкова процедура резервного копіювання буде значно довшою і важчою для CPU.", + "global_settings_setting_security_experimental_enabled_help": "Увімкнути експериментальні функції безпеки (не вмикайте це, якщо ви не знаєте, що робите!)", + "global_settings_setting_nginx_compatibility_help": "Компроміс між сумісністю і безпекою для вебсервера NGINX. Впливає на шифри (і інші аспекти, пов'язані з безпекою)", + "global_settings_setting_nginx_redirect_to_https_help": "Типово переспрямовувати HTTP-запити до HTTP (НЕ ВИМИКАЙТЕ, якщо ви дійсно не знаєте, що робите!)", + "global_settings_setting_admin_strength": "Надійність пароля адміністратора", + "global_settings_setting_user_strength": "Надійність пароля користувача", + "global_settings_setting_postfix_compatibility_help": "Компроміс між сумісністю і безпекою для сервера Postfix. Впливає на шифри (і інші аспекти, пов'язані з безпекою)", + "global_settings_setting_ssh_compatibility_help": "Компроміс між сумісністю і безпекою для SSH-сервера. Впливає на шифри (і інші аспекти, пов'язані з безпекою)", + "global_settings_setting_ssh_password_authentication_help": "Дозволити автентифікацію паролем для SSH", + "global_settings_setting_ssh_port": "SSH-порт", + "global_settings_setting_webadmin_allowlist_help": "IP-адреси, яким дозволений доступ до вебадміністрації. Через кому.", + "global_settings_setting_webadmin_allowlist_enabled_help": "Дозволити доступ до вебадміністрації тільки деяким IP-адресам.", + "global_settings_setting_ssh_allow_deprecated_dsa_hostkey_help": "Дозволити використання (застарілого) ключа DSA для конфігурації демона SSH", + "global_settings_setting_smtp_allow_ipv6_help": "Дозволити використання IPv6 для отримання і надсилання листів е-пошти", + "global_settings_setting_smtp_relay_enabled_help": "Хост SMTP-ретрансляції, який буде використовуватися для надсилання е-пошти замість цього зразка Yunohost. Корисно, якщо ви знаходитеся в одній із цих ситуацій: ваш 25 порт заблокований вашим провайдером або VPS провайдером, у вас є житловий IP в списку DUHL, ви не можете налаштувати зворотний DNS або цей сервер не доступний безпосередньо в Інтернеті і ви хочете використовувати інший сервер для відправки електронних листів." } \ No newline at end of file diff --git a/locales/zh_Hans.json b/locales/zh_Hans.json index 2daf45483..e27a7473c 100644 --- a/locales/zh_Hans.json +++ b/locales/zh_Hans.json @@ -300,21 +300,11 @@ "group_already_exist": "群组{group}已经存在", "good_practices_about_admin_password": "现在，您将设置一个新的管理员密码。 密码至少应包含8个字符。并且出于安全考虑建议使用较长的密码同时尽可能使用各种字符（大写，小写，数字和特殊字符）。", "global_settings_unknown_type": "意外的情况，设置{setting}似乎具有类型 {unknown_type} ，但是系统不支持该类型。", - "global_settings_setting_backup_compress_tar_archives": "创建新备份时，请压缩档案(.tar.gz) ，而不要压缩未压缩的档案(.tar)。注意：启用此选项意味着创建较小的备份存档，但是初始备份过程将明显更长且占用大量CPU。", "global_settings_setting_smtp_relay_password": "SMTP中继主机密码", "global_settings_setting_smtp_relay_user": "SMTP中继用户帐户", "global_settings_setting_smtp_relay_port": "SMTP中继端口", - "global_settings_setting_smtp_allow_ipv6": "允许使用IPv6接收和发送邮件", "global_settings_setting_ssowat_panel_overlay_enabled": "启用SSOwat面板覆盖", - "global_settings_setting_service_ssh_allow_deprecated_dsa_hostkey": "允许使用DSA主机密钥进行SSH守护程序配置（不建议使用）", "global_settings_unknown_setting_from_settings_file": "设置中的未知密钥:'{setting_key}'，将其丢弃并保存在/etc/yunohost/settings-unknown.json中", - "global_settings_setting_security_ssh_port": "SSH端口", - "global_settings_setting_security_postfix_compatibility": "Postfix服务器的兼容性与安全性的权衡。影响密码（以及其他与安全性有关的方面）", - "global_settings_setting_security_ssh_compatibility": "SSH服务器的兼容性与安全性的权衡。影响密码（以及其他与安全性有关的方面）", - "global_settings_setting_security_password_user_strength": "用户密码强度", - "global_settings_setting_security_password_admin_strength": "管理员密码强度", - "global_settings_setting_security_nginx_compatibility": "Web服务器NGINX的兼容性与安全性的权衡，影响密码（以及其他与安全性有关的方面）", - "global_settings_setting_pop3_enabled": "为邮件服务器启用POP3协议", "global_settings_reset_success": "以前的设置现在已经备份到{path}", "global_settings_key_doesnt_exists": "全局设置中不存在键'{settings_key}'，您可以通过运行 'yunohost settings list'来查看所有可用键", "global_settings_cant_write_settings": "无法保存设置文件，原因: {reason}", @@ -455,7 +445,6 @@ "regenconf_up_to_date": "类别'{category}'的配置已经是最新的", "regenconf_file_kept_back": "配置文件'{conf}'预计将被regen-conf（类别{category}）删除，但被保留了下来。", "good_practices_about_user_password": "现在，您将设置一个新的管理员密码。 密码至少应包含8个字符。并且出于安全考虑建议使用较长的密码同时尽可能使用各种字符（大写，小写，数字和特殊字符）", - "global_settings_setting_smtp_relay_host": "使用SMTP中继主机来代替这个YunoHost实例发送邮件。如果你有以下情况，就很有用:你的25端口被你的ISP或VPS提供商封锁，你有一个住宅IP列在DUHL上，你不能配置反向DNS，或者这个服务器没有直接暴露在互联网上，你想使用其他服务器来发送邮件。", "domain_cannot_remove_main_add_new_one": "你不能删除'{domain}'，因为它是主域和你唯一的域，你需要先用'yunohost domain add '添加另一个域，然后用'yunohost domain main-domain -n '设置为主域，然后你可以用'yunohost domain remove {domain}'删除域", "domain_cannot_add_xmpp_upload": "你不能添加以'xmpp-upload.'开头的域名。这种名称是为YunoHost中集成的XMPP上传功能保留的。", "domain_cannot_remove_main": "你不能删除'{domain}'，因为它是主域，你首先需要用'yunohost domain main-domain -n '设置另一个域作为主域；这里是候选域的列表: {other_domains}", @@ -604,5 +593,15 @@ "diagnosis_apps_allgood": "所有已安装的应用程序都遵守基本的打包原则", "diagnosis_apps_deprecated_practices": "此应用程序的安装 版本仍然使用一些超旧的弃用打包原则。推荐您升级它。", "diagnosis_apps_issue": "发现应用{ app } 存在问题", - "diagnosis_description_apps": "应用" + "diagnosis_description_apps": "应用", + "global_settings_setting_backup_compress_tar_archives_help": "创建新备份时，请压缩档案(.tar.gz) ，而不要压缩未压缩的档案(.tar)。注意：启用此选项意味着创建较小的备份存档，但是初始备份过程将明显更长且占用大量CPU。", + "global_settings_setting_nginx_compatibility_help": "Web服务器NGINX的兼容性与安全性的权衡，影响密码（以及其他与安全性有关的方面）", + "global_settings_setting_admin_strength": "管理员密码强度", + "global_settings_setting_user_strength": "用户密码强度", + "global_settings_setting_postfix_compatibility_help": "Postfix服务器的兼容性与安全性的权衡。影响密码（以及其他与安全性有关的方面）", + "global_settings_setting_ssh_compatibility_help": "SSH服务器的兼容性与安全性的权衡。影响密码（以及其他与安全性有关的方面）", + "global_settings_setting_ssh_port": "SSH端口", + "global_settings_setting_ssh_allow_deprecated_dsa_hostkey_help": "允许使用DSA主机密钥进行SSH守护程序配置（不建议使用）", + "global_settings_setting_smtp_allow_ipv6_help": "允许使用IPv6接收和发送邮件", + "global_settings_setting_smtp_relay_enabled_help": "使用SMTP中继主机来代替这个YunoHost实例发送邮件。如果你有以下情况，就很有用:你的25端口被你的ISP或VPS提供商封锁，你有一个住宅IP列在DUHL上，你不能配置反向DNS，或者这个服务器没有直接暴露在互联网上，你想使用其他服务器来发送邮件。" } \ No newline at end of file From 0ed05e221a4e6b04a8152818cfca7c1643edca82 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Sat, 6 Aug 2022 12:37:12 +0200 Subject: [PATCH 73/89] i18n: fix weird phrasing for fr translation... --- locales/fr.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/locales/fr.json b/locales/fr.json index a158d8767..a5ee23720 100644 --- a/locales/fr.json +++ b/locales/fr.json @@ -671,12 +671,12 @@ "migration_0023_postgresql_11_not_installed": "PostgreSQL n'a pas été installé sur votre système. Il n'y a rien à faire.", "global_settings_setting_backup_compress_tar_archives_help": "Lors de la création de nouvelles sauvegardes, compresser automatiquement les archives (.tar.gz) au lieu des archives non compressées (.tar). N.B. : activer cette option permet de créer des archives plus légères, mais la procédure de sauvegarde initiale sera significativement plus longues et plus gourmandes en CPU.", "global_settings_setting_security_experimental_enabled_help": "Activer les fonctionnalités de sécurité expérimentales (ne l'activez pas si vous ne savez pas ce que vous faites !)", - "global_settings_setting_nginx_compatibility_help": "Compatibilité versus compromis sécuritaire pour le serveur web Nginx. Affecte les cryptogrammes (et d'autres aspects liés à la sécurité)", + "global_settings_setting_nginx_compatibility_help": "Compromis 'compatibilité versus sécurité' pour le serveur web Nginx. Affecte les cryptogrammes utilisés (et d'autres aspects liés à la sécurité)", "global_settings_setting_nginx_redirect_to_https_help": "Rediriger les requêtes HTTP vers HTTPS par défaut (NE PAS DÉSACTIVER à moins de savoir vraiment ce que vous faites !)", "global_settings_setting_admin_strength": "Qualité du mot de passe administrateur", "global_settings_setting_user_strength": "Qualité du mot de passe de l'utilisateur", - "global_settings_setting_postfix_compatibility_help": "Compatibilité versus compromis sécuritaire pour le serveur Postfix. Affecte les cryptogrammes (et d'autres aspects liés à la sécurité)", - "global_settings_setting_ssh_compatibility_help": "Compatibilité versus compromis sécuritaire pour le serveur SSH. Affecte les cryptogrammes (et d'autres aspects liés à la sécurité)", + "global_settings_setting_postfix_compatibility_help": "Compromis 'compatibilité versus sécurité' pour le serveur Postfix. Affecte les cryptogrammes utilisés (et d'autres aspects liés à la sécurité)", + "global_settings_setting_ssh_compatibility_help": "Compromis 'compatibilité versus sécurité' pour le serveur SSH. Affecte les cryptogrammes utilisés (et d'autres aspects liés à la sécurité)", "global_settings_setting_ssh_password_authentication_help": "Autoriser l'authentification par mot de passe pour SSH", "global_settings_setting_ssh_port": "Port SSH", "global_settings_setting_webadmin_allowlist_help": "Adresses IP autorisées à accéder à la webadmin. Elles doivent être séparées par une virgule.", @@ -684,4 +684,4 @@ "global_settings_setting_ssh_allow_deprecated_dsa_hostkey_help": "Autoriser l'utilisation de la clé hôte DSA (obsolète) pour la configuration du service SSH", "global_settings_setting_smtp_allow_ipv6_help": "Autoriser l'utilisation d'IPv6 pour recevoir et envoyer du courrier", "global_settings_setting_smtp_relay_enabled_help": "Un relais SMTP permet d'envoyer du courrier à la place de cette instance YunoHost. Cela est utile si vous êtes dans l'une de ces situations : le port 25 est bloqué par votre FAI ou par votre fournisseur VPS, vous avez une IP résidentielle répertoriée sur DUHL, vous ne pouvez pas configurer de reverse DNS ou le serveur n'est pas directement accessible depuis Internet et que vous voulez en utiliser un autre pour envoyer des mails." -} \ No newline at end of file +} From 133d8b60c1955a0da54efd8fd9353bf9f8931519 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Sat, 6 Aug 2022 13:03:28 +0200 Subject: [PATCH 74/89] global settings: misc naming/ui/ux/i18n improvements --- hooks/conf_regen/15-nginx | 2 +- locales/en.json | 10 +++++----- locales/fr.json | 5 +++-- share/config_global.toml | 11 ++++++----- src/utils/legacy.py | 2 +- 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/hooks/conf_regen/15-nginx b/hooks/conf_regen/15-nginx index 482784d8d..fe5154cb9 100755 --- a/hooks/conf_regen/15-nginx +++ b/hooks/conf_regen/15-nginx @@ -56,7 +56,7 @@ do_pre_regen() { # install / update plain conf files cp plain/* "$nginx_conf_dir" # remove the panel overlay if this is specified in settings - panel_overlay=$(yunohost settings get 'misc.ssowat.ssowat_panel_overlay_enabled') + panel_overlay=$(yunohost settings get 'misc.portal.ssowat_panel_overlay_enabled') if [ "$panel_overlay" == "false" ] || [ "$panel_overlay" == "False" ]; then echo "#" >"${nginx_conf_dir}/yunohost_panel.conf.inc" fi diff --git a/locales/en.json b/locales/en.json index 6cfab9109..1180415ad 100644 --- a/locales/en.json +++ b/locales/en.json @@ -386,10 +386,10 @@ "global_settings_setting_smtp_allow_ipv6_help": "Allow the use of IPv6 to receive and send mail", "global_settings_setting_smtp_relay_enabled": "Enable SMTP relay", "global_settings_setting_smtp_relay_enabled_help": "Enable the SMTP relay to use in order to send mail instead of this yunohost instance. Useful if you are in one of this situation: your 25 port is blocked by your ISP or VPS provider, you have a residential IP listed on DUHL, you are not able to configure reverse DNS or this server is not directly exposed on the internet and you want use an other one to send mails.", - "global_settings_setting_smtp_relay_host": "Relay host", - "global_settings_setting_smtp_relay_password": "Relay password", - "global_settings_setting_smtp_relay_port": "Relay port", - "global_settings_setting_smtp_relay_user": "Relay user", + "global_settings_setting_smtp_relay_host": "SMTP relay host", + "global_settings_setting_smtp_relay_password": "SMTP relay password", + "global_settings_setting_smtp_relay_port": "SMTP relay port", + "global_settings_setting_smtp_relay_user": "SMTP relay user", "global_settings_setting_ssh_allow_deprecated_dsa_hostkey": "Allow DSA hostkey", "global_settings_setting_ssh_allow_deprecated_dsa_hostkey_help": "Allow the use of (deprecated) DSA hostkey for the SSH daemon configuration", "global_settings_setting_ssh_compatibility": "SSH Compatibility", @@ -397,7 +397,7 @@ "global_settings_setting_ssh_password_authentication": "Password authentication", "global_settings_setting_ssh_password_authentication_help": "Allow password authentication for SSH", "global_settings_setting_ssh_port": "SSH port", - "global_settings_setting_ssowat_panel_overlay_enabled": "SSOwat panel overlay", + "global_settings_setting_ssowat_panel_overlay_enabled": "Enable the small 'YunoHost' portal shortcut square on apps", "global_settings_setting_user_strength": "User password strength", "global_settings_setting_user_strength_help": "These requirements are only enforced when defining the password", "global_settings_setting_webadmin_allowlist": "Webadmin IP allowlist", diff --git a/locales/fr.json b/locales/fr.json index a5ee23720..fd807c8a5 100644 --- a/locales/fr.json +++ b/locales/fr.json @@ -535,12 +535,13 @@ "app_manifest_install_ask_password": "Choisissez un mot de passe administrateur pour cette application", "app_manifest_install_ask_path": "Choisissez le chemin d'URL (après le domaine) où cette application doit être installée", "app_manifest_install_ask_domain": "Choisissez le domaine sur lequel vous souhaitez installer cette application", + "global_settings_setting_smtp_relay_host": "Adresse du relais SMTP", "global_settings_setting_smtp_relay_user": "Compte utilisateur du relais SMTP", "global_settings_setting_smtp_relay_port": "Port du relais SMTP", "diagnosis_package_installed_from_sury_details": "Certains paquets ont été installés par inadvertance à partir d'un dépôt tiers appelé Sury. L'équipe YunoHost a amélioré la stratégie de gestion de ces paquets, mais on s'attend à ce que certaines configurations qui ont installé des applications PHP7.3 tout en étant toujours sur Stretch présentent des incohérences. Pour résoudre cette situation, vous devez essayer d'exécuter la commande suivante : {cmd_to_fix}", "app_argument_password_no_default": "Erreur lors de l'analyse de l'argument de mot de passe '{name}' : l'argument de mot de passe ne peut pas avoir de valeur par défaut pour des raisons de sécurité", "pattern_email_forward": "L'adresse électronique doit être valide, le symbole '+' étant accepté (par exemple : johndoe+yunohost@exemple.com)", - "global_settings_setting_smtp_relay_password": "Mot de passe du relais de l'hôte SMTP", + "global_settings_setting_smtp_relay_password": "Mot de passe du relais SMTP", "diagnosis_package_installed_from_sury": "Des paquets du système devraient être rétrogradé de version", "additional_urls_already_added": "URL supplémentaire '{url}' déjà ajoutée pour la permission '{permission}'", "unknown_main_domain_path": "Domaine ou chemin inconnu pour '{app}'. Vous devez spécifier un domaine et un chemin pour pouvoir spécifier une URL pour l'autorisation.", @@ -562,7 +563,7 @@ "app_restore_script_failed": "Une erreur s'est produite dans le script de restauration de l'application", "restore_backup_too_old": "Cette sauvegarde ne peut pas être restaurée car elle provient d'une version de YunoHost trop ancienne.", "log_backup_create": "Création d'une archive de sauvegarde", - "global_settings_setting_ssowat_panel_overlay_enabled": "Activer la superposition de la vignette SSOwat", + "global_settings_setting_ssowat_panel_overlay_enabled": "Activer la vignette 'YunoHost' (raccourci vers le portail) sur les apps", "migration_ldap_rollback_success": "Système rétabli dans son état initial.", "permission_cant_add_to_all_users": "L'autorisation {permission} ne peut pas être ajoutée à tous les utilisateurs.", "migration_ldap_migration_failed_trying_to_rollback": "Impossible de migrer... tentative de restauration du système.", diff --git a/share/config_global.toml b/share/config_global.toml index 775f02cdf..49a674627 100644 --- a/share/config_global.toml +++ b/share/config_global.toml @@ -43,7 +43,7 @@ name = "Security" default = false [security.nginx] - name = "NGINX" + name = "NGINX (web server)" [security.nginx.nginx_redirect_to_https] type = "boolean" default = true @@ -55,7 +55,7 @@ name = "Security" default = "intermediate" [security.postfix] - name = "Postfix" + name = "Postfix (SMTP email server)" [security.postfix.postfix_compatibility] type = "select" choices.intermediate = "Intermediate (allows TLS 1.2)" @@ -121,12 +121,13 @@ name = "Email" default = "" optional = true visible="smtp_relay_enabled" + help = "" # This is empty string on purpose, otherwise the core automatically set the 'good_practice_admin_password' string here which is not relevant, because the admin is not actually "choosing" the password ... [misc] name = "Other" - [misc.ssowat] - name = "SSOwat" - [misc.ssowat.ssowat_panel_overlay_enabled] + [misc.portal] + name = "User portal" + [misc.portal.ssowat_panel_overlay_enabled] type = "boolean" default = true diff --git a/src/utils/legacy.py b/src/utils/legacy.py index 4742318cb..1ef3c1023 100644 --- a/src/utils/legacy.py +++ b/src/utils/legacy.py @@ -79,7 +79,7 @@ LEGACY_SETTINGS = { "smtp.relay.user": "email.smtp.smtp_relay_user", "smtp.relay.password": "email.smtp.smtp_relay_password", "backup.compress_tar_archives": "misc.backup.backup_compress_tar_archives", - "ssowat.panel_overlay.enabled": "misc.ssowat.ssowat_panel_overlay_enabled", + "ssowat.panel_overlay.enabled": "misc.portal.ssowat_panel_overlay_enabled", "security.webadmin.allowlist.enabled": "security.webadmin.webadmin_allowlist_enabled", "security.webadmin.allowlist": "security.webadmin.webadmin_allowlist", "security.experimental.enabled": "security.experimental.security_experimental_enabled" From 66901e4f73e784c612742c8cec86e31e1586ab37 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Sat, 6 Aug 2022 13:05:54 +0200 Subject: [PATCH 75/89] global settings: drop the support old DSA hostkey support --- hooks/conf_regen/03-ssh | 5 ----- locales/en.json | 2 -- share/config_global.toml | 4 ---- src/utils/legacy.py | 1 - 4 files changed, 12 deletions(-) diff --git a/hooks/conf_regen/03-ssh b/hooks/conf_regen/03-ssh index eb548d4f4..832e07015 100755 --- a/hooks/conf_regen/03-ssh +++ b/hooks/conf_regen/03-ssh @@ -14,11 +14,6 @@ do_pre_regen() { ssh_keys=$(ls /etc/ssh/ssh_host_{ed25519,rsa,ecdsa}_key 2>/dev/null || true) - # Support legacy setting (this setting might be disabled by a user during a migration) - if [[ "$(yunohost settings get 'security.ssh.ssh_allow_deprecated_dsa_hostkey')" == "True" ]]; then - ssh_keys="$ssh_keys $(ls /etc/ssh/ssh_host_dsa_key 2>/dev/null || true)" - fi - # Support different strategy for security configurations export compatibility="$(yunohost settings get 'security.ssh.ssh_compatibility')" export port="$(yunohost settings get 'security.ssh.ssh_port')" diff --git a/locales/en.json b/locales/en.json index 1180415ad..dd0361424 100644 --- a/locales/en.json +++ b/locales/en.json @@ -390,8 +390,6 @@ "global_settings_setting_smtp_relay_password": "SMTP relay password", "global_settings_setting_smtp_relay_port": "SMTP relay port", "global_settings_setting_smtp_relay_user": "SMTP relay user", - "global_settings_setting_ssh_allow_deprecated_dsa_hostkey": "Allow DSA hostkey", - "global_settings_setting_ssh_allow_deprecated_dsa_hostkey_help": "Allow the use of (deprecated) DSA hostkey for the SSH daemon configuration", "global_settings_setting_ssh_compatibility": "SSH Compatibility", "global_settings_setting_ssh_compatibility_help": "Compatibility vs. security tradeoff for the SSH server. Affects the ciphers (and other security-related aspects). See https://infosec.mozilla.org/guidelines/openssh for more info.", "global_settings_setting_ssh_password_authentication": "Password authentication", diff --git a/share/config_global.toml b/share/config_global.toml index 49a674627..f64ef65a7 100644 --- a/share/config_global.toml +++ b/share/config_global.toml @@ -38,10 +38,6 @@ name = "Security" type = "boolean" default = true - [security.ssh.ssh_allow_deprecated_dsa_hostkey] - type = "boolean" - default = false - [security.nginx] name = "NGINX (web server)" [security.nginx.nginx_redirect_to_https] diff --git a/src/utils/legacy.py b/src/utils/legacy.py index 1ef3c1023..df6c10025 100644 --- a/src/utils/legacy.py +++ b/src/utils/legacy.py @@ -68,7 +68,6 @@ LEGACY_SETTINGS = { "security.ssh.compatibility": "security.ssh.ssh_compatibility", "security.ssh.port": "security.ssh.ssh_port", "security.ssh.password_authentication": "security.ssh.ssh_password_authentication", - "service.ssh.allow_deprecated_dsa_hostkey": "security.ssh.ssh_allow_deprecated_dsa_hostkey", "security.nginx.redirect_to_https": "security.nginx.nginx_redirect_to_https", "security.nginx.compatibility": "security.nginx.nginx_compatibility", "security.postfix.compatibility": "security.postfix.postfix_compatibility", From 324c03e6ae95457eeccdc7abf1a889394a2ec513 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Tue, 9 Aug 2022 16:41:20 +0200 Subject: [PATCH 76/89] Move setting migration to 0025 instead of 0024 because of the new python venv migration --- locales/en.json | 2 +- ...to_configpanel.py => 0025_global_settings_to_configpanel.py} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename src/migrations/{0024_global_settings_to_configpanel.py => 0025_global_settings_to_configpanel.py} (100%) diff --git a/locales/en.json b/locales/en.json index 7ba471995..6755771aa 100644 --- a/locales/en.json +++ b/locales/en.json @@ -521,8 +521,8 @@ "migration_description_0021_migrate_to_bullseye": "Upgrade the system to Debian Bullseye and YunoHost 11.x", "migration_description_0022_php73_to_php74_pools": "Migrate php7.3-fpm 'pool' conf files to php7.4", "migration_description_0023_postgresql_11_to_13": "Migrate databases from PostgreSQL 11 to 13", - "migration_description_0024_global_settings_to_configpanel": "Migrate legacy global settings nomenclature to the new, modern nomenclature", "migration_description_0024_rebuild_python_venv": "Repair python app after bullseye migration", + "migration_description_0025_global_settings_to_configpanel": "Migrate legacy global settings nomenclature to the new, modern nomenclature", "migration_ldap_backup_before_migration": "Creating a backup of LDAP database and apps settings prior to the actual migration.", "migration_ldap_can_not_backup_before_migration": "The backup of the system could not be completed before the migration failed. Error: {error}", "migration_ldap_migration_failed_trying_to_rollback": "Could not migrate... trying to roll back the system.", diff --git a/src/migrations/0024_global_settings_to_configpanel.py b/src/migrations/0025_global_settings_to_configpanel.py similarity index 100% rename from src/migrations/0024_global_settings_to_configpanel.py rename to src/migrations/0025_global_settings_to_configpanel.py From f4cb20f081a1e6cbec23d3770e9ef654a92e50c2 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Thu, 1 Sep 2022 16:19:38 +0200 Subject: [PATCH 77/89] manifestv2: try to fix a bunch of tests --- src/tests/test_apps.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/tests/test_apps.py b/src/tests/test_apps.py index 4661e54b2..4853817f9 100644 --- a/src/tests/test_apps.py +++ b/src/tests/test_apps.py @@ -220,7 +220,7 @@ def test_legacy_app_manifest_preinstall(): assert "integration" in m assert "install" in m assert m.get("doc") == {} - assert m.get("notifications") == {} + assert m.get["notifications"] == {"pre_install": {}, "pre_upgrade": {}, "post_install": {}, "post_upgrade": {}} def test_manifestv2_app_manifest_preinstall(): @@ -231,11 +231,11 @@ def test_manifestv2_app_manifest_preinstall(): assert "install" in m assert "description" in m assert "doc" in m - assert "This is a dummy description of this app features" in m["doc"]["DESCRIPTION"]["en"] - assert "Ceci est une fausse description des fonctionalités de l'app" in m["doc"]["DESCRIPTION"]["fr"] + assert "This is a dummy description of this app features" in m["doc"]["DESCRIPTION"]["main"]["en"] + assert "Ceci est une fausse description des fonctionalités de l'app" in m["doc"]["DESCRIPTION"]["main"]["fr"] assert "notifications" in m - assert "This is a dummy disclaimer to display prior to the install" in m["notifications"]["pre_install"]["en"] - assert "Ceci est un faux disclaimer à présenter avant l'installation" in m["notifications"]["pre_install"]["fr"] + assert "This is a dummy disclaimer to display prior to the install" in m["notifications"]["pre_install"]["main"]["en"] + assert "Ceci est un faux disclaimer à présenter avant l'installation" in m["notifications"]["pre_install"]["main"]["fr"] def test_manifestv2_app_install_main_domain(): @@ -278,6 +278,8 @@ def test_manifestv2_app_info_postinstall(): def test_manifestv2_app_info_preupgrade(monkeypatch): + manifest = app_manifest(os.path.join(get_test_apps_dir(), "manifestv2_app_ynh")) + from yunohost.app_catalog import _load_apps_catalog as original_load_apps_catalog def custom_load_apps_catalog(*args, **kwargs): @@ -287,7 +289,7 @@ def test_manifestv2_app_info_preupgrade(monkeypatch): "level": 10, "lastUpdate": 999999999, "maintained": True, - "manifest": app_manifest(os.path.join(get_test_apps_dir(), "manifestv2_app_ynh")), + "manifest": manifest, } res["apps"]["manifestv2_app"]["manifest"]["version"] = "99999~ynh1" From 4faeabefa2f415afeaf95fbd6341a2f3f3b441ca Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Thu, 1 Sep 2022 21:51:48 +0200 Subject: [PATCH 78/89] manifestv2: moar test fixes --- helpers/utils | 2 +- src/tests/test_apps.py | 13 +++++++------ src/utils/resources.py | 7 ++++--- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/helpers/utils b/helpers/utils index 1b6e3cd50..7741ee02b 100644 --- a/helpers/utils +++ b/helpers/utils @@ -926,7 +926,7 @@ ynh_compare_current_package_version() { _ynh_apply_default_permissions() { local target=$1 - local ynh_requirement=$(ynh_read_manifest --key=".requirements.yunohost") + local ynh_requirement=$(ynh_read_manifest --manifest_key="requirements.yunohost") if dpkg --compare-versions ${YNH_APP_PACKAGING_FORMAT:-0} ge 2 || [ -z "$ynh_requirement" ] || [ "$ynh_requirement" == "null" ] || dpkg --compare-versions $ynh_requirement ge 4.2; then chmod o-rwx $target diff --git a/src/tests/test_apps.py b/src/tests/test_apps.py index 4853817f9..20a47b5d7 100644 --- a/src/tests/test_apps.py +++ b/src/tests/test_apps.py @@ -219,8 +219,8 @@ def test_legacy_app_manifest_preinstall(): assert "description" in m assert "integration" in m assert "install" in m - assert m.get("doc") == {} - assert m.get["notifications"] == {"pre_install": {}, "pre_upgrade": {}, "post_install": {}, "post_upgrade": {}} + assert m["doc"] == {} + assert m["notifications"] == {"pre_install": {}, "pre_upgrade": {}, "post_install": {}, "post_upgrade": {}} def test_manifestv2_app_manifest_preinstall(): @@ -271,9 +271,9 @@ def test_manifestv2_app_info_postinstall(): assert "The app install dir is /var/www/manifestv2_app" in m["doc"]["ADMIN"]["en"] assert "Le dossier d'install de l'app est /var/www/manifestv2_app" in m["doc"]["ADMIN"]["fr"] assert "notifications" in m - assert "The app install dir is /var/www/manifestv2_app" in m["notifications"]["post_install"]["en"] - assert "The app id is manifestv2_app" in m["notifications"]["post_install"]["en"] - assert f"The app url is {main_domain}/manifestv2" in m["notifications"]["post_install"]["en"] + assert "The app install dir is /var/www/manifestv2_app" in m["notifications"]["post_install"]["main"]["en"] + assert "The app id is manifestv2_app" in m["notifications"]["post_install"]["main"]["en"] + assert f"The app url is {main_domain}/manifestv2" in m["notifications"]["post_install"]["main"]["en"] def test_manifestv2_app_info_preupgrade(monkeypatch): @@ -290,6 +290,7 @@ def test_manifestv2_app_info_preupgrade(monkeypatch): "lastUpdate": 999999999, "maintained": True, "manifest": manifest, + "state": "working", } res["apps"]["manifestv2_app"]["manifest"]["version"] = "99999~ynh1" @@ -306,7 +307,7 @@ def test_manifestv2_app_info_preupgrade(monkeypatch): # does provide the notifications, which means the list builder script # should parse the files in the original app repo, possibly with proper i18n etc assert "This is a dummy disclaimer to display prior to any upgrade" \ - in i["from_catalog"]["manifest"]["notifications"]["pre_upgrade"] + in i["from_catalog"]["manifest"]["notifications"]["pre_upgrade"]["main"]["en"] def test_app_from_catalog(): main_domain = _get_maindomain() diff --git a/src/utils/resources.py b/src/utils/resources.py index 46f2eba33..f93543cb2 100644 --- a/src/utils/resources.py +++ b/src/utils/resources.py @@ -615,9 +615,10 @@ class PortsResource(AppResource): # Automigrate from legacy setting foobar_port (instead of port_foobar) legacy_setting_name = "{name}_port" port_value = self.get_setting(legacy_setting_name) - self.set_setting(setting_name, port_value) - self.delete_setting(legacy_setting_name) - continue + if port_value: + self.set_setting(setting_name, port_value) + self.delete_setting(legacy_setting_name) + continue if not port_value: port_value = infos["default"] From e9190a6bd6f9f1fe3d55306fb798539e5f4b2989 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Thu, 1 Sep 2022 23:55:16 +0200 Subject: [PATCH 79/89] manifestv2: moar test fixes --- src/tests/test_apps.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tests/test_apps.py b/src/tests/test_apps.py index 20a47b5d7..e62680824 100644 --- a/src/tests/test_apps.py +++ b/src/tests/test_apps.py @@ -231,8 +231,8 @@ def test_manifestv2_app_manifest_preinstall(): assert "install" in m assert "description" in m assert "doc" in m - assert "This is a dummy description of this app features" in m["doc"]["DESCRIPTION"]["main"]["en"] - assert "Ceci est une fausse description des fonctionalités de l'app" in m["doc"]["DESCRIPTION"]["main"]["fr"] + assert "This is a dummy description of this app features" in m["doc"]["DESCRIPTION"]["en"] + assert "Ceci est une fausse description des fonctionalités de l'app" in m["doc"]["DESCRIPTION"]["fr"] assert "notifications" in m assert "This is a dummy disclaimer to display prior to the install" in m["notifications"]["pre_install"]["main"]["en"] assert "Ceci est un faux disclaimer à présenter avant l'installation" in m["notifications"]["pre_install"]["main"]["fr"] From 0610a1808b12b218651cf9e1b7faf3431882d568 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 2 Sep 2022 00:20:44 +0200 Subject: [PATCH 80/89] =?UTF-8?q?manifestv2:=20attempt=20to=20fix=20mypy?= =?UTF-8?q?=20errors=20=C3=A9=5F=C3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/resources.py | 14 ++++++++++++-- src/utils/system.py | 5 +++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/utils/resources.py b/src/utils/resources.py index f93543cb2..9edad2970 100644 --- a/src/utils/resources.py +++ b/src/utils/resources.py @@ -22,7 +22,8 @@ import os import copy import shutil import random -from typing import Dict, Any +from typing import Optional, Dict, List, Union, Any, Mapping, Callable, no_type_check + from moulinette.utils.process import check_output from moulinette.utils.log import getActionLogger @@ -123,6 +124,8 @@ class AppResourceManager: class AppResource: + default_properties: Dict[str, Any] = None + def __init__(self, properties: Dict[str, Any], app: str, manager=None): self.app = app @@ -199,7 +202,7 @@ class PermissionsResource(AppResource): default_properties = { } - default_perm_properties = { + default_perm_properties: Dict[str, Any] = { "url": None, "additional_urls": [], "auth_header": True, @@ -208,6 +211,8 @@ class PermissionsResource(AppResource): "protected": False, } + permissions: Dict[str, Dict[str, Any]] = {} + def __init__(self, properties: Dict[str, Any], *args, **kwargs): # FIXME : if url != None, we should check that there's indeed a domain/path defined ? ie that app is a webapp @@ -362,6 +367,7 @@ class SystemuserAppResource(AppResource): # fi # +@no_type_check class InstalldirAppResource(AppResource): """ is_provisioned -> setting install_dir exists + /dir/ exists @@ -427,6 +433,7 @@ class InstalldirAppResource(AppResource): # FIXME : in fact we should delete settings to be consistent +@no_type_check class DatadirAppResource(AppResource): """ is_provisioned -> setting data_dir exists + /dir/ exists @@ -510,6 +517,7 @@ class DatadirAppResource(AppResource): # return # +@no_type_check class AptDependenciesAppResource(AppResource): """ is_provisioned -> package __APP__-ynh-deps exists (ideally should check the Depends: but hmgn) @@ -583,6 +591,8 @@ class PortsResource(AppResource): "fixed": False, # FIXME: implement logic. Corresponding to wether or not the port is "fixed" or any random port is ok } + ports: Dict[str, Dict[str, Any]] + def __init__(self, properties: Dict[str, Any], *args, **kwargs): if "main" not in properties: diff --git a/src/utils/system.py b/src/utils/system.py index 2aaf0fa35..fe6d2d01b 100644 --- a/src/utils/system.py +++ b/src/utils/system.py @@ -21,6 +21,7 @@ import re import os import logging +from typing import Union from moulinette.utils.process import check_output from yunohost.utils.error import YunohostError @@ -74,11 +75,11 @@ def human_to_binary(size: str) -> int: raise YunohostError(f"Invalid size suffix '{suffix}', expected one of {symbols}") try: - size = float(size) + size_ = float(size) except Exception: raise YunohostError(f"Failed to convert size {size} to float") - return size * factor[suffix] + return int(size_ * factor[suffix]) def binary_to_human(n: int) -> str: From 564c2de8153f2f7dbdbd3668e0898ddc83a178cc Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 2 Sep 2022 20:34:41 +0200 Subject: [PATCH 81/89] manifestv2: moar attempts to fix mypy errors --- src/utils/resources.py | 39 ++++++++++++++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/src/utils/resources.py b/src/utils/resources.py index 9edad2970..05499c9b7 100644 --- a/src/utils/resources.py +++ b/src/utils/resources.py @@ -22,8 +22,7 @@ import os import copy import shutil import random -from typing import Optional, Dict, List, Union, Any, Mapping, Callable, no_type_check - +from typing import Optional, Dict, List, Union, Any, Mapping, Callable from moulinette.utils.process import check_output from moulinette.utils.log import getActionLogger @@ -124,6 +123,7 @@ class AppResourceManager: class AppResource: + type: str = "" default_properties: Dict[str, Any] = None def __init__(self, properties: Dict[str, Any], app: str, manager=None): @@ -318,6 +318,9 @@ class SystemuserAppResource(AppResource): "allow_sftp": False } + allow_ssh: bool = False + allow_sftp: bool = False + def provision_or_update(self, context: Dict={}): # FIXME : validate that no yunohost user exists with that name? @@ -367,7 +370,6 @@ class SystemuserAppResource(AppResource): # fi # -@no_type_check class InstalldirAppResource(AppResource): """ is_provisioned -> setting install_dir exists + /dir/ exists @@ -393,10 +395,18 @@ class InstalldirAppResource(AppResource): "group": "__APP__:rx", } + dir: str = "" + owner: str = "" + group: str = "" + # FIXME: change default dir to /opt/stuff if app ain't a webapp ... def provision_or_update(self, context: Dict={}): + assert self.dir.strip() # Be paranoid about self.dir being empty... + assert self.owner.strip() + assert self.group.strip() + current_install_dir = self.get_setting("install_dir") or self.get_setting("final_path") # If during install, /var/www/$app already exists, assume that it's okay to remove and recreate it @@ -427,13 +437,17 @@ class InstalldirAppResource(AppResource): self.delete_setting("final_path") # Legacy def deprovision(self, context: Dict={}): + + assert self.dir.strip() # Be paranoid about self.dir being empty... + assert self.owner.strip() + assert self.group.strip() + # FIXME : check that self.dir has a sensible value to prevent catastrophes if os.path.isdir(self.dir): rm(self.dir, recursive=True) # FIXME : in fact we should delete settings to be consistent -@no_type_check class DatadirAppResource(AppResource): """ is_provisioned -> setting data_dir exists + /dir/ exists @@ -459,8 +473,16 @@ class DatadirAppResource(AppResource): "group": "__APP__:rx", } + dir: str = "" + owner: str = "" + group: str = "" + def provision_or_update(self, context: Dict={}): + assert self.dir.strip() # Be paranoid about self.dir being empty... + assert self.owner.strip() + assert self.group.strip() + current_data_dir = self.get_setting("data_dir") if not os.path.isdir(self.dir): @@ -482,6 +504,11 @@ class DatadirAppResource(AppResource): self.set_setting("data_dir", self.dir) def deprovision(self, context: Dict={}): + + assert self.dir.strip() # Be paranoid about self.dir being empty... + assert self.owner.strip() + assert self.group.strip() + # FIXME: This should rm the datadir only if purge is enabled pass #if os.path.isdir(self.dir): @@ -517,7 +544,6 @@ class DatadirAppResource(AppResource): # return # -@no_type_check class AptDependenciesAppResource(AppResource): """ is_provisioned -> package __APP__-ynh-deps exists (ideally should check the Depends: but hmgn) @@ -542,6 +568,9 @@ class AptDependenciesAppResource(AppResource): "extras": {} } + packages: List = [] + extras: Dict[str: Any] = {} + def __init__(self, properties: Dict[str, Any], *args, **kwargs): for key, values in properties.get("extras", {}).items(): From 7bd5857b3cf38ea507e0e1d7f8a989dad068d8f2 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 2 Sep 2022 21:01:39 +0200 Subject: [PATCH 82/89] manifestv2: fix some FIXME, add some others @_@ --- src/utils/resources.py | 43 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 8 deletions(-) diff --git a/src/utils/resources.py b/src/utils/resources.py index 05499c9b7..3db999c84 100644 --- a/src/utils/resources.py +++ b/src/utils/resources.py @@ -39,6 +39,9 @@ logger = getActionLogger("yunohost.app_resources") class AppResourceManager: + # FIXME : add some sort of documentation mechanism + # to create a have a detailed description of each resource behavior + def __init__(self, app: str, current: Dict, wanted: Dict): self.app = app @@ -156,6 +159,7 @@ class AppResource: def _run_script(self, action, script, env={}, user="root"): from yunohost.app import _make_tmp_workdir_for_app, _make_environment_for_app_script + from yunohost.hook import hook_exec_with_script_debug_if_failure tmpdir = _make_tmp_workdir_for_app(app=self.app) @@ -172,10 +176,29 @@ ynh_abort_if_errors write_to_file(script_path, script) - #print(env_) - - # FIXME : use the hook_exec_with_debug_instructions_stuff - ret, _ = hook_exec(script_path, env=env_) + from yunohost.log import OperationLogger + operation_logger = OperationLogger._instances[-1], # FIXME : this is an ugly hack :( + try: + ( + call_failed, + failure_message_with_debug_instructions, + ) = hook_exec_with_script_debug_if_failure( + script_path + env=env_, + operation_logger=operation_logger, + error_message_if_script_failed="An error occured inside the script snippet", + error_message_if_failed=lambda e: f"{action} failed for {self.type} : {e}" + ) + finally: + if call_failed: + raise YunohostError( + failure_message_with_debug_instructions, raw_msg=True + ) + else: + # FIXME: currently in app install code, we have + # more sophisticated code checking if this broke something on the system etc ... + # dunno if we want to do this here or manage it elsewhere + pass #print(ret) @@ -327,9 +350,10 @@ class SystemuserAppResource(AppResource): # and/or that no system user exists during install ? if not check_output(f"getent passwd {self.app} &>/dev/null || true").strip(): - # FIXME: improve error handling ? + # FIXME: improve logging ? os.system wont log stdout / stderr cmd = f"useradd --system --user-group {self.app}" - os.system(cmd) + ret = os.system(cmd) + assert ret == 0, f"useradd command failed with exit code {ret}" if not check_output(f"getent passwd {self.app} &>/dev/null || true").strip(): raise YunohostError(f"Failed to create system user for {self.app}", raw_msg=True) @@ -390,7 +414,7 @@ class InstalldirAppResource(AppResource): priority = 30 default_properties = { - "dir": "/var/www/__APP__", # FIXME or choose to move this elsewhere nowadays idk... + "dir": "/var/www/__APP__", "owner": "__APP__:rx", "group": "__APP__:rx", } @@ -417,7 +441,10 @@ class InstalldirAppResource(AppResource): if not os.path.isdir(self.dir): # Handle case where install location changed, in which case we shall move the existing install dir # FIXME: confirm that's what we wanna do + # Maybe a middle ground could be to compute the size, check that it's not too crazy (eg > 1G idk), + # and check for available space on the destination if current_install_dir and os.path.isdir(current_install_dir): + logger.warning(f"Moving {current_install_dir} to {self.dir} ... (this may take a while)") shutil.move(current_install_dir, self.dir) else: mkdir(self.dir) @@ -468,7 +495,7 @@ class DatadirAppResource(AppResource): priority = 40 default_properties = { - "dir": "/home/yunohost.app/__APP__", # FIXME or choose to move this elsewhere nowadays idk... + "dir": "/home/yunohost.app/__APP__", "owner": "__APP__:rx", "group": "__APP__:rx", } From ebe41411adc0ea23c79c663f12b02223064b0030 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 2 Sep 2022 21:03:25 +0200 Subject: [PATCH 83/89] Unused imports --- src/utils/resources.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/resources.py b/src/utils/resources.py index 3db999c84..22b1177f0 100644 --- a/src/utils/resources.py +++ b/src/utils/resources.py @@ -22,7 +22,7 @@ import os import copy import shutil import random -from typing import Optional, Dict, List, Union, Any, Mapping, Callable +from typing import Dict, Any from moulinette.utils.process import check_output from moulinette.utils.log import getActionLogger From 28d0b6d891197076382fc87b2f9f0232ca230f9e Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 2 Sep 2022 21:04:00 +0200 Subject: [PATCH 84/89] Unused imports --- src/utils/system.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/utils/system.py b/src/utils/system.py index fe6d2d01b..7e1d8746e 100644 --- a/src/utils/system.py +++ b/src/utils/system.py @@ -21,7 +21,6 @@ import re import os import logging -from typing import Union from moulinette.utils.process import check_output from yunohost.utils.error import YunohostError From 74e745a291d651c2ea965a15931da7e875c3490c Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 2 Sep 2022 21:44:00 +0200 Subject: [PATCH 85/89] Stupid typo >_> --- src/utils/resources.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/resources.py b/src/utils/resources.py index 22b1177f0..a7685083a 100644 --- a/src/utils/resources.py +++ b/src/utils/resources.py @@ -183,7 +183,7 @@ ynh_abort_if_errors call_failed, failure_message_with_debug_instructions, ) = hook_exec_with_script_debug_if_failure( - script_path + script_path, env=env_, operation_logger=operation_logger, error_message_if_script_failed="An error occured inside the script snippet", From 487ef303d86fa8543b1c0c4ea66739a45b2097b0 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Sat, 3 Sep 2022 01:04:05 +0200 Subject: [PATCH 86/89] Typo again ugh --- src/utils/resources.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/resources.py b/src/utils/resources.py index a7685083a..73284b5be 100644 --- a/src/utils/resources.py +++ b/src/utils/resources.py @@ -22,7 +22,7 @@ import os import copy import shutil import random -from typing import Dict, Any +from typing import Dict, Any, List from moulinette.utils.process import check_output from moulinette.utils.log import getActionLogger From f6970ba4034739cfd5c5a7d5584b0e392e03d08d Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Sat, 3 Sep 2022 01:04:29 +0200 Subject: [PATCH 87/89] manifestv2: Add doc about each resource type + script to create doc file --- doc/generate_resource_doc.py | 12 ++ src/utils/resources.py | 312 ++++++++++++++++++++++++----------- 2 files changed, 224 insertions(+), 100 deletions(-) create mode 100644 doc/generate_resource_doc.py diff --git a/doc/generate_resource_doc.py b/doc/generate_resource_doc.py new file mode 100644 index 000000000..1e16a76d9 --- /dev/null +++ b/doc/generate_resource_doc.py @@ -0,0 +1,12 @@ +from yunohost.utils.resources import AppResourceClassesByType + +resources = sorted(AppResourceClassesByType.values(), key=lambda r: r.priority) + +for klass in resources: + + doc = klass.__doc__.replace("\n ", "\n") + + print("") + print(f"## {klass.type.replace('_', ' ').title()}") + print("") + print(doc) diff --git a/src/utils/resources.py b/src/utils/resources.py index 73284b5be..4bda6589f 100644 --- a/src/utils/resources.py +++ b/src/utils/resources.py @@ -205,22 +205,49 @@ ynh_abort_if_errors class PermissionsResource(AppResource): """ - is_provisioned -> main perm exists - is_available -> perm urls do not conflict + Configure the SSO permissions/tiles. Typically, webapps are expected to have a 'main' permission mapped to '/', meaning that a tile pointing to the `$domain/$path` will be available in the SSO for users allowed to access that app. - update -> refresh/update values for url/additional_urls/show_tile/auth/protected/... create new perms / delete any perm not listed - provision -> same as update? + Additional permissions can be created, typically to have a specific tile and/or access rules for the admin part of a webapp. - deprovision -> delete permissions + The list of allowed user/groups may be initialized using the content of the `init_{perm}_permission` question from the manifest, hence `init_main_permission` replaces the `is_public` question and shall contain a group name (typically, `all_users` or `visitors`). - deep_clean -> delete permissions for any __APP__.foobar where app not in app list... + ##### Example: + ```toml + [resources.permissions] + main.url = "/" + # (these two previous lines should be enough in the majority of cases) - backup -> handled elsewhere by the core, should be integrated in there (dump .ldif/yml?) - restore -> handled by the core, should be integrated in there (restore .ldif/yml?) + admin.url = "/admin" + admin.show_tile = false + admin.allowed = "admins" # Assuming the "admins" group exists (cf future developments ;)) + ``` + + ##### Properties (for each perm name): + - `url`: The relative URI corresponding to this permission. Typically `/` or `/something`. This property may be omitted for non-web permissions. + - `show_tile`: (default: `true` if `url` is defined) Wether or not a tile should be displayed for that permission in the user portal + - `allowed`: (default: nobody) The group initially allowed to access this perm, if `init_{perm}_permission` is not defined in the manifest questions. Note that the admin may tweak who is allowed/unallowed on that permission later on, this is only meant to **initialize** the permission. + - `auth_header`: (default: `true`) Define for the URL of this permission, if SSOwat pass the authentication header to the application. Default is true + - `protected`: (default: `false`) Define if this permission is protected. If it is protected the administrator won't be able to add or remove the visitors group of this permission. Defaults to 'false'. + - `additional_urls`: (default: none) List of additional URL for which access will be allowed/forbidden + + ##### Provision/Update: + - Delete any permissions that may exist and be related to this app yet is not declared anymore + - Loop over the declared permissions and create them if needed or update them with the new values (FIXME : update ain't implemented yet >_>) + + ##### Deprovision: + - Delete all permission related to this app + + ##### Legacy management: + - Legacy `is_public` setting will be deleted if it exists """ + # Notes for future ? + # deep_clean -> delete permissions for any __APP__.foobar where app not in app list... + # backup -> handled elsewhere by the core, should be integrated in there (dump .ldif/yml?) + # restore -> handled by the core, should be integrated in there (restore .ldif/yml?) + type = "permissions" - priority = 10 + priority = 80 default_properties = { } @@ -319,20 +346,33 @@ class PermissionsResource(AppResource): class SystemuserAppResource(AppResource): """ - is_provisioned -> user __APP__ exists - is_available -> user and group __APP__ doesn't exists + Provision a system user to be used by the app. The username is exactly equal to the app id - provision -> create user - update -> update values for home / shell / groups + ##### Example: + ```toml + [resources.system_user] + # (empty - defaults are usually okay) + ``` - deprovision -> delete user + ##### Properties: + - `allow_ssh`: (default: False) Adds the user to the ssh.app group, allowing SSH connection via this user + - `allow_sftp`: (defalt: False) Adds the user to the sftp.app group, allowing SFTP connection via this user - deep_clean -> uuuuh ? delete any user that could correspond to an app x_x ? + ##### Provision/Update: + - will create the system user if it doesn't exists yet + - will add/remove the ssh/sftp.app groups - backup -> nothing - restore -> provision + ##### Deprovision: + - deletes the user and group """ + # Notes for future? + # + # deep_clean -> uuuuh ? delete any user that could correspond to an app x_x ? + # + # backup -> nothing + # restore -> provision + type = "system_user" priority = 20 @@ -341,6 +381,9 @@ class SystemuserAppResource(AppResource): "allow_sftp": False } + # FIXME : wat do regarding ssl-cert, multimedia + # FIXME : wat do about home dir + allow_ssh: bool = False allow_sftp: bool = False @@ -362,8 +405,13 @@ class SystemuserAppResource(AppResource): if self.allow_ssh: groups.add("ssh.app") + elif "ssh.app" in groups: + groups.remove("ssh.app") + if self.allow_sftp: groups.add("sftp.app") + elif "sftp.app" in groups: + groups.remove("sftp.app") os.system(f"usermod -G {','.join(groups)} {self.app}") @@ -382,34 +430,42 @@ class SystemuserAppResource(AppResource): # FIXME : better logging and error handling, add stdout/stderr from the deluser/delgroup commands... -# # Check if the user exists on the system -#if os.system(f"getent passwd {self.username} &>/dev/null") != 0: -# if ynh_system_user_exists "$username"; then -# deluser $username -# fi -# # Check if the group exists on the system -#if os.system(f"getent group {self.username} &>/dev/null") != 0: -# if ynh_system_group_exists "$username"; then -# delgroup $username -# fi -# - class InstalldirAppResource(AppResource): """ - is_provisioned -> setting install_dir exists + /dir/ exists - is_available -> /dir/ doesn't exists + Creates a directory to be used by the app as the installation directory, typically where the app sources and assets are located. The corresponding path is stored in the settings as `install_dir` - provision -> create setting + create dir - update -> update perms ? + ##### Example: + ```toml + [resources.install_dir] + # (empty - defaults are usually okay) + ``` - deprovision -> delete dir + delete setting + ##### Properties: + - `dir`: (default: `/var/www/__APP__`) The full path of the install dir + - `owner`: (default: `__APP__:rx`) The owner (and owner permissions) for the install dir + - `group`: (default: `__APP__:rx`) The group (and group permissions) for the install dir - deep_clean -> uuuuh ? delete any dir in /var/www/ that would not correspond to an app x_x ? + ##### Provision/Update: + - during install, the folder will be deleted if it already exists (FIXME: is this what we want?) + - if the dir path changed and a folder exists at the old location, the folder will be `mv`'ed to the new location + - otherwise, creates the directory if it doesn't exists yet + - (re-)apply permissions (only on the folder itself, not recursively) + - save the value of `dir` as `install_dir` in the app's settings, which can be then used by the app scripts (`$install_dir`) and conf templates (`__INSTALL_DIR__`) + + ##### Deprovision: + - recursively deletes the directory if it exists + + ##### Legacy management: + - In the past, the setting was called `final_path`. The code will automatically rename it as `install_dir`. + - As explained in the 'Provision/Update' section, the folder will also be moved if the location changed - backup -> cp install dir - restore -> cp install dir """ + # Notes for future? + # deep_clean -> uuuuh ? delete any dir in /var/www/ that would not correspond to an app x_x ? + # backup -> cp install dir + # restore -> cp install dir + type = "install_dir" priority = 30 @@ -477,20 +533,41 @@ class InstalldirAppResource(AppResource): class DatadirAppResource(AppResource): """ - is_provisioned -> setting data_dir exists + /dir/ exists - is_available -> /dir/ doesn't exists + Creates a directory to be used by the app as the data store directory, typically where the app multimedia or large assets added by users are located. The corresponding path is stored in the settings as `data_dir`. This resource behaves very similarly to install_dir. - provision -> create setting + create dir - update -> update perms ? + ##### Example: + ```toml + [resources.data_dir] + # (empty - defaults are usually okay) + ``` - deprovision -> (only if purge enabled...) delete dir + delete setting + ##### Properties: + - `dir`: (default: `/home/yunohost.app/__APP__`) The full path of the data dir + - `owner`: (default: `__APP__:rx`) The owner (and owner permissions) for the data dir + - `group`: (default: `__APP__:rx`) The group (and group permissions) for the data dir - deep_clean -> zblerg idk nothing + ##### Provision/Update: + - if the dir path changed and a folder exists at the old location, the folder will be `mv`'ed to the new location + - otherwise, creates the directory if it doesn't exists yet + - (re-)apply permissions (only on the folder itself, not recursively) + - save the value of `dir` as `data_dir` in the app's settings, which can be then used by the app scripts (`$data_dir`) and conf templates (`__DATA_DIR__`) + + ##### Deprovision: + - recursively deletes the directory if it exists + - FIXME: this should only be done if the PURGE option is set + - FIXME: this should also delete the corresponding setting + + ##### Legacy management: + - In the past, the setting may have been called `datadir`. The code will automatically rename it as `data_dir`. + - As explained in the 'Provision/Update' section, the folder will also be moved if the location changed - backup -> cp data dir ? (if not backup_core_only) - restore -> cp data dir ? (if in backup) """ + # notes for future ? + # deep_clean -> zblerg idk nothing + # backup -> cp data dir ? (if not backup_core_only) + # restore -> cp data dir ? (if in backup) + type = "data_dir" priority = 40 @@ -510,10 +587,12 @@ class DatadirAppResource(AppResource): assert self.owner.strip() assert self.group.strip() - current_data_dir = self.get_setting("data_dir") + current_data_dir = self.get_setting("data_dir") or self.get_setting("datadir") if not os.path.isdir(self.dir): # Handle case where install location changed, in which case we shall move the existing install dir + # FIXME: same as install_dir, is this what we want ? + # FIXME: What if people manually mved the data dir and changed the setting value and dont want the folder to be moved ? x_x if current_data_dir and os.path.isdir(current_data_dir): shutil.move(current_data_dir, self.dir) else: @@ -529,6 +608,7 @@ class DatadirAppResource(AppResource): chown(self.dir, owner, group) self.set_setting("data_dir", self.dir) + self.delete_setting("datadir") # Legacy def deprovision(self, context: Dict={}): @@ -543,50 +623,37 @@ class DatadirAppResource(AppResource): # FIXME : in fact we should delete settings to be consistent -# -#class SourcesAppResource(AppResource): -# """ -# is_provisioned -> (if pre_download,) cache exists with appropriate checksum -# is_available -> curl HEAD returns 200 -# -# update -> none? -# provision -> full download + check checksum -# -# deprovision -> remove cache for __APP__ ? -# -# deep_clean -> remove all cache -# -# backup -> nothing -# restore -> nothing -# """ -# -# type = "sources" -# -# default_properties = { -# "main": {"url": "?", "sha256sum": "?", "predownload": True} -# } -# -# def provision_or_update(self, context: Dict={}): -# # FIXME -# return -# - class AptDependenciesAppResource(AppResource): """ - is_provisioned -> package __APP__-ynh-deps exists (ideally should check the Depends: but hmgn) - is_available -> True? idk + Create a virtual package in apt, depending on the list of specified packages that the app needs. The virtual packages is called `$app-ynh-deps` (with `_` being replaced by `-` in the app name, see `ynh_install_app_dependencies`) - update -> update deps on __APP__-ynh-deps - provision -> create/update deps on __APP__-ynh-deps + ##### Example: + ```toml + [resources.apt] + packages = "nyancat, lolcat, sl" - deprovision -> remove __APP__-ynh-deps (+autoremove?) + # (this part is optional and corresponds to the legacy ynh_install_extra_app_dependencies helper) + extras.yarn.repo = "deb https://dl.yarnpkg.com/debian/ stable main" + extras.yarn.key = "https://dl.yarnpkg.com/debian/pubkey.gpg" + extras.yarn.packages = "yarn" + ``` - deep_clean -> remove any __APP__-ynh-deps for app not in app list + ##### Properties: + - `packages`: Comma-separated list of packages to be installed via `apt` + - `extras`: A dict of (repo, key, packages) corresponding to "extra" repositories to fetch dependencies from - backup -> nothing - restore = provision + ##### Provision/Update: + - The code literally calls the bash helpers `ynh_install_app_dependencies` and `ynh_install_extra_app_dependencies`, similar to what happens in v1. + + ##### Deprovision: + - The code literally calls the bash helper `ynh_remove_app_dependencies` """ + # Notes for future? + # deep_clean -> remove any __APP__-ynh-deps for app not in app list + # backup -> nothing + # restore = provision + type = "apt" priority = 50 @@ -596,7 +663,7 @@ class AptDependenciesAppResource(AppResource): } packages: List = [] - extras: Dict[str: Any] = {} + extras: Dict[str, Dict[str, str]] = {} def __init__(self, properties: Dict[str, Any], *args, **kwargs): @@ -611,6 +678,7 @@ class AptDependenciesAppResource(AppResource): script = [f"ynh_install_app_dependencies {self.packages}"] for repo, values in self.extras.items(): script += [f"ynh_install_extra_app_dependencies --repo='{values['repo']}' --key='{values['key']}' --package='{values['packages']}'"] + # FIXME : we're feeding the raw value of values['packages'] to the helper .. if we want to be consistent, may they should be comma-separated, though in the majority of cases, only a single package is installed from an extra repo.. self._run_script("provision_or_update", '\n'.join(script)) @@ -621,20 +689,44 @@ class AptDependenciesAppResource(AppResource): class PortsResource(AppResource): """ - is_provisioned -> port setting exists and is not the port used by another app (ie not in another app setting) - is_available -> true + Book port(s) to be used by the app, typically to be used to the internal reverse-proxy between nginx and the app process. - update -> true - provision -> find a port not used by any app + Note that because multiple ports can be booked, each properties is prefixed by the name of the port. `main` is a special name and will correspond to the setting `$port`, whereas for example `xmpp_client` will correspond to the setting `$port_xmpp_client`. - deprovision -> delete the port setting + ##### Example: + ```toml + [resources.port] + # (empty should be fine for most apps ... though you can customize stuff if absolutely needed) - deep_clean -> ? + main.default = 12345 # if you really want to specify a prefered value .. but shouldnt matter in the majority of cases - backup -> nothing (backup port setting) - restore -> nothing (restore port setting) + xmpp_client.default = 5222 # if you need another port, pick a name for it (here, "xmpp_client") + xmpp_client.exposed = "TCP" # here, we're telling that the port needs to be publicly exposed on TCP on the firewall + ``` + + ##### Properties (for every port name): + - `default`: The prefered value for the port. If this port is already being used by another process right now, or is booked in another app's setting, the code will increment the value until it finds a free port and store that value as the setting. If no value is specified, a random value between 10000 and 60000 is used. + - `exposed`: (default: `false`) Wether this port should be opened on the firewall and be publicly reachable. This should be kept to `false` for the majority of apps than only need a port for internal reverse-proxying! Possible values: `false`, `true`(=`Both`), `Both`, `TCP`, `UDP`. This will result in the port being opened on the firewall, and the diagnosis checking that a program answers on that port. (FIXME: this is not implemented yet) + - `fixed`: (default: `false`) Tells that the app absolutely needs the specific value provided in `default`, typically because it's needed for a specific protocol (FIXME: this is not implemented yet) + + ##### Provision/Update (for every port name): + - If not already booked, look for a free port, starting with the `default` value (or a random value between 10000 and 60000 if no `default` set) + - (FIXME) If `exposed` is not `false`, open the port in the firewall accordingly - otherwise make sure it's closed. + - The value of the port is stored in the `$port` setting for the `main` port, or `$port_NAME` for other `NAME`s + + ##### Deprovision: + - (FIXME) Close the ports on the firewall + - Deletes all the port settings + + ##### Legacy management: + - In the past, some settings may have been named `NAME_port` instead of `port_NAME`, in which case the code will automatically rename the old setting. """ + # Notes for future? + #deep_clean -> ? + #backup -> nothing (backup port setting) + #restore -> nothing (restore port setting) + type = "ports" priority = 70 @@ -702,24 +794,44 @@ class PortsResource(AppResource): class DatabaseAppResource(AppResource): """ - is_provisioned -> setting db_user, db_name, db_pwd exists - is_available -> db doesn't already exists ( ... also gotta make sure that mysql / postgresql is indeed installed ... or will be after apt provisions it) + Initialize a database, either using MySQL or Postgresql. Relevant DB infos are stored in settings `$db_name`, `$db_user` and `$db_pwd`. - provision -> setup the db + init the setting - update -> ?? + NB: only one DB can be handled in such a way (is there really an app that would need two completely different DB ?...) - deprovision -> delete the db + NB2: no automagic migration will happen in an suddenly change `type` from `mysql` to `postgresql` or viceversa in its life - deep_clean -> ... idk look into any db name that would not be related to any app ... + ##### Example: + ```toml + [resources.database] + type = "mysql" # or : "postgresql". Only these two values are supported + ``` - backup -> dump db - restore -> setup + inject db dump + ##### Properties: + - `type`: The database type, either `mysql` or `postgresql` + + ##### Provision/Update: + - (Re)set the `$db_name` and `$db_user` settings with the sanitized app name (replacing `-` and `.` with `_`) + - If `$db_pwd` doesn't already exists, pick a random database password and store it in that setting + - If the database doesn't exists yet, create the SQL user and DB using `ynh_mysql_create_db` or `ynh_psql_create_db`. + + ##### Deprovision: + - Drop the DB using `ynh_mysql_remove_db` or `ynh_psql_remove_db` + - Deletes the `db_name`, `db_user` and `db_pwd` settings + + ##### Legacy management: + - In the past, the sql passwords may have been named `mysqlpwd` or `psqlpwd`, in which case it will automatically be renamed as `db_pwd` """ + # Notes for future? + # deep_clean -> ... idk look into any db name that would not be related to any app ... + # backup -> dump db + # restore -> setup + inject db dump + type = "database" + priority = 90 default_properties = { - "type": None, + "type": None, # FIXME: eeeeeeeh is this really a good idea considering 'type' is supposed to be the resource type x_x } def __init__(self, properties: Dict[str, Any], *args, **kwargs): From 0d2cb690b3b20669df5725a96f4fe28f7c86f9d4 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Sat, 3 Sep 2022 16:31:42 +0200 Subject: [PATCH 88/89] manifestv2: moar test fixes --- src/utils/resources.py | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/src/utils/resources.py b/src/utils/resources.py index 4bda6589f..9da0cedb7 100644 --- a/src/utils/resources.py +++ b/src/utils/resources.py @@ -32,7 +32,6 @@ from moulinette.utils.filesystem import ( ) from yunohost.utils.error import YunohostError -from yunohost.hook import hook_exec logger = getActionLogger("yunohost.app_resources") @@ -127,7 +126,7 @@ class AppResourceManager: class AppResource: type: str = "" - default_properties: Dict[str, Any] = None + default_properties: Dict[str, Any] = {} def __init__(self, properties: Dict[str, Any], app: str, manager=None): @@ -177,7 +176,14 @@ ynh_abort_if_errors write_to_file(script_path, script) from yunohost.log import OperationLogger - operation_logger = OperationLogger._instances[-1], # FIXME : this is an ugly hack :( + + if OperationLogger._instances: + # FIXME ? : this is an ugly hack :( + operation_logger = OperationLogger._instances[-1] + else: + operation_logger = OperationLogger("resource_snippet", [("app", self.app)], env=env_) + operation_logger.start() + try: ( call_failed, @@ -249,7 +255,7 @@ class PermissionsResource(AppResource): type = "permissions" priority = 80 - default_properties = { + default_properties: Dict[str, Any] = { } default_perm_properties: Dict[str, Any] = { @@ -376,7 +382,7 @@ class SystemuserAppResource(AppResource): type = "system_user" priority = 20 - default_properties = { + default_properties: Dict[str, Any] = { "allow_ssh": False, "allow_sftp": False } @@ -469,7 +475,7 @@ class InstalldirAppResource(AppResource): type = "install_dir" priority = 30 - default_properties = { + default_properties: Dict[str, Any] = { "dir": "/var/www/__APP__", "owner": "__APP__:rx", "group": "__APP__:rx", @@ -571,7 +577,7 @@ class DatadirAppResource(AppResource): type = "data_dir" priority = 40 - default_properties = { + default_properties: Dict[str, Any] = { "dir": "/home/yunohost.app/__APP__", "owner": "__APP__:rx", "group": "__APP__:rx", @@ -657,7 +663,7 @@ class AptDependenciesAppResource(AppResource): type = "apt" priority = 50 - default_properties = { + default_properties: Dict[str, Any] = { "packages": [], "extras": {} } @@ -730,7 +736,7 @@ class PortsResource(AppResource): type = "ports" priority = 70 - default_properties = { + default_properties: Dict[str, Any] = { } default_port_properties = { @@ -830,7 +836,7 @@ class DatabaseAppResource(AppResource): type = "database" priority = 90 - default_properties = { + default_properties: Dict[str, Any] = { "type": None, # FIXME: eeeeeeeh is this really a good idea considering 'type' is supposed to be the resource type x_x } From dd59a855541c75796aee3fa81f84548d782f4d42 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Sun, 4 Sep 2022 19:51:16 +0200 Subject: [PATCH 89/89] manifestv2: fix i18n --- locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/en.json b/locales/en.json index 67d8feca5..2a50db16d 100644 --- a/locales/en.json +++ b/locales/en.json @@ -44,7 +44,6 @@ "app_remove_after_failed_install": "Removing the app following the installation failure...", "app_removed": "{app} uninstalled", "app_requirements_checking": "Checking requirements for {app}...", - "app_requirements_unmeet": "Requirements are not met for {app}, the package {pkgname} ({version}) must be {spec}", "app_restore_failed": "Could not restore {app}: {error}", "app_restore_script_failed": "An error occured inside the app restore script", "app_sources_fetch_failed": "Could not fetch sources files, is the URL correct?", @@ -463,6 +462,7 @@ "log_regen_conf": "Regenerate system configurations '{}'", "log_remove_on_failed_install": "Remove '{}' after a failed installation", "log_remove_on_failed_restore": "Remove '{}' after a failed restore from a backup archive", + "log_resource_snippet": "Provisioning/deprovisioning/updating a resource", "log_selfsigned_cert_install": "Install self-signed certificate on '{}' domain", "log_tools_migrations_migrate_forward": "Run migrations", "log_tools_postinstall": "Postinstall your YunoHost server",