From 0b943a26def0029ec95a2f326ccc66a9b571c275 Mon Sep 17 00:00:00 2001 From: swrup Date: Sun, 30 Nov 2025 20:55:30 +0100 Subject: [PATCH] --- tools/offline.ml | 104 ++++++++++++++++++++++------------------------- 1 file changed, 48 insertions(+), 56 deletions(-) diff --git a/tools/offline.ml b/tools/offline.ml index 0f2fb67f..99c5434e 100644 --- a/tools/offline.ml +++ b/tools/offline.ml @@ -3,17 +3,27 @@ - setup: need public key in config file - check sigs *) (* doc: https://docs.taler.net/manpages/taler-exchange-offline.1.html *) -let version = "%%VERSION%%" + +open Syntax + +let read_file fname = Bos.OS.File.read (Fpath.v fname) |> unwrap_err_msg + +let write_file fname content = + Bos.OS.File.write (Fpath.v fname) content |> unwrap_err_msg + let base_url = Uri.of_string "http://localhost:3434/" +let management_keys_url = + Uri.with_path base_url "/management/keys/" |> Uri.to_string + let download ~output = let open Bos in - 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 uri = management_keys_url in + OS.Cmd.run Cmd.(v "curl" % "-s" % "-o" % output % "-X" % "GET" % uri) let upload ~input = let open Bos in - let uri = Uri.with_path base_url "/management/keys/" |> Uri.to_string in + let uri = management_keys_url in OS.Cmd.run Cmd.( v "curl" @@ -27,23 +37,17 @@ let upload ~input = % uri) let setup ~output = - let output = Fpath.v output in let () = Mirage_crypto_rng_unix.use_default () in let priv, pub = Mirage_crypto_ec.Ed25519.generate () in Fmt.pr "generated master public key:@\n%s@." (Mirage_crypto_ec.Ed25519.pub_to_octets pub |> B32.encode); let priv_data = Mirage_crypto_ec.Ed25519.priv_to_octets priv in - Bos.OS.File.write output priv_data + write_file output priv_data -let sign ~input ~output ~master_key = - let open Syntax in - let open Bos.OS in +let sign ~master_key ~input ~output = let open Crypto in - let input = Fpath.v input in - let output = Fpath.v output in - let master_key = Fpath.v master_key in - let* input = File.read input |> unwrap_err_msg in - let* master_key = File.read master_key |> unwrap_err_msg in + let* input = read_file input in + let* master_key = read_file master_key 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 @@ -51,7 +55,7 @@ let sign ~input ~output ~master_key = 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 + let* () = write_file output s in Ok () (* CLI *) @@ -59,22 +63,24 @@ let sign ~input ~output ~master_key = open Cmdliner open Cmdliner.Term.Syntax +let default_master_offline_key_file = "data/master_offline_private_key" +let default_response_file = "response.json" +let default_request_file = "request.json" +let to_term_ret = function Error e -> `Error (false, e) | Ok () -> `Ok () + let setup_cmd = let doc = "Generate offline master keys" in let output = Arg.( value - & opt filepath "data/eddsa_master_offline" + & opt filepath default_master_offline_key_file & info [ "o"; "output" ] ~doc) in - Cmd.make (Cmd.info "setup" ~version ~doc) + Cmd.make (Cmd.info "setup" ~doc) + @@ Term.ret @@ let+ output = output in - match setup ~output with - | Error (`Msg err) -> - Fmt.epr "Setup failure: %s@." err; - exit 1 - | Ok () -> () + setup ~output |> to_term_ret let download_cmd = let doc = "GET /management/keys/" in @@ -82,16 +88,14 @@ let download_cmd = [ `S Manpage.s_description; `P "$(cmd) download /management/keys." ] in let output = - Arg.(value & opt filepath "future_keys.json" & info [ "o"; "output" ] ~doc) + Arg.( + value & opt filepath default_response_file & info [ "o"; "output" ] ~doc) in - Cmd.make (Cmd.info "download" ~version ~doc ~man) + Cmd.make (Cmd.info "download" ~doc ~man) + @@ Term.ret @@ let+ output = output in - match download ~output with - | Error (`Msg err) -> - Fmt.epr "Download failure: %s@." err; - exit 1 - | Ok () -> () + download ~output |> unwrap_err_msg |> to_term_ret let upload_cmd = let doc = "POST /management/keys/" in @@ -99,51 +103,39 @@ let upload_cmd = [ `S Manpage.s_description; `P "$(cmd) upload /management/keys." ] in let input = - Arg.( - value & opt filepath "master_signatures.json" & info [ "i"; "input" ] ~doc) + Arg.(value & opt file default_request_file & info [ "i"; "input" ] ~doc) in - Cmd.make (Cmd.info "upload" ~version ~doc ~man) + Cmd.make (Cmd.info "upload" ~doc ~man) + @@ Term.ret @@ let+ input = input in - match upload ~input with - | Error (`Msg err) -> - Fmt.epr "Upload failure: %s@." err; - exit 1 - | Ok () -> () + upload ~input |> unwrap_err_msg |> to_term_ret let sign_cmd = let doc = "Sign FutureKeysResponse." in + let master_key = + let doc = "Master offline Eddsa private key file." in + Arg.(value & opt file default_master_offline_key_file & info [ "key" ] ~doc) + in let input = - Arg.(value & opt filepath "future_keys.json" & info [ "i"; "input" ] ~doc) + Arg.(value & opt file default_response_file & info [ "i"; "input" ] ~doc) in let output = Arg.( - value - & opt filepath "master_signatures.json" - & info [ "o"; "output" ] ~doc) + value & opt filepath default_request_file & info [ "o"; "output" ] ~doc) in - let master_key = - let doc = "Master offline Eddsa private key file." in - Arg.( - value - & opt filepath "data/eddsa_master_offline" - & info [ "master-key" ] ~doc) - in - Cmd.make (Cmd.info "sign" ~version ~doc) + Cmd.make (Cmd.info "sign" ~doc) + @@ Term.ret @@ let+ input = input and+ output = output and+ master_key = master_key in - match sign ~input ~output ~master_key with - | Error (*`Msg*) err -> - Fmt.epr "Signature failure: %s@." err; - exit 1 - | Ok () -> () + sign ~input ~output ~master_key |> to_term_ret let cli = let info = let doc = "MTE Offline CLI tool" in - Cmd.info "mte-offline" ~version ~doc + Cmd.info "mte-offline" ~doc in Cmd.group info [ setup_cmd; download_cmd; sign_cmd; upload_cmd ] let main () = Cmd.eval cli -let () = exit (main ()) +let () = if !Sys.interactive then () else exit (main ())