From cf11b3f0b2fef5998e4b404b76ab81e0c0bdf53e Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sat, 23 Apr 2022 18:01:00 +0200 Subject: -create cmd for purse creation from reserve --- src/include/taler_exchange_service.h | 4 - src/include/taler_testing_lib.h | 4 - src/lib/exchange_api_purse_create_with_merge.c | 15 +- src/testing/Makefile.am | 3 +- src/testing/testing_api_cmd_reserve_purse.c | 274 +++++++++++++++++++++++++ 5 files changed, 282 insertions(+), 18 deletions(-) create mode 100644 src/testing/testing_api_cmd_reserve_purse.c diff --git a/src/include/taler_exchange_service.h b/src/include/taler_exchange_service.h index 18bde0fe5..6bb298077 100644 --- a/src/include/taler_exchange_service.h +++ b/src/include/taler_exchange_service.h @@ -4437,9 +4437,7 @@ struct TALER_EXCHANGE_PurseCreateMergeHandle; * @param contract_priv private key to get the contract * @param contract_terms contract the purse is about * @param upload_contract true to upload the contract - * @param purse_expiration when will the unmerged purse expire * @paran merge_timestamp when should the merge happen (use current time) - * @param purse_value_after_fees target amount in the purse * @param cb function to call with the exchange's result * @param cb_cls closure for @a cb * @return the request handle; NULL upon error @@ -4453,9 +4451,7 @@ TALER_EXCHANGE_purse_create_with_merge ( const struct TALER_ContractDiffiePrivateP *contract_priv, const json_t *contract_terms, bool upload_contract, - struct GNUNET_TIME_Timestamp purse_expiration, struct GNUNET_TIME_Timestamp merge_timestamp, - const struct TALER_Amount *purse_value_after_fees, TALER_EXCHANGE_PurseCreateMergeCallback cb, void *cb_cls); diff --git a/src/include/taler_testing_lib.h b/src/include/taler_testing_lib.h index 7c4071521..30d0f0987 100644 --- a/src/include/taler_testing_lib.h +++ b/src/include/taler_testing_lib.h @@ -2441,10 +2441,8 @@ TALER_TESTING_cmd_purse_get ( * * @param label command label * @param expected_http_status what HTTP status do we expect to get returned from the exchange - * @param target_amount amount for the purse to be full, without fees * @param contract_terms contract, JSON string * @param upload_contract should we upload the contract - * @param purse_expiration how long until the purse expires * @param reserve_ref reference to reserve key, or NULL to create a new reserve * @return the command */ @@ -2452,10 +2450,8 @@ struct TALER_TESTING_Command TALER_TESTING_cmd_purse_create_with_reserve ( const char *label, unsigned int expected_http_status, - const char *target_amount, const char *contract_terms, bool upload_contract, - struct GNUNET_TIME_Relative purse_expiration, const char *reserve_ref); diff --git a/src/lib/exchange_api_purse_create_with_merge.c b/src/lib/exchange_api_purse_create_with_merge.c index dac0eaf5d..61d4e545d 100644 --- a/src/lib/exchange_api_purse_create_with_merge.c +++ b/src/lib/exchange_api_purse_create_with_merge.c @@ -250,9 +250,7 @@ TALER_EXCHANGE_purse_create_with_merge ( const struct TALER_ContractDiffiePrivateP *contract_priv, const json_t *contract_terms, bool upload_contract, - struct GNUNET_TIME_Timestamp purse_expiration, struct GNUNET_TIME_Timestamp merge_timestamp, - const struct TALER_Amount *purse_value_after_fees, TALER_EXCHANGE_PurseCreateMergeCallback cb, void *cb_cls) { @@ -270,6 +268,7 @@ TALER_EXCHANGE_purse_create_with_merge ( struct TALER_PurseContractSignatureP purse_sig; void *econtract = NULL; size_t econtract_size = 0; + struct TALER_Amount purse_value_after_fees; pcm = GNUNET_new (struct TALER_EXCHANGE_PurseCreateMergeHandle); pcm->exchange = exchange; @@ -284,9 +283,7 @@ TALER_EXCHANGE_purse_create_with_merge ( return NULL; } pcm->h_contract_terms = pcm->h_contract_terms; - pcm->purse_expiration = purse_expiration; pcm->merge_timestamp = merge_timestamp; - pcm->purse_value_after_fees = *purse_value_after_fees; GNUNET_CRYPTO_eddsa_key_get_public (&purse_priv->eddsa_priv, &pcm->purse_pub.eddsa_pub); GNUNET_CRYPTO_eddsa_key_get_public (&reserve_priv->eddsa_priv, @@ -296,11 +293,8 @@ TALER_EXCHANGE_purse_create_with_merge ( GNUNET_CRYPTO_ecdhe_key_get_public (&contract_priv->ecdhe_priv, &contract_pub.ecdhe_pub); - // FIXME: extract min_age from contract_terms! { - // FIXME: extract amount from contract - // or pass explicitly? what about other - // args, like the purse expiration time? + // FIXME: get purse expiration time from contract? struct GNUNET_JSON_Specification spec[] = { TALER_JSON_spec_amount_any ("amount", &pcm->purse_value_after_fees), @@ -308,6 +302,9 @@ TALER_EXCHANGE_purse_create_with_merge ( GNUNET_JSON_spec_uint32 ("minimum_age", &min_age), NULL), + // FIXME: correct field name? + GNUNET_JSON_spec_timestamp ("payment_deadline", + &pcm->purse_expiration), GNUNET_JSON_spec_end () }; @@ -385,7 +382,7 @@ TALER_EXCHANGE_purse_create_with_merge ( } create_with_merge_obj = GNUNET_JSON_PACK ( TALER_JSON_pack_amount ("purse_value", - purse_value_after_fees), + &purse_value_after_fees), GNUNET_JSON_pack_uint64 ("min_age", min_age), GNUNET_JSON_pack_allow_null ( diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am index 304a24401..e96e9b0e1 100644 --- a/src/testing/Makefile.am +++ b/src/testing/Makefile.am @@ -80,6 +80,7 @@ libtalertesting_la_SOURCES = \ testing_api_cmd_refresh.c \ testing_api_cmd_reserve_get.c \ testing_api_cmd_reserve_history.c \ + testing_api_cmd_reserve_purse.c \ testing_api_cmd_reserve_status.c \ testing_api_cmd_revoke.c \ testing_api_cmd_revoke_denom_key.c \ @@ -122,7 +123,7 @@ AM_TESTS_ENVIRONMENT=export TALER_PREFIX=$${TALER_PREFIX:-@libdir@};export PATH= noinst_PROGRAMS = \ test_exchange_p2p_cs \ - test_exchange_p2p_rsa + test_exchange_p2p_rsa .NOTPARALLEL: diff --git a/src/testing/testing_api_cmd_reserve_purse.c b/src/testing/testing_api_cmd_reserve_purse.c new file mode 100644 index 000000000..987843288 --- /dev/null +++ b/src/testing/testing_api_cmd_reserve_purse.c @@ -0,0 +1,274 @@ +/* + This file is part of TALER + Copyright (C) 2022 Taler Systems SA + + TALER is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3, or (at your + option) any later version. + + TALER is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public + License along with TALER; see the file COPYING. If not, see + +*/ +/** + * @file testing/testing_api_cmd_reserve_purse.c + * @brief command for testing /reserves/$PID/purse + * @author Christian Grothoff + */ +#include "platform.h" +#include "taler_json_lib.h" +#include +#include "taler_testing_lib.h" +#include "taler_signatures.h" +#include "backoff.h" + + +/** + * State for a "purse create with merge" CMD. + */ +struct ReservePurseState +{ + + /** + * Merge time (local time when the command was + * executed). + */ + struct GNUNET_TIME_Timestamp merge_timestamp; + + /** + * Reserve private key. + */ + struct TALER_ReservePrivateKeyP reserve_priv; + + /** + * Private key of the purse. + */ + struct TALER_PurseContractPrivateKeyP purse_priv; + + /** + * Private key with the merge capability. + */ + struct TALER_PurseMergePrivateKeyP merge_priv; + + /** + * Private key to decrypt the contract. + */ + struct TALER_ContractDiffiePrivateP contract_priv; + + /** + * Handle while operation is running. + */ + struct TALER_EXCHANGE_PurseCreateMergeHandle *dh; + + /** + * Contract terms for the purse. + */ + json_t *contract_terms; + + /** + * Refernece to the reserve, or NULL (!). + */ + const char *reserve_ref; + + /** + * Interpreter state. + */ + struct TALER_TESTING_Interpreter *is; + + /** + * Expected HTTP response code. + */ + unsigned int expected_response_code; + +}; + + +/** + * Callback to analyze the /reserves/$PID/purse response, just used to check if + * the response code is acceptable. + * + * @param cls closure. + * @param dr purse response details + */ +static void +purse_cb (void *cls, + const struct TALER_EXCHANGE_PurseCreateMergeResponse *dr) +{ + struct ReservePurseState *ds = cls; + + ds->dh = NULL; + if (ds->expected_response_code != dr->hr.http_status) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Unexpected response code %u to command %s in %s:%u\n", + dr->hr.http_status, + ds->is->commands[ds->is->ip].label, + __FILE__, + __LINE__); + json_dumpf (dr->hr.reply, + stderr, + 0); + TALER_TESTING_interpreter_fail (ds->is); + return; + } + TALER_TESTING_interpreter_next (ds->is); +} + + +/** + * Run the command. + * + * @param cls closure. + * @param cmd the command to execute. + * @param is the interpreter state. + */ +static void +purse_run (void *cls, + const struct TALER_TESTING_Command *cmd, + struct TALER_TESTING_Interpreter *is) +{ + struct ReservePurseState *ds = cls; + const struct TALER_ReservePrivateKeyP *reserve_priv; + const struct TALER_TESTING_Command *ref; + + (void) cmd; + ds->is = is; + ref = TALER_TESTING_interpreter_lookup_command (ds->is, + ds->reserve_ref); + GNUNET_assert (NULL != ref); + if (GNUNET_OK != + TALER_TESTING_get_trait_reserve_priv (ref, + &reserve_priv)) + { + GNUNET_break (0); + TALER_TESTING_interpreter_fail (ds->is); + return; + } + ds->reserve_priv = *reserve_priv; + GNUNET_CRYPTO_eddsa_key_create (&ds->purse_priv.eddsa_priv); + GNUNET_CRYPTO_eddsa_key_create (&ds->merge_priv.eddsa_priv); + GNUNET_CRYPTO_ecdhe_key_create (&ds->contract_priv.ecdhe_priv); + ds->merge_timestamp = GNUNET_TIME_timestamp_get (); + ds->dh = TALER_EXCHANGE_purse_create_with_merge ( + is->exchange, + &ds->reserve_priv, + &ds->purse_priv, + &ds->merge_priv, + &ds->contract_priv, + ds->contract_terms, + true /* upload contract */, + ds->merge_timestamp, + &purse_cb, + ds); + if (NULL == ds->dh) + { + GNUNET_break (0); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Could not purse reserve\n"); + TALER_TESTING_interpreter_fail (is); + return; + } +} + + +/** + * Free the state of a "purse" CMD, and possibly cancel a + * pending operation thereof. + * + * @param cls closure, must be a `struct ReservePurseState`. + * @param cmd the command which is being cleaned up. + */ +static void +purse_cleanup (void *cls, + const struct TALER_TESTING_Command *cmd) +{ + struct ReservePurseState *ds = cls; + + if (NULL != ds->dh) + { + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "Command %u (%s) did not complete\n", + ds->is->ip, + cmd->label); + TALER_EXCHANGE_purse_create_with_merge_cancel (ds->dh); + ds->dh = NULL; + } + json_decref (ds->contract_terms); + GNUNET_free (ds); +} + + +/** + * Offer internal data from a "purse" CMD, to other commands. + * + * @param cls closure. + * @param[out] ret result. + * @param trait name of the trait. + * @param index index number of the object to offer. + * @return #GNUNET_OK on success. + */ +static enum GNUNET_GenericReturnValue +purse_traits (void *cls, + const void **ret, + const char *trait, + unsigned int index) +{ + struct ReservePurseState *ds = cls; + struct TALER_TESTING_Trait traits[] = { + TALER_TESTING_make_trait_timestamp (0, + &ds->merge_timestamp), + TALER_TESTING_make_trait_contract_terms (ds->contract_terms), + TALER_TESTING_make_trait_purse_priv (&ds->purse_priv), + TALER_TESTING_make_trait_merge_priv (&ds->merge_priv), + TALER_TESTING_make_trait_contract_priv (&ds->contract_priv), + TALER_TESTING_make_trait_reserve_priv (&ds->reserve_priv), + TALER_TESTING_trait_end () + }; + + return TALER_TESTING_get_trait (traits, + ret, + trait, + index); +} + + +struct TALER_TESTING_Command +TALER_TESTING_cmd_purse_create_with_reserve ( + const char *label, + unsigned int expected_http_status, + const char *contract_terms, + bool upload_contract, + const char *reserve_ref) +{ + struct ReservePurseState *ds; + json_error_t err; + + ds = GNUNET_new (struct ReservePurseState); + ds->contract_terms = json_loads (contract_terms, + 0 /* flags */, + &err); + GNUNET_assert (NULL != ds->contract_terms); + ds->reserve_ref = reserve_ref; + ds->expected_response_code = expected_http_status; + + { + struct TALER_TESTING_Command cmd = { + .cls = ds, + .label = label, + .run = &purse_run, + .cleanup = &purse_cleanup, + .traits = &purse_traits + }; + + return cmd; + } +} + + +/* end of testing_api_cmd_reserve_purse.c */ -- cgit v1.2.3