gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[taler-exchange] branch master updated: add /management/drain handler


From: gnunet
Subject: [taler-exchange] branch master updated: add /management/drain handler
Date: Fri, 29 Jul 2022 11:01:02 +0200

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 ba0ab58c add /management/drain handler
ba0ab58c is described below

commit ba0ab58cdd4bd767f3944dcde1dc16676220d136
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Fri Jul 29 11:00:59 2022 +0200

    add /management/drain handler
---
 contrib/gana                                       |   2 +-
 src/exchange/Makefile.am                           |   1 +
 src/exchange/taler-exchange-httpd.c                |  18 ++
 src/exchange/taler-exchange-httpd_management.h     |  13 ++
 .../taler-exchange-httpd_management_drain.c        | 199 +++++++++++++++++++++
 5 files changed, 232 insertions(+), 1 deletion(-)

diff --git a/contrib/gana b/contrib/gana
index f4ec586e..47522119 160000
--- a/contrib/gana
+++ b/contrib/gana
@@ -1 +1 @@
-Subproject commit f4ec586e0fc4c067fbc9e14b21d66f2573717c1e
+Subproject commit 4752211918879f9ceec07bec5f64c8209d840b51
diff --git a/src/exchange/Makefile.am b/src/exchange/Makefile.am
index eb607ddf..41083502 100644
--- a/src/exchange/Makefile.am
+++ b/src/exchange/Makefile.am
@@ -126,6 +126,7 @@ taler_exchange_httpd_SOURCES = \
   taler-exchange-httpd_management_auditors.c \
   taler-exchange-httpd_management_auditors_AP_disable.c \
   taler-exchange-httpd_management_denominations_HDP_revoke.c \
+  taler-exchange-httpd_management_drain.c \
   taler-exchange-httpd_management_extensions.c \
   taler-exchange-httpd_management_global_fees.c \
   taler-exchange-httpd_management_post_keys.c \
