Added path checks to the schema validations

karel26 · karel26 · commit c22ac6c5d0a8 · 2025-02-09T16:24:42.000+01:00
diff --git a/core/data/impl/nodeimpl.py b/core/data/impl/nodeimpl.py
@@ -205,7 +205,8 @@ def read_locals(self) -> dict:
             try:
                 schema_files = ['schemas/nodes_schema.yaml']
                 schema_files.extend([str(x) for x in Path('./extensions').rglob('*_schema.yaml')])
-                c = Core(source_file=config_file, schema_files=schema_files, file_encoding='utf-8')
+                c = Core(source_file=config_file, schema_files=schema_files, file_encoding='utf-8',
+                         extensions=['core/utils/validators.py'])
                 try:
                     c.validate(raise_exception=True)
                 except SchemaError as ex:
diff --git a/core/data/node.py b/core/data/node.py
@@ -88,7 +88,8 @@ def extensions(self) -> dict:
 
     def read_config(self, file: str) -> dict:
         try:
-            c = Core(source_file=file, schema_files=['schemas/main_schema.yaml'], file_encoding='utf-8')
+            c = Core(source_file=file, schema_files=['schemas/main_schema.yaml'], file_encoding='utf-8',
+                     extensions=['core/utils/validators.py'])
             try:
                 c.validate(raise_exception=True)
             except SchemaError as ex:
diff --git a/core/data/server.py b/core/data/server.py
@@ -74,7 +74,8 @@ def read_locals(self) -> dict:
         config_file = os.path.join(self.node.config_dir, 'servers.yaml')
         if os.path.exists(config_file):
             try:
-                c = Core(source_file=config_file, schema_files=['schemas/servers_schema.yaml'], file_encoding='utf-8')
+                c = Core(source_file=config_file, schema_files=['schemas/servers_schema.yaml'], file_encoding='utf-8',
+                         extensions=['core/utils/validators.py'])
                 try:
                     c.validate(raise_exception=True)
                 except SchemaError as ex:
diff --git a/core/plugin.py b/core/plugin.py
@@ -429,7 +429,8 @@ def read_locals(self) -> dict:
             if os.path.exists(path):
                 schema_files = [str(x) for x in Path(path).glob('*.yaml')]
                 schema_files.append('schemas/commands_schema.yaml')
-                c = Core(source_file=filename, schema_files=schema_files, file_encoding='utf-8')
+                c = Core(source_file=filename, schema_files=schema_files, file_encoding='utf-8',
+                         extensions=['core/utils/validators.py'])
                 try:
                     c.validate(raise_exception=True)
                 except SchemaError as ex:
diff --git a/core/services/base.py b/core/services/base.py
@@ -118,7 +118,8 @@ def read_locals(self) -> dict:
             path = os.path.join('services', self.name.lower(), 'schemas')
             if os.path.exists(path):
                 schema_files = [str(x) for x in Path(path).glob('*.yaml')]
-                c = Core(source_file=filename, schema_files=schema_files, file_encoding='utf-8')
+                c = Core(source_file=filename, schema_files=schema_files, file_encoding='utf-8',
+                         extensions=['core/utils/validators.py'])
                 try:
                     c.validate(raise_exception=True)
                 except SchemaError as ex:
diff --git a/core/utils/validators.py b/core/utils/validators.py
@@ -0,0 +1,11 @@
+import os
+
+from pykwalify.errors import SchemaError
+
+from core import DEFAULT_TAG, COMMAND_LINE_ARGS
+
+def file_exists(value, rule_obj, path):
+    if path and path.split("/")[1] in [DEFAULT_TAG, COMMAND_LINE_ARGS.node]:
+        if not os.path.exists(os.path.expandvars(value)):
+            raise SchemaError(msg=f'File "{value}" does not exist', path=path)
+    return True
diff --git a/extensions/github/schemas/github_schema.yaml b/extensions/github/schemas/github_schema.yaml
@@ -3,6 +3,6 @@ schema;github_schema:
   nullable: false
   mapping:
     enabled: {type: bool, nullable: false}
