Merge branch 'main' into nm/fix-wrong-password-message

someengineering · Sep 4, 2024 · 4a2bd4a · 4a2bd4a
2 parents dc3ce47 + b95c61c
commit 4a2bd4a
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 0 deletions.
diff --git a/fixbackend/app.py b/fixbackend/app.py
@@ -79,6 +79,23 @@ async def custom_ui(hash: str) -> Response:
         headers["X-Content-Type-Options"] = "nosniff"
         headers["X-Frame-Options"] = "DENY"
         headers["Strict-Transport-Security"] = "max-age=31536000; includeSubDomains; preload"
+        headers["Referrer-Policy"] = "origin-when-cross-origin"
+        headers["Permissions-Policy"] = (
+            "notifications=(self),"
+            " payment=(self),"
+            " fullscreen=(self),"
+            " geolocation=(),"
+            " camera=(),"
+            " microphone=(),"
+            " accelerometer=(),"
+            " gyroscope=(),"
+            " magnetometer=(),"
+            " usb=(),"
+            " vr=(),"
+            " xr-spatial-tracking=(),"
+            " autoplay=(),"
+            " midi=()"
+        )
         headers["Content-Security-Policy"] = (
             "default-src 'self' https://cdn.fix.security;"
             f" connect-src 'self' data: https://cdn.fix.security https://capture.trackjs.com https://ph.fix.security;"
@@ -337,6 +354,23 @@ async def root(_: Request) -> Response:
             headers["X-Content-Type-Options"] = "nosniff"
             headers["X-Frame-Options"] = "DENY"
             headers["Strict-Transport-Security"] = "max-age=31536000; includeSubDomains; preload"
+            headers["Referrer-Policy"] = "origin-when-cross-origin"
+            headers["Permissions-Policy"] = (
+                "notifications=(self),"
+                " payment=(self),"
+                " fullscreen=(self),"
+                " geolocation=(),"
+                " camera=(),"
+                " microphone=(),"
+                " accelerometer=(),"
+                " gyroscope=(),"
+                " magnetometer=(),"
+                " usb=(),"
+                " vr=(),"
+                " xr-spatial-tracking=(),"
+                " autoplay=(),"
+                " midi=()"
+            )
             headers["Content-Security-Policy"] = (
                 "default-src 'self' https://cdn.fix.security;"
                 f" connect-src 'self' data: https://cdn.fix.security https://capture.trackjs.com https://ph.fix.security;"

diff --git a/fixbackend/cloud_accounts/service.py b/fixbackend/cloud_accounts/service.py
@@ -1076,6 +1076,8 @@ def update_state(cloud_account: CloudAccount) -> CloudAccount:
                         scan=scan,
                     )
                     return evolve(cloud_account, state=CloudAccountStates.Configured(access, enabled, scan))
+                case CloudAccountStates.Degraded():
+                    return evolve(cloud_account, state=evolve(cloud_account.state, scan=scan))
                 case _:  # pragma: no cover
                     raise WrongState(f"Account {cloud_account_id} is not configured, cannot enable account")