blockers 2

src/AirGap/StellaOps.AirGap.Time/Controllers/TimeStatusController.cs

@@ -10,12 +10,14 @@ public class TimeStatusController : ControllerBase
 {
     private readonly TimeStatusService _statusService;
     private readonly TimeAnchorLoader _loader;
+    private readonly TrustRootProvider _trustRoots;
     private readonly ILogger<TimeStatusController> _logger;
 
-    public TimeStatusController(TimeStatusService statusService, TimeAnchorLoader loader, ILogger<TimeStatusController> logger)
+    public TimeStatusController(TimeStatusService statusService, TimeAnchorLoader loader, TrustRootProvider trustRoots, ILogger<TimeStatusController> logger)
     {
         _statusService = statusService;
         _loader = loader;
+        _trustRoots = trustRoots;
         _logger = logger;
     }
 
@@ -39,22 +41,24 @@ public class TimeStatusController : ControllerBase
             return ValidationProblem(ModelState);
         }
 
-        byte[] publicKey;
-        try
+        var trustRoots = _trustRoots.GetAll();
+        if (!string.IsNullOrWhiteSpace(request.TrustRootPublicKeyBase64))
         {
-            publicKey = Convert.FromBase64String(request.TrustRootPublicKeyBase64);
+            try
+            {
+                var publicKey = Convert.FromBase64String(request.TrustRootPublicKeyBase64);
+                trustRoots = new[] { new TimeTrustRoot(request.TrustRootKeyId, publicKey, request.TrustRootAlgorithm) };
+            }
+            catch (FormatException)
+            {
+                return BadRequest("trust-root-public-key-invalid-base64");
+            }
         }
-        catch (FormatException)
-        {
-            return BadRequest("trust-root-public-key-invalid-base64");
-        }
-
-        var trustRoot = new TimeTrustRoot(request.TrustRootKeyId, publicKey, request.TrustRootAlgorithm);
 
         var result = _loader.TryLoadHex(
             request.HexToken,
             request.Format,
-            new[] { trustRoot },
+            trustRoots,
             out var anchor);
 
         if (!result.IsValid)