diff --git a/src/exchange/taler-exchange-httpd.c 
b/src/exchange/taler-exchange-httpd.c
index 79db4acd..2d659058 100644
--- a/src/exchange/taler-exchange-httpd.c
+++ b/src/exchange/taler-exchange-httpd.c
@@ -929,9 +929,27 @@ handle_post_management (struct TEH_RequestContext *rc,
   if (0 == strcmp (args[0],
                    "extensions"))
   {
+    if (NULL != args[1])
+    {
+      GNUNET_break_op (0);
+      return r404 (rc->connection,
+                   "/management/extensions/*");
+    }
     return TEH_handler_management_post_extensions (rc->connection,
                                                    root);
   }
+  if (0 == strcmp (args[0],
+                   "drain"))
+  {
+    if (NULL != args[1])
+    {
+      GNUNET_break_op (0);
+      return r404 (rc->connection,
+                   "/management/drain/*");
+    }
+    return TEH_handler_management_post_drain (rc->connection,
+                                              root);
+  }
   GNUNET_break_op (0);
   return r404 (rc->connection,
                "/management/*");
diff --git a/src/exchange/taler-exchange-httpd_management.h 
b/src/exchange/taler-exchange-httpd_management.h
index 1bae4901..a5a8b0e7 100644
--- a/src/exchange/taler-exchange-httpd_management.h
+++ b/src/exchange/taler-exchange-httpd_management.h
@@ -161,6 +161,19 @@ TEH_handler_management_post_extensions (
   const json_t *root);
 
 
+/**
+ * Handle a POST "/management/drain" request.
+ *
+ * @param connection the MHD connection to handle
+ * @param root uploaded JSON data
+ * @return MHD result code
+ */
+MHD_RESULT
+TEH_handler_management_post_drain (
+  struct MHD_Connection *connection,
+  const json_t *root);
+
+
 /**
  * Initialize extension configuration handling.
  *
diff --git a/src/exchange/taler-exchange-httpd_management_drain.c 
b/src/exchange/taler-exchange-httpd_management_drain.c
new file mode 100644
index 00000000..a611b83a
--- /dev/null
+++ b/src/exchange/taler-exchange-httpd_management_drain.c
@@ -0,0 +1,199 @@
+/*
+  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 Affero 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 Affero General Public License for more 
details.
+
+  You should have received a copy of the GNU Affero General Public License 
along with
+  TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
+*/
+/**
+ * @file taler-exchange-httpd_management_drain.c
+ * @brief Handle request to drain profits
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_json_lib.h>
+#include <jansson.h>
+#include <microhttpd.h>
+#include <pthread.h>
+#include "taler_json_lib.h"
+#include "taler_mhd_lib.h"
+#include "taler_signatures.h"
+#include "taler-exchange-httpd_keys.h"
+#include "taler-exchange-httpd_management.h"
+#include "taler-exchange-httpd_responses.h"
+
+
+/**
+ * Closure for the #drain transaction.
+ */
+struct DrainContext
+{
+  /**
+   * Fee's signature affirming the #TALER_SIGNATURE_MASTER_DRAIN_PROFITS 
operation.
+   */
+  struct TALER_MasterSignatureP master_sig;
+
+  /**
+   * Wire transfer identifier to use.
+   */
+  struct TALER_WireTransferIdentifierRawP wtid;
+
+  /**
+   * Account to credit.
+   */
+  const char *payto_uri;
+
+  /**
+   * Configuration section with account to debit.
+   */
+  const char *account_section;
+
+  /**
+   * Signature time.
+   */
+  struct GNUNET_TIME_Timestamp date;
+
+  /**
+   * Amount to transfer.
+   */
+  struct TALER_Amount amount;
+
+};
+
+
+/**
+ * Function implementing database transaction to drain profits.  Runs the
+ * transaction logic; IF it returns a non-error code, the transaction logic
+ * MUST NOT queue a MHD response.  IF it returns an hard error, the
+ * transaction logic MUST queue a MHD response and set @a mhd_ret.  IF it
+ * returns the soft error code, the function MAY be called again to retry and
+ * MUST not queue a MHD response.
+ *
+ * @param cls closure with a `struct DrainContext`
+ * @param connection MHD request which triggered the transaction
+ * @param[out] mhd_ret set to MHD response status for @a connection,
+ *             if transaction failed (!)
+ * @return transaction status
+ */
+static enum GNUNET_DB_QueryStatus
+drain (void *cls,
+       struct MHD_Connection *connection,
+       MHD_RESULT *mhd_ret)
+{
+  struct DrainContext *dc = cls;
+  enum GNUNET_DB_QueryStatus qs;
+
+#if 0
+  qs = TEH_plugin->insert_drain_profit (
+    TEH_plugin->cls,
+    &dc->wtid,
+    dc->account_section,
+    dc->payto_uri,
+    dc->date,
+    &dc->amount,
+    &dc->master_sig);
+#else
+  qs = -1;
+#endif
+  if (qs < 0)
+  {
+    if (GNUNET_DB_STATUS_SOFT_ERROR == qs)
+      return qs;
+    GNUNET_break (0);
+    *mhd_ret = TALER_MHD_reply_with_error (connection,
+                                           MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                           TALER_EC_GENERIC_DB_STORE_FAILED,
+                                           "insert drain profit");
+    return qs;
+  }
+  return qs;
+}
+
+
+MHD_RESULT
+TEH_handler_management_post_drain (
+  struct MHD_Connection *connection,
+  const json_t *root)
+{
+  struct DrainContext dc;
+  struct GNUNET_JSON_Specification spec[] = {
+    GNUNET_JSON_spec_string ("debit_account_section",
+                             &dc.account_section),
+    GNUNET_JSON_spec_string ("credit_payto_uri",
+                             &dc.payto_uri),
+    GNUNET_JSON_spec_fixed_auto ("wtid",
+                                 &dc.wtid),
+    GNUNET_JSON_spec_fixed_auto ("master_sig",
+                                 &dc.master_sig),
+    GNUNET_JSON_spec_timestamp ("date",
+                                &dc.date),
+    TALER_JSON_spec_amount ("amount",
+                            TEH_currency,
+                            &dc.amount),
+    GNUNET_JSON_spec_end ()
+  };
+
+  {
+    enum GNUNET_GenericReturnValue res;
+
+    res = TALER_MHD_parse_json_data (connection,
+                                     root,
+                                     spec);
+    if (GNUNET_SYSERR == res)
+      return MHD_NO; /* hard failure */
+    if (GNUNET_NO == res)
+      return MHD_YES; /* failure */
+  }
+
+  TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_EDDSA]++;
+  if (GNUNET_OK !=
+      TALER_exchange_offline_profit_drain_verify (
+        &dc.wtid,
+        dc.date,
+        &dc.amount,
+        dc.account_section,
+        dc.payto_uri,
+        &TEH_master_public_key,
+        &dc.master_sig))
+  {
+    /* signature invalid */
+    GNUNET_break_op (0);
+    return TALER_MHD_reply_with_error (
+      connection,
+      MHD_HTTP_FORBIDDEN,
+      TALER_EC_EXCHANGE_MANAGEMENT_DRAIN_PROFITS_SIGNATURE_INVALID,
+      NULL);
+  }
+
+  {
+    enum GNUNET_GenericReturnValue res;
+    MHD_RESULT ret;
+
+    res = TEH_DB_run_transaction (connection,
+                                  "insert drain profit",
+                                  TEH_MT_REQUEST_OTHER,
+                                  &ret,
+                                  &drain,
+                                  &dc);
+    if (GNUNET_SYSERR == res)
+      return ret;
+  }
+  return TALER_MHD_reply_static (
+    connection,
+    MHD_HTTP_NO_CONTENT,
+    NULL,
+    NULL,
+    0);
+}
+
+
+/* end of taler-exchange-httpd_management_drain.c */

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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]