From 80b5433b24772c1050692461f168b535e69eb4dc Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Thu, 16 Jan 2020 20:20:12 +0100 Subject: separate tests, address FIXMEs --- src/lib/.gitignore | 1 + src/lib/Makefile.am | 15 +++ src/lib/test_exchange_api.c | 134 ++----------------- src/lib/test_exchange_api_revocation.c | 232 +++++++++++++++++++++++++++++++++ src/lib/testing_api_cmd_deposit.c | 17 ++- 5 files changed, 264 insertions(+), 135 deletions(-) create mode 100644 src/lib/test_exchange_api_revocation.c (limited to 'src') diff --git a/src/lib/.gitignore b/src/lib/.gitignore index 7993fdd9f..17a848cce 100644 --- a/src/lib/.gitignore +++ b/src/lib/.gitignore @@ -5,3 +5,4 @@ test_bank_api_with_pybank test_bank_api_with_pybank_twisted test_taler_exchange_aggregator-postgres test_taler_exchange_wirewatch-postgres +test_exchange_api_revocation diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index b70289512..08c2ad29d 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -144,6 +144,7 @@ check_PROGRAMS = \ test_bank_api_with_pybank \ test_exchange_api \ test_exchange_api_keys_cherry_picking \ + test_exchange_api_revocation \ test_exchange_api_overlapping_keys_bug \ test_taler_exchange_aggregator-postgres \ test_taler_exchange_wirewatch-postgres @@ -212,6 +213,20 @@ test_exchange_api_LDADD = \ -lgnunetutil \ -ljansson +test_exchange_api_revocation_SOURCES = \ + test_exchange_api_revocation.c +test_exchange_api_revocation_LDADD = \ + libtalertesting.la \ + libtalerexchange.la \ + $(LIBGCRYPT_LIBS) \ + $(top_builddir)/src/bank-lib/libtalerfakebank.la \ + $(top_builddir)/src/bank-lib/libtalerbank.la \ + $(top_builddir)/src/json/libtalerjson.la \ + $(top_builddir)/src/util/libtalerutil.la \ + -lgnunetcurl \ + -lgnunetutil \ + -ljansson + test_exchange_api_keys_cherry_picking_SOURCES = \ test_exchange_api_keys_cherry_picking.c test_exchange_api_keys_cherry_picking_LDADD = \ diff --git a/src/lib/test_exchange_api.c b/src/lib/test_exchange_api.c index 076d12bb9..dc07e6b56 100644 --- a/src/lib/test_exchange_api.c +++ b/src/lib/test_exchange_api.c @@ -178,12 +178,11 @@ run (void *cls, "EUR:5", MHD_HTTP_CONFLICT), /* Try to double spend using a different transaction id. - * (copied verbatim from old exchange-lib tests.) - * FIXME: how can it get a different transaction id? There - * isn't such a thing actually, the exchange only knows about - * contract terms' hashes. So since the contract terms are - * exactly the same as the previous command, - * how can a different id be generated? */// + * The test needs the contract terms to differ. This + * is currently the case because of the "timestamp" field, + * which is set automatically by #TALER_TESTING_cmd_deposit(). + * This could theoretically fail if at some point a deposit + * command executs in less than 1 ms. */// TALER_TESTING_cmd_deposit ("deposit-double-1", "withdraw-coin-1", 0, @@ -693,9 +692,8 @@ run (void *cls, MHD_HTTP_NOT_FOUND), /* Test deposit fails after payback, with proof in payback */ - /* FIXME: #3887: right now, the exchange will never return the - * coin's transaction history with payback data, as we get a - * 404 on the DK! */ + /* Note that, the exchange will never return the coin's transaction + * history with payback data, as we get a 404 on the DK! */ TALER_TESTING_cmd_deposit ("payback-deposit-partial-after-payback", "payback-withdraw-coin-2a", 0, @@ -724,117 +722,6 @@ run (void *cls, TALER_TESTING_cmd_end () }; - struct TALER_TESTING_Command revocation[] = { - /** - * Fill reserve with EUR:5.01, as withdraw fee is 1 ct per - * config. - */ - CMD_TRANSFER_TO_EXCHANGE ("create-reserve-1", - "EUR:5.01"), - TALER_TESTING_cmd_check_bank_admin_transfer ("check-create-reserve-1", - "EUR:5.01", - bc.user42_payto, - bc.exchange_payto, - "create-reserve-1"), - /** - * Run wire-watch to trigger the reserve creation. - */ - CMD_EXEC_WIREWATCH ("wirewatch-4"), - /* Withdraw a 5 EUR coin, at fee of 1 ct */ - TALER_TESTING_cmd_withdraw_amount ("withdraw-revocation-coin-1", - "create-reserve-1", - "EUR:5", - MHD_HTTP_OK), - /* Try to partially spend (deposit) 1 EUR of the 5 EUR coin (in full) - * (merchant would receive EUR:0.99 due to 1 ct deposit fee) */// - TALER_TESTING_cmd_deposit ("deposit-partial", - "withdraw-revocation-coin-1", - 0, - bc.user42_payto, - "{\"items\":[{\"name\":\"ice cream\",\"value\":\"EUR:1\"}]}", - GNUNET_TIME_UNIT_ZERO, - "EUR:1", - MHD_HTTP_OK), - /** - * Melt SOME of the rest of the coin's value - * (EUR:3.17 = 3x EUR:1.03 + 7x EUR:0.13) */ - TALER_TESTING_cmd_refresh_melt ("refresh-melt-1", - "withdraw-revocation-coin-1", - MHD_HTTP_OK, - NULL), - /** - * Complete (successful) melt operation, and withdraw the coins - */ - TALER_TESTING_cmd_refresh_reveal ("refresh-reveal-1", - "refresh-melt-1", - MHD_HTTP_OK), - /* Make refreshed coin invalid */ - TALER_TESTING_cmd_revoke ("revoke-2-EUR:5", - MHD_HTTP_OK, - "refresh-melt-1", - CONFIG_FILE), - /* Refund coin to original coin */ - TALER_TESTING_cmd_payback ("payback-1a", - MHD_HTTP_OK, - "refresh-reveal-1#0", - "EUR:1", - "refresh-melt-1"), - TALER_TESTING_cmd_payback ("payback-1b", - MHD_HTTP_OK, - "refresh-reveal-1#1", - "EUR:1", - "refresh-melt-1"), - TALER_TESTING_cmd_payback ("payback-1c", - MHD_HTTP_OK, - "refresh-reveal-1#2", - "EUR:1", - "refresh-melt-1"), - /* Now we have EUR:3.83 EUR back after 3x EUR:1 in paybacks */ - /* Melt original coin AGAIN, but only create one 0.1 EUR coin; - This costs EUR:0.03 in refresh and EUR:01 in withdraw fees, - leaving EUR:3.69. */ - TALER_TESTING_cmd_refresh_melt ("refresh-melt-2", - "withdraw-revocation-coin-1", - MHD_HTTP_OK, - "EUR:0.1", - NULL), - /** - * Complete (successful) melt operation, and withdraw the coins - */ - TALER_TESTING_cmd_refresh_reveal ("refresh-reveal-2", - "refresh-melt-2", - MHD_HTTP_OK), - /* Revokes refreshed EUR:0.1 coin */ - TALER_TESTING_cmd_revoke ("revoke-3-EUR:0.1", - MHD_HTTP_OK, - "refresh-reveal-2", - CONFIG_FILE), - /* Revoke also original coin denomination */ - TALER_TESTING_cmd_revoke ("revoke-4-EUR:5", - MHD_HTTP_OK, - "withdraw-revocation-coin-1", - CONFIG_FILE), - /* Refund coin EUR:0.1 to original coin, creating zombie! */ - TALER_TESTING_cmd_payback ("payback-2", - MHD_HTTP_OK, - "refresh-reveal-2", - "EUR:0.1", - "refresh-melt-2"), - /* Due to payback, original coin is now at EUR:3.79 */ - /* Refund original (now zombie) coin to reserve */ - TALER_TESTING_cmd_payback ("payback-3", - MHD_HTTP_OK, - "withdraw-revocation-coin-1", - "EUR:3.79", - NULL), - /* Check the money is back with the reserve */ - TALER_TESTING_cmd_status ("payback-reserve-status-1", - "create-reserve-1", - "EUR:3.79", - MHD_HTTP_OK), - TALER_TESTING_cmd_end () - }; - #define RESERVE_OPEN_CLOSE_CHUNK 4 #define RESERVE_OPEN_CLOSE_ITERATIONS 3 @@ -883,12 +770,7 @@ run (void *cls, payback), TALER_TESTING_cmd_batch ("reserve-open-close", reserve_open_close), - TALER_TESTING_cmd_batch ("revocation", - revocation), - /** - * End the suite. Fixme: better to have a label for this - * too, as it shows as "(null)" on logs. - */ + /* End the suite. */ TALER_TESTING_cmd_end () }; diff --git a/src/lib/test_exchange_api_revocation.c b/src/lib/test_exchange_api_revocation.c new file mode 100644 index 000000000..80fede121 --- /dev/null +++ b/src/lib/test_exchange_api_revocation.c @@ -0,0 +1,232 @@ +/* + This file is part of TALER + Copyright (C) 2014--2020 Taler Systems SA + + TALER is free software; you can redistribute it and/or modify + it under the terms of the GNU 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 General Public License for more details. + + You should have received a copy of the GNU General Public + License along with TALER; see the file COPYING. If not, see + +*/ +/** + * @file lib/test_exchange_api_revocation.c + * @brief testcase to test key revocation handling via the exchange's HTTP API interface + * @author Sree Harsha Totakura + * @author Christian Grothoff + * @author Marcello Stanisci + */ +#include "platform.h" +#include "taler_util.h" +#include "taler_signatures.h" +#include "taler_exchange_service.h" +#include "taler_json_lib.h" +#include +#include +#include "taler_bank_service.h" +#include "taler_fakebank_lib.h" +#include "taler_testing_lib.h" + +/** + * Configuration file we use. One (big) configuration is used + * for the various components for this test. + */ +#define CONFIG_FILE "test_exchange_api.conf" + +/** + * Exchange configuration data. + */ +static struct TALER_TESTING_ExchangeConfiguration ec; + +/** + * Bank configuration data. + */ +static struct TALER_TESTING_BankConfiguration bc; + + +/** + * Main function that will tell the interpreter what commands to + * run. + * + * @param cls closure + */ +static void +run (void *cls, + struct TALER_TESTING_Interpreter *is) +{ + struct TALER_TESTING_Command revocation[] = { + /** + * Fill reserve with EUR:5.01, as withdraw fee is 1 ct per + * config. + */ + TALER_TESTING_cmd_admin_add_incoming ("create-reserve-1", + "EUR:5.01", + bc.exchange_account_url, + &bc.exchange_auth, + bc.user42_payto), + TALER_TESTING_cmd_check_bank_admin_transfer ("check-create-reserve-1", + "EUR:5.01", + bc.user42_payto, + bc.exchange_payto, + "create-reserve-1"), + /** + * Run wire-watch to trigger the reserve creation. + */ + TALER_TESTING_cmd_exec_wirewatch ("wirewatch-4", + CONFIG_FILE), + /* Withdraw a 5 EUR coin, at fee of 1 ct */ + TALER_TESTING_cmd_withdraw_amount ("withdraw-revocation-coin-1", + "create-reserve-1", + "EUR:5", + MHD_HTTP_OK), + /* Try to partially spend (deposit) 1 EUR of the 5 EUR coin (in full) + * (merchant would receive EUR:0.99 due to 1 ct deposit fee) */// + TALER_TESTING_cmd_deposit ("deposit-partial", + "withdraw-revocation-coin-1", + 0, + bc.user42_payto, + "{\"items\":[{\"name\":\"ice cream\",\"value\":\"EUR:1\"}]}", + GNUNET_TIME_UNIT_ZERO, + "EUR:1", + MHD_HTTP_OK), + /** + * Melt SOME of the rest of the coin's value + * (EUR:3.17 = 3x EUR:1.03 + 7x EUR:0.13) */ + TALER_TESTING_cmd_refresh_melt ("refresh-melt-1", + "withdraw-revocation-coin-1", + MHD_HTTP_OK, + NULL), + /** + * Complete (successful) melt operation, and withdraw the coins + */ + TALER_TESTING_cmd_refresh_reveal ("refresh-reveal-1", + "refresh-melt-1", + MHD_HTTP_OK), + /* Make refreshed coin invalid */ + TALER_TESTING_cmd_revoke ("revoke-2-EUR:5", + MHD_HTTP_OK, + "refresh-melt-1", + CONFIG_FILE), + /* Refund coin to original coin */ + TALER_TESTING_cmd_payback ("payback-1a", + MHD_HTTP_OK, + "refresh-reveal-1#0", + "EUR:1", + "refresh-melt-1"), + TALER_TESTING_cmd_payback ("payback-1b", + MHD_HTTP_OK, + "refresh-reveal-1#1", + "EUR:1", + "refresh-melt-1"), + TALER_TESTING_cmd_payback ("payback-1c", + MHD_HTTP_OK, + "refresh-reveal-1#2", + "EUR:1", + "refresh-melt-1"), + /* Now we have EUR:3.83 EUR back after 3x EUR:1 in paybacks */ + /* Melt original coin AGAIN, but only create one 0.1 EUR coin; + This costs EUR:0.03 in refresh and EUR:01 in withdraw fees, + leaving EUR:3.69. */ + TALER_TESTING_cmd_refresh_melt ("refresh-melt-2", + "withdraw-revocation-coin-1", + MHD_HTTP_OK, + "EUR:0.1", + NULL), + /** + * Complete (successful) melt operation, and withdraw the coins + */ + TALER_TESTING_cmd_refresh_reveal ("refresh-reveal-2", + "refresh-melt-2", + MHD_HTTP_OK), + /* Revokes refreshed EUR:0.1 coin */ + TALER_TESTING_cmd_revoke ("revoke-3-EUR:0.1", + MHD_HTTP_OK, + "refresh-reveal-2", + CONFIG_FILE), + /* Revoke also original coin denomination */ + TALER_TESTING_cmd_revoke ("revoke-4-EUR:5", + MHD_HTTP_OK, + "withdraw-revocation-coin-1", + CONFIG_FILE), + /* Refund coin EUR:0.1 to original coin, creating zombie! */ + TALER_TESTING_cmd_payback ("payback-2", + MHD_HTTP_OK, + "refresh-reveal-2", + "EUR:0.1", + "refresh-melt-2"), + /* Due to payback, original coin is now at EUR:3.79 */ + /* Refund original (now zombie) coin to reserve */ + TALER_TESTING_cmd_payback ("payback-3", + MHD_HTTP_OK, + "withdraw-revocation-coin-1", + "EUR:3.79", + NULL), + /* Check the money is back with the reserve */ + TALER_TESTING_cmd_status ("payback-reserve-status-1", + "create-reserve-1", + "EUR:3.79", + MHD_HTTP_OK), + TALER_TESTING_cmd_end () + }; + + TALER_TESTING_run_with_fakebank (is, + revocation, + bc.bank_url); +} + + +int +main (int argc, + char *const *argv) +{ + /* These environment variables get in the way... */ + unsetenv ("XDG_DATA_HOME"); + unsetenv ("XDG_CONFIG_HOME"); + GNUNET_log_setup ("test-exchange-api-revocation", + "INFO", + NULL); + /* Check fakebank port is available and get config */ + if (GNUNET_OK != + TALER_TESTING_prepare_fakebank (CONFIG_FILE, + "account-2", + &bc)) + return 77; + TALER_TESTING_cleanup_files (CONFIG_FILE); + /* @helpers. Run keyup, create tables, ... Note: it + * fetches the port number from config in order to see + * if it's available. */ + switch (TALER_TESTING_prepare_exchange (CONFIG_FILE, + &ec)) + { + case GNUNET_SYSERR: + GNUNET_break (0); + return 1; + case GNUNET_NO: + return 77; + case GNUNET_OK: + if (GNUNET_OK != + /* Set up event loop and reschedule context, plus + * start/stop the exchange. It calls TALER_TESTING_setup + * which creates the 'is' object. + */ + TALER_TESTING_setup_with_exchange (&run, + NULL, + CONFIG_FILE)) + return 1; + break; + default: + GNUNET_break (0); + return 1; + } + return 0; +} + + +/* end of test_exchange_api_revocation.c */ diff --git a/src/lib/testing_api_cmd_deposit.c b/src/lib/testing_api_cmd_deposit.c index 7c7e4936e..8eefd7bef 100644 --- a/src/lib/testing_api_cmd_deposit.c +++ b/src/lib/testing_api_cmd_deposit.c @@ -493,15 +493,14 @@ deposit_traits (void *cls, * @return the command. */ struct TALER_TESTING_Command -TALER_TESTING_cmd_deposit - (const char *label, - const char *coin_reference, - unsigned int coin_index, - const char *target_account_payto, - const char *contract_terms, - struct GNUNET_TIME_Relative refund_deadline, - const char *amount, - unsigned int expected_response_code) +TALER_TESTING_cmd_deposit (const char *label, + const char *coin_reference, + unsigned int coin_index, + const char *target_account_payto, + const char *contract_terms, + struct GNUNET_TIME_Relative refund_deadline, + const char *amount, + unsigned int expected_response_code) { struct DepositState *ds; json_t *wire_details; -- cgit v1.2.3