diff options
Diffstat (limited to 'src/lib/exchange_api_link.c')
| -rw-r--r-- | src/lib/exchange_api_link.c | 252 |
1 files changed, 134 insertions, 118 deletions
diff --git a/src/lib/exchange_api_link.c b/src/lib/exchange_api_link.c index ec085b533..4b1adc723 100644 --- a/src/lib/exchange_api_link.c +++ b/src/lib/exchange_api_link.c @@ -1,6 +1,6 @@ /* This file is part of TALER - Copyright (C) 2015-2021 Taler Systems SA + Copyright (C) 2015-2023 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 @@ -37,11 +37,6 @@ struct TALER_EXCHANGE_LinkHandle { /** - * The connection to exchange this request handle will use - */ - struct TALER_EXCHANGE_Handle *exchange; - - /** * The url for this request. */ char *url; @@ -66,6 +61,12 @@ struct TALER_EXCHANGE_LinkHandle */ struct TALER_CoinSpendPrivateKeyP coin_priv; + /** + * Age commitment and proof of the original coin, might be NULL. + * Required to derive the new age commitment and proof. + */ + const struct TALER_AgeCommitmentProof *age_commitment_proof; + }; @@ -75,36 +76,45 @@ struct TALER_EXCHANGE_LinkHandle * * @param lh link handle * @param json json reply with the data for one coin - * @param coin_num number of the coin * @param trans_pub our transfer public key - * @param[out] coin_priv where to return private coin key - * @param[out] sig where to return private coin signature - * @param[out] pub where to return the public key for the coin + * @param[out] lci where to return coin details * @return #GNUNET_OK on success, #GNUNET_SYSERR on error */ static enum GNUNET_GenericReturnValue parse_link_coin (const struct TALER_EXCHANGE_LinkHandle *lh, const json_t *json, - uint32_t coin_num, const struct TALER_TransferPublicKeyP *trans_pub, - struct TALER_CoinSpendPrivateKeyP *coin_priv, - struct TALER_DenominationSignature *sig, - struct TALER_DenominationPublicKey *pub) + struct TALER_EXCHANGE_LinkedCoinInfo *lci) { struct TALER_BlindedDenominationSignature bsig; struct TALER_DenominationPublicKey rpub; struct TALER_CoinSpendSignatureP link_sig; + union GNUNET_CRYPTO_BlindingSecretP bks; + struct TALER_ExchangeWithdrawValues alg_values; + union GNUNET_CRYPTO_BlindSessionNonce nonce; + bool no_nonce; + uint32_t coin_idx; struct GNUNET_JSON_Specification spec[] = { TALER_JSON_spec_denom_pub ("denom_pub", &rpub), TALER_JSON_spec_blinded_denom_sig ("ev_sig", &bsig), + TALER_JSON_spec_exchange_withdraw_values ("ewv", + &alg_values), GNUNET_JSON_spec_fixed_auto ("link_sig", &link_sig), + GNUNET_JSON_spec_uint32 ("coin_idx", + &coin_idx), + GNUNET_JSON_spec_mark_optional ( + GNUNET_JSON_spec_fixed_auto ("cs_nonce", + &nonce), + &no_nonce), GNUNET_JSON_spec_end () }; struct TALER_TransferSecretP secret; - struct TALER_PlanchetSecretsP fc; + struct TALER_PlanchetDetail pd; + struct TALER_CoinPubHashP c_hash; + struct TALER_AgeCommitmentHash *pah = NULL; /* parse reply */ if (GNUNET_OK != @@ -118,44 +128,76 @@ parse_link_coin (const struct TALER_EXCHANGE_LinkHandle *lh, TALER_link_recover_transfer_secret (trans_pub, &lh->coin_priv, &secret); - TALER_planchet_setup_refresh (&secret, - coin_num, - &fc); + TALER_transfer_secret_to_planchet_secret (&secret, + coin_idx, + &lci->ps); + TALER_planchet_setup_coin_priv (&lci->ps, + &alg_values, + &lci->coin_priv); + TALER_planchet_blinding_secret_create (&lci->ps, + &alg_values, + &bks); + + lci->has_age_commitment = false; + + /* Derive the age commitment and calculate the hash */ + if (NULL != lh->age_commitment_proof) + { + + GNUNET_assert (GNUNET_OK == + TALER_age_commitment_derive ( + lh->age_commitment_proof, + &secret.key, + &lci->age_commitment_proof)); + + TALER_age_commitment_hash ( + &lci->age_commitment_proof.commitment, + &lci->h_age_commitment); + + lci->has_age_commitment = true; + pah = &lci->h_age_commitment; + } + if (GNUNET_OK != + TALER_planchet_prepare ( + &rpub, + &alg_values, + &bks, + no_nonce + ? NULL + : &nonce, + &lci->coin_priv, + pah, + &c_hash, + &pd)) + { + GNUNET_break (0); + GNUNET_JSON_parse_free (spec); + return GNUNET_SYSERR; + } /* extract coin and signature */ if (GNUNET_OK != - TALER_denom_sig_unblind (sig, + TALER_denom_sig_unblind (&lci->sig, &bsig, - &fc.blinding_key, + &bks, + &c_hash, + &alg_values, &rpub)) { GNUNET_break_op (0); return GNUNET_SYSERR; } - *coin_priv = fc.coin_priv; /* verify link_sig */ { - struct TALER_PlanchetDetail pd; - struct TALER_CoinPubHash c_hash; struct TALER_CoinSpendPublicKeyP old_coin_pub; - struct TALER_BlindedCoinHash coin_envelope_hash; + struct TALER_BlindedCoinHashP coin_envelope_hash; GNUNET_CRYPTO_eddsa_key_get_public (&lh->coin_priv.eddsa_priv, &old_coin_pub.eddsa_pub); - if (GNUNET_OK != - TALER_planchet_prepare (&rpub, - &fc, - &c_hash, - &pd)) - { - GNUNET_break (0); - GNUNET_JSON_parse_free (spec); - return GNUNET_SYSERR; - } - GNUNET_CRYPTO_hash (pd.coin_ev, - pd.coin_ev_size, - &coin_envelope_hash.hash); + TALER_coin_ev_hash (&pd.blinded_planchet, + &pd.denom_pub_hash, + &coin_envelope_hash); if (GNUNET_OK != TALER_wallet_link_verify (&pd.denom_pub_hash, trans_pub, @@ -164,16 +206,16 @@ parse_link_coin (const struct TALER_EXCHANGE_LinkHandle *lh, &link_sig)) { GNUNET_break_op (0); - GNUNET_free (pd.coin_ev); + TALER_blinded_planchet_free (&pd.blinded_planchet); GNUNET_JSON_parse_free (spec); return GNUNET_SYSERR; } - GNUNET_free (pd.coin_ev); + TALER_blinded_planchet_free (&pd.blinded_planchet); } /* clean up */ - TALER_denom_pub_deep_copy (pub, - &rpub); + TALER_denom_pub_copy (&lci->pub, + &rpub); GNUNET_JSON_parse_free (spec); return GNUNET_OK; } @@ -194,9 +236,9 @@ parse_link_ok (struct TALER_EXCHANGE_LinkHandle *lh, unsigned int session; unsigned int num_coins; int ret; - struct TALER_EXCHANGE_HttpResponse hr = { - .reply = json, - .http_status = MHD_HTTP_OK + struct TALER_EXCHANGE_LinkResult lr = { + .hr.reply = json, + .hr.http_status = MHD_HTTP_OK }; if (! json_is_array (json)) @@ -218,9 +260,10 @@ parse_link_ok (struct TALER_EXCHANGE_LinkHandle *lh, whilst 'i' and 'session' track the 2d array. */// for (session = 0; session<json_array_size (json); session++) { - json_t *jsona; + const json_t *jsona; struct GNUNET_JSON_Specification spec[] = { - GNUNET_JSON_spec_json ("new_coins", &jsona), + GNUNET_JSON_spec_array_const ("new_coins", + &jsona), GNUNET_JSON_spec_end () }; @@ -233,36 +276,25 @@ parse_link_ok (struct TALER_EXCHANGE_LinkHandle *lh, GNUNET_break_op (0); return GNUNET_SYSERR; } - if (! json_is_array (jsona)) - { - GNUNET_break_op (0); - GNUNET_JSON_parse_free (spec); - return GNUNET_SYSERR; - } - /* count all coins over all sessions */ num_coins += json_array_size (jsona); - GNUNET_JSON_parse_free (spec); } /* Now that we know how big the 1d array is, allocate and fill it. */ { unsigned int off_coin; /* index into 1d array */ unsigned int i; - struct TALER_CoinSpendPrivateKeyP coin_privs[GNUNET_NZL (num_coins)]; - struct TALER_DenominationSignature sigs[GNUNET_NZL (num_coins)]; - struct TALER_DenominationPublicKey pubs[GNUNET_NZL (num_coins)]; + struct TALER_EXCHANGE_LinkedCoinInfo lcis[GNUNET_NZL (num_coins)]; - memset (sigs, 0, sizeof (sigs)); - memset (pubs, 0, sizeof (pubs)); + memset (lcis, 0, sizeof (lcis)); off_coin = 0; for (session = 0; session<json_array_size (json); session++) { - json_t *jsona; + const json_t *jsona; struct TALER_TransferPublicKeyP trans_pub; struct GNUNET_JSON_Specification spec[] = { - GNUNET_JSON_spec_json ("new_coins", - &jsona), + GNUNET_JSON_spec_array_const ("new_coins", + &jsona), GNUNET_JSON_spec_fixed_auto ("transfer_pub", &trans_pub), GNUNET_JSON_spec_end () @@ -277,26 +309,20 @@ parse_link_ok (struct TALER_EXCHANGE_LinkHandle *lh, GNUNET_break_op (0); return GNUNET_SYSERR; } - if (! json_is_array (jsona)) - { - GNUNET_break_op (0); - GNUNET_JSON_parse_free (spec); - return GNUNET_SYSERR; - } /* decode all coins */ for (i = 0; i<json_array_size (jsona); i++) { + struct TALER_EXCHANGE_LinkedCoinInfo *lci; + + lci = &lcis[i + off_coin]; GNUNET_assert (i + off_coin < num_coins); if (GNUNET_OK != parse_link_coin (lh, json_array_get (jsona, i), - i, &trans_pub, - &coin_privs[i + off_coin], - &sigs[i + off_coin], - &pubs[i + off_coin])) + lci)) { GNUNET_break_op (0); break; @@ -308,20 +334,16 @@ parse_link_ok (struct TALER_EXCHANGE_LinkHandle *lh, { GNUNET_break_op (0); ret = GNUNET_SYSERR; - GNUNET_JSON_parse_free (spec); break; } - GNUNET_JSON_parse_free (spec); } /* end of for (session) */ if (off_coin == num_coins) { + lr.details.ok.num_coins = num_coins; + lr.details.ok.coins = lcis; lh->link_cb (lh->link_cb_cls, - &hr, - num_coins, - coin_privs, - sigs, - pubs); + &lr); lh->link_cb = NULL; ret = GNUNET_OK; } @@ -335,8 +357,10 @@ parse_link_ok (struct TALER_EXCHANGE_LinkHandle *lh, GNUNET_assert (off_coin <= num_coins); for (i = 0; i<off_coin; i++) { - TALER_denom_sig_free (&sigs[i]); - TALER_denom_pub_free (&pubs[i]); + TALER_denom_sig_free (&lcis[i].sig); + TALER_denom_pub_free (&lcis[i].pub); + if (lcis[i].has_age_commitment) + TALER_age_commitment_proof_free (&lcis[i].age_commitment_proof); } } return ret; @@ -358,16 +382,16 @@ handle_link_finished (void *cls, { struct TALER_EXCHANGE_LinkHandle *lh = cls; const json_t *j = response; - struct TALER_EXCHANGE_HttpResponse hr = { - .reply = j, - .http_status = (unsigned int) response_code + struct TALER_EXCHANGE_LinkResult lr = { + .hr.reply = j, + .hr.http_status = (unsigned int) response_code }; lh->job = NULL; switch (response_code) { case 0: - hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE; + lr.hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE; break; case MHD_HTTP_OK: if (GNUNET_OK != @@ -375,72 +399,63 @@ handle_link_finished (void *cls, j)) { GNUNET_break_op (0); - hr.http_status = 0; - hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED; + lr.hr.http_status = 0; + lr.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED; break; } GNUNET_assert (NULL == lh->link_cb); TALER_EXCHANGE_link_cancel (lh); return; case MHD_HTTP_BAD_REQUEST: - hr.ec = TALER_JSON_get_error_code (j); - hr.hint = TALER_JSON_get_error_hint (j); + lr.hr.ec = TALER_JSON_get_error_code (j); + lr.hr.hint = TALER_JSON_get_error_hint (j); /* This should never happen, either us or the exchange is buggy (or API version conflict); just pass JSON reply to the application */ break; case MHD_HTTP_NOT_FOUND: - hr.ec = TALER_JSON_get_error_code (j); - hr.hint = TALER_JSON_get_error_hint (j); + lr.hr.ec = TALER_JSON_get_error_code (j); + lr.hr.hint = TALER_JSON_get_error_hint (j); /* Nothing really to verify, exchange says this coin was not melted; we should pass the JSON reply to the application */ break; case MHD_HTTP_INTERNAL_SERVER_ERROR: - hr.ec = TALER_JSON_get_error_code (j); - hr.hint = TALER_JSON_get_error_hint (j); + lr.hr.ec = TALER_JSON_get_error_code (j); + lr.hr.hint = TALER_JSON_get_error_hint (j); /* Server had an internal issue; we should retry, but this API leaves this to the application */ break; default: /* unexpected response code */ GNUNET_break_op (0); - hr.ec = TALER_JSON_get_error_code (j); - hr.hint = TALER_JSON_get_error_hint (j); + lr.hr.ec = TALER_JSON_get_error_code (j); + lr.hr.hint = TALER_JSON_get_error_hint (j); GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Unexpected response code %u/%d for exchange link\n", (unsigned int) response_code, - (int) hr.ec); + (int) lr.hr.ec); break; } if (NULL != lh->link_cb) lh->link_cb (lh->link_cb_cls, - &hr, - 0, - NULL, - NULL, - NULL); + &lr); TALER_EXCHANGE_link_cancel (lh); } struct TALER_EXCHANGE_LinkHandle * -TALER_EXCHANGE_link (struct TALER_EXCHANGE_Handle *exchange, - const struct TALER_CoinSpendPrivateKeyP *coin_priv, - TALER_EXCHANGE_LinkCallback link_cb, - void *link_cb_cls) +TALER_EXCHANGE_link ( + struct GNUNET_CURL_Context *ctx, + const char *url, + const struct TALER_CoinSpendPrivateKeyP *coin_priv, + const struct TALER_AgeCommitmentProof *age_commitment_proof, + TALER_EXCHANGE_LinkCallback link_cb, + void *link_cb_cls) { struct TALER_EXCHANGE_LinkHandle *lh; CURL *eh; - struct GNUNET_CURL_Context *ctx; struct TALER_CoinSpendPublicKeyP coin_pub; char arg_str[sizeof (struct TALER_CoinSpendPublicKeyP) * 2 + 32]; - if (GNUNET_YES != - TEAH_handle_is_ready (exchange)) - { - GNUNET_break (0); - return NULL; - } - GNUNET_CRYPTO_eddsa_key_get_public (&coin_priv->eddsa_priv, &coin_pub.eddsa_pub); { @@ -455,16 +470,17 @@ TALER_EXCHANGE_link (struct TALER_EXCHANGE_Handle *exchange, *end = '\0'; GNUNET_snprintf (arg_str, sizeof (arg_str), - "/coins/%s/link", + "coins/%s/link", pub_str); } lh = GNUNET_new (struct TALER_EXCHANGE_LinkHandle); - lh->exchange = exchange; lh->link_cb = link_cb; lh->link_cb_cls = link_cb_cls; lh->coin_priv = *coin_priv; - lh->url = TEAH_path_to_url (exchange, - arg_str); + lh->age_commitment_proof = age_commitment_proof; + lh->url = TALER_url_join (url, + arg_str, + NULL); if (NULL == lh->url) { GNUNET_free (lh); @@ -478,7 +494,6 @@ TALER_EXCHANGE_link (struct TALER_EXCHANGE_Handle *exchange, GNUNET_free (lh); return NULL; } - ctx = TEAH_handle_to_context (exchange); lh->job = GNUNET_CURL_job_add_with_ct_json (ctx, eh, &handle_link_finished, @@ -495,6 +510,7 @@ TALER_EXCHANGE_link_cancel (struct TALER_EXCHANGE_LinkHandle *lh) GNUNET_CURL_job_cancel (lh->job); lh->job = NULL; } + GNUNET_free (lh->url); GNUNET_free (lh); } |