-skeleton logic for deposits into purse
This commit is contained in:
parent
53cde04c4e
commit
eea35ffb01
@ -1 +1 @@
|
||||
Subproject commit 1cfd50974f6e01dee0302b7918c18cc2b06edf71
|
||||
Subproject commit 138acf20b87d796543e9eaa68f98e5e8ae2e7302
|
@ -48,6 +48,7 @@ libtalerexchange_la_SOURCES = \
|
||||
exchange_api_melt.c \
|
||||
exchange_api_purse_create_with_deposit.c \
|
||||
exchange_api_purse_create_with_merge.c \
|
||||
exchange_api_purse_deposit.c \
|
||||
exchange_api_purse_merge.c \
|
||||
exchange_api_recoup.c \
|
||||
exchange_api_recoup_refresh.c \
|
||||
|
@ -297,6 +297,31 @@ TALER_EXCHANGE_purse_create_with_merge (
|
||||
&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?
|
||||
struct GNUNET_JSON_Specification spec[] = {
|
||||
TALER_JSON_spec_amount_any ("amount",
|
||||
&pcm->purse_value_after_fees),
|
||||
GNUNET_JSON_spec_mark_optional (
|
||||
GNUNET_JSON_spec_uint32 ("minimum_age",
|
||||
&min_age),
|
||||
NULL),
|
||||
GNUNET_JSON_spec_end ()
|
||||
};
|
||||
|
||||
if (GNUNET_OK !=
|
||||
GNUNET_JSON_parse (contract_terms,
|
||||
spec,
|
||||
NULL, NULL))
|
||||
{
|
||||
GNUNET_break (0);
|
||||
GNUNET_free (pcm);
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
GNUNET_assert (GNUNET_YES ==
|
||||
TEAH_handle_is_ready (exchange));
|
||||
|
380
src/lib/exchange_api_purse_deposit.c
Normal file
380
src/lib/exchange_api_purse_deposit.c
Normal file
@ -0,0 +1,380 @@
|
||||
/*
|
||||
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
|
||||
<http://www.gnu.org/licenses/>
|
||||
*/
|
||||
/**
|
||||
* @file lib/exchange_api_purse_deposit.c
|
||||
* @brief Implementation of the client to create a purse with
|
||||
* an initial set of deposits (and a contract)
|
||||
* @author Christian Grothoff
|
||||
*/
|
||||
#include "platform.h"
|
||||
#include <jansson.h>
|
||||
#include <microhttpd.h> /* just for HTTP status codes */
|
||||
#include <gnunet/gnunet_util_lib.h>
|
||||
#include <gnunet/gnunet_json_lib.h>
|
||||
#include <gnunet/gnunet_curl_lib.h>
|
||||
#include "taler_json_lib.h"
|
||||
#include "taler_exchange_service.h"
|
||||
#include "exchange_api_handle.h"
|
||||
#include "taler_signatures.h"
|
||||
#include "exchange_api_curl_defaults.h"
|
||||
|
||||
|
||||
/**
|
||||
* @brief A purse create with deposit handle
|
||||
*/
|
||||
struct TALER_EXCHANGE_PurseDepositHandle
|
||||
{
|
||||
|
||||
/**
|
||||
* The connection to exchange this request handle will use
|
||||
*/
|
||||
struct TALER_EXCHANGE_Handle *exchange;
|
||||
|
||||
/**
|
||||
* The url for this request.
|
||||
*/
|
||||
char *url;
|
||||
|
||||
/**
|
||||
* Context for #TEH_curl_easy_post(). Keeps the data that must
|
||||
* persist for Curl to make the upload.
|
||||
*/
|
||||
struct TALER_CURL_PostContext ctx;
|
||||
|
||||
/**
|
||||
* Handle for the request.
|
||||
*/
|
||||
struct GNUNET_CURL_Job *job;
|
||||
|
||||
/**
|
||||
* Function to call with the result.
|
||||
*/
|
||||
TALER_EXCHANGE_PurseDepositCallback cb;
|
||||
|
||||
/**
|
||||
* Closure for @a cb.
|
||||
*/
|
||||
void *cb_cls;
|
||||
|
||||
/**
|
||||
* Expected value in the purse after fees.
|
||||
*/
|
||||
struct TALER_Amount purse_value_after_fees;
|
||||
|
||||
/**
|
||||
* Public key of the purse.
|
||||
*/
|
||||
struct TALER_PurseContractPublicKeyP purse_pub;
|
||||
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* Function called when we're done processing the
|
||||
* HTTP /purses/$PID/deposit request.
|
||||
*
|
||||
* @param cls the `struct TALER_EXCHANGE_PurseDepositHandle`
|
||||
* @param response_code HTTP response code, 0 on error
|
||||
* @param response parsed JSON result, NULL on error
|
||||
*/
|
||||
static void
|
||||
handle_purse_deposit_finished (void *cls,
|
||||
long response_code,
|
||||
const void *response)
|
||||
{
|
||||
struct TALER_EXCHANGE_PurseDepositHandle *pch = cls;
|
||||
const json_t *j = response;
|
||||
struct TALER_EXCHANGE_PurseDepositResponse dr = {
|
||||
.hr.reply = j,
|
||||
.hr.http_status = (unsigned int) response_code
|
||||
};
|
||||
|
||||
pch->job = NULL;
|
||||
switch (response_code)
|
||||
{
|
||||
case 0:
|
||||
dr.hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
|
||||
break;
|
||||
case MHD_HTTP_OK:
|
||||
{
|
||||
const struct TALER_EXCHANGE_Keys *key_state;
|
||||
struct GNUNET_TIME_Timestamp etime;
|
||||
struct TALER_Amount total_deposited;
|
||||
struct TALER_ExchangeSignatureP exchange_sig;
|
||||
struct TALER_ExchangePublicKeyP exchange_pub;
|
||||
struct GNUNET_JSON_Specification spec[] = {
|
||||
GNUNET_JSON_spec_fixed_auto ("exchange_sig",
|
||||
&exchange_sig),
|
||||
GNUNET_JSON_spec_fixed_auto ("exchange_pub",
|
||||
&exchange_pub),
|
||||
GNUNET_JSON_spec_timestamp ("exchange_timestamp",
|
||||
&etime),
|
||||
TALER_JSON_spec_amount ("total_deposited",
|
||||
pch->purse_value_after_fees.currency,
|
||||
&total_deposited),
|
||||
GNUNET_JSON_spec_end ()
|
||||
};
|
||||
|
||||
if (GNUNET_OK !=
|
||||
GNUNET_JSON_parse (j,
|
||||
spec,
|
||||
NULL, NULL))
|
||||
{
|
||||
GNUNET_break_op (0);
|
||||
dr.hr.http_status = 0;
|
||||
dr.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
|
||||
break;
|
||||
}
|
||||
key_state = TALER_EXCHANGE_get_keys (pch->exchange);
|
||||
if (GNUNET_OK !=
|
||||
TALER_EXCHANGE_test_signing_key (key_state,
|
||||
&exchange_pub))
|
||||
{
|
||||
GNUNET_break_op (0);
|
||||
dr.hr.http_status = 0;
|
||||
dr.hr.ec = TALER_EC_EXCHANGE_PURSE_DEPOSIT_EXCHANGE_SIGNATURE_INVALID;
|
||||
break;
|
||||
}
|
||||
#if FIXME
|
||||
if (GNUNET_OK !=
|
||||
TALER_exchange_online_purse_created_verify (
|
||||
etime,
|
||||
pch->purse_expiration,
|
||||
&pch->purse_value_after_fees,
|
||||
&total_deposited,
|
||||
&pch->purse_pub,
|
||||
&pch->merge_pub,
|
||||
&pch->h_contract_terms,
|
||||
&exchange_pub,
|
||||
&exchange_sig))
|
||||
{
|
||||
GNUNET_break_op (0);
|
||||
dr.hr.http_status = 0;
|
||||
dr.hr.ec = TALER_EC_EXCHANGE_PURSE_DEPOSIT_EXCHANGE_SIGNATURE_INVALID;
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
break;
|
||||
case MHD_HTTP_BAD_REQUEST:
|
||||
/* This should never happen, either us or the exchange is buggy
|
||||
(or API version conflict); just pass JSON reply to the application */
|
||||
dr.hr.ec = TALER_JSON_get_error_code (j);
|
||||
dr.hr.hint = TALER_JSON_get_error_hint (j);
|
||||
break;
|
||||
case MHD_HTTP_FORBIDDEN:
|
||||
dr.hr.ec = TALER_JSON_get_error_code (j);
|
||||
dr.hr.hint = TALER_JSON_get_error_hint (j);
|
||||
/* Nothing really to verify, exchange says one of the signatures is
|
||||
invalid; as we checked them, this should never happen, we
|
||||
should pass the JSON reply to the application */
|
||||
break;
|
||||
case MHD_HTTP_NOT_FOUND:
|
||||
dr.hr.ec = TALER_JSON_get_error_code (j);
|
||||
dr.hr.hint = TALER_JSON_get_error_hint (j);
|
||||
/* Nothing really to verify, this should never
|
||||
happen, we should pass the JSON reply to the application */
|
||||
break;
|
||||
case MHD_HTTP_CONFLICT:
|
||||
// FIXME: check reply!
|
||||
break;
|
||||
case MHD_HTTP_GONE:
|
||||
/* could happen if denomination was revoked */
|
||||
/* Note: one might want to check /keys for revocation
|
||||
signature here, alas tricky in case our /keys
|
||||
is outdated => left to clients */
|
||||
dr.hr.ec = TALER_JSON_get_error_code (j);
|
||||
dr.hr.hint = TALER_JSON_get_error_hint (j);
|
||||
break;
|
||||
case MHD_HTTP_INTERNAL_SERVER_ERROR:
|
||||
dr.hr.ec = TALER_JSON_get_error_code (j);
|
||||
dr.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 */
|
||||
dr.hr.ec = TALER_JSON_get_error_code (j);
|
||||
dr.hr.hint = TALER_JSON_get_error_hint (j);
|
||||
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
|
||||
"Unexpected response code %u/%d for exchange deposit\n",
|
||||
(unsigned int) response_code,
|
||||
dr.hr.ec);
|
||||
GNUNET_break_op (0);
|
||||
break;
|
||||
}
|
||||
pch->cb (pch->cb_cls,
|
||||
&dr);
|
||||
TALER_EXCHANGE_purse_deposit_cancel (pch);
|
||||
}
|
||||
|
||||
|
||||
struct TALER_EXCHANGE_PurseDepositHandle *
|
||||
TALER_EXCHANGE_purse_deposit (
|
||||
struct TALER_EXCHANGE_Handle *exchange,
|
||||
const char *purse_exchange_url,
|
||||
const struct TALER_PurseContractPublicKeyP *purse_pub,
|
||||
uint8_t min_age,
|
||||
unsigned int num_deposits,
|
||||
const struct TALER_EXCHANGE_PurseDeposit *deposits,
|
||||
TALER_EXCHANGE_PurseDepositCallback cb,
|
||||
void *cb_cls)
|
||||
{
|
||||
struct TALER_EXCHANGE_PurseDepositHandle *pch;
|
||||
struct GNUNET_CURL_Context *ctx;
|
||||
json_t *create_obj;
|
||||
json_t *deposit_arr;
|
||||
CURL *eh;
|
||||
char *url;
|
||||
char arg_str[sizeof (pch->purse_pub) * 2 + 32];
|
||||
|
||||
GNUNET_assert (GNUNET_YES ==
|
||||
TEAH_handle_is_ready (exchange));
|
||||
pch = GNUNET_new (struct TALER_EXCHANGE_PurseDepositHandle);
|
||||
pch->purse_pub = *purse_pub;
|
||||
pch->exchange = exchange;
|
||||
pch->cb = cb;
|
||||
pch->cb_cls = cb_cls;
|
||||
{
|
||||
char pub_str[sizeof (pch->purse_pub) * 2];
|
||||
char *end;
|
||||
|
||||
end = GNUNET_STRINGS_data_to_string (
|
||||
&pch->purse_pub,
|
||||
sizeof (pch->purse_pub),
|
||||
pub_str,
|
||||
sizeof (pub_str));
|
||||
*end = '\0';
|
||||
GNUNET_snprintf (arg_str,
|
||||
sizeof (arg_str),
|
||||
"/purses/%s/deposit",
|
||||
pub_str);
|
||||
}
|
||||
pch->url = TEAH_path_to_url (exchange,
|
||||
arg_str);
|
||||
if (NULL == pch->url)
|
||||
{
|
||||
GNUNET_break (0);
|
||||
GNUNET_free (pch);
|
||||
return NULL;
|
||||
}
|
||||
deposit_arr = json_array ();
|
||||
GNUNET_assert (NULL != deposit_arr);
|
||||
url = TEAH_path_to_url (exchange,
|
||||
"/");
|
||||
for (unsigned int i = 0; i<num_deposits; i++)
|
||||
{
|
||||
const struct TALER_EXCHANGE_PurseDeposit *deposit = &deposits[i];
|
||||
json_t *jdeposit;
|
||||
struct TALER_CoinSpendSignatureP coin_sig;
|
||||
#if FIXME_OEC
|
||||
struct TALER_AgeCommitmentHash agh;
|
||||
struct TALER_AgeCommitmentHash *aghp = NULL;
|
||||
struct TALER_AgeAttestation attest;
|
||||
|
||||
TALER_age_commitment_hash (&deposit->age_commitment,
|
||||
&agh);
|
||||
aghp = &agh;
|
||||
if (GNUNET_OK !=
|
||||
TALER_age_commitment_attest (&deposit->age_proof,
|
||||
min_age,
|
||||
&attest))
|
||||
{
|
||||
GNUNET_break (0);
|
||||
json_decref (deposit_arr);
|
||||
GNUNET_free (url);
|
||||
GNUNET_free (pch);
|
||||
return NULL;
|
||||
}
|
||||
#endif
|
||||
TALER_wallet_purse_deposit_sign (
|
||||
url,
|
||||
&pch->purse_pub,
|
||||
&deposit->amount,
|
||||
&deposit->coin_priv,
|
||||
&coin_sig);
|
||||
jdeposit = GNUNET_JSON_PACK (
|
||||
#if FIXME_OEC
|
||||
GNUNET_JSON_pack_allow_null (
|
||||
GNUNET_JSON_pack_data_auto ("h_age_commitment",
|
||||
aghp)),
|
||||
GNUNET_JSON_pack_allow_null (
|
||||
GNUNET_JSON_pack_data_auto ("age_attestation",
|
||||
&attest)),
|
||||
#endif
|
||||
TALER_JSON_pack_amount ("amount",
|
||||
&deposit->amount),
|
||||
GNUNET_JSON_pack_data_auto ("denom_pub_hash",
|
||||
&deposit->h_denom_pub),
|
||||
TALER_JSON_pack_denom_sig ("ub_sig",
|
||||
&deposit->denom_sig),
|
||||
GNUNET_JSON_pack_data_auto ("coin_sig",
|
||||
&coin_sig));
|
||||
GNUNET_assert (0 ==
|
||||
json_array_append_new (deposit_arr,
|
||||
jdeposit));
|
||||
}
|
||||
GNUNET_free (url);
|
||||
create_obj = GNUNET_JSON_PACK (
|
||||
GNUNET_JSON_pack_array_steal ("deposits",
|
||||
deposit_arr));
|
||||
GNUNET_assert (NULL != create_obj);
|
||||
eh = TALER_EXCHANGE_curl_easy_get_ (pch->url);
|
||||
if ( (NULL == eh) ||
|
||||
(GNUNET_OK !=
|
||||
TALER_curl_easy_post (&pch->ctx,
|
||||
eh,
|
||||
create_obj)) )
|
||||
{
|
||||
GNUNET_break (0);
|
||||
if (NULL != eh)
|
||||
curl_easy_cleanup (eh);
|
||||
json_decref (create_obj);
|
||||
GNUNET_free (pch->url);
|
||||
GNUNET_free (pch);
|
||||
return NULL;
|
||||
}
|
||||
json_decref (create_obj);
|
||||
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
|
||||
"URL for purse deposit: `%s'\n",
|
||||
pch->url);
|
||||
ctx = TEAH_handle_to_context (exchange);
|
||||
pch->job = GNUNET_CURL_job_add2 (ctx,
|
||||
eh,
|
||||
pch->ctx.headers,
|
||||
&handle_purse_deposit_finished,
|
||||
pch);
|
||||
return pch;
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
TALER_EXCHANGE_purse_deposit_cancel (
|
||||
struct TALER_EXCHANGE_PurseDepositHandle *pch)
|
||||
{
|
||||
if (NULL != pch->job)
|
||||
{
|
||||
GNUNET_CURL_job_cancel (pch->job);
|
||||
pch->job = NULL;
|
||||
}
|
||||
GNUNET_free (pch->url);
|
||||
TALER_curl_easy_post_finished (&pch->ctx);
|
||||
GNUNET_free (pch);
|
||||
}
|
||||
|
||||
|
||||
/* end of exchange_api_purse_deposit.c */
|
Loading…
Reference in New Issue
Block a user