+ wip /management/keys/
This commit is contained in:
parent
cf4da6b382
commit
f9d1006045
7 changed files with 32 additions and 53 deletions
1
foo.json
Normal file
1
foo.json
Normal file
|
|
@ -0,0 +1 @@
|
|||
{"v":"bar"}
|
||||
1
future_keys.json
Normal file
1
future_keys.json
Normal file
|
|
@ -0,0 +1 @@
|
|||
{"future_denoms":[{"section_name":"kudo_1","value":"EUR:0.01","stamp_start":{"t_s":1764526675.644896},"stamp_expire_withdraw":{"t_s":1796062675.644896},"stamp_expire_deposit":{"t_s":1796062675.644896},"stamp_expire_legal":{"t_s":1796062675.644896},"denom_pub":{"cipher":"RSA","age_mask":0,"rsa_pub":"04000254QES2888WRRP625ND2NHJRWSQ2GK6KYF1HXEKTACA00QZ8P626BYZQP5XQFXR609AQZAW64CP5WHH1C9TANP9N7C2Z0BT1CA2FJM5K29JYX17QR9MJQWMNRTNARFRYB8K6131YJW8PSPNPY0Q9DW4QGT391GNEZ3S0KZF1D0JKAHF4ADTH8NPCM9DVM0319QXDCD8CDVXRMMCH53BCBADWW99EATWEDAX042M9QA54440AX9CN4KS78N9RY4WMEEPW10RJJ33Q532JH8HP03ZXMK9DMDXYC49C41W1BN8KD9RMXWKHS862BF1D4BKSSWP2T9RRQRN500YGM2GG8F3F39Q4NNF9CB5KH4HHJCFWMX6XMMC3QP56M85JAEGG298FXJ3TTRF4RFKB2J11SCKE1830000000004002==="},"fee_withdraw":"EUR:0.00","fee_deposit":"EUR:0.00","fee_refresh":"EUR:0.00","fee_refund":"EUR:0.00","denom_secmod_sig":"JN8623Z3YRW61B8Q65HYBTC0ZSGSARQCTAH7TVC04BWMSTN7DMV4GA89SC06Q44F1KDY2BCA25ZV3PVJ01TJV840T7SQRJE49MMNE1R="},{"section_name":"kudo_2","value":"EUR:0.02","stamp_start":{"t_s":1764526675.6826456},"stamp_expire_withdraw":{"t_s":1796062675.6826456},"stamp_expire_deposit":{"t_s":1796062675.6826456},"stamp_expire_legal":{"t_s":1796062675.6826456},"denom_pub":{"cipher":"RSA","age_mask":0,"rsa_pub":"0400026DPPYG5JCSBMJNCGNBWRD1P5RBFM53515Z0EMW51CWX5JBR53KXFM4HJCDXV091GZ7WW1656S3425SRF4195TCWVVKGXA8T5Z3T1M4NVGSAKZFQB640RGQ51BGJAZ4TVRPM34ZBBC10X0DRN2DZQG6YXSJ8ZC76E2AHB3G1QXZTK0J9P0BBSVRF0J9MK3EK2FKS6RDC5B13PJ14V591KAJPSXJ2GDT3JA185JYN68W0P9BK55YGYF980JV2W0KV7034S73E2BQZKSNX9CPG6239DY8VAHRVPPTWB8VNM6GSJ4CCTBN1WR81X45A45C4D5GXBACY239XJHZHFVM77KN75Y8MCM6R517MDBBVBFEJNRTZ9CG538B3ZE5JFG5F2DXEW1HX0SNMCCXNX1EKFWFJEJ10000000004002==="},"fee_withdraw":"EUR:0.00","fee_deposit":"EUR:0.00","fee_refresh":"EUR:0.00","fee_refund":"EUR:0.00","denom_secmod_sig":"QXMGY28GYSW2AEWK5YB73RY2EFDXG5BXV8P3V9TEX3Z8P1PVM9BDTZTZ1HHZ1KRKKYFY7PV73H3NG469FKTS253D27EREVWAKZMN43G="}],"future_signkeys":[{"key":"HGDR794CYVK0DK72YMF6TQS0G955E49MWM77VEH456E7CR0EVG4G====","stamp_start":{"t_s":1764526675.6448135},"stamp_expire":{"t_s":1796062675.6448135},"stamp_end":{"t_s":1796062675.6448135},"signkey_secmod_sig":"MM6Q8PABQ3K3D7VCGZAP5ZVK6A4TWT9FM8WCHTVYBS2S25PJ5X4BEMFW1B2Q7YAPBPHF09R1KMSE3QZXG4NHG6WFVQ5EN0Y4A715P2G="}],"master_pub":"SJ0NYND22VQP3MP7FM754RDX8HCKVWAXTHY9SQNBTPRJZ2SPM2S0====","denom_secmod_public_key":"PHF846J4JT41AXZZE1RKR0KH3TBE7MZNASH41CQ7V1VM220FSVZ0====","signkey_secmod_public_key":"GSK1SA7T09XYPBM93WYBW1N8GHKX1MXJR474T5DWP9DDMJBSDZ60===="}
|
||||
|
|
@ -109,10 +109,3 @@ let keys_get req server _env =
|
|||
let* () = with_string req s in
|
||||
let* () = add ~field:"content-type" "application/json" in
|
||||
respond `OK
|
||||
|
||||
let keys_post req _server _env =
|
||||
let open Vif.Response in
|
||||
let open Syntax in
|
||||
let* () = with_string req {||} in
|
||||
let* () = add ~field:"content-type" "application/json" in
|
||||
respond `OK
|
||||
|
|
|
|||
15
src/mte.ml
15
src/mte.ml
|
|
@ -23,17 +23,12 @@ let hello req _server _env =
|
|||
let routes =
|
||||
let open Vif.Uri in
|
||||
let open Vif.Route in
|
||||
let open Vif.Type in
|
||||
(* just for alignement *)
|
||||
let get_ = get in
|
||||
let post = Fun.flip post in
|
||||
(*let open Vif.Type in*)
|
||||
[
|
||||
get_ (rel /?? nil) --> hello;
|
||||
get_ (rel / "terms" /?? nil) --> Static.terms;
|
||||
get_ (rel / "privacy" /?? nil) --> Static.privacy;
|
||||
get_ (rel / "test" /?? nil) --> Database.test_activate;
|
||||
get_ (rel / "management" / "keys" /?? nil) --> Management.keys_get;
|
||||
post (rel / "management" / "keys" /?? nil) any --> Management.keys_post;
|
||||
get (rel /?? nil) --> hello;
|
||||
get (rel / "terms" /?? nil) --> Static.terms;
|
||||
get (rel / "privacy" /?? nil) --> Static.privacy;
|
||||
get (rel / "management" / "keys" /?? nil) --> Management.keys_get;
|
||||
]
|
||||
|
||||
let () =
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
(executable
|
||||
(public_name offline)
|
||||
(name offline)
|
||||
(modules offline offline_signature)
|
||||
(modules offline offline_bin)
|
||||
(libraries cmdliner bos fmt mirage-crypto ptime mte vif))
|
||||
|
|
|
|||
|
|
@ -1,36 +1,30 @@
|
|||
(* TODO
|
||||
- clean up cmdliner
|
||||
- don't depends on wget
|
||||
- setup: need public key in config file
|
||||
- check sigs *)
|
||||
(* doc: https://docs.taler.net/manpages/taler-exchange-offline.1.html *)
|
||||
let version = "%%VERSION%%"
|
||||
let base_url = Uri.of_string "http://localhost:3434/"
|
||||
|
||||
let download ~base_url ~output =
|
||||
let download ~output =
|
||||
let open Bos in
|
||||
let uri =
|
||||
Uri.with_path (Uri.of_string base_url) "/management/keys/" |> Uri.to_string
|
||||
in
|
||||
let wget = Cmd.(v "wget" % "-O" % output % uri) in
|
||||
OS.Cmd.run wget
|
||||
let uri = Uri.with_path base_url "/management/keys/" |> Uri.to_string in
|
||||
OS.Cmd.run Cmd.(v "curl" (* % "-s" *) % "-o" % output % "-X" % "GET" % uri)
|
||||
|
||||
let upload ~base_url ~input =
|
||||
let upload ~input =
|
||||
let open Bos in
|
||||
let uri =
|
||||
Uri.with_path (Uri.of_string base_url) "/management/keys/" |> Uri.to_string
|
||||
in
|
||||
let wget =
|
||||
let uri = Uri.with_path base_url "/management/keys/" |> Uri.to_string in
|
||||
OS.Cmd.run
|
||||
Cmd.(
|
||||
v "wget"
|
||||
% "--method=POST"
|
||||
% "--header='Content-Type: application/json'"
|
||||
% "--body-file"
|
||||
% input
|
||||
% "-O"
|
||||
% "/dev/null"
|
||||
v "curl"
|
||||
% "-i"
|
||||
% "-X"
|
||||
% "POST"
|
||||
% "-H"
|
||||
% "Content-Type: application/json"
|
||||
% "--data"
|
||||
% ("@" ^ input)
|
||||
% uri)
|
||||
in
|
||||
OS.Cmd.run wget
|
||||
|
||||
let setup ~output =
|
||||
let output = Fpath.v output in
|
||||
|
|
@ -52,8 +46,9 @@ let sign ~input ~output ~master_key =
|
|||
let* master_key = File.read master_key |> unwrap_err_msg in
|
||||
let master_key = EddsaPrivateKey.of_octets master_key in
|
||||
let* future_key_response = Api.decode Api.FutureKeysResponse.jsont input in
|
||||
let* () = Offline_bin.verify_future_key_response future_key_response in
|
||||
let master_signatures =
|
||||
Offline_signature.master_signatures ~master_key future_key_response
|
||||
Offline_bin.make_master_signatures ~master_key future_key_response
|
||||
in
|
||||
let* s = Api.encode Api.MasterSignatures.jsont master_signatures in
|
||||
let* () = File.write output s |> unwrap_err_msg in
|
||||
|
|
@ -91,14 +86,10 @@ let download_cmd =
|
|||
let doc = "File to save data to be signed." in
|
||||
Arg.(value & opt filepath "future_keys.json" & info [ "o"; "output" ] ~doc)
|
||||
in
|
||||
let base_url =
|
||||
let doc = "Base url of the exchange." in
|
||||
Arg.(value & opt string "http://localhost:3434/" & info [ "base-url" ] ~doc)
|
||||
in
|
||||
Cmd.make (Cmd.info "download" ~version ~doc ~man)
|
||||
@@
|
||||
let+ output = output and+ base_url = base_url in
|
||||
match download ~base_url ~output with
|
||||
let+ output = output in
|
||||
match download ~output with
|
||||
| Error (`Msg err) ->
|
||||
Fmt.epr "Download failure: %s@." err;
|
||||
exit 1
|
||||
|
|
@ -114,14 +105,10 @@ let upload_cmd =
|
|||
Arg.(
|
||||
value & opt filepath "master_signatures.json" & info [ "i"; "input" ] ~doc)
|
||||
in
|
||||
let base_url =
|
||||
let doc = "Base url of the exchange." in
|
||||
Arg.(value & opt string "http://localhost:3434/" & info [ "base-url" ] ~doc)
|
||||
in
|
||||
Cmd.make (Cmd.info "upload" ~version ~doc ~man)
|
||||
@@
|
||||
let+ input = input and+ base_url = base_url in
|
||||
match upload ~base_url ~input with
|
||||
let+ input = input in
|
||||
match upload ~input with
|
||||
| Error (`Msg err) ->
|
||||
Fmt.epr "Upload failure: %s@." err;
|
||||
exit 1
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ let signkey_signature ~master_key
|
|||
in
|
||||
Api.SignKeySignature.{ key; master_sig }
|
||||
|
||||
let master_signatures ~master_key
|
||||
let make_master_signatures ~master_key
|
||||
Api.FutureKeysResponse.
|
||||
{
|
||||
future_denoms;
|
||||
|
|
@ -83,3 +83,5 @@ let master_signatures ~master_key
|
|||
let denom_sigs = List.map (denom_signature ~master_key) future_denoms in
|
||||
let signkey_sigs = List.map (signkey_signature ~master_key) future_signkeys in
|
||||
Api.MasterSignatures.{ denom_sigs; signkey_sigs }
|
||||
|
||||
let verify_future_key_response _future_key_response = assert false
|
||||
Loading…
Add table
Add a link
Reference in a new issue