netinvent/npbackup
1
1
Fork 0
mirror of https://github.com/netinvent/npbackup.git synced 2025-10-25 04:46:58 +08:00
Code Issues Projects Releases Packages Wiki Activity

GUI: Don't allow dot notation in repo and group names

Browse source
This commit is contained in:
deajan 2025-02-16 12:33:03 +01:00
parent 68a542245f
commit 9c7aa5f6d5
4 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
npbackup/configuration.py
View file

@ -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": [],

2
npbackup/gui/config.py
View file

@ -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
)

2
npbackup/translations/config_gui.en.yml
View file

@ -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

2
npbackup/translations/config_gui.fr.yml
View file

@ -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