-    repo: {type: str, required: true, nullable: false, range: {min: 1}}
-    target: {type: str, required: true, nullable: false, range: {min: 1}}
+    repo: {type: url, required: true, nullable: false}
+    target: {type: str, required: true, nullable: false, range: {min: 1}, func: file_exists}
     filter: {type: str, nullable: false, range: {min: 1}}
diff --git a/extensions/lardoon/schemas/lardoon_schema.yaml b/extensions/lardoon/schemas/lardoon_schema.yaml
@@ -5,11 +5,11 @@ schema;node_lardoon_schema:
     cmd: {type: str, pattern: '.+\.exe$', required: true, nullable: false, range: {min: 1}}
     minutes: {type: int, nullable: false}
     bind: {type: str, pattern: '\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}:\d{1,5}', required: true, nullable: false}
-    url: {type: str, pattern: 'http(s)?://[a-zA-Z0-9\-.]+(:[0-9]+)?(/.*)?', nullable: false}
+    url: {type: url, nullable: false}
 schema;instance_lardoon_schema:
   type: map
   nullable: false
   mapping:
     enabled: {type: bool, nullable: false}
     debug: {type: bool, nullable: false}
-    tacviewExportPath: {type: str, nullable: false, range: {min: 1}}
+    tacviewExportPath: {type: str, nullable: false, range: {min: 1}, func: file_exists}
diff --git a/extensions/lotatc/schemas/lotatc_schema.yaml b/extensions/lotatc/schemas/lotatc_schema.yaml
@@ -3,7 +3,7 @@ schema;node_lotatc_schema:
   nullable: false
   allowempty: true  # we might want to specify additional lotatc parameters, which are then not validated
   mapping:
-    installation: {type: str, nullable: false, range: {min: 1}}
+    installation: {type: str, nullable: false, range: {min: 1}, func: file_exists}
     autoupdate: {type: any, nullable: false}
 schema;instance_lotatc_schema:
   type: map
diff --git a/extensions/olympus/schemas/olympus_schema.yaml b/extensions/olympus/schemas/olympus_schema.yaml
@@ -2,7 +2,7 @@ schema;node_olympus_schema:
   type: map
   nullable: false
   mapping:
-    nodejs: {type: str, nullable: false, range: {min: 1}}
+    nodejs: {type: str, nullable: false, range: {min: 1}, func: file_exists}
     debug: {type: bool, nullable: false}
     show_passwords: {type: bool, nullable: false}
     authentication:
@@ -21,7 +21,7 @@ schema;instance_olympus_schema:
     enabled: {type: bool, nullable: false}
     debug: {type: bool, nullable: false}
     show_passwords: {type: bool, nullable: false}
-    url: {type: str, pattern: 'http(s)?://[a-zA-Z0-9\-.]+(:[0-9]+)?(/.*)?', nullable: false}
+    url: {type: url, nullable: false}
     regex;(backend|server):
       type: map
       nullable: false
@@ -44,5 +44,5 @@ schema;instance_olympus_schema:
       required: true
       allowempty: true
       mapping:
-        path: {type: str, nullable: false, range: {min: 1}}
+        path: {type: str, nullable: false, range: {min: 1}, func: file_exists}
         port: {type: int, required: true, range: {min: 80, max: 65535}, nullable: false}
diff --git a/extensions/realweather/schemas/realweather_schema.yaml b/extensions/realweather/schemas/realweather_schema.yaml
@@ -3,7 +3,7 @@ schema;node_realweather_schema:
   nullable: false
   allowempty: true
   mapping:
-    installation: {type: str, required: true, nullable: false, range: {min: 1}}
+    installation: {type: str, required: true, nullable: false, range: {min: 1}, func: file_exists}
     realweather:
       type: map
       nullable: false
