[taler-exchange] branch master updated: disable wire client logic

[gnunet]

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 9f56b54a disable wire client logic
9f56b54a is described below

commit 9f56b54ae1f39af2021a10448fd0dbbf06cbfe8b
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Wed Nov 25 21:38:38 2020 +0100

    disable wire client logic
---
 src/lib/Makefile.am                               |   1 +
 src/lib/exchange_api_management_auditor_disable.c |   2 +-
 src/lib/exchange_api_management_wire_disable.c    | 146 +++++++++++++++++++---
 3 files changed, 130 insertions(+), 19 deletions(-)

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index d2fd161f..8fb3d027 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -29,6 +29,7 @@ libtalerexchange_la_SOURCES = \
   exchange_api_link.c \
   exchange_api_management_auditor_disable.c \
   exchange_api_management_auditor_enable.c \
+  exchange_api_management_wire_disable.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_disable.c 
b/src/lib/exchange_api_management_auditor_disable.c
index b70a8946..0ea368b8 100644
--- a/src/lib/exchange_api_management_auditor_disable.c
+++ b/src/lib/exchange_api_management_auditor_disable.c
@@ -66,7 +66,7 @@ struct TALER_EXCHANGE_ManagementAuditorDisableHandle
 
 /**
  * Function called when we're done processing the
- * HTTP /management/signkeys/%s/revoke request.
+ * HTTP /management/auditors/%s/disable request.
  *
  * @param cls the `struct TALER_EXCHANGE_ManagementAuditorDisableHandle *`
  * @param response_code HTTP response code, 0 on error
diff --git a/src/lib/exchange_api_management_wire_disable.c 
b/src/lib/exchange_api_management_wire_disable.c
index 05d4832f..b510970a 100644
--- a/src/lib/exchange_api_management_wire_disable.c
+++ b/src/lib/exchange_api_management_wire_disable.c
@@ -24,11 +24,10 @@
 #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/wire/disable request.
- */
 struct TALER_EXCHANGE_ManagementWireDisableHandle
 {
 
@@ -37,6 +36,11 @@ struct TALER_EXCHANGE_ManagementWireDisableHandle
    */
   char *url;
 
+  /**
+   * Minor context that holds body and headers.
+   */
+  struct TALER_CURL_PostContext post_ctx;
+
   /**
    * Handle for the request.
    */
@@ -60,17 +64,63 @@ struct TALER_EXCHANGE_ManagementWireDisableHandle
 
 
 /**
- * Inform the exchange that a wire account should be disabled.
+ * Function called when we're done processing the
+ * HTTP /management/wire/disable request.
  *
- * @param ctx the context
- * @param url HTTP base URL for the exchange
- * @param payto_uri RFC 8905 URI of the exchange's bank account
- * @param validity_end when was this decided?
- * @param master_sig signature affirming the wire 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_ManagementAuditorDisableHandle *`
+ * @param response_code HTTP response code, 0 on error
+ * @param response response body, NULL if not in JSON
  */
+static void
+handle_auditor_disable_finished (void *cls,
+                                 long response_code,
+                                 const void *response)
+{
+  struct TALER_EXCHANGE_ManagementWireDisableHandle *wh = cls;
+  const json_t *json = response;
+  struct TALER_EXCHANGE_HttpResponse hr = {
+    .http_status = (unsigned int) response_code,
+    .reply = json
+  };
+
+  wh->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_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 != wh->cb)
+  {
+    wh->cb (wh->cb_cls,
+            &hr);
+    wh->cb = NULL;
+  }
+  TALER_EXCHANGE_management_disable_wire_cancel (wh);
+}
+
+
 struct TALER_EXCHANGE_ManagementWireDisableHandle *
 TALER_EXCHANGE_management_disable_wire (
   struct GNUNET_CURL_Context *ctx,
@@ -79,14 +129,73 @@ TALER_EXCHANGE_management_disable_wire (
   struct GNUNET_TIME_Absolute validity_end,
   const struct TALER_MasterSignatureP *master_sig,
   TALER_EXCHANGE_ManagementWireDisableCallback cb,
-  void *cb_cls);
+  void *cb_cls)
+{
+  struct TALER_EXCHANGE_ManagementWireDisableHandle *wh;
+  CURL *eh;
+  json_t *body;
+
+  wh = GNUNET_new (struct TALER_EXCHANGE_ManagementWireDisableHandle);
+  wh->cb = cb;
+  wh->cb_cls = cb_cls;
+  wh->ctx = ctx;
+  wh->url = TALER_url_join (url,
+                            "management/wire/disable",
+                            NULL);
+  if (NULL == wh->url)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Could not construct request URL.\n");
+    GNUNET_free (wh);
+    return NULL;
+  }
+  body = json_pack ("{s:s, s:o, s:o}",
+                    "payto_uri",
+                    payto_uri,
+                    "master_sig",
+                    GNUNET_JSON_from_data_auto (master_sig),
+                    "validity_end",
+                    GNUNET_JSON_from_time_abs (validity_end));
+  if (NULL == body)
+  {
+    GNUNET_break (0);
+    GNUNET_free (wh->url);
+    GNUNET_free (wh);
+    return NULL;
+  }
+  eh = curl_easy_init ();
+  if (GNUNET_OK !=
+      TALER_curl_easy_post (&wh->post_ctx,
+                            eh,
+                            body))
+  {
+    GNUNET_break (0);
+    json_decref (body);
+    GNUNET_free (wh->url);
+    GNUNET_free (eh);
+    return NULL;
+  }
+  json_decref (body);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Requesting URL '%s'\n",
+              wh->url);
+  GNUNET_assert (CURLE_OK == curl_easy_setopt (eh,
+                                               CURLOPT_URL,
+                                               wh->url));
+  wh->job = GNUNET_CURL_job_add2 (ctx,
+                                  eh,
+                                  wh->post_ctx.headers,
+                                  &handle_auditor_disable_finished,
+                                  wh);
+  if (NULL == wh->job)
+  {
+    TALER_EXCHANGE_management_disable_wire_cancel (wh);
+    return NULL;
+  }
+  return wh;
+}
 
 
-/**
- * Cancel #TALER_EXCHANGE_management_disable_wire() operation.
- *
- * @param wh handle of the operation to cancel
- */
 void
 TALER_EXCHANGE_management_disable_wire_cancel (
   struct TALER_EXCHANGE_ManagementWireDisableHandle *wh)
@@ -96,6 +205,7 @@ TALER_EXCHANGE_management_disable_wire_cancel (
     GNUNET_CURL_job_cancel (wh->job);
     wh->job = NULL;
   }
+  TALER_curl_easy_post_finished (&wh->post_ctx);
   GNUNET_free (wh->url);
   GNUNET_free (wh);
 }

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.