Add bypass for as/hs token config check when generating registration

Author: tulir

mautrix/__init__.py

@@ -1,3 +1,3 @@
-__version__ = "0.4.0rc2"
+__version__ = "0.4.0rc3"
 __author__ = "Tulir Asokan <[email protected]>"
 __all__ = ["api", "appservice", "bridge", "client", "errors", "util", "types"]

mautrix/bridge/bridge.py

@@ -98,7 +98,7 @@ def _prepare(self) -> None:
 
         self.prepare_config(args.config, args.registration, args.base_config)
         self.prepare_log()
-        self.check_config()
+        self.check_config(check_tokens=not args.generate_registration)
 
         if args.generate_registration:
             self.generate_registration()
@@ -121,8 +121,9 @@ def prepare_config(self, config: str, registration: str, base_config: str) -> No
         self.config.load()
         self.config.update()
 
-    def check_config(self) -> None:
+    def check_config(self, check_tokens: bool = True) -> None:
         try:
+            self.config._check_tokens = check_tokens
             self.config.check_default_values()
         except ConfigValueError as e:
             self.log.fatal(f"Configuration error: {e}")

mautrix/bridge/config.py

@@ -46,11 +46,13 @@ def exception(self) -> ConfigValueError:
 class BaseBridgeConfig(BaseFileConfig, ABC):
     registration_path: str
     _registration: Optional[Dict]
+    _check_tokens: bool
 
     def __init__(self, path: str, registration_path: str, base_path: str) -> None:
         super().__init__(path, base_path)
         self.registration_path = registration_path
         self._registration = None
+        self._check_tokens = True
 
     def save(self) -> None:
         super().save()
@@ -67,13 +69,14 @@ def forbidden_defaults(self) -> List[ForbiddenDefault]:
         return [
             ForbiddenDefault("homeserver.address", "https://example.com"),
             ForbiddenDefault("homeserver.domain", "example.com"),
+        ] + ([
             ForbiddenDefault("appservice.as_token",
                              "This value is generated when generating the registration",
                              "Did you forget to generate the registration?"),
             ForbiddenDefault("appservice.hs_token",
                              "This value is generated when generating the registration",
                              "Did you forget to generate the registration?"),
-        ]
+        ] if self._check_tokens else [])
 
     def check_default_values(self) -> None:
         for default in self.forbidden_defaults: