From baf9b31cb73afd975f1edf2679f5aa59dcec5141 Mon Sep 17 00:00:00 2001 From: swrup Date: Sat, 6 Dec 2025 23:25:29 +0100 Subject: [PATCH] wip lock --- src/devices.ml | 24 ++---------------------- src/management.ml | 34 +++++++++++++++++----------------- src/secmod_denom.ml | 30 ++++++++++++++++++++++-------- src/secmod_signkey.ml | 37 +++++++++++++++++++++++++++---------- 4 files changed, 68 insertions(+), 57 deletions(-) diff --git a/src/devices.ml b/src/devices.ml index e91f0eb2..f5f5a4f7 100644 --- a/src/devices.ml +++ b/src/devices.ml @@ -22,29 +22,9 @@ let secmod_signkey = let finally _key = () in Vif.Device.v ~name:"secmod_signkey" ~finally [ Vif.Device.value db_connection ] - @@ fun conn (_env : env) -> - match Secmod_signkey.load conn with - | Ok None -> - let t = Secmod_signkey.make_new () in - Logs.info (fun m -> m "secmod_signkey initialized with fresh keys"); - t - | Ok (Some v) -> - Logs.info (fun m -> m "secmod_signkey initialized from storage"); - v - | Error _ -> - (* TODO error: pretty print *) - Fmt.failwith "secmod_signkey init failure." + @@ fun conn (_env : env) -> Secmod_signkey.init conn let secmod_denom = let finally _key = () in Vif.Device.v ~name:"secmod_denom" ~finally [ Vif.Device.value db_connection ] - @@ fun conn (_env : env) -> - match Secmod_denom.load conn with - | Ok None -> - let t = Secmod_denom.make_new () in - Logs.info (fun m -> m "secmod_denom initialized with fresh keys"); - t - | Ok (Some v) -> - Logs.info (fun m -> m "secmod_denom initialized from storage"); - v - | Error _ -> Fmt.failwith "secmod_denom init failure." + @@ fun conn (_env : env) -> Secmod_denom.init conn diff --git a/src/management.ml b/src/management.ml index dc7e6331..e138c036 100644 --- a/src/management.ml +++ b/src/management.ml @@ -66,19 +66,19 @@ let mk_future_signkey ~sm_signkey_priv let mk_future_keys_response ~(sm_signkey : Secmod_signkey.t) ~(sm_denom : Secmod_denom.t) = - let future_denoms = - sm_denom.keys - |> List.filter (fun k -> Option.is_none k.Denomination.master_sig) - |> List.map (fun denom -> - mk_future_denom ~sm_denom_priv:sm_denom.sm_key.Signkey.priv denom) - in let future_signkeys = - sm_signkey.keys + sm_signkey.signkeys |> List.filter (fun k -> Option.is_none k.Signkey.master_sig) |> List.map (fun signkey -> mk_future_signkey ~sm_signkey_priv:sm_signkey.sm_key.Signkey.priv signkey) in + let future_denoms = + sm_denom.denoms + |> List.filter (fun k -> Option.is_none k.Denomination.master_sig) + |> List.map (fun denom -> + mk_future_denom ~sm_denom_priv:sm_denom.sm_key.Signkey.priv denom) + in let master_pub = Config.Exchange.master_public_key in let denom_secmod_public_key = sm_denom.sm_key.pub in let signkey_secmod_public_key = sm_signkey.sm_key.pub in @@ -93,7 +93,7 @@ let mk_future_keys_response ~(sm_signkey : Secmod_signkey.t) (* - ** - *) -let verify_denom_signature ~sm_denom DenomSignature.{ h_denom_pub; master_sig } +let verify_denom_signature ~sm_denoms DenomSignature.{ h_denom_pub; master_sig } = let open Syntax in let denom_hash = @@ -103,7 +103,7 @@ let verify_denom_signature ~sm_denom DenomSignature.{ h_denom_pub; master_sig } let opt = List.find_opt (fun (denom : Denomination.t) -> denom.h_pub = denom_hash) - sm_denom.Secmod_denom.keys + sm_denoms in match opt with | None -> @@ -129,13 +129,11 @@ let verify_denom_signature ~sm_denom DenomSignature.{ h_denom_pub; master_sig } in verify ~key:Config.master_public_key master_sig r -let verify_signkey_signature ~sm_signkey SignKeySignature.{ key; master_sig } = +let verify_signkey_signature ~sm_signkeys SignKeySignature.{ key; master_sig } = let open Syntax in let* signkey = let opt = - List.find_opt - (fun (signkey : Signkey.t) -> signkey.pub = key) - sm_signkey.Secmod_signkey.keys + List.find_opt (fun (signkey : Signkey.t) -> signkey.pub = key) sm_signkeys in match opt with | None -> @@ -155,11 +153,11 @@ let verify_signkey_signature ~sm_signkey SignKeySignature.{ key; master_sig } = in verify ~key:Config.master_public_key master_sig r -let verify_master_signatures ~sm_signkey ~sm_denom +let verify_master_signatures ~sm_signkeys ~sm_denoms MasterSignatures.{ denom_sigs; signkey_sigs } = let open Syntax in - let* () = list_iter (verify_denom_signature ~sm_denom) denom_sigs in - let* () = list_iter (verify_signkey_signature ~sm_signkey) signkey_sigs in + let* () = list_iter (verify_denom_signature ~sm_denoms) denom_sigs in + let* () = list_iter (verify_signkey_signature ~sm_signkeys) signkey_sigs in Ok () (* --- *) @@ -215,7 +213,9 @@ let keys_post req server _env = Error msg in let* () = - verify_master_signatures ~sm_signkey ~sm_denom master_signatures + let sm_denoms = sm_denom.denoms in + let sm_signkeys = sm_signkey.signkeys in + verify_master_signatures ~sm_signkeys ~sm_denoms master_signatures in let* () = store_master_signatures () in Ok "" diff --git a/src/secmod_denom.ml b/src/secmod_denom.ml index 504e0755..ba83d5b1 100644 --- a/src/secmod_denom.ml +++ b/src/secmod_denom.ml @@ -1,16 +1,16 @@ open Syntax type t = { + lock: Miou.Mutex.t; sm_key: Signkey.t; - (* TODO rename *) - keys: Denomination.t list; + mutable denoms: Denomination.t list; } let dir = Fpath.(v "data" / "secmod_signkey") let store_secmod_data t = let* () = Data_file.write_eddsa Fpath.(dir / "sm_key") t.sm_key.priv in - t.keys + t.denoms |> List.mapi (fun i key -> let fname = Fpath.(dir / string_of_int i) in (fname, key.Denomination.priv)) @@ -21,7 +21,7 @@ let load conn = Fmt.error_msg "secmod_denom load error: invalid store state." in let* sm_key = Data_file.load_signkey conn Fpath.(dir / "sm_key") in - let* keys = + let* denoms = let* l = let open Config.Coin in Syntax.list_map @@ -36,12 +36,26 @@ let load conn = | Error () -> error_invalid_state | Ok opt -> Ok opt in - match (sm_key, keys) with + match (sm_key, denoms) with | None, None -> Ok None - | Some sm_key, Some keys -> Ok (Some { sm_key; keys }) + | Some sm_key, Some denoms -> + let lock = Miou.Mutex.create () in + Ok (Some { lock; sm_key; denoms }) | _, _ -> error_invalid_state let make_new () = + let lock = Miou.Mutex.create () in let sm_key = Signkey.make () in - let keys = List.map Denomination.make Config.Coin.all_coins in - { sm_key; keys } + let denoms = List.map Denomination.make Config.Coin.all_coins in + { lock; sm_key; denoms } + +let init conn = + match load conn with + | Ok None -> + let t = make_new () in + Logs.info (fun m -> m "secmod_denom initialized with fresh keys"); + t + | Ok (Some v) -> + Logs.info (fun m -> m "secmod_denom initialized from storage"); + v + | Error _ -> Fmt.failwith "secmod_denom init failure." diff --git a/src/secmod_signkey.ml b/src/secmod_signkey.ml index 128a38c0..9b6cf1f6 100644 --- a/src/secmod_signkey.ml +++ b/src/secmod_signkey.ml @@ -1,19 +1,20 @@ (* TODO - - key rotation - - how many signkey to use? - we just use 1 for now *) + - key rotation + - how many signkey to use? + we just use 1 for now *) open Syntax type t = { + lock: Miou.Mutex.t; sm_key: Signkey.t; - keys: Signkey.t list; + mutable signkeys: Signkey.t list; } let dir = Fpath.(v "data" / "secmod_signkey") let store_secmod_data t = let* () = Data_file.write_eddsa Fpath.(dir / "sm_key") t.sm_key.priv in - t.keys + t.signkeys |> List.mapi (fun i key -> let fname = Fpath.(dir / string_of_int i) in (fname, key.Signkey.priv)) @@ -24,7 +25,7 @@ let load conn = Fmt.error_msg "secmod_signkey load error: invalid store state." in let* sm_key = Data_file.load_signkey conn Fpath.(dir / "sm_key") in - let* keys = + let* signkeys = let l = List.init 1 (fun i -> Fpath.(dir / string_of_int i)) in let* l = Syntax.list_map (fun fname -> Data_file.load_signkey conn fname) l @@ -33,12 +34,28 @@ let load conn = | Error () -> error_invalid_state | Ok opt -> Ok opt in - match (sm_key, keys) with + match (sm_key, signkeys) with | None, None -> Ok None - | Some sm_key, Some keys -> Ok (Some { sm_key; keys }) + | Some sm_key, Some signkeys -> + let lock = Miou.Mutex.create () in + Ok (Some { lock; sm_key; signkeys }) | _, _ -> error_invalid_state let make_new () = + let lock = Miou.Mutex.create () in let sm_key = Signkey.make () in - let keys = [ Signkey.make () ] in - { sm_key; keys } + let signkeys = [ Signkey.make () ] in + { lock; sm_key; signkeys } + +let init conn = + match load conn with + | Ok None -> + let t = make_new () in + Logs.info (fun m -> m "secmod_signkey initialized with fresh keys"); + t + | Ok (Some v) -> + Logs.info (fun m -> m "secmod_signkey initialized from storage"); + v + | Error _ -> + (* TODO error: pretty print *) + Fmt.failwith "secmod_signkey init failure."