CHANGES:

karel26 · karel26 · commit 184632e2ef63 · 2025-09-23T13:43:08.000+02:00
- Security setting to YAML parser added.
- Default ports to schemas added.
- Tacview: Ports are ints now in the schema (in opposite to the TV settings in options.lua but in favor of the port checks)
diff --git a/core/data/impl/nodeimpl.py b/core/data/impl/nodeimpl.py
@@ -49,7 +49,7 @@
 # ruamel YAML support
 from ruamel.yaml import YAML
 from ruamel.yaml.error import MarkedYAMLError
-yaml = YAML()
+yaml = YAML(typ='safe')
 
 
 __all__ = [
diff --git a/core/data/impl/serverimpl.py b/core/data/impl/serverimpl.py
@@ -36,7 +36,7 @@
 
 # ruamel YAML support
 from ruamel.yaml import YAML
-yaml = YAML()
+yaml = YAML(typ='safe')
 
 if TYPE_CHECKING:
     from core import Instance
diff --git a/core/data/node.py b/core/data/node.py
@@ -15,7 +15,7 @@
 # ruamel YAML support
 from ruamel.yaml import YAML
 from ruamel.yaml.error import MarkedYAMLError
-yaml = YAML()
+yaml = YAML(typ='safe')
 
 if TYPE_CHECKING:
     from core import Server, Instance
diff --git a/core/data/proxy/nodeproxy.py b/core/data/proxy/nodeproxy.py
@@ -11,13 +11,12 @@
 
 # ruamel YAML support
 from ruamel.yaml import YAML
+yaml = YAML(typ='safe')
 
 if TYPE_CHECKING:
     from core import Instance, Server
     from core import NodeImpl
 
-yaml = YAML()
-
 __all__ = ["NodeProxy"]
 
 
diff --git a/core/data/server.py b/core/data/server.py
@@ -20,7 +20,7 @@
 # ruamel YAML support
 from ruamel.yaml import YAML
 from ruamel.yaml.error import MarkedYAMLError
-yaml = YAML()
+yaml = YAML(typ='safe')
 
 if TYPE_CHECKING:
     from core import Extension, Instance, Mission, UploadStatus, Player
diff --git a/core/plugin.py b/core/plugin.py
@@ -31,7 +31,7 @@
 # ruamel YAML support
 from ruamel.yaml import YAML
 from ruamel.yaml.error import MarkedYAMLError
-yaml = YAML()
+yaml = YAML(typ='safe')
 
 if TYPE_CHECKING:
     from core import Server
diff --git a/core/services/base.py b/core/services/base.py
@@ -22,7 +22,7 @@
 from pykwalify.errors import PyKwalifyException
 from ruamel.yaml import YAML
 from ruamel.yaml.error import MarkedYAMLError
-yaml = YAML()
+yaml = YAML(typ='safe')
 
 __all__ = [
     "proxy",
diff --git a/core/translations.py b/core/translations.py
@@ -7,7 +7,7 @@
 
 # ruamel YAML support
 from ruamel.yaml import YAML
-yaml = YAML()
+yaml = YAML(typ='safe')
 
 
 __all__ = [
diff --git a/core/utils/helper.py b/core/utils/helper.py
@@ -40,7 +40,7 @@
 from pykwalify.errors import SchemaError
 from ruamel.yaml import YAML
 from ruamel.yaml.error import MarkedYAMLError
-yaml = YAML()
+yaml = YAML(typ='safe')
 
 if TYPE_CHECKING:
     from core import ServerProxy, DataObject, Node
diff --git a/core/utils/validators.py b/core/utils/validators.py
@@ -49,7 +49,7 @@
 
 # ruamel YAML support
 from ruamel.yaml import YAML
-yaml = YAML()
+yaml = YAML(typ='safe')
 
 # Global ports that survive multiple loads
 if 'ports' not in vars(sys):
@@ -139,7 +139,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, _, path):
+def unique_port(value, rule, path):
     try:
         value = int(value)
         if value < 1024 or value > 65535:
diff --git a/extensions/cloud/extension.py b/extensions/cloud/extension.py
@@ -13,7 +13,7 @@
 
 # ruamel YAML support
 from ruamel.yaml import YAML
-yaml = YAML()
+yaml = YAML(typ='safe')
 
 
 class Cloud(Extension):
diff --git a/extensions/grpc/schemas/grpc_schema.yaml b/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, func: unique_port}
+    port: {type: int, nullable: false, default: 50051, func: unique_port}
     evalEnabled: {type: bool, nullable: false}
     host: {type: str, nullable: false, range: {min: 1}}
     debug: {type: bool, nullable: false}
diff --git a/extensions/lotatc/schemas/lotatc_schema.yaml b/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, func: unique_port}
+    port: {type: int, nullable: false, default: 10310, func: unique_port}
     show_passwords: {type: bool, nullable: false}
     autoupdate: {type: bool, nullable: false}
     dedicated_mode: {type: bool, nullable: false, func: obsolete}
