summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/include/taler_exchange_service.h40
-rw-r--r--src/lib/Makefile.am1
-rw-r--r--src/lib/exchange_api_auditor_add_denomination.c42
-rw-r--r--src/lib/exchange_api_management_auditor_disable.c40
-rw-r--r--src/lib/exchange_api_management_auditor_enable.c40
-rw-r--r--src/lib/exchange_api_management_get_keys.c40
-rw-r--r--src/lib/exchange_api_management_post_keys.c40
-rw-r--r--src/lib/exchange_api_management_revoke_denomination_key.c40
-rw-r--r--src/lib/exchange_api_management_revoke_signing_key.c188
-rw-r--r--src/lib/exchange_api_management_wire_disable.c40
-rw-r--r--src/lib/exchange_api_management_wire_enable.c40
11 files changed, 475 insertions, 76 deletions
diff --git a/src/include/taler_exchange_service.h b/src/include/taler_exchange_service.h
index b3235e328..fa1cfde49 100644
--- a/src/include/taler_exchange_service.h
+++ b/src/include/taler_exchange_service.h
@@ -2040,46 +2040,6 @@ struct TALER_EXCHANGE_FutureKeys
/**
- * General information about the HTTP response we obtained
- * from the exchange for a request.
- */
-struct TALER_EXCHANGE_HttpResponse
-{
-
- /**
- * The complete JSON reply. NULL if we failed to parse the
- * reply (too big, invalid JSON).
- */
- const json_t *reply;
-
- /**
- * Set to the human-readable 'hint' that is optionally
- * provided by the exchange together with errors. NULL
- * if no hint was provided or if there was no error.
- */
- const char *hint;
-
- /**
- * HTTP status code for the response. 0 if the
- * HTTP request failed and we did not get any answer, or
- * if the answer was invalid and we set @a ec to a
- * client-side error code.
- */
- unsigned int http_status;
-
- /**
- * Taler error code. #TALER_EC_NONE if everything was
- * OK. Usually set to the "code" field of an error
- * response, but may be set to values created at the
- * client side, for example when the response was
- * not in JSON format or was otherwise ill-formed.
- */
- enum TALER_ErrorCode ec;
-
-};
-
-
-/**
* Function called with information about future keys.
*
* @param cls closure
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 830ecf65e..4c447c18e 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -27,6 +27,7 @@ libtalerexchange_la_SOURCES = \
exchange_api_deposit.c \
exchange_api_deposits_get.c \
exchange_api_link.c \
+ exchange_api_management_revoke_signing_key.c \
exchange_api_melt.c \
exchange_api_recoup.c \
exchange_api_refresh_common.c exchange_api_refresh_common.h \
diff --git a/src/lib/exchange_api_auditor_add_denomination.c b/src/lib/exchange_api_auditor_add_denomination.c
index a4d85f8f3..ce18c3d5e 100644
--- a/src/lib/exchange_api_auditor_add_denomination.c
+++ b/src/lib/exchange_api_auditor_add_denomination.c
@@ -29,7 +29,34 @@
/**
* @brief Handle for a POST /auditor/$AUDITOR_PUB/$H_DENOM_PUB request.
*/
-struct TALER_EXCHANGE_AuditorAddDenominationHandle;
+struct TALER_EXCHANGE_AuditorAddDenominationHandle
+{
+
+ /**
+ * The url for this request.
+ */
+ char *url;
+
+ /**
+ * Handle for the request.
+ */
+ struct GNUNET_CURL_Job *job;
+
+ /**
+ * Function to call with the result.
+ */
+ TALER_EXCHANGE_AuditorAddDenominationCallback cb;
+
+ /**
+ * Closure for @a cb.
+ */
+ void *cb_cls;
+
+ /**
+ * Reference to the execution context.
+ */
+ struct GNUNET_CURL_Context *ctx;
+};
/**
@@ -58,8 +85,17 @@ TALER_EXCHANGE_add_auditor_denomination (
/**
* Cancel #TALER_EXCHANGE_add_auditor_denomination() operation.
*
- * @param gh handle of the operation to cancel
+ * @param ah handle of the operation to cancel
*/
void
TALER_EXCHANGE_add_auditor_denomination_cancel (
- struct TALER_EXCHANGE_AuditorAddDenominationHandle *ah);
+ struct TALER_EXCHANGE_AuditorAddDenominationHandle *ah)
+{
+ if (NULL != ah->job)
+ {
+ GNUNET_CURL_job_cancel (ah->job);
+ ah->job = NULL;
+ }
+ GNUNET_free (ah->url);
+ GNUNET_free (ah);
+}
diff --git a/src/lib/exchange_api_management_auditor_disable.c b/src/lib/exchange_api_management_auditor_disable.c
index 1744179e8..8cd4e3223 100644
--- a/src/lib/exchange_api_management_auditor_disable.c
+++ b/src/lib/exchange_api_management_auditor_disable.c
@@ -28,7 +28,34 @@
/**
* @brief Handle for a POST /management/auditors/disable request.
*/
-struct TALER_EXCHANGE_ManagementAuditorDisableHandle;
+struct TALER_EXCHANGE_ManagementAuditorDisableHandle
+{
+
+ /**
+ * The url for this request.
+ */
+ char *url;
+
+ /**
+ * Handle for the request.
+ */
+ struct GNUNET_CURL_Job *job;
+
+ /**
+ * Function to call with the result.
+ */
+ TALER_EXCHANGE_ManagementAuditorDisableCallback cb;
+
+ /**
+ * Closure for @a cb.
+ */
+ void *cb_cls;
+
+ /**
+ * Reference to the execution context.
+ */
+ struct GNUNET_CURL_Context *ctx;
+};
/**
@@ -63,4 +90,13 @@ TALER_EXCHANGE_management_disable_auditor (
*/
void
TALER_EXCHANGE_management_disable_auditor_cancel (
- struct TALER_EXCHANGE_ManagementAuditorDisableHandle *ah);
+ struct TALER_EXCHANGE_ManagementAuditorDisableHandle *ah)
+{
+ if (NULL != ah->job)
+ {
+ GNUNET_CURL_job_cancel (ah->job);
+ ah->job = NULL;
+ }
+ GNUNET_free (ah->url);
+ GNUNET_free (ah);
+}
diff --git a/src/lib/exchange_api_management_auditor_enable.c b/src/lib/exchange_api_management_auditor_enable.c
index 954b678b6..98eea9a84 100644
--- a/src/lib/exchange_api_management_auditor_enable.c
+++ b/src/lib/exchange_api_management_auditor_enable.c
@@ -29,7 +29,34 @@
/**
* @brief Handle for a POST /management/auditors request.
*/
-struct TALER_EXCHANGE_ManagementAuditorEnableHandle;
+struct TALER_EXCHANGE_ManagementAuditorEnableHandle
+{
+
+ /**
+ * The url for this request.
+ */
+ char *url;
+
+ /**
+ * Handle for the request.
+ */
+ struct GNUNET_CURL_Job *job;
+
+ /**
+ * Function to call with the result.
+ */
+ TALER_EXCHANGE_ManagementAuditorEnableCallback cb;
+
+ /**
+ * Closure for @a cb.
+ */
+ void *cb_cls;
+
+ /**
+ * Reference to the execution context.
+ */
+ struct GNUNET_CURL_Context *ctx;
+};
/**
@@ -64,4 +91,13 @@ TALER_EXCHANGE_management_enable_auditor (
*/
void
TALER_EXCHANGE_management_enable_auditor_cancel (
- struct TALER_EXCHANGE_ManagementAuditorEnableHandle *ah);
+ struct TALER_EXCHANGE_ManagementAuditorEnableHandle *ah)
+{
+ if (NULL != ah->job)
+ {
+ GNUNET_CURL_job_cancel (ah->job);
+ ah->job = NULL;
+ }
+ GNUNET_free (ah->url);
+ GNUNET_free (ah);
+}
diff --git a/src/lib/exchange_api_management_get_keys.c b/src/lib/exchange_api_management_get_keys.c
index 46a107106..36259314b 100644
--- a/src/lib/exchange_api_management_get_keys.c
+++ b/src/lib/exchange_api_management_get_keys.c
@@ -29,7 +29,34 @@
/**
* @brief Handle for a GET /management/keys request.
*/
-struct TALER_EXCHANGE_ManagementGetKeysHandle;
+struct TALER_EXCHANGE_ManagementGetKeysHandle
+{
+
+ /**
+ * The url for this request.
+ */
+ char *url;
+
+ /**
+ * Handle for the request.
+ */
+ struct GNUNET_CURL_Job *job;
+
+ /**
+ * Function to call with the result.
+ */
+ TALER_EXCHANGE_ManagementGetKeysCallback cb;
+
+ /**
+ * Closure for @a cb.
+ */
+ void *cb_cls;
+
+ /**
+ * Reference to the execution context.
+ */
+ struct GNUNET_CURL_Context *ctx;
+};
/**
@@ -56,4 +83,13 @@ TALER_EXCHANGE_get_management_keys (struct GNUNET_CURL_Context *ctx,
*/
void
TALER_EXCHANGE_get_management_keys_cancel (
- struct TALER_EXCHANGE_ManagementGetKeysHandle *gh);
+ struct TALER_EXCHANGE_ManagementGetKeysHandle *gh)
+{
+ if (NULL != gh->job)
+ {
+ GNUNET_CURL_job_cancel (gh->job);
+ gh->job = NULL;
+ }
+ GNUNET_free (gh->url);
+ GNUNET_free (gh);
+}
diff --git a/src/lib/exchange_api_management_post_keys.c b/src/lib/exchange_api_management_post_keys.c
index fe8131b1d..7cbf27b31 100644
--- a/src/lib/exchange_api_management_post_keys.c
+++ b/src/lib/exchange_api_management_post_keys.c
@@ -29,7 +29,34 @@
/**
* @brief Handle for a POST /management/keys request.
*/
-struct TALER_EXCHANGE_ManagementPostKeysHandle;
+struct TALER_EXCHANGE_ManagementPostKeysHandle
+{
+
+ /**
+ * The url for this request.
+ */
+ char *url;
+
+ /**
+ * Handle for the request.
+ */
+ struct GNUNET_CURL_Job *job;
+
+ /**
+ * Function to call with the result.
+ */
+ TALER_EXCHANGE_ManagementGetKeysCallback cb;
+
+ /**
+ * Closure for @a cb.
+ */
+ void *cb_cls;
+
+ /**
+ * Reference to the execution context.
+ */
+ struct GNUNET_CURL_Context *ctx;
+};
/**
@@ -57,4 +84,13 @@ TALER_EXCHANGE_post_management_keys (
*/
void
TALER_EXCHANGE_post_management_keys_cancel (
- struct TALER_EXCHANGE_ManagementPostKeysHandle *ph);
+ struct TALER_EXCHANGE_ManagementPostKeysHandle *ph)
+{
+ if (NULL != ph->job)
+ {
+ GNUNET_CURL_job_cancel (ph->job);
+ ph->job = NULL;
+ }
+ GNUNET_free (ph->url);
+ GNUNET_free (ph);
+}
diff --git a/src/lib/exchange_api_management_revoke_denomination_key.c b/src/lib/exchange_api_management_revoke_denomination_key.c
index 8eb3a05e0..8a7404e5b 100644
--- a/src/lib/exchange_api_management_revoke_denomination_key.c
+++ b/src/lib/exchange_api_management_revoke_denomination_key.c
@@ -29,7 +29,34 @@
/**
* @brief Handle for a POST /management/denominations/$H_DENOM_PUB/revoke request.
*/
-struct TALER_EXCHANGE_ManagementRevokeDenominationKeyHandle;
+struct TALER_EXCHANGE_ManagementRevokeDenominationKeyHandle
+{
+
+ /**
+ * The url for this request.
+ */
+ char *url;
+
+ /**
+ * Handle for the request.
+ */
+ struct GNUNET_CURL_Job *job;
+
+ /**
+ * Function to call with the result.
+ */
+ TALER_EXCHANGE_ManagementRevokeDenominationKeyCallback cb;
+
+ /**
+ * Closure for @a cb.
+ */
+ void *cb_cls;
+
+ /**
+ * Reference to the execution context.
+ */
+ struct GNUNET_CURL_Context *ctx;
+};
/**
@@ -60,4 +87,13 @@ TALER_EXCHANGE_management_revoke_denomination_key (
*/
void
TALER_EXCHANGE_management_revoke_denomination_key_cancel (
- struct TALER_EXCHANGE_ManagementRevokeDenominationKeyHandle *rh);
+ struct TALER_EXCHANGE_ManagementRevokeDenominationKeyHandle *rh)
+{
+ if (NULL != rh->job)
+ {
+ GNUNET_CURL_job_cancel (rh->job);
+ rh->job = NULL;
+ }
+ GNUNET_free (rh->url);
+ GNUNET_free (rh);
+}
diff --git a/src/lib/exchange_api_management_revoke_signing_key.c b/src/lib/exchange_api_management_revoke_signing_key.c
index cebc8e324..3e8b7f63f 100644
--- a/src/lib/exchange_api_management_revoke_signing_key.c
+++ b/src/lib/exchange_api_management_revoke_signing_key.c
@@ -24,25 +24,95 @@
#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"
-/**
- * @brief Handle for a POST /management/signkeys/$H_DENOM_PUB/revoke request.
- */
-struct TALER_EXCHANGE_ManagementRevokeSigningKeyHandle;
+struct TALER_EXCHANGE_ManagementRevokeSigningKeyHandle
+{
+
+ /**
+ * The url for this request.
+ */
+ char *url;
+
+ /**
+ * Minor context that holds body and headers.
+ */
+ struct TALER_CURL_PostContext post_ctx;
+
+ /**
+ * Handle for the request.
+ */
+ struct GNUNET_CURL_Job *job;
+
+ /**
+ * Function to call with the result.
+ */
+ TALER_EXCHANGE_ManagementRevokeSigningKeyCallback cb;
+
+ /**
+ * Closure for @a cb.
+ */
+ void *cb_cls;
+
+ /**
+ * Reference to the execution context.
+ */
+ struct GNUNET_CURL_Context *ctx;
+};
/**
- * Inform the exchange that a signing key was revoked.
+ * Function called when we're done processing the
+ * HTTP /management/signkeys/%s/revoke request.
*
- * @param ctx the context
- * @param url HTTP base URL for the exchange
- * @param exchange_pub the public signing key that was revoked
- * @param master_sig signature affirming the revocation
- * @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_ManagementRevokeSigningKeyHandle *`
+ * @param response_code HTTP response code, 0 on error
+ * @param response response body, NULL if not in JSON
*/
+static void
+handle_revoke_signing_finished (void *cls,
+ long response_code,
+ const void *response)
+{
+ struct TALER_EXCHANGE_ManagementRevokeSigningKeyHandle *rh = cls;
+ const json_t *json = response;
+ struct TALER_EXCHANGE_HttpResponse hr = {
+ .http_status = (unsigned int) response_code,
+ .reply = json
+ };
+
+ rh->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;
+ 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 != rh->cb)
+ {
+ rh->cb (rh->cb_cls,
+ &hr);
+ rh->cb = NULL;
+ }
+ TALER_EXCHANGE_management_revoke_signing_key_cancel (rh);
+}
+
+
struct TALER_EXCHANGE_ManagementRevokeSigningKeyHandle *
TALER_EXCHANGE_management_revoke_signing_key (
struct GNUNET_CURL_Context *ctx,
@@ -50,14 +120,94 @@ TALER_EXCHANGE_management_revoke_signing_key (
const struct TALER_ExchangePublicKeyP *exchange_pub,
const struct TALER_MasterSignatureP *master_sig,
TALER_EXCHANGE_ManagementRevokeSigningKeyCallback cb,
- void *cb_cls);
+ void *cb_cls)
+{
+ struct TALER_EXCHANGE_ManagementRevokeSigningKeyHandle *rh;
+ CURL *eh;
+ json_t *body;
+
+ rh = GNUNET_new (struct TALER_EXCHANGE_ManagementRevokeSigningKeyHandle);
+ rh->cb = cb;
+ rh->cb_cls = cb_cls;
+ rh->ctx = ctx;
+ {
+ char epub_str[sizeof (*exchange_pub) * 2];
+ char arg_str[sizeof (epub_str) + 64];
+ char *end;
+
+ end = GNUNET_STRINGS_data_to_string (exchange_pub,
+ sizeof (*exchange_pub),
+ epub_str,
+ sizeof (epub_str));
+ *end = '\0';
+ GNUNET_snprintf (arg_str,
+ sizeof (arg_str),
+ "management/signkeys/%s/revoke",
+ epub_str);
+ rh->url = TALER_url_join (url,
+ arg_str,
+ NULL);
+ }
+ if (NULL == rh->url)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Could not construct request URL.\n");
+ GNUNET_free (rh);
+ return NULL;
+ }
+ body = json_pack ("{s:o}",
+ "master_sig",
+ GNUNET_JSON_from_data_auto (master_sig));
+ if (NULL == body)
+ {
+ GNUNET_break (0);
+ GNUNET_free (rh->url);
+ GNUNET_free (rh);
+ return NULL;
+ }
+ eh = curl_easy_init ();
+ if (GNUNET_OK !=
+ TALER_curl_easy_post (&rh->post_ctx,
+ eh,
+ body))
+ {
+ GNUNET_break (0);
+ json_decref (body);
+ GNUNET_free (rh->url);
+ GNUNET_free (eh);
+ return NULL;
+ }
+ json_decref (body);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Requesting URL '%s'\n",
+ rh->url);
+ GNUNET_assert (CURLE_OK == curl_easy_setopt (eh,
+ CURLOPT_URL,
+ rh->url));
+ rh->job = GNUNET_CURL_job_add2 (ctx,
+ eh,
+ rh->post_ctx.headers,
+ &handle_revoke_signing_finished,
+ rh);
+ if (NULL == rh->job)
+ {
+ TALER_EXCHANGE_management_revoke_signing_key_cancel (rh);
+ return NULL;
+ }
+ return rh;
+}
-/**
- * Cancel #TALER_EXCHANGE_management_revoke_signing_key() operation.
- *
- * @param rh handle of the operation to cancel
- */
void
TALER_EXCHANGE_management_revoke_signing_key_cancel (
- struct TALER_EXCHANGE_ManagementRevokeSigningKeyHandle *rh);
+ struct TALER_EXCHANGE_ManagementRevokeSigningKeyHandle *rh)
+{
+ if (NULL != rh->job)
+ {
+ GNUNET_CURL_job_cancel (rh->job);
+ rh->job = NULL;
+ }
+ TALER_curl_easy_post_finished (&rh->post_ctx);
+ GNUNET_free (rh->url);
+ GNUNET_free (rh);
+}
diff --git a/src/lib/exchange_api_management_wire_disable.c b/src/lib/exchange_api_management_wire_disable.c
index c51b350e3..05d4832f4 100644
--- a/src/lib/exchange_api_management_wire_disable.c
+++ b/src/lib/exchange_api_management_wire_disable.c
@@ -29,7 +29,34 @@
/**
* @brief Handle for a POST /management/wire/disable request.
*/
-struct TALER_EXCHANGE_ManagementWireDisableHandle;
+struct TALER_EXCHANGE_ManagementWireDisableHandle
+{
+
+ /**
+ * The url for this request.
+ */
+ char *url;
+
+ /**
+ * Handle for the request.
+ */
+ struct GNUNET_CURL_Job *job;
+
+ /**
+ * Function to call with the result.
+ */
+ TALER_EXCHANGE_ManagementWireDisableCallback cb;
+
+ /**
+ * Closure for @a cb.
+ */
+ void *cb_cls;
+
+ /**
+ * Reference to the execution context.
+ */
+ struct GNUNET_CURL_Context *ctx;
+};
/**
@@ -62,4 +89,13 @@ TALER_EXCHANGE_management_disable_wire (
*/
void
TALER_EXCHANGE_management_disable_wire_cancel (
- struct TALER_EXCHANGE_ManagementWireDisableHandle *wh);
+ struct TALER_EXCHANGE_ManagementWireDisableHandle *wh)
+{
+ if (NULL != wh->job)
+ {
+ GNUNET_CURL_job_cancel (wh->job);
+ wh->job = NULL;
+ }
+ GNUNET_free (wh->url);
+ GNUNET_free (wh);
+}
diff --git a/src/lib/exchange_api_management_wire_enable.c b/src/lib/exchange_api_management_wire_enable.c
index a6ed1cdbb..12a7dfd8c 100644
--- a/src/lib/exchange_api_management_wire_enable.c
+++ b/src/lib/exchange_api_management_wire_enable.c
@@ -27,7 +27,34 @@
/**
* @brief Handle for a POST /management/wire request.
*/
-struct TALER_EXCHANGE_ManagementWireEnableHandle;
+struct TALER_EXCHANGE_ManagementWireEnableHandle
+{
+
+ /**
+ * The url for this request.
+ */
+ char *url;
+
+ /**
+ * Handle for the request.
+ */
+ struct GNUNET_CURL_Job *job;
+
+ /**
+ * Function to call with the result.
+ */
+ TALER_EXCHANGE_ManagementWireEnableCallback cb;
+
+ /**
+ * Closure for @a cb.
+ */
+ void *cb_cls;
+
+ /**
+ * Reference to the execution context.
+ */
+ struct GNUNET_CURL_Context *ctx;
+};
/**
@@ -62,4 +89,13 @@ TALER_EXCHANGE_management_enable_wire (
*/
void
TALER_EXCHANGE_management_enable_wire_cancel (
- struct TALER_EXCHANGE_ManagementWireEnableHandle *wh);
+ struct TALER_EXCHANGE_ManagementWireEnableHandle *wh)
+{
+ if (NULL != wh->job)
+ {
+ GNUNET_CURL_job_cancel (wh->job);
+ wh->job = NULL;
+ }
+ GNUNET_free (wh->url);
+ GNUNET_free (wh);
+}