diff options
| -rw-r--r-- | src/include/taler_exchange_service.h | 10 | ||||
| -rw-r--r-- | src/include/taler_signatures.h | 72 | ||||
| -rw-r--r-- | src/include/taler_testing_lib.h | 12 | ||||
| -rw-r--r-- | src/lib/exchange_api_management_wire_disable.c | 2 | ||||
| -rw-r--r-- | src/lib/exchange_api_management_wire_enable.c | 20 | ||||
| -rw-r--r-- | src/testing/Makefile.am | 2 | ||||
| -rw-r--r-- | src/testing/testing_api_cmd_auditor_add.c | 2 | ||||
| -rw-r--r-- | src/testing/testing_api_cmd_auditor_del.c | 2 | ||||
| -rw-r--r-- | src/testing/testing_api_cmd_wire_add.c | 295 | ||||
| -rw-r--r-- | src/testing/testing_api_cmd_wire_del.c | 282 |
10 files changed, 679 insertions, 20 deletions
diff --git a/src/include/taler_exchange_service.h b/src/include/taler_exchange_service.h index 8a5ba311b..4ad05a688 100644 --- a/src/include/taler_exchange_service.h +++ b/src/include/taler_exchange_service.h @@ -2451,7 +2451,10 @@ struct TALER_EXCHANGE_ManagementWireEnableHandle; * @param salt salt to use when hashing the account for the signature * @param payto_uri RFC 8905 URI of the exchange's bank account * @param validity_start when was this decided? - * @param master_sig signature affirming the wire addition + * @param master_sig1 signature affirming the wire addition + * of purpose #TALER_SIGNATURE_MASTER_ADD_WIRE + * @param master_sig2 signature affirming the validity of the account for clients; + * of purpose #TALER_SIGNATURE_MASTER_WIRE_DETAILS. * @param cb function to call with the exchange's result * @param cb_cls closure for @a cb * @return the request handle; NULL upon error @@ -2460,10 +2463,10 @@ struct TALER_EXCHANGE_ManagementWireEnableHandle * TALER_EXCHANGE_management_enable_wire ( struct GNUNET_CURL_Context *ctx, const char *url, - const char *salt, const char *payto_uri, struct GNUNET_TIME_Absolute validity_start, - const struct TALER_MasterSignatureP *master_sig, + const struct TALER_MasterSignatureP *master_sig1, + const struct TALER_MasterSignatureP *master_sig2, TALER_EXCHANGE_ManagementWireEnableCallback cb, void *cb_cls); @@ -2504,6 +2507,7 @@ struct TALER_EXCHANGE_ManagementWireDisableHandle; * @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 + * of purpose #TALER_SIGNATURE_MASTER_DEL_WIRE * @param cb function to call with the exchange's result * @param cb_cls closure for @a cb * @return the request handle; NULL upon error diff --git a/src/include/taler_signatures.h b/src/include/taler_signatures.h index e732f13b6..90d772441 100644 --- a/src/include/taler_signatures.h +++ b/src/include/taler_signatures.h @@ -47,6 +47,21 @@ /*********************************************/ /** + * The given revocation key was revoked and must no longer be used. + */ +#define TALER_SIGNATURE_MASTER_SIGNING_KEY_REVOKED 1020 + +/** + * Add payto URI to the list of our wire methods. + */ +#define TALER_SIGNATURE_MASTER_ADD_WIRE 1021 + +/** + * Remove payto URI from the list of our wire methods. + */ +#define TALER_SIGNATURE_MASTER_DEL_WIRE 1023 + +/** * Purpose for signing public keys signed by the exchange master key. */ #define TALER_SIGNATURE_MASTER_SIGNING_KEY_VALIDITY 1024 @@ -806,7 +821,7 @@ struct TALER_ExchangeKeySetPS * @brief Signature made by the exchange offline key over the information of * an auditor to be added to the exchange's set of auditors. */ -struct TALER_ExchangeAddAuditorPS +struct TALER_MasterAddAuditorPS { /** @@ -834,9 +849,9 @@ struct TALER_ExchangeAddAuditorPS /** * @brief Signature made by the exchange offline key over the information of - * an auditor to be removed to the exchange's set of auditors. + * an auditor to be removed from the exchange's set of auditors. */ -struct TALER_ExchangeDelAuditorPS +struct TALER_MasterDelAuditorPS { /** @@ -859,6 +874,57 @@ struct TALER_ExchangeDelAuditorPS /** + * @brief Signature made by the exchange offline key over the information of + * a payto:// URI to be added to the exchange's set of active wire accounts. + */ +struct TALER_MasterAddWirePS +{ + + /** + * Purpose is #TALER_SIGNATURE_MASTER_ADD_WIRE. Signed + * by a `struct TALER_MasterPublicKeyP` using EdDSA. + */ + struct GNUNET_CRYPTO_EccSignaturePurpose purpose; + + /** + * Time of the change. + */ + struct GNUNET_TIME_AbsoluteNBO start_date; + + /** + * Hash over the exchange's payto URI. + */ + struct GNUNET_HashCode h_wire GNUNET_PACKED; +}; + + +/** + * @brief Signature made by the exchange offline key over the information of + * a wire method to be removed to the exchange's set of active accounts. + */ +struct TALER_MasterDelWirePS +{ + + /** + * Purpose is #TALER_SIGNATURE_MASTER_DEL_WIRE. Signed + * by a `struct TALER_MasterPublicKeyP` using EdDSA. + */ + struct GNUNET_CRYPTO_EccSignaturePurpose purpose; + + /** + * Time of the change. + */ + struct GNUNET_TIME_AbsoluteNBO end_date; + + /** + * Hash over the exchange's payto URI. + */ + struct GNUNET_HashCode h_wire GNUNET_PACKED; + +}; + + +/** * @brief Information about a denomination key. Denomination keys * are used to sign coins of a certain value into existence. */ diff --git a/src/include/taler_testing_lib.h b/src/include/taler_testing_lib.h index b89a775e6..051726445 100644 --- a/src/include/taler_testing_lib.h +++ b/src/include/taler_testing_lib.h @@ -2057,11 +2057,15 @@ TALER_TESTING_cmd_auditor_del (const char *label, * * @param label command label. * @param payto_uri URI identifying the bank account + * @param expected_http_status expected HTTP status from exchange + * @param bad_sig should we use a bogus signature? * @return the command */ struct TALER_TESTING_Command TALER_TESTING_cmd_wire_add (const char *label, - const char *payto_uri); + const char *payto_uri, + unsigned int expected_http_status, + bool bad_sig); /** @@ -2070,11 +2074,15 @@ TALER_TESTING_cmd_wire_add (const char *label, * * @param label command label. * @param payto_uri URI identifying the bank account + * @param expected_http_status expected HTTP status from exchange + * @param bad_sig should we use a bogus signature? * @return the command */ struct TALER_TESTING_Command TALER_TESTING_cmd_wire_del (const char *label, - const char *payto_uri); + const char *payto_uri, + unsigned int expected_http_status, + bool bad_sig); /** diff --git a/src/lib/exchange_api_management_wire_disable.c b/src/lib/exchange_api_management_wire_disable.c index b510970ab..157d146b8 100644 --- a/src/lib/exchange_api_management_wire_disable.c +++ b/src/lib/exchange_api_management_wire_disable.c @@ -152,7 +152,7 @@ TALER_EXCHANGE_management_disable_wire ( body = json_pack ("{s:s, s:o, s:o}", "payto_uri", payto_uri, - "master_sig", + "master_sig_del", GNUNET_JSON_from_data_auto (master_sig), "validity_end", GNUNET_JSON_from_time_abs (validity_end)); diff --git a/src/lib/exchange_api_management_wire_enable.c b/src/lib/exchange_api_management_wire_enable.c index 298fe5d25..9de52fe0f 100644 --- a/src/lib/exchange_api_management_wire_enable.c +++ b/src/lib/exchange_api_management_wire_enable.c @@ -122,10 +122,12 @@ handle_auditor_enable_finished (void *cls, * * @param ctx the context * @param url HTTP base URL for the exchange - * @param salt salt to use when hashing the account for the signature * @param payto_uri RFC 8905 URI of the exchange's bank account * @param validity_start when was this decided? - * @param master_sig signature affirming the wire addition + * @param master_sig1 signature affirming the wire addition + * of purpose #TALER_SIGNATURE_MASTER_ADD_WIRE + * @param master_sig2 signature affirming the validity of the account for clients; + * of purpose #TALER_SIGNATURE_MASTER_WIRE_DETAILS. * @param cb function to call with the exchange's result * @param cb_cls closure for @a cb * @return the request handle; NULL upon error @@ -134,10 +136,10 @@ struct TALER_EXCHANGE_ManagementWireEnableHandle * TALER_EXCHANGE_management_enable_wire ( struct GNUNET_CURL_Context *ctx, const char *url, - const char *salt, const char *payto_uri, struct GNUNET_TIME_Absolute validity_start, - const struct TALER_MasterSignatureP *master_sig, + const struct TALER_MasterSignatureP *master_sig1, + const struct TALER_MasterSignatureP *master_sig2, TALER_EXCHANGE_ManagementWireEnableCallback cb, void *cb_cls) { @@ -159,13 +161,13 @@ TALER_EXCHANGE_management_enable_wire ( GNUNET_free (wh); return NULL; } - body = json_pack ("{s:s, s:s, s:o, s:o}", + body = json_pack ("{s:s, s:s, s:o, s:o, s:o}", "payto_uri", payto_uri, - "salt", - salt, - "master_sig", - GNUNET_JSON_from_data_auto (master_sig), + "master_sig_add", + GNUNET_JSON_from_data_auto (master_sig1), + "master_sig_wire", + GNUNET_JSON_from_data_auto (master_sig2), "validity_start", GNUNET_JSON_from_time_abs (validity_start)); if (NULL == body) diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am index 1c55e30ff..0850f842c 100644 --- a/src/testing/Makefile.am +++ b/src/testing/Makefile.am @@ -73,6 +73,8 @@ libtalertesting_la_SOURCES = \ testing_api_cmd_transfer_get.c \ testing_api_cmd_wait.c \ testing_api_cmd_wire.c \ + testing_api_cmd_wire_add.c \ + testing_api_cmd_wire_del.c \ testing_api_cmd_withdraw.c \ testing_api_helpers_auditor.c \ testing_api_helpers_bank.c \ diff --git a/src/testing/testing_api_cmd_auditor_add.c b/src/testing/testing_api_cmd_auditor_add.c index 5112d1fb6..0a37c73db 100644 --- a/src/testing/testing_api_cmd_auditor_add.c +++ b/src/testing/testing_api_cmd_auditor_add.c @@ -218,7 +218,7 @@ auditor_add_run (void *cls, /* now sign */ { - struct TALER_ExchangeAddAuditorPS kv = { + struct TALER_MasterAddAuditorPS kv = { .purpose.purpose = htonl (TALER_SIGNATURE_MASTER_ADD_AUDITOR), .purpose.size = htonl (sizeof (kv)), .start_date = GNUNET_TIME_absolute_hton (now), diff --git a/src/testing/testing_api_cmd_auditor_del.c b/src/testing/testing_api_cmd_auditor_del.c index d66858849..11efbd404 100644 --- a/src/testing/testing_api_cmd_auditor_del.c +++ b/src/testing/testing_api_cmd_auditor_del.c @@ -200,7 +200,7 @@ auditor_del_run (void *cls, /* now sign */ { - struct TALER_ExchangeDelAuditorPS kv = { + struct TALER_MasterDelAuditorPS kv = { .purpose.purpose = htonl (TALER_SIGNATURE_MASTER_DEL_AUDITOR), .purpose.size = htonl (sizeof (kv)), .end_date = GNUNET_TIME_absolute_hton (now), diff --git a/src/testing/testing_api_cmd_wire_add.c b/src/testing/testing_api_cmd_wire_add.c new file mode 100644 index 000000000..0384e78a6 --- /dev/null +++ b/src/testing/testing_api_cmd_wire_add.c @@ -0,0 +1,295 @@ +/* + 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 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 + <http://www.gnu.org/licenses/> +*/ +/** + * @file testing/testing_api_cmd_wire_add.c + * @brief command for testing POST to /management/wire + * @author Christian Grothoff + */ +#include "platform.h" +#include "taler_json_lib.h" +#include <gnunet/gnunet_curl_lib.h> +#include "taler_testing_lib.h" +#include "taler_signatures.h" +#include "backoff.h" + + +/** + * State for a "wire_add" CMD. + */ +struct WireAddState +{ + + /** + * Wire enable handle while operation is running. + */ + struct TALER_EXCHANGE_ManagementWireEnableHandle *dh; + + /** + * Our interpreter. + */ + struct TALER_TESTING_Interpreter *is; + + /** + * Account to add. + */ + const char *payto_uri; + + /** + * Expected HTTP response code. + */ + unsigned int expected_response_code; + + /** + * Should we make the request with a bad master_sig signature? + */ + bool bad_sig; +}; + + +/** + * Callback to analyze the /management/wire response, just used to check + * if the response code is acceptable. + * + * @param cls closure. + * @param hr HTTP response details + */ +static void +wire_add_cb (void *cls, + const struct TALER_EXCHANGE_HttpResponse *hr) +{ + struct WireAddState *ds = cls; + + ds->dh = NULL; + if (ds->expected_response_code != hr->http_status) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Unexpected response code %u to command %s in %s:%u\n", + hr->http_status, + ds->is->commands[ds->is->ip].label, + __FILE__, + __LINE__); + json_dumpf (hr->reply, + stderr, + 0); + TALER_TESTING_interpreter_fail (ds->is); + return; + } + TALER_TESTING_interpreter_next (ds->is); +} + + +/** + * Run the command. + * + * @param cls closure. + * @param cmd the command to execute. + * @param is the interpreter state. + */ +static void +wire_add_run (void *cls, + const struct TALER_TESTING_Command *cmd, + struct TALER_TESTING_Interpreter *is) +{ + struct WireAddState *ds = cls; + char *exchange_url; + struct TALER_MasterSignatureP master_sig1; + struct TALER_MasterSignatureP master_sig2; + struct GNUNET_TIME_Absolute now; + + (void) cmd; + now = GNUNET_TIME_absolute_get (); + (void) GNUNET_TIME_round_abs (&now); + ds->is = is; + if (ds->bad_sig) + { + memset (&master_sig1, + 42, + sizeof (master_sig1)); + memset (&master_sig2, + 42, + sizeof (master_sig2)); + } + else + { + char *fn; + struct TALER_MasterPrivateKeyP master_priv; + + if (GNUNET_OK != + GNUNET_CONFIGURATION_get_value_filename (is->cfg, + "exchange-offline", + "MASTER_PRIV_FILE", + &fn)) + { + GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, + "exchange-offline", + "MASTER_PRIV_FILE"); + TALER_TESTING_interpreter_next (ds->is); + return; + } + if (GNUNET_SYSERR == + GNUNET_DISK_directory_create_for_file (fn)) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Could not setup directory for master private key file `%s'\n", + fn); + GNUNET_free (fn); + TALER_TESTING_interpreter_next (ds->is); + return; + } + if (GNUNET_OK != + GNUNET_CRYPTO_eddsa_key_from_file (fn, + GNUNET_YES, + &master_priv.eddsa_priv)) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Could not load master private key from `%s'\n", + fn); + GNUNET_free (fn); + TALER_TESTING_interpreter_next (ds->is); + return; + } + GNUNET_free (fn); + + /* now sign */ + { + struct TALER_MasterAddWirePS kv = { + .purpose.purpose = htonl (TALER_SIGNATURE_MASTER_ADD_WIRE), + .purpose.size = htonl (sizeof (kv)), + .start_date = GNUNET_TIME_absolute_hton (now), + }; + struct TALER_MasterWireDetailsPS wd = { + .purpose.purpose = htonl (TALER_SIGNATURE_MASTER_WIRE_DETAILS), + .purpose.size = htonl (sizeof (wd)), + }; + + TALER_exchange_wire_signature_hash (ds->payto_uri, + &kv.h_wire); + wd.h_wire_details = kv.h_wire; + GNUNET_CRYPTO_eddsa_sign (&master_priv.eddsa_priv, + &kv, + &master_sig1.eddsa_signature); + GNUNET_CRYPTO_eddsa_sign (&master_priv.eddsa_priv, + &wd, + &master_sig2.eddsa_signature); + } + } + if (GNUNET_OK != + GNUNET_CONFIGURATION_get_value_string (is->cfg, + "exchange", + "BASE_URL", + &exchange_url)) + { + GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, + "exchange", + "BASE_URL"); + TALER_TESTING_interpreter_next (ds->is); + return; + } + ds->dh = TALER_EXCHANGE_management_enable_wire ( + is->ctx, + exchange_url, + ds->payto_uri, + now, + &master_sig1, + &master_sig2, + &wire_add_cb, + ds); + GNUNET_free (exchange_url); + if (NULL == ds->dh) + { + GNUNET_break (0); + TALER_TESTING_interpreter_fail (is); + return; + } +} + + +/** + * Free the state of a "wire_add" CMD, and possibly cancel a + * pending operation thereof. + * + * @param cls closure, must be a `struct WireAddState`. + * @param cmd the command which is being cleaned up. + */ +static void +wire_add_cleanup (void *cls, + const struct TALER_TESTING_Command *cmd) +{ + struct WireAddState *ds = cls; + + if (NULL != ds->dh) + { + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "Command %u (%s) did not complete\n", + ds->is->ip, + cmd->label); + TALER_EXCHANGE_management_enable_wire_cancel (ds->dh); + ds->dh = NULL; + } + GNUNET_free (ds); +} + + +/** + * Offer internal data from a "wire_add" CMD, to other commands. + * + * @param cls closure. + * @param[out] ret result. + * @param trait name of the trait. + * @param index index number of the object to offer. + * + * @return #GNUNET_OK on success. + */ +static int +wire_add_traits (void *cls, + const void **ret, + const char *trait, + unsigned int index) +{ + return GNUNET_NO; +} + + +struct TALER_TESTING_Command +TALER_TESTING_cmd_wire_add (const char *label, + const char *payto_uri, + unsigned int expected_http_status, + bool bad_sig) +{ + struct WireAddState *ds; + + ds = GNUNET_new (struct WireAddState); + ds->expected_response_code = expected_http_status; + ds->bad_sig = bad_sig; + ds->payto_uri = payto_uri; + { + struct TALER_TESTING_Command cmd = { + .cls = ds, + .label = label, + .run = &wire_add_run, + .cleanup = &wire_add_cleanup, + .traits = &wire_add_traits + }; + + return cmd; + } +} + + +/* end of testing_api_cmd_wire_add.c */ diff --git a/src/testing/testing_api_cmd_wire_del.c b/src/testing/testing_api_cmd_wire_del.c new file mode 100644 index 000000000..06de499ad --- /dev/null +++ b/src/testing/testing_api_cmd_wire_del.c @@ -0,0 +1,282 @@ +/* + 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 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 + <http://www.gnu.org/licenses/> +*/ +/** + * @file testing/testing_api_cmd_wire_del.c + * @brief command for testing POST to /management/wire + * @author Christian Grothoff + */ +#include "platform.h" +#include "taler_json_lib.h" +#include <gnunet/gnunet_curl_lib.h> +#include "taler_testing_lib.h" +#include "taler_signatures.h" +#include "backoff.h" + + +/** + * State for a "wire_del" CMD. + */ +struct WireDelState +{ + + /** + * Wire enable handle while operation is running. + */ + struct TALER_EXCHANGE_ManagementWireDisableHandle *dh; + + /** + * Our interpreter. + */ + struct TALER_TESTING_Interpreter *is; + + /** + * Account to del. + */ + const char *payto_uri; + + /** + * Expected HTTP response code. + */ + unsigned int expected_response_code; + + /** + * Should we make the request with a bad master_sig signature? + */ + bool bad_sig; +}; + + +/** + * Callback to analyze the /management/wire response, just used to check + * if the response code is acceptable. + * + * @param cls closure. + * @param hr HTTP response details + */ +static void +wire_del_cb (void *cls, + const struct TALER_EXCHANGE_HttpResponse *hr) +{ + struct WireDelState *ds = cls; + + ds->dh = NULL; + if (ds->expected_response_code != hr->http_status) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Unexpected response code %u to command %s in %s:%u\n", + hr->http_status, + ds->is->commands[ds->is->ip].label, + __FILE__, + __LINE__); + json_dumpf (hr->reply, + stderr, + 0); + TALER_TESTING_interpreter_fail (ds->is); + return; + } + TALER_TESTING_interpreter_next (ds->is); +} + + +/** + * Run the command. + * + * @param cls closure. + * @param cmd the command to execute. + * @param is the interpreter state. + */ +static void +wire_del_run (void *cls, + const struct TALER_TESTING_Command *cmd, + struct TALER_TESTING_Interpreter *is) +{ + struct WireDelState *ds = cls; + char *exchange_url; + struct TALER_MasterSignatureP master_sig; + struct GNUNET_TIME_Absolute now; + + (void) cmd; + now = GNUNET_TIME_absolute_get (); + (void) GNUNET_TIME_round_abs (&now); + ds->is = is; + if (ds->bad_sig) + { + memset (&master_sig, + 42, + sizeof (master_sig)); + } + else + { + char *fn; + struct TALER_MasterPrivateKeyP master_priv; + + if (GNUNET_OK != + GNUNET_CONFIGURATION_get_value_filename (is->cfg, + "exchange-offline", + "MASTER_PRIV_FILE", + &fn)) + { + GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, + "exchange-offline", + "MASTER_PRIV_FILE"); + TALER_TESTING_interpreter_next (ds->is); + return; + } + if (GNUNET_SYSERR == + GNUNET_DISK_directory_create_for_file (fn)) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Could not setup directory for master private key file `%s'\n", + fn); + GNUNET_free (fn); + TALER_TESTING_interpreter_next (ds->is); + return; + } + if (GNUNET_OK != + GNUNET_CRYPTO_eddsa_key_from_file (fn, + GNUNET_YES, + &master_priv.eddsa_priv)) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Could not load master private key from `%s'\n", + fn); + GNUNET_free (fn); + TALER_TESTING_interpreter_next (ds->is); + return; + } + GNUNET_free (fn); + + /* now sign */ + { + struct TALER_MasterDelWirePS kv = { + .purpose.purpose = htonl (TALER_SIGNATURE_MASTER_DEL_WIRE), + .purpose.size = htonl (sizeof (kv)), + .end_date = GNUNET_TIME_absolute_hton (now), + }; + + TALER_exchange_wire_signature_hash (ds->payto_uri, + &kv.h_wire); + GNUNET_CRYPTO_eddsa_sign (&master_priv.eddsa_priv, + &kv, + &master_sig.eddsa_signature); + } + } + if (GNUNET_OK != + GNUNET_CONFIGURATION_get_value_string (is->cfg, + "exchange", + "BASE_URL", + &exchange_url)) + { + GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, + "exchange", + "BASE_URL"); + TALER_TESTING_interpreter_next (ds->is); + return; + } + ds->dh = TALER_EXCHANGE_management_disable_wire ( + is->ctx, + exchange_url, + ds->payto_uri, + now, + &master_sig, + &wire_del_cb, + ds); + GNUNET_free (exchange_url); + if (NULL == ds->dh) + { + GNUNET_break (0); + TALER_TESTING_interpreter_fail (is); + return; + } +} + + +/** + * Free the state of a "wire_del" CMD, and possibly cancel a + * pending operation thereof. + * + * @param cls closure, must be a `struct WireDelState`. + * @param cmd the command which is being cleaned up. + */ +static void +wire_del_cleanup (void *cls, + const struct TALER_TESTING_Command *cmd) +{ + struct WireDelState *ds = cls; + + if (NULL != ds->dh) + { + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "Command %u (%s) did not complete\n", + ds->is->ip, + cmd->label); + TALER_EXCHANGE_management_disable_wire_cancel (ds->dh); + ds->dh = NULL; + } + GNUNET_free (ds); +} + + +/** + * Offer internal data from a "wire_del" CMD, to other commands. + * + * @param cls closure. + * @param[out] ret result. + * @param trait name of the trait. + * @param index index number of the object to offer. + * + * @return #GNUNET_OK on success. + */ +static int +wire_del_traits (void *cls, + const void **ret, + const char *trait, + unsigned int index) +{ + return GNUNET_NO; +} + + +struct TALER_TESTING_Command +TALER_TESTING_cmd_wire_del (const char *label, + const char *payto_uri, + unsigned int expected_http_status, + bool bad_sig) +{ + struct WireDelState *ds; + + ds = GNUNET_new (struct WireDelState); + ds->expected_response_code = expected_http_status; + ds->bad_sig = bad_sig; + ds->payto_uri = payto_uri; + { + struct TALER_TESTING_Command cmd = { + .cls = ds, + .label = label, + .run = &wire_del_run, + .cleanup = &wire_del_cleanup, + .traits = &wire_del_traits + }; + + return cmd; + } +} + + +/* end of testing_api_cmd_wire_del.c */ |