diff --git a/extensions/mizedit/extension.py b/extensions/mizedit/extension.py
@@ -13,7 +13,7 @@
 # ruamel YAML support
 from ruamel.yaml import YAML
 from ruamel.yaml.error import MarkedYAMLError
-yaml = YAML()
+yaml = YAML(typ='safe')
 
 logger = logging.getLogger(__name__)
 
diff --git a/extensions/olympus/schemas/olympus_schema.yaml b/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, func: unique_port}
+        port: {type: int, required: true, nullable: false, default: 4512, 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, func: unique_port}
+        port: {type: int, required: true, nullable: false, default: 3000, 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, func: unique_port}
+        WSPort: {required: true, type: int, nullable: false, default: 4000, func: unique_port}
         WSEndpoint: {type: str, nullable: false, range: {min: 1}}
diff --git a/extensions/skyeye/extension.py b/extensions/skyeye/extension.py
@@ -26,7 +26,7 @@
 
 # ruamel YAML support
 from ruamel.yaml import YAML
-yaml = YAML()
+yaml = YAML(typ='safe')
 
 _ = get_translation(__name__.split('.')[1])
 
diff --git a/extensions/srs/schemas/srs_schema.yaml b/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, func: unique_port}
+    port: {type: int, nullable: false, default: 5002, func: unique_port}
     gui_server: {type: bool, nullable: false}
     minimized: {type: bool, nullable: false}
     debug: {type: bool, nullable: false}
@@ -57,6 +57,6 @@ schema;instance_srs_schema:
     always_on: {type: bool, nullable: false}
     radio_effect_override: {type: bool, nullable: false}
     global_lobby_frequencies: {type: str, nullable: false, range: {min: 1}}
-    lotatc_export_port: {type: int, nullable: false, func: unique_port}
+    lotatc_export_port: {type: int, nullable: false, default: 10712, func: unique_port}
     http_server_enabled: {type: bool, nullable: false}
-    http_server_port: {type: int, nullable: false, func: unique_port}
+    http_server_port: {type: int, nullable: false, default: 8080,func: unique_port}
diff --git a/extensions/tacview/schemas/tacview_schema.yaml b/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: text, nullable: false, func: unique_port}
+    tacviewRealTimeTelemetryPort: {type: int, nullable: false, default: 42674, func: unique_port}
     tacviewRealTimeTelemetryPassword: {type: str, nullable: false}
     tacviewRemoteControlEnabled: {type: bool, nullable: false}
-    tacviewRemoteControlPort: {type: text, nullable: false, func: unique_port}
+    tacviewRemoteControlPort: {type: int, nullable: false, default: 42675, func: unique_port}
     tacviewRemoteControlPassword: {type: str, nullable: false}
     tacviewSinglePlayerFlights: {type: int, nullable: false}
     tacviewTerrainExport: {type: int, nullable: false}
diff --git a/install.py b/install.py
@@ -23,7 +23,7 @@
 
 # ruamel YAML support
 from ruamel.yaml import YAML
-yaml = YAML()
+yaml = YAML(typ='safe')
 
 # for gettext // i18n
 _: Optional[Callable[[str], str]] = None
diff --git a/migrate.py b/migrate.py
@@ -18,7 +18,7 @@
 
 # ruamel YAML support
 from ruamel.yaml import YAML
-yaml = YAML()
+yaml = YAML(typ='safe')
 
 
 def post_migrate_admin(node: str):
diff --git a/mizedit.py b/mizedit.py
@@ -8,7 +8,7 @@
 
 # ruamel YAML support
 from ruamel.yaml import YAML
-yaml = YAML()
+yaml = YAML(typ='safe')
 
 logger = logging.getLogger(__name__)
 
diff --git a/plugins/admin/commands.py b/plugins/admin/commands.py
@@ -25,7 +25,7 @@
 
 # ruamel YAML support
 from ruamel.yaml import YAML
-yaml = YAML()
+yaml = YAML(typ='safe')
 
 _ = get_translation(__name__.split('.')[1])
 
diff --git a/plugins/backup/commands.py b/plugins/backup/commands.py
@@ -11,7 +11,7 @@
 # ruamel YAML support
 from ruamel.yaml import YAML
 from ruamel.yaml.error import MarkedYAMLError
-yaml = YAML()
+yaml = YAML(typ='safe')
 
 _ = get_translation(__name__.split('.')[1])
 
diff --git a/plugins/commands/commands.py b/plugins/commands/commands.py
@@ -17,7 +17,7 @@
 
 # ruamel YAML support
 from ruamel.yaml import YAML
-yaml = YAML()
+yaml = YAML(typ='safe')
 
 _ = get_translation(__name__.split('.')[1])
 
diff --git a/plugins/funkman/commands.py b/plugins/funkman/commands.py
@@ -10,7 +10,7 @@
 
 # ruamel YAML support
 from ruamel.yaml import YAML
