Merge branch 'master' into fix-aerich-migrations

Author: b-rowan

README.md

@@ -11,10 +11,14 @@
 from tortoise import Tortoise
 from tortoise.contrib.fastapi import RegisterTortoise
 
-from goosebit import app
-from goosebit.auth.permissions import GOOSEBIT_PERMISSIONS
-from goosebit.db.models import UpdateModeEnum, UpdateStateEnum
-from goosebit.settings import PWD_CXT  # type: ignore[attr-defined]
+# Configuring rauc_compatible_pattern for tests/unit/updates/rauc/test_swdesc.py here, as we do not want to have it set
+# in goosebit.yaml.
+os.environ["GOOSEBIT_RAUC_COMPATIBLE_PATTERN"] = r"^(?P<hw_boardname>.+?)(-(?P<hw_revision>\w*[\d.]+\w*))?$"
+
+from goosebit import app  # noqa: E402
+from goosebit.auth.permissions import GOOSEBIT_PERMISSIONS  # noqa: E402
+from goosebit.db.models import UpdateModeEnum, UpdateStateEnum  # noqa: E402
+from goosebit.settings import PWD_CXT  # type: ignore[attr-defined]  # noqa: E402
 
 # Configure logging
 logging.basicConfig(level=logging.WARN)

conftest.py

@@ -59,6 +59,12 @@ poll_time: 00:01:00
 # Defaults to a randomized value. If this value is not set, user sessions will not persist when app restarts.
 #secret_key: my_very_top_secret_key123
 
+# Regular expression to extract board name and revision from RAUC compatible string.
+# HW revision support is disabled by default when using RAUC.
+# By uncommenting the following line, the last part of the compatible string, separated by a hyphen, will be
+# interpreted as the HW revision, e.g.: myboard-rev1.0a
+#rauc_compatible_pattern: ^(?P<hw_boardname>.+?)(-(?P<hw_revision>\w*[\d.]+\w*))?$
+
 # A list of installed plugins that you want to enable in gooseBit
 #plugins:
 #  - goosebit_simple_stats

goosebit.yaml

@@ -62,7 +62,11 @@ async def lifespan(_: FastAPI) -> AsyncGenerator[None, None]:
         }
     ],
 )
-app.include_router(updater.router)  # type: ignore[attr-defined]
+if isinstance(config.tenant, list):
+    for tenant in config.tenant:
+        app.include_router(updater.router, prefix=f"/{tenant}")  # type: ignore[attr-defined]
+elif isinstance(config.tenant, str):
+    app.include_router(updater.router, prefix=f"/{config.tenant}")  # type: ignore[attr-defined]
 app.include_router(ui.router)  # type: ignore[attr-defined]
 app.include_router(api.router)  # type: ignore[attr-defined]
 app.mount("/static", static, name="static")

goosebit/__init__.py

@@ -1,12 +1,25 @@
 from __future__ import annotations
 
-from urllib.parse import unquote, urlparse
+from urllib.parse import unquote, urlparse, urlunparse
 from urllib.request import url2pathname
 
 from anyio import Path
 from pydantic import BaseModel, ConfigDict, Field, computed_field
 
 
+def mask_url_password(url: str) -> str:
+    """Mask password in URL for display purposes."""
+    parsed = urlparse(url)
+    if parsed.password:
+        # Reconstruct netloc with masked password
+        if parsed.port:
+            netloc = f"{parsed.username}:***@{parsed.hostname}:{parsed.port}"
+        else:
+            netloc = f"{parsed.username}:***@{parsed.hostname}"
+        return urlunparse(parsed._replace(netloc=netloc))
+    return url
+
+
 class HardwareSchema(BaseModel):
     model_config = ConfigDict(from_attributes=True)
 
@@ -39,4 +52,4 @@ def name(self) -> str:
         if self.local:
             return self.path.name
         else:
-            return self.uri
+            return mask_url_password(self.uri)

goosebit/schema/software.py

@@ -76,7 +76,7 @@ class GooseBitSettings(BaseSettings):
     config_file: Path | None = None
 
     port: int = 60053  # GOOSE
-    tenant: str = "DEFAULT"
+    tenant: str | list = "DEFAULT"
 
     poll_time: str = "00:01:00"
 
@@ -101,6 +101,8 @@ class GooseBitSettings(BaseSettings):
 
     track_device_ip: bool = True
 
+    rauc_compatible_pattern: str | None = None
+
     @field_validator("secret_key", mode="before")
     @classmethod
     def import_secret_key(cls, v: Any) -> OctKey: