Add advisory_device_file_protection support to server_config API command on server

Author: touilleMan

server/parsec/cli/run.py

@@ -9,7 +9,14 @@
 
 import click
 
-from parsec._parsec import ActiveUsersLimit, EmailAddress, ParsecAddr, SecretKey, TrustAnchor
+from parsec._parsec import (
+    ActiveUsersLimit,
+    AdvisoryDeviceFileProtection,
+    EmailAddress,
+    ParsecAddr,
+    SecretKey,
+    TrustAnchor,
+)
 from parsec._version import __version__ as server_version
 from parsec.asgi import app_factory, serve_parsec_asgi_app
 from parsec.backend import backend_factory
@@ -199,6 +206,7 @@ def handle_parse_result(
     envvar="PARSEC_ADVISORY_DEVICE_FILE_PROTECTION",
     show_envvar=True,
     multiple=True,
+    type=AdvisoryDeviceFileProtection.from_str,
     metavar="STRATEGY",
     help="""Advisory device file protection to recommend to clients.
 
@@ -571,7 +579,7 @@ async def run_cmd(
     blockstore: BaseBlockStoreConfig,
     administration_token: str,
     account_config: AccountConfig,
-    advisory_device_file_protection: tuple[str, ...],
+    advisory_device_file_protection: tuple[AdvisoryDeviceFileProtection, ...],
     cryptpad_server_url: str | None,
     openbao_server_url: str | None,
     openbao_secret_mount_path: str,

server/parsec/components/events.py

@@ -547,5 +547,7 @@ async def api_server_config(
             organization_bootstrap=organization_bootstrap,
             cryptpad=cryptpad,
             openbao=openbao,
-            advisory_device_file_protection=list(self._config.advisory_device_file_protection),
+            advisory_device_file_protection=[
+                p.str for p in self._config.advisory_device_file_protection
+            ],
         )

server/parsec/config.py

@@ -11,6 +11,7 @@
 
 from parsec._parsec import (
     ActiveUsersLimit,
+    AdvisoryDeviceFileProtection,
     DateTime,
     EmailAddress,
     OpenBaoAuthType,
@@ -306,7 +307,7 @@ class BackendConfig:
 
     openbao_config: OpenBaoConfig | None = None
 
-    advisory_device_file_protection: tuple[str, ...] = ()
+    advisory_device_file_protection: tuple[AdvisoryDeviceFileProtection, ...] = ()
 
     organization_bootstrap_webhook_url: str | None = None
     organization_spontaneous_bootstrap: bool = False

server/tests/api_v5/anonymous_server/test_server_config.py

@@ -2,7 +2,12 @@
 
 import pytest
 
-from parsec._parsec import OpenBaoAuthType, anonymous_server_cmds
+from parsec._parsec import (
+    AdvisoryDeviceFilePrimaryProtection,
+    AdvisoryDeviceFileProtection,
+    OpenBaoAuthType,
+    anonymous_server_cmds,
+)
 from parsec.config import AccountConfig, CryptPadConfig, OpenBaoAuthConfig, OpenBaoConfig
 from tests.common import AnonymousServerRpcClient, Backend, HttpCommonErrorsTester
 
@@ -71,7 +76,14 @@ async def test_anonymous_server_server_config_ok(
             )
 
         case "with_advisory_device_file_protection":
-            backend.config.advisory_device_file_protection = ("PASSWORD+TOTP", "PKI")
+            backend.config.advisory_device_file_protection = (
+                AdvisoryDeviceFileProtection(
+                    primary=AdvisoryDeviceFilePrimaryProtection.PASSWORD, with_totp=True
+                ),
+                AdvisoryDeviceFileProtection(
+                    primary=AdvisoryDeviceFilePrimaryProtection.PKI, with_totp=False
+                ),
+            )
 
             expected_rep = anonymous_server_cmds.latest.server_config.RepOk(
                 account=anonymous_server_cmds.latest.server_config.AccountConfig.DISABLED,