-yaml = YAML()
+yaml = YAML(typ='safe')
 
 
 class FunkMan(Plugin[FunkManEventListener]):
diff --git a/plugins/greenieboard/commands.py b/plugins/greenieboard/commands.py
@@ -25,7 +25,7 @@
 
 # ruamel YAML support
 from ruamel.yaml import YAML
-yaml = YAML()
+yaml = YAML(typ='safe')
 
 _ = get_translation(__name__.split('.')[1])
 
diff --git a/plugins/mission/commands.py b/plugins/mission/commands.py
@@ -29,7 +29,7 @@
 
 # ruamel YAML support
 from ruamel.yaml import YAML
-yaml = YAML()
+yaml = YAML(typ='safe')
 
 _ = get_translation(__name__.split('.')[1])
 
diff --git a/plugins/mission/menu.py b/plugins/mission/menu.py
@@ -9,7 +9,7 @@
 from pykwalify.errors import PyKwalifyException
 from ruamel.yaml import YAML
 from ruamel.yaml.error import MarkedYAMLError, YAMLError
-yaml = YAML()
+yaml = YAML(typ='safe')
 
 logger = logging.getLogger(__name__)
 
diff --git a/plugins/mission/migrate.py b/plugins/mission/migrate.py
@@ -6,7 +6,7 @@
 
 # ruamel YAML support
 from ruamel.yaml import YAML
-yaml = YAML()
+yaml = YAML(typ='safe')
 
 
 async def migrate_3_6(self: Plugin):
diff --git a/plugins/mission/views.py b/plugins/mission/views.py
@@ -417,7 +417,7 @@ def cut(message: Optional[str] = None) -> str:
         return message[:4096 - len(remark)] + remark
 
     def render(self):
-        yaml = YAML()
+        yaml = YAML(typ='safe')
         yaml.indent(mapping=2, sequence=4, offset=2)
         yaml.default_flow_style = False
         yaml.sort_keys = True
diff --git a/plugins/monitoring/commands.py b/plugins/monitoring/commands.py
@@ -21,7 +21,7 @@
 
 # ruamel YAML support
 from ruamel.yaml import YAML
-yaml = YAML()
+yaml = YAML(typ='safe')
 
 
 class ServerLoadFilter(PeriodFilter):
diff --git a/plugins/scheduler/commands.py b/plugins/scheduler/commands.py
@@ -23,7 +23,7 @@
 
 # ruamel YAML support
 from ruamel.yaml import YAML
-yaml = YAML()
+yaml = YAML(typ='safe')
 
 _ = get_translation(__name__.split('.')[1])
 
diff --git a/plugins/slotblocking/commands.py b/plugins/slotblocking/commands.py
@@ -10,7 +10,7 @@
 
 # ruamel YAML support
 from ruamel.yaml import YAML
-yaml = YAML()
+yaml = YAML(typ='safe')
 
 
 class SlotBlocking(Plugin[SlotBlockingListener]):
diff --git a/plugins/tournament/commands.py b/plugins/tournament/commands.py
@@ -33,7 +33,7 @@
 
 # ruamel YAML support
 from ruamel.yaml import YAML
-yaml = YAML()
+yaml = YAML(typ='safe')
 
 _ = get_translation(__name__.split('.')[1])
 
diff --git a/plugins/userstats/commands.py b/plugins/userstats/commands.py
@@ -19,13 +19,11 @@
     TheatreFilter
 from .listener import UserStatisticsEventListener
 from .views import SquadronModal
+from ..creditsystem.squadron import Squadron
 
 # ruamel YAML support
 from ruamel.yaml import YAML
-
-from ..creditsystem.squadron import Squadron
-
-yaml = YAML()
+yaml = YAML(typ='safe')
 
 _ = get_translation(__name__.split('.')[1])
 
diff --git a/plugins/voting/listener.py b/plugins/voting/listener.py
@@ -10,7 +10,7 @@
 
 # ruamel YAML support
 from ruamel.yaml import YAML
-yaml = YAML()
+yaml = YAML(typ='safe')
 
 if TYPE_CHECKING:
     from .commands import Voting
diff --git a/run.py b/run.py
@@ -31,7 +31,7 @@
 
     # ruamel YAML support
     from ruamel.yaml import YAML
-    yaml = YAML()
+    yaml = YAML(typ='safe')
 except ModuleNotFoundError as ex:
     import subprocess
 
diff --git a/schemas/nodes_schema.yaml b/schemas/nodes_schema.yaml
diff --git a/services/bot/dummy/guild.py b/services/bot/dummy/guild.py
diff --git a/services/bot/service.py b/services/bot/service.py
diff --git a/services/music/radios/base.py b/services/music/radios/base.py
diff --git a/services/webservice/schemas/webservice_schema.yaml b/services/webservice/schemas/webservice_schema.yaml
