diff options
Diffstat (limited to 'src/testing/testing_api_cmd_withdraw.c')
| -rw-r--r-- | src/testing/testing_api_cmd_withdraw.c | 316 |
1 files changed, 157 insertions, 159 deletions
diff --git a/src/testing/testing_api_cmd_withdraw.c b/src/testing/testing_api_cmd_withdraw.c index 8e6cba704..f8ff0205b 100644 --- a/src/testing/testing_api_cmd_withdraw.c +++ b/src/testing/testing_api_cmd_withdraw.c @@ -1,6 +1,6 @@ /* This file is part of TALER - Copyright (C) 2018-2021 Taler Systems SA + Copyright (C) 2018-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 @@ -27,6 +27,7 @@ #include <microhttpd.h> #include <gnunet/gnunet_curl_lib.h> #include "taler_signatures.h" +#include "taler_extensions.h" #include "taler_testing_lib.h" #include "backoff.h" @@ -61,11 +62,16 @@ struct WithdrawState /** * Reference to a withdraw or reveal operation from which we should - * re-use the private coin key, or NULL for regular withdrawal. + * reuse the private coin key, or NULL for regular withdrawal. */ const char *reuse_coin_key_ref; /** + * Our command. + */ + const struct TALER_TESTING_Command *cmd; + + /** * String describing the denomination value we should withdraw. * A corresponding denomination key must exist in the exchange's * offerings. Can be NULL if @e pk is set instead. @@ -100,6 +106,22 @@ struct WithdrawState struct TALER_ReservePublicKeyP reserve_pub; /** + * Private key of the coin. + */ + struct TALER_CoinSpendPrivateKeyP coin_priv; + + /** + * Blinding key used during the operation. + */ + union GNUNET_CRYPTO_BlindingSecretP bks; + + /** + * Values contributed from the exchange during the + * withdraw protocol. + */ + struct TALER_ExchangeWithdrawValues exchange_vals; + + /** * Interpreter state (during command). */ struct TALER_TESTING_Interpreter *is; @@ -113,18 +135,30 @@ struct WithdrawState /** * Private key material of the coin, set by the interpreter. */ - struct TALER_PlanchetSecretsP ps; + struct TALER_PlanchetMasterSecretP ps; + + /** + * An age > 0 signifies age restriction is required + */ + uint8_t age; + + /** + * If age > 0, put here the corresponding age commitment with its proof and + * its hash, respectively. + */ + struct TALER_AgeCommitmentProof age_commitment_proof; + struct TALER_AgeCommitmentHash h_age_commitment; /** * Reserve history entry that corresponds to this operation. * Will be of type #TALER_EXCHANGE_RTT_WITHDRAWAL. */ - struct TALER_EXCHANGE_ReserveHistory reserve_history; + struct TALER_EXCHANGE_ReserveHistoryEntry reserve_history; /** * Withdraw handle (while operation is running). */ - struct TALER_EXCHANGE_WithdrawHandle *wsh; + struct TALER_EXCHANGE_BatchWithdrawHandle *wsh; /** * Task scheduled to try later. @@ -142,10 +176,16 @@ struct WithdrawState struct GNUNET_TIME_Relative total_backoff; /** - * Set to the KYC UUID *if* the exchange replied with + * Set to the KYC requirement payto hash *if* the exchange replied with a + * request for KYC. + */ + struct TALER_PaytoHashP h_payto; + + /** + * Set to the KYC requirement row *if* the exchange replied with * a request for KYC. */ - uint64_t kyc_uuid; + uint64_t requirement_row; /** * Expected HTTP response code to the request. @@ -185,8 +225,7 @@ do_retry (void *cls) struct WithdrawState *ws = cls; ws->retry_task = NULL; - ws->is->commands[ws->is->ip].last_req_time - = GNUNET_TIME_absolute_get (); + TALER_TESTING_touch_cmd (ws->is); withdraw_run (ws, NULL, ws->is); @@ -203,7 +242,7 @@ do_retry (void *cls) */ static void reserve_withdraw_cb (void *cls, - const struct TALER_EXCHANGE_WithdrawResponse *wr) + const struct TALER_EXCHANGE_BatchWithdrawResponse *wr) { struct WithdrawState *ws = cls; struct TALER_TESTING_Interpreter *is = ws->is; @@ -213,12 +252,12 @@ reserve_withdraw_cb (void *cls, { if (0 != ws->do_retry) { - if (TALER_EC_EXCHANGE_WITHDRAW_RESERVE_UNKNOWN != wr->hr.ec) + if (TALER_EC_EXCHANGE_GENERIC_RESERVE_UNKNOWN != wr->hr.ec) ws->do_retry--; /* we don't count reserve unknown as failures here */ if ( (0 == wr->hr.http_status) || (TALER_EC_GENERIC_DB_SOFT_FAILURE == wr->hr.ec) || (TALER_EC_EXCHANGE_WITHDRAW_INSUFFICIENT_FUNDS == wr->hr.ec) || - (TALER_EC_EXCHANGE_WITHDRAW_RESERVE_UNKNOWN == wr->hr.ec) || + (TALER_EC_EXCHANGE_GENERIC_RESERVE_UNKNOWN == wr->hr.ec) || (MHD_HTTP_INTERNAL_SERVER_ERROR == wr->hr.http_status) ) { GNUNET_log (GNUNET_ERROR_TYPE_INFO, @@ -228,7 +267,7 @@ reserve_withdraw_cb (void *cls, /* on DB conflicts, do not use backoff */ if (TALER_EC_GENERIC_DB_SOFT_FAILURE == wr->hr.ec) ws->backoff = GNUNET_TIME_UNIT_ZERO; - else if (TALER_EC_EXCHANGE_WITHDRAW_RESERVE_UNKNOWN != wr->hr.ec) + else if (TALER_EC_EXCHANGE_GENERIC_RESERVE_UNKNOWN != wr->hr.ec) ws->backoff = EXCHANGE_LIB_BACKOFF (ws->backoff); else ws->backoff = GNUNET_TIME_relative_max (UNKNOWN_MIN_BACKOFF, @@ -237,45 +276,38 @@ reserve_withdraw_cb (void *cls, UNKNOWN_MAX_BACKOFF); ws->total_backoff = GNUNET_TIME_relative_add (ws->total_backoff, ws->backoff); - ws->is->commands[ws->is->ip].num_tries++; + TALER_TESTING_inc_tries (ws->is); ws->retry_task = GNUNET_SCHEDULER_add_delayed (ws->backoff, &do_retry, ws); return; } } - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Unexpected response code %u/%d to command %s in %s:%u\n", - wr->hr.http_status, - (int) wr->hr.ec, - TALER_TESTING_interpreter_get_current_label (is), - __FILE__, - __LINE__); - json_dumpf (wr->hr.reply, - stderr, - 0); - GNUNET_break (0); - TALER_TESTING_interpreter_fail (is); + TALER_TESTING_unexpected_status_with_body (is, + wr->hr.http_status, + ws->expected_response_code, + wr->hr.reply); return; } switch (wr->hr.http_status) { case MHD_HTTP_OK: - TALER_denom_sig_deep_copy (&ws->sig, - &wr->details.success.sig); + GNUNET_assert (1 == wr->details.ok.num_coins); + TALER_denom_sig_copy (&ws->sig, + &wr->details.ok.coins[0].sig); + ws->coin_priv = wr->details.ok.coins[0].coin_priv; + ws->bks = wr->details.ok.coins[0].bks; + TALER_denom_ewv_copy (&ws->exchange_vals, + &wr->details.ok.coins[0].exchange_vals); if (0 != ws->total_backoff.rel_value_us) { GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Total withdraw backoff for %s was %s\n", - is->commands[is->ip].label, + ws->cmd->label, GNUNET_STRINGS_relative_time_to_string (ws->total_backoff, - GNUNET_YES)); + true)); } break; - case MHD_HTTP_ACCEPTED: - /* nothing to check */ - ws->kyc_uuid = wr->details.accepted.payment_target_uuid; - break; case MHD_HTTP_FORBIDDEN: /* nothing to check */ break; @@ -288,6 +320,13 @@ reserve_withdraw_cb (void *cls, case MHD_HTTP_GONE: /* theoretically could check that the key was actually */ break; + case MHD_HTTP_UNAVAILABLE_FOR_LEGAL_REASONS: + /* KYC required */ + ws->requirement_row = + wr->details.unavailable_for_legal_reasons.requirement_row; + ws->h_payto + = wr->details.unavailable_for_legal_reasons.h_payto; + break; default: /* Unsupported status code (by test harness) */ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, @@ -301,50 +340,6 @@ reserve_withdraw_cb (void *cls, /** - * Parser reference to a coin. - * - * @param coin_reference of format $LABEL['#' $INDEX]? - * @param[out] cref where we return a copy of $LABEL - * @param[out] idx where we set $INDEX - * @return #GNUNET_SYSERR if $INDEX is present but not numeric - */ -static enum GNUNET_GenericReturnValue -parse_coin_reference (const char *coin_reference, - char **cref, - unsigned int *idx) -{ - const char *index; - - /* We allow command references of the form "$LABEL#$INDEX" or - just "$LABEL", which implies the index is 0. Figure out - which one it is. */ - index = strchr (coin_reference, '#'); - if (NULL == index) - { - *idx = 0; - *cref = GNUNET_strdup (coin_reference); - return GNUNET_OK; - } - *cref = GNUNET_strndup (coin_reference, - index - coin_reference); - if (1 != sscanf (index + 1, - "%u", - idx)) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Numeric index (not `%s') required after `#' in command reference of command in %s:%u\n", - index, - __FILE__, - __LINE__); - GNUNET_free (*cref); - *cref = NULL; - return GNUNET_SYSERR; - } - return GNUNET_OK; -} - - -/** * Run the command. */ static void @@ -357,7 +352,8 @@ withdraw_run (void *cls, const struct TALER_TESTING_Command *create_reserve; const struct TALER_EXCHANGE_DenomPublicKey *dpk; - (void) cmd; + if (NULL != cmd) + ws->cmd = cmd; ws->is = is; create_reserve = TALER_TESTING_interpreter_lookup_command ( @@ -379,43 +375,45 @@ withdraw_run (void *cls, } if (NULL == ws->exchange_url) ws->exchange_url - = GNUNET_strdup (TALER_EXCHANGE_get_base_url (is->exchange)); + = GNUNET_strdup (TALER_TESTING_get_exchange_url (is)); ws->reserve_priv = *rp; GNUNET_CRYPTO_eddsa_key_get_public (&ws->reserve_priv.eddsa_priv, &ws->reserve_pub.eddsa_pub); ws->reserve_payto_uri - = TALER_payto_from_reserve (ws->exchange_url, + = TALER_reserve_make_payto (ws->exchange_url, &ws->reserve_pub); + if (NULL == ws->reuse_coin_key_ref) { - TALER_planchet_setup_random (&ws->ps); + TALER_planchet_master_setup_random (&ws->ps); } else { - const struct TALER_CoinSpendPrivateKeyP *coin_priv; + const struct TALER_PlanchetMasterSecretP *ps; const struct TALER_TESTING_Command *cref; char *cstr; unsigned int index; GNUNET_assert (GNUNET_OK == - parse_coin_reference (ws->reuse_coin_key_ref, - &cstr, - &index)); + TALER_TESTING_parse_coin_reference ( + ws->reuse_coin_key_ref, + &cstr, + &index)); cref = TALER_TESTING_interpreter_lookup_command (is, cstr); GNUNET_assert (NULL != cref); GNUNET_free (cstr); GNUNET_assert (GNUNET_OK == - TALER_TESTING_get_trait_coin_priv (cref, - index, - &coin_priv)); - TALER_planchet_setup_random (&ws->ps); - ws->ps.coin_priv = *coin_priv; + TALER_TESTING_get_trait_planchet_secret (cref, + &ps)); + ws->ps = *ps; } + if (NULL == ws->pk) { - dpk = TALER_TESTING_find_pk (TALER_EXCHANGE_get_keys (is->exchange), - &ws->amount); + dpk = TALER_TESTING_find_pk (TALER_TESTING_get_keys (is), + &ws->amount, + ws->age > 0); if (NULL == dpk) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, @@ -433,18 +431,30 @@ withdraw_run (void *cls, { ws->amount = ws->pk->value; } + ws->reserve_history.type = TALER_EXCHANGE_RTT_WITHDRAWAL; GNUNET_assert (0 <= TALER_amount_add (&ws->reserve_history.amount, &ws->amount, - &ws->pk->fee_withdraw)); - ws->reserve_history.details.withdraw.fee = ws->pk->fee_withdraw; - ws->wsh = TALER_EXCHANGE_withdraw (is->exchange, - ws->pk, - rp, - &ws->ps, - &reserve_withdraw_cb, - ws); + &ws->pk->fees.withdraw)); + ws->reserve_history.details.withdraw.fee = ws->pk->fees.withdraw; + { + struct TALER_EXCHANGE_WithdrawCoinInput wci = { + .pk = ws->pk, + .ps = &ws->ps, + .ach = 0 < ws->age ? &ws->h_age_commitment : NULL + }; + + ws->wsh = TALER_EXCHANGE_batch_withdraw ( + TALER_TESTING_interpreter_get_context (is), + TALER_TESTING_get_exchange_url (is), + TALER_TESTING_get_keys (is), + rp, + 1, + &wci, + &reserve_withdraw_cb, + ws); + } if (NULL == ws->wsh) { GNUNET_break (0); @@ -469,10 +479,9 @@ withdraw_cleanup (void *cls, if (NULL != ws->wsh) { - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - "Command %s did not complete\n", - cmd->label); - TALER_EXCHANGE_withdraw_cancel (ws->wsh); + TALER_TESTING_command_incomplete (ws->is, + cmd->label); + TALER_EXCHANGE_batch_withdraw_cancel (ws->wsh); ws->wsh = NULL; } if (NULL != ws->retry_task) @@ -481,11 +490,14 @@ withdraw_cleanup (void *cls, ws->retry_task = NULL; } TALER_denom_sig_free (&ws->sig); + TALER_denom_ewv_free (&ws->exchange_vals); if (NULL != ws->pk) { TALER_EXCHANGE_destroy_denomination_key (ws->pk); ws->pk = NULL; } + if (ws->age > 0) + TALER_age_commitment_proof_free (&ws->age_commitment_proof); GNUNET_free (ws->exchange_url); GNUNET_free (ws->reserve_payto_uri); GNUNET_free (ws); @@ -511,11 +523,15 @@ withdraw_traits (void *cls, struct WithdrawState *ws = cls; struct TALER_TESTING_Trait traits[] = { /* history entry MUST be first due to response code logic below! */ - TALER_TESTING_make_trait_reserve_history (&ws->reserve_history), + TALER_TESTING_make_trait_reserve_history (0, + &ws->reserve_history), TALER_TESTING_make_trait_coin_priv (0 /* only one coin */, - &ws->ps.coin_priv), + &ws->coin_priv), + TALER_TESTING_make_trait_planchet_secret (&ws->ps), TALER_TESTING_make_trait_blinding_key (0 /* only one coin */, - &ws->ps.blinding_key), + &ws->bks), + TALER_TESTING_make_trait_exchange_wd_value (0 /* only one coin */, + &ws->exchange_vals), TALER_TESTING_make_trait_denom_pub (0 /* only one coin */, ws->pk), TALER_TESTING_make_trait_denom_sig (0 /* only one coin */, @@ -523,11 +539,18 @@ withdraw_traits (void *cls, TALER_TESTING_make_trait_reserve_priv (&ws->reserve_priv), TALER_TESTING_make_trait_reserve_pub (&ws->reserve_pub), TALER_TESTING_make_trait_amount (&ws->amount), - TALER_TESTING_make_trait_payment_target_uuid (&ws->kyc_uuid), - TALER_TESTING_make_trait_payto_uri ( - (const char **) &ws->reserve_payto_uri), - TALER_TESTING_make_trait_exchange_url ( - (const char **) &ws->exchange_url), + TALER_TESTING_make_trait_legi_requirement_row (&ws->requirement_row), + TALER_TESTING_make_trait_h_payto (&ws->h_payto), + TALER_TESTING_make_trait_payto_uri (ws->reserve_payto_uri), + TALER_TESTING_make_trait_exchange_url (ws->exchange_url), + TALER_TESTING_make_trait_age_commitment_proof (0, + 0 < ws->age + ? &ws->age_commitment_proof + : NULL), + TALER_TESTING_make_trait_h_age_commitment (0, + 0 < ws->age + ? &ws->h_age_commitment + : NULL), TALER_TESTING_trait_end () }; @@ -540,26 +563,34 @@ withdraw_traits (void *cls, } -/** - * Create a withdraw command, letting the caller specify - * the desired amount as string. - * - * @param label command label. - * @param reserve_reference command providing us with a reserve to withdraw from - * @param amount how much we withdraw. - * @param expected_response_code which HTTP response code - * we expect from the exchange. - * @return the withdraw command to be executed by the interpreter. - */ struct TALER_TESTING_Command TALER_TESTING_cmd_withdraw_amount (const char *label, const char *reserve_reference, const char *amount, + uint8_t age, unsigned int expected_response_code) { struct WithdrawState *ws; ws = GNUNET_new (struct WithdrawState); + ws->age = age; + if (0 < age) + { + struct GNUNET_HashCode seed; + struct TALER_AgeMask mask; + + mask = TALER_extensions_get_age_restriction_mask (); + GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK, + &seed, + sizeof(seed)); + TALER_age_restriction_commit (&mask, + age, + &seed, + &ws->age_commitment_proof); + TALER_age_commitment_hash (&ws->age_commitment_proof.commitment, + &ws->h_age_commitment); + } + ws->reserve_reference = reserve_reference; if (GNUNET_OK != TALER_string_to_amount (amount, @@ -586,26 +617,12 @@ TALER_TESTING_cmd_withdraw_amount (const char *label, } -/** - * Create a withdraw command, letting the caller specify - * the desired amount as string and also re-using an existing - * coin private key in the process (violating the specification, - * which will result in an error when spending the coin!). - * - * @param label command label. - * @param reserve_reference command providing us with a reserve to withdraw from - * @param amount how much we withdraw. - * @param coin_ref reference to (withdraw/reveal) command of a coin - * from which we should re-use the private key - * @param expected_response_code which HTTP response code - * we expect from the exchange. - * @return the withdraw command to be executed by the interpreter. - */ struct TALER_TESTING_Command TALER_TESTING_cmd_withdraw_amount_reuse_key ( const char *label, const char *reserve_reference, const char *amount, + uint8_t age, const char *coin_ref, unsigned int expected_response_code) { @@ -614,6 +631,7 @@ TALER_TESTING_cmd_withdraw_amount_reuse_key ( cmd = TALER_TESTING_cmd_withdraw_amount (label, reserve_reference, amount, + age, expected_response_code); { struct WithdrawState *ws = cmd.cls; @@ -624,18 +642,6 @@ TALER_TESTING_cmd_withdraw_amount_reuse_key ( } -/** - * Create withdraw command, letting the caller specify the - * amount by a denomination key. - * - * @param label command label. - * @param reserve_reference reference to the reserve to withdraw - * from; will provide reserve priv to sign the request. - * @param dk denomination public key. - * @param expected_response_code expected HTTP response code. - * - * @return the command. - */ struct TALER_TESTING_Command TALER_TESTING_cmd_withdraw_denomination ( const char *label, @@ -670,14 +676,6 @@ TALER_TESTING_cmd_withdraw_denomination ( } -/** - * Modify a withdraw command to enable retries when the - * reserve is not yet full or we get other transient - * errors from the exchange. - * - * @param cmd a withdraw command - * @return the command with retries enabled - */ struct TALER_TESTING_Command TALER_TESTING_cmd_withdraw_with_retry (struct TALER_TESTING_Command cmd) { |