Fix missing now parameter in BaseShamirComponent.add_recovery_setup

Scille · Aug 21, 2024 · 9349757 · 9349757
1 parent 4612e4f
commit 9349757
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/server/parsec/components/memory/shamir.py b/server/parsec/components/memory/shamir.py
@@ -2,7 +2,7 @@
 
 from typing import override
 
-from parsec._parsec import DeviceID, OrganizationID, UserID, VerifyKey, authenticated_cmds
+from parsec._parsec import DateTime, DeviceID, OrganizationID, UserID, VerifyKey, authenticated_cmds
 from parsec.ballpark import RequireGreaterTimestamp, TimestampOutOfBallpark
 from parsec.components.events import EventBus
 from parsec.components.memory.datamodel import (
@@ -68,6 +68,7 @@ async def remove_recovery_setup(
     @override
     async def add_recovery_setup(
         self,
+        now: DateTime,
         organization_id: OrganizationID,
         author: UserID,
         device: DeviceID,
@@ -88,7 +89,7 @@ async def add_recovery_setup(
             case error:
                 return error
 
-        match shamir_add_recovery_setup_validate(setup, device, author, author_verify_key):
+        match shamir_add_recovery_setup_validate(now, setup, device, author, author_verify_key):
             case (brief, shares):
                 pass
             case error:

diff --git a/server/parsec/components/shamir.py b/server/parsec/components/shamir.py
@@ -37,11 +37,12 @@ async def api_shamir_recovery_setup(
             return authenticated_cmds.latest.shamir_recovery_setup.RepOk()
         else:
             match await self.add_recovery_setup(
-                client_ctx.organization_id,
-                client_ctx.user_id,
-                client_ctx.device_id,
-                client_ctx.device_verify_key,
-                req.setup,
+                now=DateTime.now(),
+                organization_id=client_ctx.organization_id,
+                author=client_ctx.user_id,
+                device=client_ctx.device_id,
+                author_verify_key=client_ctx.device_verify_key,
+                setup=req.setup,
             ):
                 case None:
                     return authenticated_cmds.latest.shamir_recovery_setup.RepOk()
@@ -106,6 +107,7 @@ async def remove_recovery_setup(
 
     async def add_recovery_setup(
         self,
+        now: DateTime,
         organization_id: OrganizationID,
         author: UserID,
         device: DeviceID,
@@ -152,6 +154,7 @@ class ShamirInvalidRecipientBadOutcome(BadOutcome):
 
 # Check internal consistency of certificate
 def shamir_add_recovery_setup_validate(
+    now: DateTime,
     setup: authenticated_cmds.latest.shamir_recovery_setup.ShamirRecoverySetup,
     author: DeviceID,
     user_id: UserID,
@@ -169,7 +172,7 @@ def shamir_add_recovery_setup_validate(
     except ValueError:
         return ShamirAddRecoverySetupValidateBadOutcome.BRIEF_INVALID_DATA
 
-    match timestamps_in_the_ballpark(brief_certificate.timestamp, DateTime.now()):
+    match timestamps_in_the_ballpark(brief_certificate.timestamp, now):
         case TimestampOutOfBallpark() as error:
             return error
         case _: