diff --git a/npbackup/configuration.py b/npbackup/configuration.py index 8f08229..7fa6a52 100644 --- a/npbackup/configuration.py +++ b/npbackup/configuration.py @@ -138,6 +138,7 @@ empty_config_dict = { "conf_version": MAX_CONF_VERSION, "audience": None, "repos": { + # Don't allow repo names to contain dots "default": { "repo_uri": None, "permissions": "full", @@ -156,6 +157,7 @@ empty_config_dict = { }, }, "groups": { + # Don't allow group names to contain dots "default_group": { "backup_opts": { "paths": [], diff --git a/npbackup/gui/config.py b/npbackup/gui/config.py index 8517f08..8891b27 100644 --- a/npbackup/gui/config.py +++ b/npbackup/gui/config.py @@ -155,7 +155,7 @@ def config_gui(full_config: dict, config_file: str): "groups" if values["-OBJECT-TYPE-"] == "group" else "repos" ) object_name = values["-OBJECT-NAME-"] - if object_name is None or object_name == "": + if object_name is None or object_name == "" or "." in object_name: sg.PopupError( _t("config_gui.object_name_cannot_be_empty"), keep_on_top=True ) diff --git a/npbackup/translations/config_gui.en.yml b/npbackup/translations/config_gui.en.yml index c88d9a2..dad7147 100644 --- a/npbackup/translations/config_gui.en.yml +++ b/npbackup/translations/config_gui.en.yml @@ -139,7 +139,7 @@ en: repo_already_exists: Repo already exists group_already_exists: Group already exists cannot_remove_group_inherited_settings: Cannot remove group inherited settings. Please remove directly in group configuration - object_name_cannot_be_empty: Object name cannot be empty + object_name_cannot_be_empty: Object name cannot be empty and may not contain dots object_name_cannot_be_all: Object name cannot be '__all__' which is a reserved name cannot_delete_default_repo: Cannot delete default repo cannot_delete_default_group: Cannot delete default group diff --git a/npbackup/translations/config_gui.fr.yml b/npbackup/translations/config_gui.fr.yml index 81321aa..9e6f9c4 100644 --- a/npbackup/translations/config_gui.fr.yml +++ b/npbackup/translations/config_gui.fr.yml @@ -140,7 +140,7 @@ fr: repo_already_exists: Dépot déjà existant group_already_exists: Groupe déjà existant cannot_remove_group_inherited_settings: Impossible de supprimer une option héritée de groupe. Veuillez supprimer l'option directement dans la configuration de groupe - object_name_cannot_be_empty: Le nom de l'objet ne peut être vide + object_name_cannot_be_empty: Le nom de l'objet ne peut être vide et ne peut contenir de points object_name_cannot_be_all: Le nom de l'objet ne peut être '__all__' qui est un nom réservé cannot_delete_default_repo: Impossible de supprimer le dépot par défaut cannot_delete_default_group: Impossible de supprimer le groupe par défaut