From bec34b92b065f964b88be37eef7c79bafa4598fc Mon Sep 17 00:00:00 2001
From: axolotle <nchesnais@mailoo.org>
Date: Mon, 17 Apr 2023 20:03:35 +0200
Subject: [PATCH] form: add reserved "id" validator

---
 src/utils/configpanel.py | 25 -------------------------
 src/utils/form.py        | 27 ++++++++++++++++++++++++++-
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/utils/configpanel.py b/src/utils/configpanel.py
index 86dea2e7d..53cd4b9c8 100644
--- a/src/utils/configpanel.py
+++ b/src/utils/configpanel.py
@@ -455,31 +455,6 @@ class ConfigPanel:
                 "config_unknown_filter_key", filter_key=self.filter_key
             )
 
-        # List forbidden keywords from helpers and sections toml (to avoid conflict)
-        forbidden_keywords = [
-            "old",
-            "app",
-            "changed",
-            "file_hash",
-            "binds",
-            "types",
-            "formats",
-            "getter",
-            "setter",
-            "short_setting",
-            "type",
-            "bind",
-            "nothing_changed",
-            "changes_validated",
-            "result",
-            "max_progression",
-        ]
-        forbidden_keywords += format_description["sections"]
-
-        for _, _, option in self._iterate():
-            if option["id"] in forbidden_keywords:
-                raise YunohostError("config_forbidden_keyword", keyword=option["id"])
-
         return self.config
 
     def _get_default_values(self):
diff --git a/src/utils/form.py b/src/utils/form.py
index 7e009c5b5..6c14bcdf0 100644
--- a/src/utils/form.py
+++ b/src/utils/form.py
@@ -265,7 +265,26 @@ FORBIDDEN_READONLY_TYPES = {
     OptionType.user,
     OptionType.group,
 }
-
+FORBIDDEN_KEYWORDS = {
+    "old",
+    "app",
+    "changed",
+    "file_hash",
+    "binds",
+    "types",
+    "formats",
+    "getter",
+    "setter",
+    "short_setting",
+    "type",
+    "bind",
+    "nothing_changed",
+    "changes_validated",
+    "result",
+    "max_progression",
+    "properties",
+    "defaults",
+}
 
 Context = dict[str, Any]
 Translation = Union[dict[str, str], str]
@@ -298,6 +317,12 @@ class BaseOption(BaseModel):
             del schema["description"]
             schema["additionalProperties"] = False
 
+    @validator("id", pre=True)
+    def check_id_is_not_forbidden(cls, value: str) -> str:
+        if value in FORBIDDEN_KEYWORDS:
+            raise ValueError(m18n.n("config_forbidden_keyword", keyword=value))
+        return value
+
     # FIXME Legacy, is `name` still needed?
     @validator("name", pre=True, always=True)
     def apply_legacy_name(cls, value: Union[str, None], values: Values) -> str: