diff --git a/.jjconflict-base-0/src/http_management.ml b/.jjconflict-base-0/src/http_management.ml index 54ea2557..d138c5de 100644 --- a/.jjconflict-base-0/src/http_management.ml +++ b/.jjconflict-base-0/src/http_management.ml @@ -22,9 +22,9 @@ module Keys_get = struct let f req server _env = Logs.info (fun m -> m "GET /management/keys/"); - let sm = Vif.Server.device Devices.secmod server in + let keys = Vif.Server.device Devices.keys server in let res = - let v = mk_future_keys_response sm in + let v = mk_future_keys_response keys in let s = Api.encode_exn jsont v in Ok s in @@ -76,9 +76,9 @@ module Keys_post = struct in verify_f ~f:Keys.verify_with_master_key master_sig r - let verify sm MasterSignatures.{ denom_sigs; signkey_sigs } = - let* () = list_iter (verify_denom_signature sm) denom_sigs in - let* () = list_iter (verify_signkey_signature sm) signkey_sigs in + let verify keys MasterSignatures.{ denom_sigs; signkey_sigs } = + let* () = list_iter (verify_denom_signature keys) denom_sigs in + let* () = list_iter (verify_signkey_signature keys) signkey_sigs in Ok () let do_ ~db_conn:_ (module Keys : Keys.S) @@ -103,11 +103,11 @@ module Keys_post = struct let f req server _env = Logs.info (fun m -> m "POST /management/keys/"); let db_conn = Vif.Server.device Devices.db_connection server in - let sm = Vif.Server.device Devices.secmod server in + let keys = Vif.Server.device Devices.keys server in let res = let* v = Vif.Request.of_json req |> unwrap_err_msg in - let* () = verify sm v in - let* () = do_ ~db_conn sm v in + let* () = verify keys v in + let* () = do_ ~db_conn keys v in Ok "" in Respond.result res req @@ -119,21 +119,26 @@ module Denom_revoke = struct let open Signatures.MasterDenominationKeyRevocation in verify_f ~f:Keys.verify_with_master_key master_sig { h_denom_pub } - let do_ (module Keys : Keys.S) h_denom_pub + let do_ ~db_conn (module Keys : Keys.S) h_denom_pub DenomRevocationSignature.{ master_sig } = - let+ () = Keys.revoke_denomination h_denom_pub master_sig in + let* () = Keys.revoke_denomination h_denom_pub master_sig in + let+ () = + Pg.insert_denomination_revocation db_conn h_denom_pub master_sig + |> unwrap_err_caqti + in () let jsont = DenomRevocationSignature.jsont let f req h_denom_pub server _env = Logs.info (fun m -> m "POST /management/denominations/$H_DENOM_PUB/revoke/"); - let sm = Vif.Server.device Devices.secmod server in + let db_conn = Vif.Server.device Devices.db_connection server in + let keys = Vif.Server.device Devices.keys server in let res = let* h_denom_pub = DenominationHash.of_b32 h_denom_pub in let* v = Vif.Request.of_json req |> unwrap_err_msg in - let* () = verify sm h_denom_pub v in - let* () = do_ sm h_denom_pub v in + let* () = verify keys h_denom_pub v in + let* () = do_ ~db_conn keys h_denom_pub v in Ok "" in Respond.result res req @@ -145,9 +150,13 @@ module Signkey_revoke = struct let open Signatures.MasterSigningKeyRevocation in verify_f ~f:Keys.verify_with_master_key master_sig { exchange_pub } - let do_ (module Keys : Keys.S) exchange_pub + let do_ ~db_conn (module Keys : Keys.S) exchange_pub SignkeyRevocationSignature.{ master_sig } = - let+ () = Keys.revoke_signkey exchange_pub master_sig in + let* () = Keys.revoke_signkey exchange_pub master_sig in + let+ () = + Pg.insert_signkey_revocation db_conn exchange_pub master_sig + |> unwrap_err_caqti + in () let jsont = SignkeyRevocationSignature.jsont @@ -208,11 +217,11 @@ module Auditors = struct let f req server _env = Logs.info (fun m -> m "POST /management/auditors/"); - let sm = Vif.Server.device Devices.secmod server in + let keys = Vif.Server.device Devices.keys server in let db_conn = Vif.Server.device Devices.db_connection server in let res = let* v = Vif.Request.of_json req |> unwrap_err_msg in - let* () = verify sm v in + let* () = verify keys v in let* () = do_ ~db_conn v in Ok "" in @@ -248,12 +257,12 @@ module Auditors_disable = struct let f req auditor_pub server _env = Logs.info (fun m -> m "POST /management/auditors/$AUDITOR_PUB/revoke/"); - let sm = Vif.Server.device Devices.secmod server in + let keys = Vif.Server.device Devices.keys server in let db_conn = Vif.Server.device Devices.db_connection server in let res = let* auditor_pub = Crypto.EddsaPublicKey.of_b32 auditor_pub in let* v = Vif.Request.of_json req |> unwrap_err_msg in - let* () = verify sm auditor_pub v in + let* () = verify keys auditor_pub v in let* () = do_ ~db_conn auditor_pub v in Ok "" in @@ -308,11 +317,11 @@ module Wire_fee = struct let f req server _env = Logs.info (fun m -> m "POST /management/wire-fee/"); - let sm = Vif.Server.device Devices.secmod server in + let keys = Vif.Server.device Devices.keys server in let db_conn = Vif.Server.device Devices.db_connection server in let res = let* v = Vif.Request.of_json req |> unwrap_err_msg in - let* () = verify sm v in + let* () = verify keys v in let* () = do_ ~db_conn v in Ok "" in @@ -379,11 +388,11 @@ module Global_fees = struct and once set for a timeframe, it should not change. *) let f req server _env = Logs.info (fun m -> m "POST /management/global-fees/"); - let sm = Vif.Server.device Devices.secmod server in + let keys = Vif.Server.device Devices.keys server in let db_conn = Vif.Server.device Devices.db_connection server in let res = let* v = Vif.Request.of_json req |> unwrap_err_msg in - let* () = verify sm v in + let* () = verify keys v in let* () = do_ ~db_conn v in Ok "" in @@ -458,11 +467,11 @@ module Wire = struct let f req server _env = Logs.info (fun m -> m "POST /management/wire/"); - let sm = Vif.Server.device Devices.secmod server in + let keys = Vif.Server.device Devices.keys server in let db_conn = Vif.Server.device Devices.db_connection server in let res = let* v = Vif.Request.of_json req |> unwrap_err_msg in - let* () = verify sm v in + let* () = verify keys v in let* () = do_ ~db_conn v in Ok "" in @@ -493,11 +502,11 @@ module Wire_disable = struct let f req server _env = Logs.info (fun m -> m "POST /management/wire/disable/"); - let sm = Vif.Server.device Devices.secmod server in + let keys = Vif.Server.device Devices.keys server in let db_conn = Vif.Server.device Devices.db_connection server in let res = let* v = Vif.Request.of_json req |> unwrap_err_msg in - let* () = verify sm v in + let* () = verify keys v in let* () = do_ ~db_conn v in Ok "" in @@ -533,11 +542,11 @@ module Drain = struct let f req server _env = Logs.info (fun m -> m "POST /management/drain/"); - let sm = Vif.Server.device Devices.secmod server in + let keys = Vif.Server.device Devices.keys server in let db_conn = Vif.Server.device Devices.db_connection server in let res = let* v = Vif.Request.of_json req |> unwrap_err_msg in - let* () = verify sm v in + let* () = verify keys v in let* () = do_ ~db_conn v in Ok "" in @@ -573,11 +582,11 @@ module AmlOfficer = struct let f req server _env = Logs.info (fun m -> m "POST /management/aml-officers/"); - let sm = Vif.Server.device Devices.secmod server in + let keys = Vif.Server.device Devices.keys server in let db_conn = Vif.Server.device Devices.db_connection server in let res = let* v = Vif.Request.of_json req |> unwrap_err_msg in - let* () = verify sm v in + let* () = verify keys v in let* () = do_ ~db_conn v in Ok "" in @@ -615,11 +624,11 @@ module Partners = struct let f req server _env = Logs.info (fun m -> m "POST /management/partners/"); - let sm = Vif.Server.device Devices.secmod server in + let keys = Vif.Server.device Devices.keys server in let db_conn = Vif.Server.device Devices.db_connection server in let res = let* v = Vif.Request.of_json req |> unwrap_err_msg in - let* () = verify sm v in + let* () = verify keys v in let* () = do_ ~db_conn v in Ok "" in diff --git a/.jjconflict-side-0/src/http_management.ml b/.jjconflict-side-0/src/http_management.ml index 9ba83b1b..8e13115f 100644 --- a/.jjconflict-side-0/src/http_management.ml +++ b/.jjconflict-side-0/src/http_management.ml @@ -22,9 +22,9 @@ module Keys_get = struct let f req server _env = Logs.info (fun m -> m "GET /management/keys/"); - let sm = Vif.Server.device Devices.secmod server in + let keys = Vif.Server.device Devices.keys server in let res = - let v = mk_future_keys_response sm in + let v = mk_future_keys_response keys in let s = Api.encode_exn jsont v in Ok s in @@ -76,9 +76,9 @@ module Keys_post = struct in verify_f ~f:Keys.verify_with_master_key master_sig r - let verify sm MasterSignatures.{ denom_sigs; signkey_sigs } = - let* () = list_iter (verify_denom_signature sm) denom_sigs in - let* () = list_iter (verify_signkey_signature sm) signkey_sigs in + let verify keys MasterSignatures.{ denom_sigs; signkey_sigs } = + let* () = list_iter (verify_denom_signature keys) denom_sigs in + let* () = list_iter (verify_signkey_signature keys) signkey_sigs in Ok () let do_ ~db_conn:_ (module Keys : Keys.S) @@ -103,11 +103,11 @@ module Keys_post = struct let f req server _env = Logs.info (fun m -> m "POST /management/keys/"); let db_conn = Vif.Server.device Devices.db_connection server in - let sm = Vif.Server.device Devices.secmod server in + let keys = Vif.Server.device Devices.keys server in let res = let* v = Vif.Request.of_json req |> unwrap_err_msg in - let* () = verify sm v in - let* () = do_ ~db_conn sm v in + let* () = verify keys v in + let* () = do_ ~db_conn keys v in Ok "" in Respond.result res req @@ -133,12 +133,12 @@ module Denom_revoke = struct let f req h_denom_pub server _env = Logs.info (fun m -> m "POST /management/denominations/$H_DENOM_PUB/revoke/"); let db_conn = Vif.Server.device Devices.db_connection server in - let sm = Vif.Server.device Devices.secmod server in + let keys = Vif.Server.device Devices.keys server in let res = let* h_denom_pub = DenominationHash.of_b32 h_denom_pub in let* v = Vif.Request.of_json req |> unwrap_err_msg in - let* () = verify sm h_denom_pub v in - let* () = do_ ~db_conn sm h_denom_pub v in + let* () = verify keys h_denom_pub v in + let* () = do_ ~db_conn keys h_denom_pub v in Ok "" in Respond.result res req @@ -218,11 +218,11 @@ module Auditors = struct let f req server _env = Logs.info (fun m -> m "POST /management/auditors/"); - let sm = Vif.Server.device Devices.secmod server in + let keys = Vif.Server.device Devices.keys server in let db_conn = Vif.Server.device Devices.db_connection server in let res = let* v = Vif.Request.of_json req |> unwrap_err_msg in - let* () = verify sm v in + let* () = verify keys v in let* () = do_ ~db_conn v in Ok "" in @@ -258,12 +258,12 @@ module Auditors_disable = struct let f req auditor_pub server _env = Logs.info (fun m -> m "POST /management/auditors/$AUDITOR_PUB/revoke/"); - let sm = Vif.Server.device Devices.secmod server in + let keys = Vif.Server.device Devices.keys server in let db_conn = Vif.Server.device Devices.db_connection server in let res = let* auditor_pub = Crypto.EddsaPublicKey.of_b32 auditor_pub in let* v = Vif.Request.of_json req |> unwrap_err_msg in - let* () = verify sm auditor_pub v in + let* () = verify keys auditor_pub v in let* () = do_ ~db_conn auditor_pub v in Ok "" in @@ -318,11 +318,11 @@ module Wire_fee = struct let f req server _env = Logs.info (fun m -> m "POST /management/wire-fee/"); - let sm = Vif.Server.device Devices.secmod server in + let keys = Vif.Server.device Devices.keys server in let db_conn = Vif.Server.device Devices.db_connection server in let res = let* v = Vif.Request.of_json req |> unwrap_err_msg in - let* () = verify sm v in + let* () = verify keys v in let* () = do_ ~db_conn v in Ok "" in @@ -389,11 +389,11 @@ module Global_fees = struct and once set for a timeframe, it should not change. *) let f req server _env = Logs.info (fun m -> m "POST /management/global-fees/"); - let sm = Vif.Server.device Devices.secmod server in + let keys = Vif.Server.device Devices.keys server in let db_conn = Vif.Server.device Devices.db_connection server in let res = let* v = Vif.Request.of_json req |> unwrap_err_msg in - let* () = verify sm v in + let* () = verify keys v in let* () = do_ ~db_conn v in Ok "" in @@ -468,11 +468,11 @@ module Wire = struct let f req server _env = Logs.info (fun m -> m "POST /management/wire/"); - let sm = Vif.Server.device Devices.secmod server in + let keys = Vif.Server.device Devices.keys server in let db_conn = Vif.Server.device Devices.db_connection server in let res = let* v = Vif.Request.of_json req |> unwrap_err_msg in - let* () = verify sm v in + let* () = verify keys v in let* () = do_ ~db_conn v in Ok "" in @@ -503,11 +503,11 @@ module Wire_disable = struct let f req server _env = Logs.info (fun m -> m "POST /management/wire/disable/"); - let sm = Vif.Server.device Devices.secmod server in + let keys = Vif.Server.device Devices.keys server in let db_conn = Vif.Server.device Devices.db_connection server in let res = let* v = Vif.Request.of_json req |> unwrap_err_msg in - let* () = verify sm v in + let* () = verify keys v in let* () = do_ ~db_conn v in Ok "" in @@ -543,11 +543,11 @@ module Drain = struct let f req server _env = Logs.info (fun m -> m "POST /management/drain/"); - let sm = Vif.Server.device Devices.secmod server in + let keys = Vif.Server.device Devices.keys server in let db_conn = Vif.Server.device Devices.db_connection server in let res = let* v = Vif.Request.of_json req |> unwrap_err_msg in - let* () = verify sm v in + let* () = verify keys v in let* () = do_ ~db_conn v in Ok "" in @@ -583,11 +583,11 @@ module AmlOfficer = struct let f req server _env = Logs.info (fun m -> m "POST /management/aml-officers/"); - let sm = Vif.Server.device Devices.secmod server in + let keys = Vif.Server.device Devices.keys server in let db_conn = Vif.Server.device Devices.db_connection server in let res = let* v = Vif.Request.of_json req |> unwrap_err_msg in - let* () = verify sm v in + let* () = verify keys v in let* () = do_ ~db_conn v in Ok "" in @@ -625,11 +625,11 @@ module Partners = struct let f req server _env = Logs.info (fun m -> m "POST /management/partners/"); - let sm = Vif.Server.device Devices.secmod server in + let keys = Vif.Server.device Devices.keys server in let db_conn = Vif.Server.device Devices.db_connection server in let res = let* v = Vif.Request.of_json req |> unwrap_err_msg in - let* () = verify sm v in + let* () = verify keys v in let* () = do_ ~db_conn v in Ok "" in diff --git a/.jjconflict-side-1/src/http_management.ml b/.jjconflict-side-1/src/http_management.ml index be19ac91..77922db8 100644 --- a/.jjconflict-side-1/src/http_management.ml +++ b/.jjconflict-side-1/src/http_management.ml @@ -119,21 +119,26 @@ module Denom_revoke = struct let open Signatures.MasterDenominationKeyRevocation in verify_f ~f:Keys.verify_with_master_key master_sig { h_denom_pub } - let do_ (module Keys : Keys.S) h_denom_pub + let do_ ~db_conn (module Keys : Keys.S) h_denom_pub DenomRevocationSignature.{ master_sig } = - let+ () = Keys.revoke_denomination h_denom_pub master_sig in + let* () = Keys.revoke_denomination h_denom_pub master_sig in + let+ () = + Pg.insert_denomination_revocation db_conn h_denom_pub master_sig + |> unwrap_err_caqti + in () let jsont = DenomRevocationSignature.jsont let f req h_denom_pub server _env = Logs.info (fun m -> m "POST /management/denominations/$H_DENOM_PUB/revoke/"); + let db_conn = Vif.Server.device Devices.db_connection server in let keys = Vif.Server.device Devices.keys server in let res = let* h_denom_pub = DenominationHash.of_b32 h_denom_pub in let* v = Vif.Request.of_json req |> unwrap_err_msg in let* () = verify keys h_denom_pub v in - let* () = do_ keys h_denom_pub v in + let* () = do_ ~db_conn keys h_denom_pub v in Ok "" in Respond.result res req @@ -145,9 +150,13 @@ module Signkey_revoke = struct let open Signatures.MasterSigningKeyRevocation in verify_f ~f:Keys.verify_with_master_key master_sig { exchange_pub } - let do_ (module Keys : Keys.S) exchange_pub + let do_ ~db_conn (module Keys : Keys.S) exchange_pub SignkeyRevocationSignature.{ master_sig } = - let+ () = Keys.revoke_signkey exchange_pub master_sig in + let* () = Keys.revoke_signkey exchange_pub master_sig in + let+ () = + Pg.insert_signkey_revocation db_conn exchange_pub master_sig + |> unwrap_err_caqti + in () let jsont = SignkeyRevocationSignature.jsont