clean up future_sk/dn

This commit is contained in:
swrup 2026-02-24 19:04:22 +01:00
parent d69b49a335
commit 61150598d2
2 changed files with 74 additions and 134 deletions

View file

@ -9,16 +9,18 @@ module Keys_get = struct
Logs.info (fun m -> m "GET /management/keys/");
let (module Keys : Keys.S) = Vif.Server.device Devices.keys server in
let res =
let* v = Keys.make_future_keys_response () in
let v = Keys.make_future_keys_response () in
Api.encode jsont v
in
Respond.result res req
end
module Keys_post = struct
let verify_dn (module Keys : Keys.S) fdn denom_hash master_sig =
let verify_fdn (module Keys : Keys.S)
DenomSignature.{ h_denom_pub; master_sig } =
let open FutureDenom in
let open Signatures.DenominationKeyValidity in
let* fdn = Keys.find_future_denomination h_denom_pub in
verify Config.master_public_key master_sig
{
R.master= Config.master_public_key;
@ -31,54 +33,23 @@ module Keys_post = struct
fee_deposit= fdn.fee_deposit;
fee_refresh= fdn.fee_refresh;
fee_refund= fdn.fee_refund;
denom_hash;
denom_hash= h_denom_pub;
}
let verify_denom_sigs (module Keys : Keys.S) denom_sigs =
let* fdn_l = Keys.future_denominations () in
let fdn_l =
List.map
(fun fdn ->
let h_pub =
(* TODO DenominationHash.of_denom_pub *)
DenominationHash.hash
(DenominationKey.to_octets fdn.FutureDenom.denom_pub)
in
(h_pub, fdn))
fdn_l
in
list_iter
(fun DenomSignature.{ h_denom_pub; master_sig } ->
match List.assoc_opt h_denom_pub fdn_l with
| None -> Error "future denomination not found"
| Some fdn -> verify_dn (module Keys) fdn h_denom_pub master_sig)
denom_sigs
let verify_sk (module Keys : Keys.S)
FutureSignKey.
{ key; stamp_start; stamp_expire; stamp_end; signkey_secmod_sig= _ }
master_sig =
let verify_fsk (module Keys : Keys.S) SignKeySignature.{ key; master_sig } =
let open Signatures.ExchangeSigningKeyValidity in
let* fsk = Keys.find_future_signkey key in
verify Config.master_public_key master_sig
{
R.start= stamp_start;
expire= stamp_expire;
end_= stamp_end;
R.start= fsk.stamp_start;
expire= fsk.stamp_expire;
end_= fsk.stamp_end;
signkey_pub= key;
}
let verify_signkey_sigs (module Keys : Keys.S) signkey_sigs =
let* fsk_l = Keys.future_signkeys () in
list_iter
(fun SignKeySignature.{ key; master_sig } ->
match List.find_opt (fun sk -> sk.FutureSignKey.key = key) fsk_l with
| None -> Error "future signkey not found"
| Some fsk -> verify_sk (module Keys) fsk master_sig)
signkey_sigs
let verify keys MasterSignatures.{ denom_sigs; signkey_sigs } =
let* () = verify_signkey_sigs keys signkey_sigs in
let* () = verify_denom_sigs keys denom_sigs in
let* () = list_iter (verify_fsk keys) signkey_sigs in
let* () = list_iter (verify_fdn keys) denom_sigs in
Ok ()
let do_ ~db_conn:_ (module Keys : Keys.S)