From 7930103d30fec3e91fd84db025bd3cef4b8d7bd3 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 25 Nov 2020 22:02:37 +0100 Subject: auditor add denomination client logic --- src/lib/Makefile.am | 1 + src/lib/exchange_api_auditor_add_denomination.c | 168 +++++++++++++++++++++--- 2 files changed, 151 insertions(+), 18 deletions(-) (limited to 'src') diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index f7a8e0609..3ed672bb0 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -21,6 +21,7 @@ libtalerexchange_la_LDFLAGS = \ -version-info 4:0:0 \ -no-undefined libtalerexchange_la_SOURCES = \ + exchange_api_auditor_add_denomination.c \ exchange_api_curl_defaults.c exchange_api_curl_defaults.h \ exchange_api_common.c \ exchange_api_handle.c exchange_api_handle.h \ diff --git a/src/lib/exchange_api_auditor_add_denomination.c b/src/lib/exchange_api_auditor_add_denomination.c index ce18c3d5e..7630acb1e 100644 --- a/src/lib/exchange_api_auditor_add_denomination.c +++ b/src/lib/exchange_api_auditor_add_denomination.c @@ -24,11 +24,10 @@ #include #include "taler_exchange_service.h" #include "taler_signatures.h" +#include "taler_curl_lib.h" +#include "taler_json_lib.h" -/** - * @brief Handle for a POST /auditor/$AUDITOR_PUB/$H_DENOM_PUB request. - */ struct TALER_EXCHANGE_AuditorAddDenominationHandle { @@ -37,6 +36,11 @@ struct TALER_EXCHANGE_AuditorAddDenominationHandle */ char *url; + /** + * Minor context that holds body and headers. + */ + struct TALER_CURL_PostContext post_ctx; + /** * Handle for the request. */ @@ -60,17 +64,67 @@ struct TALER_EXCHANGE_AuditorAddDenominationHandle /** - * Provide auditor signatures for a denomination to the exchange. + * Function called when we're done processing the + * HTTP POST /auditor/$AUDITOR_PUB/$H_DENOM_PUB request. * - * @param ctx the context - * @param url HTTP base URL for the exchange - * @param h_denom_pub hash of the public key of the denomination - * @param auditor_pub public key of the auditor - * @param auditor_sig signature of the auditor - * @param cb function to call with the exchange's result - * @param cb_cls closure for @a cb - * @return the request handle; NULL upon error + * @param cls the `struct TALER_EXCHANGE_AuditorAddDenominationHandle *` + * @param response_code HTTP response code, 0 on error + * @param response response body, NULL if not in JSON */ +static void +handle_auditor_add_denomination_finished (void *cls, + long response_code, + const void *response) +{ + struct TALER_EXCHANGE_AuditorAddDenominationHandle *ah = cls; + const json_t *json = response; + struct TALER_EXCHANGE_HttpResponse hr = { + .http_status = (unsigned int) response_code, + .reply = json + }; + + ah->job = NULL; + switch (response_code) + { + case MHD_HTTP_NO_CONTENT: + break; + case MHD_HTTP_FORBIDDEN: + hr.ec = TALER_JSON_get_error_code (json); + hr.hint = TALER_JSON_get_error_hint (json); + break; + case MHD_HTTP_NOT_FOUND: + hr.ec = TALER_JSON_get_error_code (json); + hr.hint = TALER_JSON_get_error_hint (json); + break; + case MHD_HTTP_GONE: + hr.ec = TALER_JSON_get_error_code (json); + hr.hint = TALER_JSON_get_error_hint (json); + break; + case MHD_HTTP_PRECONDITION_FAILED: + hr.ec = TALER_JSON_get_error_code (json); + hr.hint = TALER_JSON_get_error_hint (json); + break; + default: + /* unexpected response code */ + GNUNET_break_op (0); + hr.ec = TALER_JSON_get_error_code (json); + hr.hint = TALER_JSON_get_error_hint (json); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Unexpected response code %u/%d\n", + (unsigned int) response_code, + (int) hr.ec); + break; + } + if (NULL != ah->cb) + { + ah->cb (ah->cb_cls, + &hr); + ah->cb = NULL; + } + TALER_EXCHANGE_add_auditor_denomination_cancel (ah); +} + + struct TALER_EXCHANGE_AuditorAddDenominationHandle * TALER_EXCHANGE_add_auditor_denomination ( struct GNUNET_CURL_Context *ctx, @@ -79,14 +133,91 @@ TALER_EXCHANGE_add_auditor_denomination ( const struct TALER_AuditorPublicKeyP *auditor_pub, const struct TALER_AuditorSignatureP *auditor_sig, TALER_EXCHANGE_AuditorAddDenominationCallback cb, - void *cb_cls); + void *cb_cls) +{ + struct TALER_EXCHANGE_AuditorAddDenominationHandle *ah; + CURL *eh; + json_t *body; + + ah = GNUNET_new (struct TALER_EXCHANGE_AuditorAddDenominationHandle); + ah->cb = cb; + ah->cb_cls = cb_cls; + ah->ctx = ctx; + { + char apub_str[sizeof (*auditor_pub) * 2]; + char denom_str[sizeof (*h_denom_pub) * 2]; + char arg_str[sizeof (apub_str) + sizeof (denom_str) + 32]; + char *end; + + end = GNUNET_STRINGS_data_to_string (auditor_pub, + sizeof (*auditor_pub), + apub_str, + sizeof (apub_str)); + *end = '\0'; + end = GNUNET_STRINGS_data_to_string (h_denom_pub, + sizeof (*h_denom_pub), + denom_str, + sizeof (denom_str)); + *end = '\0'; + GNUNET_snprintf (arg_str, + sizeof (arg_str), + "auditors/%s/%s", + apub_str, + denom_str); + ah->url = TALER_url_join (url, + arg_str, + NULL); + } + if (NULL == ah->url) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Could not construct request URL.\n"); + GNUNET_free (ah); + return NULL; + } + body = json_pack ("{s:o}", + "auditor_sig", + GNUNET_JSON_from_data_auto (auditor_sig)); + if (NULL == body) + { + GNUNET_break (0); + GNUNET_free (ah->url); + GNUNET_free (ah); + return NULL; + } + eh = curl_easy_init (); + if (GNUNET_OK != + TALER_curl_easy_post (&ah->post_ctx, + eh, + body)) + { + GNUNET_break (0); + json_decref (body); + GNUNET_free (ah->url); + GNUNET_free (eh); + return NULL; + } + json_decref (body); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Requesting URL '%s'\n", + ah->url); + GNUNET_assert (CURLE_OK == curl_easy_setopt (eh, + CURLOPT_URL, + ah->url)); + ah->job = GNUNET_CURL_job_add2 (ctx, + eh, + ah->post_ctx.headers, + &handle_auditor_add_denomination_finished, + ah); + if (NULL == ah->job) + { + TALER_EXCHANGE_add_auditor_denomination_cancel (ah); + return NULL; + } + return ah; +} -/** - * Cancel #TALER_EXCHANGE_add_auditor_denomination() operation. - * - * @param ah handle of the operation to cancel - */ void TALER_EXCHANGE_add_auditor_denomination_cancel ( struct TALER_EXCHANGE_AuditorAddDenominationHandle *ah) @@ -96,6 +227,7 @@ TALER_EXCHANGE_add_auditor_denomination_cancel ( GNUNET_CURL_job_cancel (ah->job); ah->job = NULL; } + TALER_curl_easy_post_finished (&ah->post_ctx); GNUNET_free (ah->url); GNUNET_free (ah); } -- cgit v1.2.3