diff --git a/extensions/skyeye/schemas/skyeye_schema.yaml b/extensions/skyeye/schemas/skyeye_schema.yaml
@@ -2,7 +2,7 @@ schema;node_skyeye_schema:
   type: map
   nullable: false
   mapping:
-    installation: {type: str, required: true, nullable: false, range: {min: 1}}
+    installation: {type: str, required: true, nullable: false, range: {min: 1}, func: file_exists}
     autoupdate: {type: bool, nullable: false}
     debug: {type: bool, nullable: false}
 schema;instance_skyeye_schema:
diff --git a/extensions/sneaker/schemas/sneaker_schema.yaml b/extensions/sneaker/schemas/sneaker_schema.yaml
@@ -2,9 +2,9 @@ schema;node_sneaker_schema:
   type: map
   nullable: false
   mapping:
-    cmd: {type: str, required: true, nullable: false, range: {min: 1}}
+    cmd: {type: str, required: true, nullable: false, range: {min: 1}, func: file_exists}
     bind: {type: str, pattern: '\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}:\d{1,5}', required: true, nullable: false}
-    url: {type: str, pattern: 'http(s)?://[a-zA-Z0-9\-.]+(:[0-9]+)?(/.*)?', nullable: false}
+    url: {type: url, nullable: false}
     debug: {type: bool, nullable: false}
 schema;instance_sneaker_schema:
   type: map
diff --git a/extensions/srs/schemas/srs_schema.yaml b/extensions/srs/schemas/srs_schema.yaml
@@ -3,7 +3,7 @@ schema;node_srs_schema:
   nullable: false
   allowempty: true
   mapping:
-    installation: {type: str, nullable: false, range: {min: 1}}
+    installation: {type: str, nullable: false, range: {min: 1}, func: file_exists}
     autoupdate: {type: any, nullable: false}
     autostart: {type: bool, nullable: false}
     host: {type: str, nullable: false, range: {min: 1}}
diff --git a/extensions/tacview/schemas/tacview_schema.yaml b/extensions/tacview/schemas/tacview_schema.yaml
@@ -3,7 +3,7 @@ schema;node_tacview_schema:
   allowempty: true  # we might want to specify additional tacview parameters, which are then not validated
   nullable: false
   mapping:
-    installation: {type: str, nullable: false, range: {min: 1}}
+    installation: {type: str, nullable: false, range: {min: 1}, func: file_exists}
     tacviewExportPath: {type: str, nullable: false, range: {min: 1}}
 schema;instance_tacview_schema:
   type: map
diff --git a/plugins/admin/schemas/admin_schema.yaml b/plugins/admin/schemas/admin_schema.yaml
@@ -8,7 +8,7 @@ schema;master_schema:
         - type: map
           mapping:
             label: {type: str, required: true, nullable: false, range: {min: 1}}
-            directory: {type: str, nullable: false, range: {min: 1}}
+            directory: {type: str, nullable: false, range: {min: 1}, func: file_exists}
             pattern: {type: str, nullable: false, range: {min: 1}}
             target: {type: str, nullable: false, range: {min: 1}}
             discord:
diff --git a/plugins/commands/schemas/commands_schema.yaml b/plugins/commands/schemas/commands_schema.yaml
@@ -4,7 +4,7 @@ schema;cmd_execute_schema:
   mapping:
     cmd: {type: str, required: true, nullable: false, range: {min: 1}}
     args: {type: str, nullable: false, range: {min: 1}}
-    cwd: {type: str, nullable: false, range: {min: 1}}
+    cwd: {type: str, nullable: false, range: {min: 1}, func: file_exists}
     shell: {type: bool, nullable: false}
 
 schema;cmd_event_schema:
diff --git a/plugins/funkman/schemas/funkman_schema.yaml b/plugins/funkman/schemas/funkman_schema.yaml
@@ -3,11 +3,11 @@ schema;master_schema:
   nullable: false
   required: true
   mapping:
