From de6c30b0e03e4921c207a03c7e4e2193331a6d94 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Fri, 6 Aug 2021 09:19:36 +0200 Subject: -rename for clarity --- src/exchange/Makefile.am | 2 +- src/exchange/taler-exchange-httpd.c | 8 +- src/exchange/taler-exchange-httpd_management.h | 8 +- .../taler-exchange-httpd_management_wire.c | 236 --------------------- .../taler-exchange-httpd_management_wire_disable.c | 2 +- .../taler-exchange-httpd_management_wire_enable.c | 236 +++++++++++++++++++++ 6 files changed, 246 insertions(+), 246 deletions(-) delete mode 100644 src/exchange/taler-exchange-httpd_management_wire.c create mode 100644 src/exchange/taler-exchange-httpd_management_wire_enable.c diff --git a/src/exchange/Makefile.am b/src/exchange/Makefile.am index 554c42fd6..4c1f26dfc 100644 --- a/src/exchange/Makefile.am +++ b/src/exchange/Makefile.am @@ -91,7 +91,7 @@ taler_exchange_httpd_SOURCES = \ taler-exchange-httpd_management_denominations_HDP_revoke.c \ taler-exchange-httpd_management_post_keys.c \ taler-exchange-httpd_management_signkey_EP_revoke.c \ - taler-exchange-httpd_management_wire.c \ + taler-exchange-httpd_management_wire_enable.c \ taler-exchange-httpd_management_wire_disable.c \ taler-exchange-httpd_management_wire_fees.c \ taler-exchange-httpd_melt.c taler-exchange-httpd_melt.h \ diff --git a/src/exchange/taler-exchange-httpd.c b/src/exchange/taler-exchange-httpd.c index e823874de..237a0e8ea 100644 --- a/src/exchange/taler-exchange-httpd.c +++ b/src/exchange/taler-exchange-httpd.c @@ -640,8 +640,8 @@ handle_post_management (const struct TEH_RequestHandler *rh, "wire")) { if (NULL == args[1]) - return TEH_handler_management_denominations_wire (connection, - root); + return TEH_handler_management_post_wire (connection, + root); if ( (0 != strcmp (args[1], "disable")) || (NULL != args[2]) ) @@ -649,8 +649,8 @@ handle_post_management (const struct TEH_RequestHandler *rh, GNUNET_break_op (0); return r404 (connection, "/management/wire/disable"); } - return TEH_handler_management_denominations_wire_disable (connection, - root); + return TEH_handler_management_post_wire_disable (connection, + root); } if (0 == strcmp (args[0], "wire-fee")) diff --git a/src/exchange/taler-exchange-httpd_management.h b/src/exchange/taler-exchange-httpd_management.h index b5ab8478e..3f58083e4 100644 --- a/src/exchange/taler-exchange-httpd_management.h +++ b/src/exchange/taler-exchange-httpd_management.h @@ -97,27 +97,27 @@ TEH_handler_management_post_keys ( /** - * Handle a "/management/wire" request. + * Handle a POST "/management/wire" request. * * @param connection the MHD connection to handle * @param root uploaded JSON data * @return MHD result code */ MHD_RESULT -TEH_handler_management_denominations_wire ( +TEH_handler_management_post_wire ( struct MHD_Connection *connection, const json_t *root); /** - * Handle a "/management/wire/disable" request. + * Handle a POST "/management/wire/disable" request. * * @param connection the MHD connection to handle * @param root uploaded JSON data * @return MHD result code */ MHD_RESULT -TEH_handler_management_denominations_wire_disable ( +TEH_handler_management_post_wire_disable ( struct MHD_Connection *connection, const json_t *root); diff --git a/src/exchange/taler-exchange-httpd_management_wire.c b/src/exchange/taler-exchange-httpd_management_wire.c deleted file mode 100644 index e3a31c1e6..000000000 --- a/src/exchange/taler-exchange-httpd_management_wire.c +++ /dev/null @@ -1,236 +0,0 @@ -/* - This file is part of TALER - Copyright (C) 2020 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 -*/ -/** - * @file taler-exchange-httpd_management_wire.c - * @brief Handle request to add wire account. - * @author Christian Grothoff - */ -#include "platform.h" -#include -#include -#include -#include -#include -#include "taler_json_lib.h" -#include "taler_mhd_lib.h" -#include "taler_signatures.h" -#include "taler-exchange-httpd_management.h" -#include "taler-exchange-httpd_responses.h" -#include "taler-exchange-httpd_wire.h" - - -/** - * Closure for the #add_wire transaction. - */ -struct AddWireContext -{ - /** - * Master signature affirming the WIRE ADD operation - * (includes timestamp). - */ - struct TALER_MasterSignatureP master_sig_add; - - /** - * Master signature to share with clients affirming the - * wire details of the bank. - */ - struct TALER_MasterSignatureP master_sig_wire; - - /** - * Payto:// URI this is about. - */ - const char *payto_uri; - - /** - * Timestamp for checking against replay attacks. - */ - struct GNUNET_TIME_Absolute validity_start; - -}; - - -/** - * Function implementing database transaction to add an wire. 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 AddWireContext` - * @param connection MHD request which triggered the transaction - * @param session database session to use - * @param[out] mhd_ret set to MHD response status for @a connection, - * if transaction failed (!) - * @return transaction status - */ -static enum GNUNET_DB_QueryStatus -add_wire (void *cls, - struct MHD_Connection *connection, - struct TALER_EXCHANGEDB_Session *session, - MHD_RESULT *mhd_ret) -{ - struct AddWireContext *awc = cls; - struct GNUNET_TIME_Absolute last_date; - enum GNUNET_DB_QueryStatus qs; - - qs = TEH_plugin->lookup_wire_timestamp (TEH_plugin->cls, - session, - awc->payto_uri, - &last_date); - 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_FETCH_FAILED, - "lookup wire"); - return qs; - } - if ( (0 < qs) && - (last_date.abs_value_us > awc->validity_start.abs_value_us) ) - { - *mhd_ret = TALER_MHD_reply_with_error ( - connection, - MHD_HTTP_CONFLICT, - TALER_EC_EXCHANGE_MANAGEMENT_WIRE_MORE_RECENT_PRESENT, - NULL); - return GNUNET_DB_STATUS_HARD_ERROR; - } - if (0 == qs) - qs = TEH_plugin->insert_wire (TEH_plugin->cls, - session, - awc->payto_uri, - awc->validity_start, - &awc->master_sig_wire); - else - qs = TEH_plugin->update_wire (TEH_plugin->cls, - session, - awc->payto_uri, - awc->validity_start, - true); - if (qs < 0) - { - GNUNET_break (0); - if (GNUNET_DB_STATUS_SOFT_ERROR == qs) - return qs; - *mhd_ret = TALER_MHD_reply_with_error (connection, - MHD_HTTP_INTERNAL_SERVER_ERROR, - TALER_EC_GENERIC_DB_STORE_FAILED, - "add wire"); - return qs; - } - return qs; -} - - -MHD_RESULT -TEH_handler_management_denominations_wire ( - struct MHD_Connection *connection, - const json_t *root) -{ - struct AddWireContext awc; - struct GNUNET_JSON_Specification spec[] = { - GNUNET_JSON_spec_fixed_auto ("master_sig_wire", - &awc.master_sig_wire), - GNUNET_JSON_spec_fixed_auto ("master_sig_add", - &awc.master_sig_add), - GNUNET_JSON_spec_string ("payto_uri", - &awc.payto_uri), - TALER_JSON_spec_absolute_time ("validity_start", - &awc.validity_start), - 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 */ - } - if (GNUNET_OK != - TALER_exchange_offline_wire_add_verify (awc.payto_uri, - awc.validity_start, - &TEH_master_public_key, - &awc.master_sig_add)) - { - GNUNET_break_op (0); - return TALER_MHD_reply_with_error ( - connection, - MHD_HTTP_FORBIDDEN, - TALER_EC_EXCHANGE_MANAGEMENT_WIRE_ADD_SIGNATURE_INVALID, - NULL); - } - if (GNUNET_OK != - TALER_exchange_wire_signature_check (awc.payto_uri, - &TEH_master_public_key, - &awc.master_sig_wire)) - { - GNUNET_break_op (0); - return TALER_MHD_reply_with_error ( - connection, - MHD_HTTP_FORBIDDEN, - TALER_EC_EXCHANGE_MANAGEMENT_WIRE_DETAILS_SIGNATURE_INVALID, - NULL); - } - { - char *wire_method; - - wire_method = TALER_payto_get_method (awc.payto_uri); - if (NULL == wire_method) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "payto:// URI `%s' is malformed\n", - awc.payto_uri); - return TALER_MHD_reply_with_error ( - connection, - MHD_HTTP_BAD_REQUEST, - TALER_EC_GENERIC_PARAMETER_MALFORMED, - "payto_uri"); - } - GNUNET_free (wire_method); - } - - { - enum GNUNET_GenericReturnValue res; - MHD_RESULT ret; - - res = TEH_DB_run_transaction (connection, - "add wire", - &ret, - &add_wire, - &awc); - if (GNUNET_SYSERR == res) - return ret; - } - TEH_wire_update_state (); - return TALER_MHD_reply_static ( - connection, - MHD_HTTP_NO_CONTENT, - NULL, - NULL, - 0); -} - - -/* end of taler-exchange-httpd_management_wire.c */ diff --git a/src/exchange/taler-exchange-httpd_management_wire_disable.c b/src/exchange/taler-exchange-httpd_management_wire_disable.c index 0d446bca1..3b760ea9f 100644 --- a/src/exchange/taler-exchange-httpd_management_wire_disable.c +++ b/src/exchange/taler-exchange-httpd_management_wire_disable.c @@ -134,7 +134,7 @@ del_wire (void *cls, MHD_RESULT -TEH_handler_management_denominations_wire_disable ( +TEH_handler_management_post_wire_disable ( struct MHD_Connection *connection, const json_t *root) { diff --git a/src/exchange/taler-exchange-httpd_management_wire_enable.c b/src/exchange/taler-exchange-httpd_management_wire_enable.c new file mode 100644 index 000000000..a12fcb647 --- /dev/null +++ b/src/exchange/taler-exchange-httpd_management_wire_enable.c @@ -0,0 +1,236 @@ +/* + This file is part of TALER + Copyright (C) 2020 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 +*/ +/** + * @file taler-exchange-httpd_management_wire.c + * @brief Handle request to add wire account. + * @author Christian Grothoff + */ +#include "platform.h" +#include +#include +#include +#include +#include +#include "taler_json_lib.h" +#include "taler_mhd_lib.h" +#include "taler_signatures.h" +#include "taler-exchange-httpd_management.h" +#include "taler-exchange-httpd_responses.h" +#include "taler-exchange-httpd_wire.h" + + +/** + * Closure for the #add_wire transaction. + */ +struct AddWireContext +{ + /** + * Master signature affirming the WIRE ADD operation + * (includes timestamp). + */ + struct TALER_MasterSignatureP master_sig_add; + + /** + * Master signature to share with clients affirming the + * wire details of the bank. + */ + struct TALER_MasterSignatureP master_sig_wire; + + /** + * Payto:// URI this is about. + */ + const char *payto_uri; + + /** + * Timestamp for checking against replay attacks. + */ + struct GNUNET_TIME_Absolute validity_start; + +}; + + +/** + * Function implementing database transaction to add an wire. 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 AddWireContext` + * @param connection MHD request which triggered the transaction + * @param session database session to use + * @param[out] mhd_ret set to MHD response status for @a connection, + * if transaction failed (!) + * @return transaction status + */ +static enum GNUNET_DB_QueryStatus +add_wire (void *cls, + struct MHD_Connection *connection, + struct TALER_EXCHANGEDB_Session *session, + MHD_RESULT *mhd_ret) +{ + struct AddWireContext *awc = cls; + struct GNUNET_TIME_Absolute last_date; + enum GNUNET_DB_QueryStatus qs; + + qs = TEH_plugin->lookup_wire_timestamp (TEH_plugin->cls, + session, + awc->payto_uri, + &last_date); + 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_FETCH_FAILED, + "lookup wire"); + return qs; + } + if ( (0 < qs) && + (last_date.abs_value_us > awc->validity_start.abs_value_us) ) + { + *mhd_ret = TALER_MHD_reply_with_error ( + connection, + MHD_HTTP_CONFLICT, + TALER_EC_EXCHANGE_MANAGEMENT_WIRE_MORE_RECENT_PRESENT, + NULL); + return GNUNET_DB_STATUS_HARD_ERROR; + } + if (0 == qs) + qs = TEH_plugin->insert_wire (TEH_plugin->cls, + session, + awc->payto_uri, + awc->validity_start, + &awc->master_sig_wire); + else + qs = TEH_plugin->update_wire (TEH_plugin->cls, + session, + awc->payto_uri, + awc->validity_start, + true); + if (qs < 0) + { + GNUNET_break (0); + if (GNUNET_DB_STATUS_SOFT_ERROR == qs) + return qs; + *mhd_ret = TALER_MHD_reply_with_error (connection, + MHD_HTTP_INTERNAL_SERVER_ERROR, + TALER_EC_GENERIC_DB_STORE_FAILED, + "add wire"); + return qs; + } + return qs; +} + + +MHD_RESULT +TEH_handler_management_post_wire ( + struct MHD_Connection *connection, + const json_t *root) +{ + struct AddWireContext awc; + struct GNUNET_JSON_Specification spec[] = { + GNUNET_JSON_spec_fixed_auto ("master_sig_wire", + &awc.master_sig_wire), + GNUNET_JSON_spec_fixed_auto ("master_sig_add", + &awc.master_sig_add), + GNUNET_JSON_spec_string ("payto_uri", + &awc.payto_uri), + TALER_JSON_spec_absolute_time ("validity_start", + &awc.validity_start), + 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 */ + } + if (GNUNET_OK != + TALER_exchange_offline_wire_add_verify (awc.payto_uri, + awc.validity_start, + &TEH_master_public_key, + &awc.master_sig_add)) + { + GNUNET_break_op (0); + return TALER_MHD_reply_with_error ( + connection, + MHD_HTTP_FORBIDDEN, + TALER_EC_EXCHANGE_MANAGEMENT_WIRE_ADD_SIGNATURE_INVALID, + NULL); + } + if (GNUNET_OK != + TALER_exchange_wire_signature_check (awc.payto_uri, + &TEH_master_public_key, + &awc.master_sig_wire)) + { + GNUNET_break_op (0); + return TALER_MHD_reply_with_error ( + connection, + MHD_HTTP_FORBIDDEN, + TALER_EC_EXCHANGE_MANAGEMENT_WIRE_DETAILS_SIGNATURE_INVALID, + NULL); + } + { + char *wire_method; + + wire_method = TALER_payto_get_method (awc.payto_uri); + if (NULL == wire_method) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "payto:// URI `%s' is malformed\n", + awc.payto_uri); + return TALER_MHD_reply_with_error ( + connection, + MHD_HTTP_BAD_REQUEST, + TALER_EC_GENERIC_PARAMETER_MALFORMED, + "payto_uri"); + } + GNUNET_free (wire_method); + } + + { + enum GNUNET_GenericReturnValue res; + MHD_RESULT ret; + + res = TEH_DB_run_transaction (connection, + "add wire", + &ret, + &add_wire, + &awc); + if (GNUNET_SYSERR == res) + return ret; + } + TEH_wire_update_state (); + return TALER_MHD_reply_static ( + connection, + MHD_HTTP_NO_CONTENT, + NULL, + NULL, + 0); +} + + +/* end of taler-exchange-httpd_management_wire.c */ -- cgit v1.2.3