diff options
Diffstat (limited to 'src/testing/testing_api_cmd_batch_withdraw.c')
| -rw-r--r-- | src/testing/testing_api_cmd_batch_withdraw.c | 218 |
1 files changed, 119 insertions, 99 deletions
diff --git a/src/testing/testing_api_cmd_batch_withdraw.c b/src/testing/testing_api_cmd_batch_withdraw.c index fb290f1e8..1b056bdbb 100644 --- a/src/testing/testing_api_cmd_batch_withdraw.c +++ b/src/testing/testing_api_cmd_batch_withdraw.c @@ -23,6 +23,7 @@ * @author Marcello Stanisci */ #include "platform.h" +#include "taler_exchange_service.h" #include "taler_json_lib.h" #include <microhttpd.h> #include <gnunet/gnunet_curl_lib.h> @@ -56,9 +57,14 @@ struct CoinState struct TALER_CoinSpendPrivateKeyP coin_priv; /** + * Public key of the coin. + */ + struct TALER_CoinSpendPublicKeyP coin_pub; + + /** * Blinding key used during the operation. */ - union TALER_DenominationBlindingKeyP bks; + union GNUNET_CRYPTO_BlindingSecretP bks; /** * Values contributed from the exchange during the @@ -79,10 +85,10 @@ struct CoinState /** * If age > 0, put here the corresponding age commitment with its proof and - * its hash, respectivelly, NULL otherwise. + * its hash, respectively. */ - struct TALER_AgeCommitmentProof *age_commitment_proof; - struct TALER_AgeCommitmentHash *h_age_commitment; + struct TALER_AgeCommitmentProof age_commitment_proof; + struct TALER_AgeCommitmentHash h_age_commitment; /** * Reserve history entry that corresponds to this coin. @@ -141,10 +147,16 @@ struct BatchWithdrawState struct CoinState *coins; /** - * 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; /** * Length of the @e coins array. @@ -161,6 +173,11 @@ struct BatchWithdrawState * Same for all coins in the batch. */ uint8_t age; + + /** + * Force a conflict: + */ + bool force_conflict; }; @@ -183,18 +200,10 @@ reserve_batch_withdraw_cb (void *cls, ws->wsh = NULL; if (ws->expected_response_code != wr->hr.http_status) { - 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) @@ -204,19 +213,19 @@ reserve_batch_withdraw_cb (void *cls, { struct CoinState *cs = &ws->coins[i]; const struct TALER_EXCHANGE_PrivateCoinDetails *pcd - = &wr->details.success.coins[i]; + = &wr->details.ok.coins[i]; - TALER_denom_sig_deep_copy (&cs->sig, - &pcd->sig); + TALER_denom_sig_copy (&cs->sig, + &pcd->sig); cs->coin_priv = pcd->coin_priv; + GNUNET_CRYPTO_eddsa_key_get_public (&cs->coin_priv.eddsa_priv, + &cs->coin_pub.eddsa_pub); + cs->bks = pcd->bks; - cs->exchange_vals = pcd->exchange_vals; + TALER_denom_ewv_copy (&cs->exchange_vals, + &pcd->exchange_vals); } 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; @@ -224,11 +233,18 @@ reserve_batch_withdraw_cb (void *cls, /* nothing to check */ break; case MHD_HTTP_CONFLICT: - /* nothing to check */ + /* TODO[oec]: Check if age-requirement is the reason */ break; case MHD_HTTP_GONE: /* theoretically could check that the key was actually */ break; + case MHD_HTTP_UNAVAILABLE_FOR_LEGAL_REASONS: + /* nothing to check */ + 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, @@ -250,10 +266,13 @@ batch_withdraw_run (void *cls, struct TALER_TESTING_Interpreter *is) { struct BatchWithdrawState *ws = cls; + const struct TALER_EXCHANGE_Keys *keys = TALER_TESTING_get_keys (is); const struct TALER_ReservePrivateKeyP *rp; const struct TALER_TESTING_Command *create_reserve; const struct TALER_EXCHANGE_DenomPublicKey *dpk; struct TALER_EXCHANGE_WithdrawCoinInput wcis[ws->num_coins]; + struct TALER_PlanchetMasterSecretP conflict_ps = {0}; + struct TALER_AgeMask mask = {0}; (void) cmd; ws->is = is; @@ -278,21 +297,46 @@ batch_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 (0 < ws->age) + mask = TALER_extensions_get_age_restriction_mask (); + + if (ws->force_conflict) + TALER_planchet_master_setup_random (&conflict_ps); + for (unsigned int i = 0; i<ws->num_coins; i++) { struct CoinState *cs = &ws->coins[i]; struct TALER_EXCHANGE_WithdrawCoinInput *wci = &wcis[i]; - TALER_planchet_master_setup_random (&cs->ps); - dpk = TALER_TESTING_find_pk (TALER_EXCHANGE_get_keys (is->exchange), + if (ws->force_conflict) + cs->ps = conflict_ps; + else + TALER_planchet_master_setup_random (&cs->ps); + + if (0 < ws->age) + { + struct GNUNET_HashCode seed = {0}; + GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK, + &seed, + sizeof(seed)); + TALER_age_restriction_commit (&mask, + ws->age, + &seed, + &cs->age_commitment_proof); + TALER_age_commitment_hash (&cs->age_commitment_proof.commitment, + &cs->h_age_commitment); + } + + + dpk = TALER_TESTING_find_pk (keys, &cs->amount, ws->age > 0); if (NULL == dpk) @@ -316,14 +360,17 @@ batch_withdraw_run (void *cls, wci->pk = cs->pk; wci->ps = &cs->ps; - wci->ach = cs->h_age_commitment; + wci->ach = &cs->h_age_commitment; } - ws->wsh = TALER_EXCHANGE_batch_withdraw (is->exchange, - rp, - wcis, - ws->num_coins, - &reserve_batch_withdraw_cb, - ws); + ws->wsh = TALER_EXCHANGE_batch_withdraw ( + TALER_TESTING_interpreter_get_context (is), + TALER_TESTING_get_exchange_url (is), + keys, + rp, + ws->num_coins, + wcis, + &reserve_batch_withdraw_cb, + ws); if (NULL == ws->wsh) { GNUNET_break (0); @@ -348,9 +395,8 @@ batch_withdraw_cleanup (void *cls, if (NULL != ws->wsh) { - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - "Command %s did not complete\n", - cmd->label); + TALER_TESTING_command_incomplete (ws->is, + cmd->label); TALER_EXCHANGE_batch_withdraw_cancel (ws->wsh); ws->wsh = NULL; } @@ -358,19 +404,15 @@ batch_withdraw_cleanup (void *cls, { struct CoinState *cs = &ws->coins[i]; + TALER_denom_ewv_free (&cs->exchange_vals); TALER_denom_sig_free (&cs->sig); if (NULL != cs->pk) { TALER_EXCHANGE_destroy_denomination_key (cs->pk); cs->pk = NULL; } - if (NULL != cs->age_commitment_proof) - { - TALER_age_commitment_proof_free (cs->age_commitment_proof); - cs->age_commitment_proof = NULL; - } - if (NULL != cs->h_age_commitment) - GNUNET_free (cs->h_age_commitment); + if (0 < ws->age) + TALER_age_commitment_proof_free (&cs->age_commitment_proof); } GNUNET_free (ws->coins); GNUNET_free (ws->exchange_url); @@ -403,6 +445,8 @@ batch_withdraw_traits (void *cls, &cs->reserve_history), TALER_TESTING_make_trait_coin_priv (index, &cs->coin_priv), + TALER_TESTING_make_trait_coin_pub (index, + &cs->coin_pub), TALER_TESTING_make_trait_planchet_secrets (index, &cs->ps), TALER_TESTING_make_trait_blinding_key (index, @@ -417,15 +461,18 @@ batch_withdraw_traits (void *cls, TALER_TESTING_make_trait_reserve_pub (&ws->reserve_pub), TALER_TESTING_make_trait_amounts (index, &cs->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 (index, - cs->age_commitment_proof), + ws->age > 0 ? + &cs->age_commitment_proof: + NULL), TALER_TESTING_make_trait_h_age_commitment (index, - cs->h_age_commitment), + ws->age > 0 ? + &cs->h_age_commitment : + NULL), TALER_TESTING_trait_end () }; @@ -441,12 +488,14 @@ batch_withdraw_traits (void *cls, struct TALER_TESTING_Command -TALER_TESTING_cmd_batch_withdraw (const char *label, - const char *reserve_reference, - uint8_t age, - unsigned int expected_response_code, - const char *amount, - ...) +TALER_TESTING_cmd_batch_withdraw_with_conflict ( + const char *label, + const char *reserve_reference, + bool conflict, + uint8_t age, + unsigned int expected_response_code, + const char *amount, + ...) { struct BatchWithdrawState *ws; unsigned int cnt; @@ -456,54 +505,24 @@ TALER_TESTING_cmd_batch_withdraw (const char *label, ws->age = age; ws->reserve_reference = reserve_reference; ws->expected_response_code = expected_response_code; + ws->force_conflict = conflict; cnt = 1; - va_start (ap, amount); - while (NULL != (va_arg (ap, const char *))) + va_start (ap, + amount); + while (NULL != (va_arg (ap, + const char *))) cnt++; ws->num_coins = cnt; ws->coins = GNUNET_new_array (cnt, struct CoinState); va_end (ap); - va_start (ap, amount); + va_start (ap, + amount); for (unsigned int i = 0; i<ws->num_coins; i++) { struct CoinState *cs = &ws->coins[i]; - if (0 < age) - { - struct TALER_AgeCommitmentProof *acp; - struct TALER_AgeCommitmentHash *hac; - struct GNUNET_HashCode seed; - struct TALER_AgeMask mask; - - acp = GNUNET_new (struct TALER_AgeCommitmentProof); - hac = GNUNET_new (struct TALER_AgeCommitmentHash); - mask = TALER_extensions_age_restriction_ageMask (); - GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK, - &seed, - sizeof(seed)); - - if (GNUNET_OK != - TALER_age_restriction_commit ( - &mask, - age, - &seed, - acp)) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Failed to generate age commitment for age %d at %s\n", - age, - label); - GNUNET_assert (0); - } - - TALER_age_commitment_hash (&acp->commitment, - hac); - cs->age_commitment_proof = acp; - cs->h_age_commitment = hac; - } - if (GNUNET_OK != TALER_string_to_amount (amount, &cs->amount)) @@ -515,7 +534,8 @@ TALER_TESTING_cmd_batch_withdraw (const char *label, GNUNET_assert (0); } /* move on to next vararg! */ - amount = va_arg (ap, const char *); + amount = va_arg (ap, + const char *); } GNUNET_assert (NULL == amount); va_end (ap); |