-    install: {type: str, nullable: false, range: {min: 1}}
+    install: {type: str, nullable: false, range: {min: 1}, func: file_exists}
     CHANNELID_MAIN: {type: text, nullable: false}    # TODO: change this to int some day
     CHANNELID_RANGE: {type: text, nullable: false}   # s.s.
     CHANNELID_AIRBOSS: {type: text, nullable: false} # s.s.
-    IMAGEPATH: {type: str, nullable: false, range: {min: 1}}
+    IMAGEPATH: {type: str, nullable: false, range: {min: 1}, func: file_exists}
     strafe_board: {type: bool, nullable: false}
     strafe_channel: {type: int, nullable: false}
     bomb_board: {type: bool, nullable: false}
diff --git a/plugins/greenieboard/schemas/greenieboard_schema.yaml b/plugins/greenieboard/schemas/greenieboard_schema.yaml
@@ -32,8 +32,8 @@ schema;default_schema:
       type: map
       nullable: false
       mapping:
-        install: {type: str, nullable: false, range: {min: 1}}
-        IMAGEPATH: {type: str, nullable: false, range: {min: 1}}
+        install: {type: str, nullable: false, range: {min: 1}, func: file_exists}
+        IMAGEPATH: {type: str, nullable: false, range: {min: 1}, func: file_exists}
 
 schema;instance_schema:
   type: map
diff --git a/plugins/pretense/schemas/pretense_schema.yaml b/plugins/pretense/schemas/pretense_schema.yaml
@@ -3,7 +3,7 @@ schema;master_schema:
   nullable: false
   mapping:
     update_interval: {type: int, range: {min: 60}, nullable: false}
-    json_file_path: {type: str, nullable: false, range: {min: 1}}
+    json_file_path: {type: str, nullable: false, range: {min: 1}, func: file_exists}
     channel: {type: int, nullable: false}
 
 type: map
diff --git a/plugins/slotblocking/schemas/slotblocking_schema.yaml b/plugins/slotblocking/schemas/slotblocking_schema.yaml
@@ -27,7 +27,7 @@ schema;master_schema:
             costs: {type: int, nullable: false}
             crew: {type: int, nullable: false}
             VIP: {type: bool, nullable: false}
-            side: {type: int, nullable: false}
+            side: {type: int, nullable: false, enum: [0, 1, 2]}
     payback: {type: bool, nullable: false}
 
 type: map
diff --git a/plugins/userstats/schemas/userstats_schema.yaml b/plugins/userstats/schemas/userstats_schema.yaml
@@ -18,7 +18,7 @@ schema;master_schema:
               type: map
               nullable: false
               mapping:
-                limit: {type: int, nullable: false}
+                limit: {type: int, nullable: false, range: {min: 3, max: 20}}
     highscore: {type: any, nullable: false} # todo
 
 type: map
diff --git a/schemas/nodes_schema.yaml b/schemas/nodes_schema.yaml
@@ -17,15 +17,15 @@ mapping:
         type: map
         nullable: false
         mapping:
-          url: {type: str, nullable: false, range: {min: 1}}
+          url: {type: str, required: true, nullable: false, range: {min: 1}}
           pool_min: {type: int, range: {min: 2}, nullable: false}
           pool_max: {type: int, range: {min: 5}, nullable: false}
           max_idle: {type: int, nullable: false}
       DCS:
         type: map
         nullable: false
         mapping:
-          installation: {type: str, required: true, nullable: false, range: {min: 1}}
+          installation: {type: str, required: true, nullable: false, range: {min: 1}, func: file_exists}
           autoupdate: {type: any, nullable: false}
           desanitize: {type: bool, nullable: false}
           minimized: {type: bool, nullable: false}
@@ -41,8 +41,8 @@ mapping:
             type: map
             nullable: false
             mapping:
-              home: {type: str, nullable: false, range: {min: 1}}
-              missions_dir: {type: str, nullable: false, range: {min: 1}}
+              home: {type: str, nullable: false, range: {min: 1}, func: file_exists}
+              missions_dir: {type: str, nullable: false, range: {min: 1}, func: file_exists}
               mission_rewrite: {type: bool, nullable: false}
               autoscan: {type: bool, nullable: false}
               bot_port: {type: int, range: {min: 1025, max: 65535}, required: true, nullable: false}
