From ae7850a318794a7167b991f74066de1b6de4a19a Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Mon, 19 Jun 2017 17:58:46 +0200 Subject: split tracking into track_transfer.c and track_transaction.c --- src/exchange/Makefile.am | 3 +- src/exchange/taler-exchange-httpd.c | 3 +- .../taler-exchange-httpd_track_transaction.c | 126 ++++++++++++++++ .../taler-exchange-httpd_track_transaction.h | 47 ++++++ src/exchange/taler-exchange-httpd_track_transfer.c | 65 +++++++++ src/exchange/taler-exchange-httpd_track_transfer.h | 46 ++++++ src/exchange/taler-exchange-httpd_tracking.c | 159 --------------------- src/exchange/taler-exchange-httpd_tracking.h | 65 --------- 8 files changed, 288 insertions(+), 226 deletions(-) create mode 100644 src/exchange/taler-exchange-httpd_track_transaction.c create mode 100644 src/exchange/taler-exchange-httpd_track_transaction.h create mode 100644 src/exchange/taler-exchange-httpd_track_transfer.c create mode 100644 src/exchange/taler-exchange-httpd_track_transfer.h delete mode 100644 src/exchange/taler-exchange-httpd_tracking.c delete mode 100644 src/exchange/taler-exchange-httpd_tracking.h diff --git a/src/exchange/Makefile.am b/src/exchange/Makefile.am index 2c4c5a941..1d8372435 100644 --- a/src/exchange/Makefile.am +++ b/src/exchange/Makefile.am @@ -55,7 +55,8 @@ taler_exchange_httpd_SOURCES = \ taler-exchange-httpd_reserve_status.c taler-exchange-httpd_reserve_status.h \ taler-exchange-httpd_reserve_withdraw.c taler-exchange-httpd_reserve_withdraw.h \ taler-exchange-httpd_responses.c taler-exchange-httpd_responses.h \ - taler-exchange-httpd_tracking.c taler-exchange-httpd_tracking.h \ + taler-exchange-httpd_track_transaction.c taler-exchange-httpd_track_transaction.h \ + taler-exchange-httpd_track_transfer.c taler-exchange-httpd_track_transfer.h \ taler-exchange-httpd_wire.c taler-exchange-httpd_wire.h \ taler-exchange-httpd_validation.c taler-exchange-httpd_validation.h taler_exchange_httpd_LDADD = \ diff --git a/src/exchange/taler-exchange-httpd.c b/src/exchange/taler-exchange-httpd.c index 67fef7143..43c8a8039 100644 --- a/src/exchange/taler-exchange-httpd.c +++ b/src/exchange/taler-exchange-httpd.c @@ -36,7 +36,8 @@ #include "taler-exchange-httpd_payback.h" #include "taler-exchange-httpd_wire.h" #include "taler-exchange-httpd_refresh.h" -#include "taler-exchange-httpd_tracking.h" +#include "taler-exchange-httpd_track_transfer.h" +#include "taler-exchange-httpd_track_transaction.h" #include "taler-exchange-httpd_keystate.h" #if HAVE_DEVELOPER #include "taler-exchange-httpd_test.h" diff --git a/src/exchange/taler-exchange-httpd_track_transaction.c b/src/exchange/taler-exchange-httpd_track_transaction.c new file mode 100644 index 000000000..9b2aaeca5 --- /dev/null +++ b/src/exchange/taler-exchange-httpd_track_transaction.c @@ -0,0 +1,126 @@ +/* + This file is part of TALER + Copyright (C) 2014-2017 GNUnet e.V. + + 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_track_transaction.c + * @brief Handle wire transfer tracking-related requests + * @author Christian Grothoff + */ +#include "platform.h" +#include +#include +#include +#include +#include "taler_signatures.h" +#include "taler-exchange-httpd_parsing.h" +#include "taler-exchange-httpd_track_transaction.h" +#include "taler-exchange-httpd_responses.h" + + +/** + * Check the merchant signature, and if it is valid, + * return the wire transfer identifier. + * + * @param connection the MHD connection to handle + * @param tps signed request to execute + * @param merchant_pub public key from the merchant + * @param merchant_sig signature from the merchant (to be checked) + * @return MHD result code + */ +static int +check_and_handle_track_transaction_request (struct MHD_Connection *connection, + const struct TALER_DepositTrackPS *tps, + struct TALER_MerchantPublicKeyP *merchant_pub, + struct TALER_MerchantSignatureP *merchant_sig) +{ + if (GNUNET_OK != + GNUNET_CRYPTO_eddsa_verify (TALER_SIGNATURE_MERCHANT_TRACK_TRANSACTION, + &tps->purpose, + &merchant_sig->eddsa_sig, + &merchant_pub->eddsa_pub)) + { + GNUNET_break_op (0); + return TEH_RESPONSE_reply_signature_invalid (connection, + TALER_EC_TRACK_TRANSACTION_MERCHANT_SIGNATURE_INVALID, + "merchant_sig"); + } + return TEH_DB_execute_track_transaction (connection, + &tps->h_contract_terms, + &tps->h_wire, + &tps->coin_pub, + merchant_pub); +} + + +/** + * Handle a "/track/transaction" request. + * + * @param rh context of the handler + * @param connection the MHD connection to handle + * @param[in,out] connection_cls the connection's closure (can be updated) + * @param upload_data upload data + * @param[in,out] upload_data_size number of bytes (left) in @a upload_data + * @return MHD result code + */ +int +TEH_TRACKING_handler_track_transaction (struct TEH_RequestHandler *rh, + struct MHD_Connection *connection, + void **connection_cls, + const char *upload_data, + size_t *upload_data_size) +{ + int res; + json_t *json; + struct TALER_DepositTrackPS tps; + struct TALER_MerchantSignatureP merchant_sig; + struct GNUNET_JSON_Specification spec[] = { + GNUNET_JSON_spec_fixed_auto ("H_wire", &tps.h_wire), + GNUNET_JSON_spec_fixed_auto ("h_contract_terms", &tps.h_contract_terms), + GNUNET_JSON_spec_fixed_auto ("coin_pub", &tps.coin_pub), + GNUNET_JSON_spec_fixed_auto ("merchant_pub", &tps.merchant), + GNUNET_JSON_spec_fixed_auto ("merchant_sig", &merchant_sig), + GNUNET_JSON_spec_end () + }; + + res = TEH_PARSE_post_json (connection, + connection_cls, + upload_data, + upload_data_size, + &json); + if (GNUNET_SYSERR == res) + return MHD_NO; + if ( (GNUNET_NO == res) || (NULL == json) ) + return MHD_YES; + res = TEH_PARSE_json_data (connection, + json, + spec); + if (GNUNET_OK != res) + { + json_decref (json); + return (GNUNET_NO == res) ? MHD_YES : MHD_NO; + } + tps.purpose.size = htonl (sizeof (struct TALER_DepositTrackPS)); + tps.purpose.purpose = htonl (TALER_SIGNATURE_MERCHANT_TRACK_TRANSACTION); + res = check_and_handle_track_transaction_request (connection, + &tps, + &tps.merchant, + &merchant_sig); + GNUNET_JSON_parse_free (spec); + json_decref (json); + return res; +} + + +/* end of taler-exchange-httpd_track_transaction.c */ diff --git a/src/exchange/taler-exchange-httpd_track_transaction.h b/src/exchange/taler-exchange-httpd_track_transaction.h new file mode 100644 index 000000000..f1cd3669d --- /dev/null +++ b/src/exchange/taler-exchange-httpd_track_transaction.h @@ -0,0 +1,47 @@ +/* + This file is part of TALER + Copyright (C) 2014-2017 GNUnet e.V. + + 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_track_transaction.h + * @brief Handle wire transfer tracking-related requests + * @author Christian Grothoff + */ +#ifndef TALER_EXCHANGE_HTTPD_TRACK_TRANSACTION_H +#define TALER_EXCHANGE_HTTPD_TRACK_TRANSACTION_H + +#include +#include +#include "taler-exchange-httpd.h" + + +/** + * Handle a "/track/transaction" request. + * + * @param rh context of the handler + * @param connection the MHD connection to handle + * @param[in,out] connection_cls the connection's closure (can be updated) + * @param upload_data upload data + * @param[in,out] upload_data_size number of bytes (left) in @a upload_data + * @return MHD result code + */ +int +TEH_TRACKING_handler_track_transaction (struct TEH_RequestHandler *rh, + struct MHD_Connection *connection, + void **connection_cls, + const char *upload_data, + size_t *upload_data_size); + + +#endif diff --git a/src/exchange/taler-exchange-httpd_track_transfer.c b/src/exchange/taler-exchange-httpd_track_transfer.c new file mode 100644 index 000000000..f54df282d --- /dev/null +++ b/src/exchange/taler-exchange-httpd_track_transfer.c @@ -0,0 +1,65 @@ +/* + This file is part of TALER + Copyright (C) 2014, 2015, 2016 GNUnet e.V. + + 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_track_transfer.c + * @brief Handle wire transfer /track/transfer requests + * @author Christian Grothoff + */ +#include "platform.h" +#include +#include +#include +#include +#include "taler_signatures.h" +#include "taler-exchange-httpd_parsing.h" +#include "taler-exchange-httpd_track_transfer.h" +#include "taler-exchange-httpd_responses.h" + + +/** + * Handle a "/track/transfer" request. + * + * @param rh context of the handler + * @param connection the MHD connection to handle + * @param[in,out] connection_cls the connection's closure (can be updated) + * @param upload_data upload data + * @param[in,out] upload_data_size number of bytes (left) in @a upload_data + * @return MHD result code + */ +int +TEH_TRACKING_handler_track_transfer (struct TEH_RequestHandler *rh, + struct MHD_Connection *connection, + void **connection_cls, + const char *upload_data, + size_t *upload_data_size) +{ + struct TALER_WireTransferIdentifierRawP wtid; + int res; + + res = TEH_PARSE_mhd_request_arg_data (connection, + "wtid", + &wtid, + sizeof (struct TALER_WireTransferIdentifierRawP)); + if (GNUNET_SYSERR == res) + return MHD_NO; /* internal error */ + if (GNUNET_NO == res) + return MHD_YES; /* parse error */ + return TEH_DB_execute_track_transfer (connection, + &wtid); +} + + +/* end of taler-exchange-httpd_track_transfer.c */ diff --git a/src/exchange/taler-exchange-httpd_track_transfer.h b/src/exchange/taler-exchange-httpd_track_transfer.h new file mode 100644 index 000000000..2242b25d0 --- /dev/null +++ b/src/exchange/taler-exchange-httpd_track_transfer.h @@ -0,0 +1,46 @@ +/* + This file is part of TALER + Copyright (C) 2014-2017 GNUnet e.V. + + 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_track_transfer.h + * @brief Handle wire transfer tracking-related requests + * @author Christian Grothoff + */ +#ifndef TALER_EXCHANGE_HTTPD_TRACK_TRANSFER_H +#define TALER_EXCHANGE_HTTPD_TRACK_TRANSFER_H + +#include +#include +#include "taler-exchange-httpd.h" + + +/** + * Handle a "/track/transfer" request. + * + * @param rh context of the handler + * @param connection the MHD connection to handle + * @param[in,out] connection_cls the connection's closure (can be updated) + * @param upload_data upload data + * @param[in,out] upload_data_size number of bytes (left) in @a upload_data + * @return MHD result code + */ +int +TEH_TRACKING_handler_track_transfer (struct TEH_RequestHandler *rh, + struct MHD_Connection *connection, + void **connection_cls, + const char *upload_data, + size_t *upload_data_size); + +#endif diff --git a/src/exchange/taler-exchange-httpd_tracking.c b/src/exchange/taler-exchange-httpd_tracking.c deleted file mode 100644 index a9735490e..000000000 --- a/src/exchange/taler-exchange-httpd_tracking.c +++ /dev/null @@ -1,159 +0,0 @@ -/* - This file is part of TALER - Copyright (C) 2014, 2015, 2016 GNUnet e.V. - - 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_tracking.c - * @brief Handle wire transfer tracking-related requests - * @author Christian Grothoff - */ -#include "platform.h" -#include -#include -#include -#include -#include "taler_signatures.h" -#include "taler-exchange-httpd_parsing.h" -#include "taler-exchange-httpd_tracking.h" -#include "taler-exchange-httpd_responses.h" - - -/** - * Handle a "/track/transfer" request. - * - * @param rh context of the handler - * @param connection the MHD connection to handle - * @param[in,out] connection_cls the connection's closure (can be updated) - * @param upload_data upload data - * @param[in,out] upload_data_size number of bytes (left) in @a upload_data - * @return MHD result code - */ -int -TEH_TRACKING_handler_track_transfer (struct TEH_RequestHandler *rh, - struct MHD_Connection *connection, - void **connection_cls, - const char *upload_data, - size_t *upload_data_size) -{ - struct TALER_WireTransferIdentifierRawP wtid; - int res; - - res = TEH_PARSE_mhd_request_arg_data (connection, - "wtid", - &wtid, - sizeof (struct TALER_WireTransferIdentifierRawP)); - if (GNUNET_SYSERR == res) - return MHD_NO; /* internal error */ - if (GNUNET_NO == res) - return MHD_YES; /* parse error */ - return TEH_DB_execute_track_transfer (connection, - &wtid); -} - - -/** - * Check the merchant signature, and if it is valid, - * return the wire transfer identifier. - * - * @param connection the MHD connection to handle - * @param tps signed request to execute - * @param merchant_pub public key from the merchant - * @param merchant_sig signature from the merchant (to be checked) - * @return MHD result code - */ -static int -check_and_handle_track_transaction_request (struct MHD_Connection *connection, - const struct TALER_DepositTrackPS *tps, - struct TALER_MerchantPublicKeyP *merchant_pub, - struct TALER_MerchantSignatureP *merchant_sig) -{ - if (GNUNET_OK != - GNUNET_CRYPTO_eddsa_verify (TALER_SIGNATURE_MERCHANT_TRACK_TRANSACTION, - &tps->purpose, - &merchant_sig->eddsa_sig, - &merchant_pub->eddsa_pub)) - { - GNUNET_break_op (0); - return TEH_RESPONSE_reply_signature_invalid (connection, - TALER_EC_TRACK_TRANSACTION_MERCHANT_SIGNATURE_INVALID, - "merchant_sig"); - } - return TEH_DB_execute_track_transaction (connection, - &tps->h_contract_terms, - &tps->h_wire, - &tps->coin_pub, - merchant_pub); -} - - -/** - * Handle a "/track/transaction" request. - * - * @param rh context of the handler - * @param connection the MHD connection to handle - * @param[in,out] connection_cls the connection's closure (can be updated) - * @param upload_data upload data - * @param[in,out] upload_data_size number of bytes (left) in @a upload_data - * @return MHD result code - */ -int -TEH_TRACKING_handler_track_transaction (struct TEH_RequestHandler *rh, - struct MHD_Connection *connection, - void **connection_cls, - const char *upload_data, - size_t *upload_data_size) -{ - int res; - json_t *json; - struct TALER_DepositTrackPS tps; - struct TALER_MerchantSignatureP merchant_sig; - struct GNUNET_JSON_Specification spec[] = { - GNUNET_JSON_spec_fixed_auto ("H_wire", &tps.h_wire), - GNUNET_JSON_spec_fixed_auto ("h_contract_terms", &tps.h_contract_terms), - GNUNET_JSON_spec_fixed_auto ("coin_pub", &tps.coin_pub), - GNUNET_JSON_spec_fixed_auto ("merchant_pub", &tps.merchant), - GNUNET_JSON_spec_fixed_auto ("merchant_sig", &merchant_sig), - GNUNET_JSON_spec_end () - }; - - res = TEH_PARSE_post_json (connection, - connection_cls, - upload_data, - upload_data_size, - &json); - if (GNUNET_SYSERR == res) - return MHD_NO; - if ( (GNUNET_NO == res) || (NULL == json) ) - return MHD_YES; - res = TEH_PARSE_json_data (connection, - json, - spec); - if (GNUNET_OK != res) - { - json_decref (json); - return (GNUNET_NO == res) ? MHD_YES : MHD_NO; - } - tps.purpose.size = htonl (sizeof (struct TALER_DepositTrackPS)); - tps.purpose.purpose = htonl (TALER_SIGNATURE_MERCHANT_TRACK_TRANSACTION); - res = check_and_handle_track_transaction_request (connection, - &tps, - &tps.merchant, - &merchant_sig); - GNUNET_JSON_parse_free (spec); - json_decref (json); - return res; -} - - -/* end of taler-exchange-httpd_tracking.c */ diff --git a/src/exchange/taler-exchange-httpd_tracking.h b/src/exchange/taler-exchange-httpd_tracking.h deleted file mode 100644 index fe223043c..000000000 --- a/src/exchange/taler-exchange-httpd_tracking.h +++ /dev/null @@ -1,65 +0,0 @@ -/* - This file is part of TALER - Copyright (C) 2014, 2015 GNUnet e.V. - - 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_tracking.h - * @brief Handle wire transfer tracking-related requests - * @author Christian Grothoff - */ -#ifndef TALER_EXCHANGE_HTTPD_TRACKING_H -#define TALER_EXCHANGE_HTTPD_TRACKING_H - -#include -#include -#include "taler-exchange-httpd.h" - - -/** - * Handle a "/track/transfer" request. - * - * @param rh context of the handler - * @param connection the MHD connection to handle - * @param[in,out] connection_cls the connection's closure (can be updated) - * @param upload_data upload data - * @param[in,out] upload_data_size number of bytes (left) in @a upload_data - * @return MHD result code - */ -int -TEH_TRACKING_handler_track_transfer (struct TEH_RequestHandler *rh, - struct MHD_Connection *connection, - void **connection_cls, - const char *upload_data, - size_t *upload_data_size); - - -/** - * Handle a "/track/transaction" request. - * - * @param rh context of the handler - * @param connection the MHD connection to handle - * @param[in,out] connection_cls the connection's closure (can be updated) - * @param upload_data upload data - * @param[in,out] upload_data_size number of bytes (left) in @a upload_data - * @return MHD result code - */ -int -TEH_TRACKING_handler_track_transaction (struct TEH_RequestHandler *rh, - struct MHD_Connection *connection, - void **connection_cls, - const char *upload_data, - size_t *upload_data_size); - - -#endif -- cgit v1.2.3