request data validation

Author: jnptk

backend/src/kitconcept/keywordmanager/services/delete.py

@@ -9,14 +9,13 @@ class KeywordsDelete(Service):
     def reply(self):
         data = json_body(self.request)
         km = getUtility(IKeywordManager)
-        keywords = data.get("items", [])
+        keywords = data.get("items") or []
 
-        if isinstance(keywords, str):
-            keywords = [keywords]
+        if not isinstance(keywords, list):
+            raise BadRequest("")
+        if not keywords:
+            raise BadRequest("")
 
-        try:
-            km.delete(keywords)
-        except Exception as err:
-            raise BadRequest(err) from err
+        km.delete(keywords)
 
         return self.reply_no_content()

backend/src/kitconcept/keywordmanager/services/get.py

@@ -14,9 +14,7 @@ def reply(self):
         keywords = km.getKeywords(**query)
 
         batch = HypermediaBatch(self.request, keywords)
-        items = []
-        for kw in batch:
-            items.append({"name": kw[0], "total": kw[1]})
+        items = {{"name": name, "total": count} for name, count in batch}
 
         keywords_data = {
             "@id": batch.canonical_url,

backend/src/kitconcept/keywordmanager/services/update.py

@@ -10,12 +10,18 @@ def reply(self):
         data = json_body(self.request)
         km = getUtility(IKeywordManager)
 
-        new_keyword = data.get("new_keyword", "")
-        old_keywords = data.get("old_keywords", [])
+        new_keyword = data.get("new_keyword") or ""
+        old_keywords = data.get("old_keywords") or []
 
-        try:
-            km.change(new_keyword, old_keywords)
-        except Exception as err:
-            raise BadRequest(err) from err
+        if not isinstance(new_keyword, str):
+            raise BadRequest("")
+        if not new_keyword:
+            raise BadRequest("")
+        if not isinstance(old_keywords, list):
+            raise BadRequest("")
+        if not old_keywords:
+            raise BadRequest("")
+
+        km.change(new_keyword, old_keywords)
 
         return self.reply_no_content()