diff --git a/services/backup/schemas/backup_schema.yaml b/services/backup/schemas/backup_schema.yaml
@@ -11,7 +11,7 @@ mapping:
         type: map
         nullable: false
         mapping:
-          path: {type: str, required: true, nullable: false, range: {min: 1}}
+          path: {type: str, required: true, nullable: false, range: {min: 1}, func: file_exists}
           password: {type: str, nullable: false}
           schedule:
             type: map
@@ -63,6 +63,7 @@ mapping:
                 nullable: false
                 range: {min: 1}
                 unique: true
+                func: file_exists
           schedule:
             type: map
             nullable: false
diff --git a/services/bot/schemas/bot_schema.yaml b/services/bot/schemas/bot_schema.yaml
@@ -35,7 +35,7 @@ mapping:
     type: map
     nullable: false
     mapping:
-      url: {type: str, nullable: false, range: {min: 1}}
+      url: {type: url, nullable: false}
       username: {type: str, nullable: false, range: {min: 1}}
       password: {type: str, nullable: false}
   roles:
diff --git a/services/cleanup/schemas/cleanup_schema.yaml b/services/cleanup/schemas/cleanup_schema.yaml
@@ -6,7 +6,7 @@ schema;master_schema:
       type: map
       nullable: false
       mapping:
-        directory: {type: str, nullable: false, range: {min: 1}}
+        directory: {type: str, nullable: false, range: {min: 1}, func: file_exists}
         pattern: {type: any, nullable: false}
         recursive: {type: bool, nullable: false}
         delete_after: {type: int, range: {min: 1}, nullable: false}
diff --git a/services/modmanager/schemas/modmanager_schema.yaml b/services/modmanager/schemas/modmanager_schema.yaml
@@ -12,14 +12,14 @@ schema;master_schema:
             name: {type: str, required: true, nullable: false, range: {min: 1}}
             version: {type: text, required: true, nullable: false}
             source: {type: str, enum: ['SavedGames', 'RootFolder'], required: true, nullable: false}
-            repo: {type: str, nullable: false, range: {min: 1}}
+            repo: {type: url, nullable: false}
 
 schema;default_schema:
   type: map
   nullable: false
   mapping:
-    SavedGames: {type: str, required: true, nullable: false, range: {min: 1}}
-    RootFolder: {type: str, required: true, nullable: false, range: {min: 1}}
+    SavedGames: {type: str, required: true, nullable: false, range: {min: 1}, func: file_exists}
+    RootFolder: {type: str, required: true, nullable: false, range: {min: 1}, func: file_exists}
 
 type: map
 nullable: false
diff --git a/services/music/schemas/music_schema.yaml b/services/music/schemas/music_schema.yaml
@@ -2,7 +2,7 @@ schema;master_schema:
   type: map
   nullable: false
   mapping:
-    music_dir: {type: str, nullable: false, range: {min: 1}}
+    music_dir: {type: str, nullable: false, range: {min: 1}, func: file_exists}
     popup: {type: str, nullable: false, range: {min: 1}}
     chat: {type: str, nullable: false, range: {min: 1}}
     pause_without_players: {type: bool, nullable: false}
@@ -18,7 +18,7 @@ schema;master_schema:
             mode: {type: int, enum: [1, 2], required: true, nullable: false}
             frequency: {type: text, required: true, nullable: false}
             modulation: {type: str, enum: ['AM', 'FM'], required: true, nullable: false}
-            coalition: {type: int, enum: [1, 2, 3], required: true, nullable: false}
+            coalition: {type: int, enum: [1, 2], required: true, nullable: false}
             volume: {type: text, nullable: false}
             display_name: {type: str, nullable: false, range: {min: 1}}
             popup: {type: str, nullable: false, range: {min: 1}}
