CHANGES:

- Rolled back default ports in schema validation.

Author: karel26

core/utils/validators.py

@@ -31,6 +31,9 @@
 __all__ = [
     "file_exists",
     "dir_exists",
+    "obsolete",
+    "unique_port",
+    "any_of",
     "seq_or_map",
     "bool_or_map",
     "str_or_map",
@@ -139,7 +142,7 @@ def obsolete(value, rule, path):
     logger.warning(f'"{os.path.basename(path)}" is obsolete and will be set by the bot: Path "{path}"')
     return True
 
-def unique_port(value, rule, path):
+def unique_port(value, _, path):
     try:
         value = int(value)
         if value < 1024 or value > 65535:

extensions/grpc/schemas/grpc_schema.yaml

@@ -4,7 +4,7 @@ schema;grpc_schema:
   allowempty: true  # we might want to specify additional parameters
   mapping:
     enabled: {type: bool, nullable: false}
-    port: {type: int, nullable: false, default: 50051, func: unique_port}
+    port: {type: int, nullable: false, func: unique_port}
     evalEnabled: {type: bool, nullable: false}
     host: {type: str, nullable: false, range: {min: 1}}
     debug: {type: bool, nullable: false}

extensions/lotatc/schemas/lotatc_schema.yaml

@@ -26,7 +26,7 @@ schema;instance_lotatc_schema:
   mapping:
     enabled: {type: bool, nullable: false}
     host: {type: str, nullable: false, range: {min: 1}}
-    port: {type: int, nullable: false, default: 10310, func: unique_port}
+    port: {type: int, nullable: false, func: unique_port}
     show_passwords: {type: bool, nullable: false}
     autoupdate: {type: bool, nullable: false}
     dedicated_mode: {type: bool, nullable: false, func: obsolete}

extensions/olympus/extension.py

@@ -30,6 +30,7 @@
 class Olympus(Extension):
     _server_ports: dict[int, str] = dict()
     _client_ports: dict[int, str] = dict()
+    _ws_ports: dict[int, str] = dict()
 
     CONFIG_DICT = {
         "backend_port": {
@@ -161,7 +162,8 @@ async def prepare_olympus_json(self) -> bool:
             self.log.warning(
                 f"  => {self.server.name}: No write permission on olympus.json, skipping {self.name}.")
             return False
-        server_port = self.config.get(self.backend_tag, {}).get('port', 3001)
+        # Port checks
+        server_port = self.config.get(self.backend_tag, {}).get('port', 4512)
         if type(self)._server_ports.get(server_port, self.server.name) != self.server.name:
             self.log.error(f"  => {self.server.name}: {self.name} server.port {server_port} already in use by "
                            f"server {type(self)._server_ports[server_port]}!")
@@ -173,6 +175,12 @@ async def prepare_olympus_json(self) -> bool:
                            f"server {type(self)._client_ports[client_port]}!")
             return False
         type(self)._client_ports[client_port] = self.server.name
+        ws_port = self.config.get('audio', {}).get('WSPort', 4000)
+        if type(self)._ws_ports.get(client_port, self.server.name) != self.server.name:
+            self.log.error(f"  => {self.server.name}: {self.name} audio.WSPort {ws_port} already in use by "
+                           f"server {type(self)._ws_ports[ws_port]}!")
+            return False
+        type(self)._ws_ports[ws_port] = self.server.name
 
         self.locals = self.load_config()
         default_address = '*' if self.version == '1.0.3.0' else 'localhost'

extensions/olympus/schemas/olympus_schema.yaml

@@ -30,7 +30,7 @@ schema;instance_olympus_schema:
       allowempty: true
       mapping:
         address: {type: str, nullable: false, range: {min: 1}}
-        port: {type: int, required: true, nullable: false, default: 4512, func: unique_port}
+        port: {type: int, required: true, nullable: false, func: unique_port}
     authentication:
       type: map
       nullable: false
@@ -47,7 +47,7 @@ schema;instance_olympus_schema:
       allowempty: true
       mapping:
         path: {type: str, nullable: false, range: {min: 1}, func: dir_exists}
-        port: {type: int, required: true, nullable: false, default: 3000, func: unique_port}
+        port: {type: int, required: true, nullable: false, func: unique_port}
         customAuthHeaders:
           type: map
           nullable: false
@@ -87,5 +87,5 @@ schema;instance_olympus_schema:
       required: true
       mapping:
         SRSPort: {type: int, nullable: false, func: obsolete}
-        WSPort: {required: true, type: int, nullable: false, default: 4000, func: unique_port}
+        WSPort: {required: true, type: int, nullable: false, func: unique_port}
         WSEndpoint: {type: str, nullable: false, range: {min: 1}}

extensions/srs/schemas/srs_schema.yaml

@@ -42,7 +42,7 @@ schema;instance_srs_schema:
     enabled: {type: bool, nullable: false}
     config: {type: str, required: true, nullable: false}
     host: {type: str, nullable: false, range: {min: 1}}
-    port: {type: int, nullable: false, default: 5002, func: unique_port}
+    port: {type: int, nullable: false, func: unique_port}
     gui_server: {type: bool, nullable: false}
     minimized: {type: bool, nullable: false}
     debug: {type: bool, nullable: false}

extensions/tacview/schemas/tacview_schema.yaml

@@ -22,10 +22,10 @@ schema;instance_tacview_schema:
     tacviewMultiplayerFlightsAsClient: {type: int, nullable: false}
     tacviewMultiplayerFlightsAsHost: {type: int, nullable: false}
     tacviewRealTimeTelemetryEnabled: {type: bool,nullable: false}
-    tacviewRealTimeTelemetryPort: {type: int, nullable: false, default: 42674, func: unique_port}
+    tacviewRealTimeTelemetryPort: {type: int, nullable: false, func: unique_port}
     tacviewRealTimeTelemetryPassword: {type: str, nullable: false}
     tacviewRemoteControlEnabled: {type: bool, nullable: false}
-    tacviewRemoteControlPort: {type: int, nullable: false, default: 42675, func: unique_port}
+    tacviewRemoteControlPort: {type: int, nullable: false, func: unique_port}
     tacviewRemoteControlPassword: {type: str, nullable: false}
     tacviewSinglePlayerFlights: {type: int, nullable: false}
     tacviewTerrainExport: {type: int, nullable: false}

schemas/nodes_schema.yaml

@@ -76,9 +76,9 @@ mapping:
               missions_dir: {type: str, nullable: false, range: {min: 1}, func: dir_exists}
               mission_rewrite: {type: bool, nullable: false}
               autoscan: {type: bool, nullable: false}
-              bot_port: {type: int, required: true, nullable: false, default: 6666, func: unique_port}
-              webgui_port: {type: int, nullable: false, default: 8088, func: unique_port}
-              dcs_port: {type: int, nullable: false, default: 10308, func: unique_port}
+              bot_port: {type: int, required: true, nullable: false, func: unique_port}
+              webgui_port: {type: int, nullable: false, func: unique_port}
+              dcs_port: {type: int, nullable: false, func: unique_port}
               server_user: {type: str, nullable: false, range: {min: 1}}
               max_hung_minutes: {type: int, range: {min: 0}, nullable: false}
               affinity: {type: any, nullable: false, func: int_csv_or_list}