[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-exchange] branch master updated: enable auditor enable client log
From: |
gnunet |
Subject: |
[taler-exchange] branch master updated: enable auditor enable client logic |
Date: |
Wed, 25 Nov 2020 21:33:17 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository exchange.
The following commit(s) were added to refs/heads/master by this push:
new 5750a2c7 enable auditor enable client logic
5750a2c7 is described below
commit 5750a2c767fc2ea38b3da6fa595c89463abb5e16
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Wed Nov 25 21:33:14 2020 +0100
enable auditor enable client logic
---
src/lib/Makefile.am | 1 +
src/lib/exchange_api_management_auditor_enable.c | 142 ++++++++++++++++++++---
2 files changed, 127 insertions(+), 16 deletions(-)
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index bf0ef6f4..d2fd161f 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -28,6 +28,7 @@ libtalerexchange_la_SOURCES = \
exchange_api_deposits_get.c \
exchange_api_link.c \
exchange_api_management_auditor_disable.c \
+ exchange_api_management_auditor_enable.c \
exchange_api_management_revoke_signing_key.c \
exchange_api_melt.c \
exchange_api_recoup.c \
diff --git a/src/lib/exchange_api_management_auditor_enable.c
b/src/lib/exchange_api_management_auditor_enable.c
index 98eea9a8..dedc9e43 100644
--- a/src/lib/exchange_api_management_auditor_enable.c
+++ b/src/lib/exchange_api_management_auditor_enable.c
@@ -24,6 +24,8 @@
#include <gnunet/gnunet_curl_lib.h>
#include "taler_exchange_service.h"
#include "taler_signatures.h"
+#include "taler_curl_lib.h"
+#include "taler_json_lib.h"
/**
@@ -37,6 +39,11 @@ struct TALER_EXCHANGE_ManagementAuditorEnableHandle
*/
char *url;
+ /**
+ * Minor context that holds body and headers.
+ */
+ struct TALER_CURL_PostContext post_ctx;
+
/**
* Handle for the request.
*/
@@ -60,18 +67,59 @@ struct TALER_EXCHANGE_ManagementAuditorEnableHandle
/**
- * Inform the exchange that an auditor should be enable or enabled.
+ * Function called when we're done processing the
+ * HTTP POST /management/auditors request.
*
- * @param ctx the context
- * @param url HTTP base URL for the exchange
- * @param auditor_pub the public signing key of the auditor
- * @param auditor_url base URL of the auditor
- * @param validity_start when was this decided?
- * @param master_sig signature affirming the auditor addition
- * @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_ManagementAuditorEnableHandle *`
+ * @param response_code HTTP response code, 0 on error
+ * @param response response body, NULL if not in JSON
*/
+static void
+handle_auditor_enable_finished (void *cls,
+ long response_code,
+ const void *response)
+{
+ struct TALER_EXCHANGE_ManagementAuditorEnableHandle *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_CONFLICT:
+ 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_management_enable_auditor_cancel (ah);
+}
+
+
struct TALER_EXCHANGE_ManagementAuditorEnableHandle *
TALER_EXCHANGE_management_enable_auditor (
struct GNUNET_CURL_Context *ctx,
@@ -81,14 +129,75 @@ TALER_EXCHANGE_management_enable_auditor (
struct GNUNET_TIME_Absolute validity_start,
const struct TALER_MasterSignatureP *master_sig,
TALER_EXCHANGE_ManagementAuditorEnableCallback cb,
- void *cb_cls);
+ void *cb_cls)
+{
+ struct TALER_EXCHANGE_ManagementAuditorEnableHandle *ah;
+ CURL *eh;
+ json_t *body;
+
+ ah = GNUNET_new (struct TALER_EXCHANGE_ManagementAuditorEnableHandle);
+ ah->cb = cb;
+ ah->cb_cls = cb_cls;
+ ah->ctx = ctx;
+ ah->url = TALER_url_join (url,
+ "management/auditors",
+ 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:s, s:o, s:o, s:o}",
+ "master_sig",
+ auditor_url,
+ "auditor_pub",
+ GNUNET_JSON_from_data_auto (auditor_pub),
+ "master_sig",
+ GNUNET_JSON_from_data_auto (master_sig),
+ "validity_start",
+ GNUNET_JSON_from_time_abs (validity_start));
+ 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_enable_finished,
+ ah);
+ if (NULL == ah->job)
+ {
+ TALER_EXCHANGE_management_enable_auditor_cancel (ah);
+ return NULL;
+ }
+ return ah;
+}
-/**
- * Cancel #TALER_EXCHANGE_management_enable_auditor() operation.
- *
- * @param ah handle of the operation to cancel
- */
void
TALER_EXCHANGE_management_enable_auditor_cancel (
struct TALER_EXCHANGE_ManagementAuditorEnableHandle *ah)
@@ -98,6 +207,7 @@ TALER_EXCHANGE_management_enable_auditor_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);
}
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-exchange] branch master updated: enable auditor enable client logic,
gnunet <=