Merge pull request #1284 from TheHive-Project/utils/improvements

utils improvements
TheHive-Project · Oct 22, 2024 · 37973d7 · 37973d7
2 parents bffc7ee + 63c399a
commit 37973d7
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/utils/flavors/check_json_schema.py b/utils/flavors/check_json_schema.py
@@ -9,8 +9,7 @@
 """
 
 import json
-import jsonschema
-from jsonschema import validate
+from jsonschema import Draft7Validator, FormatChecker
 import sys
 import os
 import argparse
@@ -62,23 +61,23 @@ def fixJsonFlavorFile(jsonfile:dict) -> dict:
         jsonfile["screenshots"] =  screenshots
     return jsonfile
 
-def validateFlavorFormat(flavorfile:str, schemafile:str, fix:bool) -> str:
+def validateFlavorFormat(flavorfile: str, schemafile: str, fix: bool) -> str:
     flavorSchema = openJsonFile(schemafile)
     fjson = openJsonFile(flavorfile)
-        
-    validator = jsonschema.Draft7Validator(flavorSchema, format_checker=jsonschema.draft7_format_checker)
-    errors = sorted(validator.iter_errors(fjson),key=lambda e: e.path)
-    if not errors:  
+    formatchecker = FormatChecker()
+    validator = Draft7Validator(flavorSchema, format_checker=formatchecker)
+    errors = sorted(validator.iter_errors(fjson), key=lambda e: e.path)
+    if not errors:
         printSuccess(True, flavorfile)
     else:
         printSuccess(False, flavorfile)
         for error in errors:
-            print("{}: {}".format(error.path,error.message))    
+            print("{}: {}".format(error.path, error.message))
         if fix:
             print("Fixing {}".format(flavorfile))
             j = fixJsonFlavorFile(fjson)
             with open(flavorfile, 'w+') as fj:
-                fj.write(json.dumps(j,indent=4))
+                fj.write(json.dumps(j, indent=4))
             fj.close()
 
 
@@ -118,4 +117,4 @@ def run():
         print(e)
 
 if __name__ == '__main__':
-    run()
+    run()
diff --git a/utils/flavors/flavor_schema.json b/utils/flavors/flavor_schema.json
@@ -95,6 +95,9 @@
                 "description": {
                     "type": "string"
                 },
+                "type": {
+                    "type": "string"
+                },
                 "multi": {
                     "type": "boolean"
                 },
@@ -109,6 +112,7 @@
                 "name",
                 "description",
                 "multi",
+                "type",
                 "required" 
             ]
         },

diff --git a/utils/test_doc/requirements.txt b/utils/test_doc/requirements.txt
@@ -5,3 +5,4 @@ mkdocs-git-revision-date-localized-plugin
 mkdocs-material
 mkdocs-material-extensions
 mkdocs-pymdownx-material-extras
+mdutils