Merge main and verify ID keys through Setup URI and QR

utils/setup/generate_setup_uri.test.ts

@@ -34,6 +34,22 @@ Deno.test("generates an Object Storage Setup URI with a selected S3 profile", as
   );
   assert(decoded, "Commonlib could not decode the Object Storage Setup URI");
   const effective = { ...DEFAULT_SETTINGS, ...decoded };
+  const recoveryCode = generated.idRecoveryCode;
+  assert(
+    typeof recoveryCode === "string" && recoveryCode.startsWith("sls-id-v1:"),
+    "the generator did not return an ID recovery code",
+  );
+  assert(
+    (effective as typeof effective & { idDerivationVersion?: number })
+      .idDerivationVersion === 1,
+    "the Setup URI did not enable independent IDs",
+  );
+  assert(
+    (effective as typeof effective & { idDerivationKey?: string })
+      .idDerivationKey ===
+      recoveryCode.slice("sls-id-v1:".length),
+    "the Setup URI did not contain the generated ID key",
+  );
   assert(
     effective.isConfigured,
     "the Setup URI left the imported device unconfigured",
@@ -82,6 +98,12 @@ Deno.test("generates a random-room P2P Setup URI without copying a device identi
   );
   assert(decoded, "Commonlib could not decode the P2P Setup URI");
   const effective = { ...DEFAULT_SETTINGS, ...decoded };
+  assert(
+    (effective as typeof effective & { idDerivationKey?: string })
+      .idDerivationKey ===
+      generated.idRecoveryCode?.slice("sls-id-v1:".length),
+    "the P2P Setup URI did not contain the generated ID key",
+  );
   assert(
     /^\d{3}-\d{3}-\d{3}-[a-z0-9]{3}$/.test(effective.P2P_roomID),
     "Commonlib did not generate the expected random room ID",
@@ -159,3 +181,80 @@ Deno.test("rejects an unknown Setup URI mode", async () => {
   }
   assert(rejected, "the generator accepted an unknown Setup URI mode");
 });
+
+for (const mode of ["ephemeral", "persistent"] as const) {
+  Deno.test(`preserves ID recovery and explicit legacy IDs in ${mode} URIs`, async () => {
+    const environment = {
+      remote_type: "p2p",
+      uri_mode: mode,
+      passphrase: "vault-secret",
+      uri_passphrase: "setup-secret",
+    };
+    const first = await generateSetupURI(environment);
+    const second = await generateSetupURI({
+      ...environment,
+      id_recovery_code: first.idRecoveryCode,
+    });
+    const independentlyGenerated = await generateSetupURI(environment);
+    assert(
+      second.idRecoveryCode === first.idRecoveryCode,
+      "the recovery code changed on repeat generation",
+    );
+    assert(
+      independentlyGenerated.idRecoveryCode !== first.idRecoveryCode,
+      "the default ID key was reused",
+    );
+    const repeatedSettings = await decodeSettingsFromSetupURI(
+      second.setupURI,
+      second.setupPassphrase,
+    );
+    assert(repeatedSettings, "the repeated Setup URI could not be decoded");
+    assert(
+      (repeatedSettings as typeof repeatedSettings & {
+        idDerivationKey?: string;
+      }).idDerivationKey ===
+        first.idRecoveryCode?.slice("sls-id-v1:".length),
+      "the recovery code did not restore the original ID key",
+    );
+
+    const legacy = await generateSetupURI({
+      ...environment,
+      id_mode: "legacy",
+    });
+    const decoded = await decodeSettingsFromSetupURI(
+      legacy.setupURI,
+      legacy.setupPassphrase,
+    );
+    assert(decoded, "the legacy Setup URI could not be decoded");
+    assert(
+      legacy.idRecoveryCode === undefined,
+      "legacy mode returned an ID recovery code",
+    );
+    assert(
+      (decoded as typeof decoded & { idDerivationVersion?: number })
+        .idDerivationVersion !== 1,
+      "legacy mode enabled independent IDs",
+    );
+    let rejected = false;
+    try {
+      await generateSetupURI({
+        ...environment,
+        id_recovery_code: "sls-id-v1:wrong",
+      });
+    } catch {
+      rejected = true;
+    }
+    assert(rejected, "an invalid recovery code was accepted");
+    rejected = false;
+    try {
+      await generateSetupURI({
+        ...environment,
+        id_mode: "legacy",
+        id_recovery_code: first.idRecoveryCode,
+      });
+    } catch {
+      rejected = true;
+    }
+    assert(rejected, "legacy mode silently ignored a recovery code");
+  });
+}