From f6877449eb6aa994df6cc1a125f983ece1f6ad39 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Fri, 3 Feb 2023 12:57:04 +0100 Subject: [PATCH] implement testing_api_cmd_take_aml_decision.c --- src/exchange/taler-exchange-httpd.c | 3 + src/include/taler_exchange_service.h | 1 + src/include/taler_testing_lib.h | 8 +- src/testing/Makefile.am | 1 + .../testing_api_cmd_check_aml_decision.c | 200 ++++++++++++++++++ src/testing/testing_api_cmd_revoke.c | 2 - .../testing_api_cmd_take_aml_decision.c | 105 ++++++--- 7 files changed, 286 insertions(+), 34 deletions(-) create mode 100644 src/testing/testing_api_cmd_check_aml_decision.c diff --git a/src/exchange/taler-exchange-httpd.c b/src/exchange/taler-exchange-httpd.c index 4bab9afaa..7d83e70c5 100644 --- a/src/exchange/taler-exchange-httpd.c +++ b/src/exchange/taler-exchange-httpd.c @@ -1578,7 +1578,10 @@ handle_mhd_request (void *cls, return MHD_NO; } if (cv > TALER_MHD_REQUEST_BUFFER_MAX) + { + GNUNET_break_op (0); return TALER_MHD_reply_request_too_large (connection); + } } } } diff --git a/src/include/taler_exchange_service.h b/src/include/taler_exchange_service.h index 7c61b7b5e..7b301aec7 100644 --- a/src/include/taler_exchange_service.h +++ b/src/include/taler_exchange_service.h @@ -433,6 +433,7 @@ struct TALER_EXCHANGE_HttpResponse * reply (too big, invalid JSON). */ const json_t *reply; + /** * Set to the human-readable 'hint' that is optionally * provided by the exchange together with errors. NULL diff --git a/src/include/taler_testing_lib.h b/src/include/taler_testing_lib.h index 50563b9b6..a54e05e53 100644 --- a/src/include/taler_testing_lib.h +++ b/src/include/taler_testing_lib.h @@ -2739,7 +2739,9 @@ TALER_TESTING_cmd_set_officer ( * @param ref_operation command that previously created an * h_payto which to make an AML decision about * @param new_threshold new threshold to set - * @param block set to true to block the account + * @param justification justification given for the decision + * @param new_state new AML state for the account + * @param expected_response expected HTTP return status * @return the command */ struct TALER_TESTING_Command @@ -2748,7 +2750,9 @@ TALER_TESTING_cmd_take_aml_decision ( const char *ref_officer, const char *ref_operation, const char *new_threshold, - bool block); + const char *justification, + enum TALER_AmlDecisionState new_state, + unsigned int expected_response); /** diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am index 9b636ad79..f92de42dd 100644 --- a/src/testing/Makefile.am +++ b/src/testing/Makefile.am @@ -103,6 +103,7 @@ libtalertesting_la_SOURCES = \ testing_api_cmd_signal.c \ testing_api_cmd_sleep.c \ testing_api_cmd_stat.c \ + testing_api_cmd_take_aml_decision.c \ testing_api_cmd_transfer_get.c \ testing_api_cmd_wait.c \ testing_api_cmd_wire.c \ diff --git a/src/testing/testing_api_cmd_check_aml_decision.c b/src/testing/testing_api_cmd_check_aml_decision.c new file mode 100644 index 000000000..17e233c73 --- /dev/null +++ b/src/testing/testing_api_cmd_check_aml_decision.c @@ -0,0 +1,200 @@ +/* + This file is part of TALER + Copyright (C) 2023 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 testing/testing_api_cmd_check_aml_decision.c + * @brief command for testing /management/XXX + * @author Christian Grothoff + */ +#include "platform.h" +#include "taler_json_lib.h" +#include +#include "taler_testing_lib.h" +#include "taler_signatures.h" +#include "backoff.h" + + +/** + * State for a "check_aml_decision" CMD. + */ +struct AmlCheckState +{ + + /** + * Auditor enable handle while operation is running. + */ + struct TALER_EXCHANGE_ManagementAuditorEnableHandle *dh; + + /** + * Our interpreter. + */ + struct TALER_TESTING_Interpreter *is; + + /** + * Reference to command to previous set officer + * to update, or NULL. + */ + const char *ref_cmd; + + /** + * Name to use for the officer. + */ + const char *name; + + /** + * Is the officer supposed to be enabled? + */ + bool is_active; + + /** + * Is access supposed to be read-only? + */ + bool read_only; + +}; + + +/** + * Callback to analyze the /management/XXX response, just used to check + * if the response code is acceptable. + * + * @param cls closure. + * @param hr HTTP response details + */ +static void +check_aml_decision_cb (void *cls, + const struct TALER_EXCHANGE_HttpResponse *hr) +{ + struct AmlCheckState *ds = cls; + + ds->dh = NULL; + if (MHD_HTTP_NO_CONTENT != hr->response_code) + { + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "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 +check_aml_decision_run (void *cls, + const struct TALER_TESTING_Command *cmd, + struct TALER_TESTING_Interpreter *is) +{ + struct AmlCheckState *ds = cls; + struct GNUNET_TIME_Timestamp now; + struct TALER_MasterSignatureP master_sig; + + (void) cmd; + now = GNUNET_TIME_timestamp_get (); + ds->is = is; + TALER_exchange_offline_check_aml_decision_sign (&is->auditor_pub, + is->auditor_url, + now, + &is->master_priv, + &master_sig); + ds->dh = TALER_EXCHANGE_management_enable_auditor ( + is->ctx, + is->exchange_url, + &is->auditor_pub, + is->auditor_url, + "test-case auditor", /* human-readable auditor name */ + now, + &master_sig, + &check_aml_decision_cb, + ds); + if (NULL == ds->dh) + { + GNUNET_break (0); + TALER_TESTING_interpreter_fail (is); + return; + } +} + + +/** + * Free the state of a "check_aml_decision" CMD, and possibly cancel a + * pending operation thereof. + * + * @param cls closure, must be a `struct AmlCheckState`. + * @param cmd the command which is being cleaned up. + */ +static void +check_aml_decision_cleanup (void *cls, + const struct TALER_TESTING_Command *cmd) +{ + struct AmlCheckState *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_auditor_cancel (ds->dh); + ds->dh = NULL; + } + GNUNET_free (ds); +} + + +struct TALER_TESTING_Command +TALER_TESTING_cmd_check_aml_decision ( + const char *label, + const char *ref_officer, + const char *ref_operation, + unsigned int expected_http_status) +{ + struct AmlCheckState *ds; + + ds = GNUNET_new (struct AmlCheckState); + ds->ref_cmd = ref_cmd; + ds->name = name; + ds->is_active = is_active; + ds->read_only = read_only; + { + struct TALER_TESTING_Command cmd = { + .cls = ds, + .label = label, + .run = &check_aml_decision_run, + .cleanup = &check_aml_decision_cleanup + }; + + return cmd; + } +} + + +/* end of testing_api_cmd_check_aml_decision.c */ diff --git a/src/testing/testing_api_cmd_revoke.c b/src/testing/testing_api_cmd_revoke.c index 4522dede1..f734be1a4 100644 --- a/src/testing/testing_api_cmd_revoke.c +++ b/src/testing/testing_api_cmd_revoke.c @@ -141,14 +141,12 @@ revoke_run (void *cls, /* Get denom pub from trait */ coin_cmd = TALER_TESTING_interpreter_lookup_command (is, rs->coin_reference); - if (NULL == coin_cmd) { GNUNET_break (0); TALER_TESTING_interpreter_fail (is); return; } - GNUNET_assert (GNUNET_OK == TALER_TESTING_get_trait_denom_pub (coin_cmd, 0, diff --git a/src/testing/testing_api_cmd_take_aml_decision.c b/src/testing/testing_api_cmd_take_aml_decision.c index f7c251dd1..2fc8a664f 100644 --- a/src/testing/testing_api_cmd_take_aml_decision.c +++ b/src/testing/testing_api_cmd_take_aml_decision.c @@ -18,7 +18,7 @@ */ /** * @file testing/testing_api_cmd_take_aml_decision.c - * @brief command for testing /management/XXX + * @brief command for testing /aml/$OFFICER_PUB/decision * @author Christian Grothoff */ #include "platform.h" @@ -38,7 +38,7 @@ struct AmlDecisionState /** * Auditor enable handle while operation is running. */ - struct TALER_EXCHANGE_ManagementAuditorEnableHandle *dh; + struct TALER_EXCHANGE_AddAmlDecision *dh; /** * Our interpreter. @@ -46,26 +46,36 @@ struct AmlDecisionState struct TALER_TESTING_Interpreter *is; /** - * Reference to command to previous set officer - * to update, or NULL. + * Reference to command to previous set officer command that gives + * us an officer_priv trait. */ - const char *ref_cmd; + const char *officer_ref_cmd; /** - * Name to use for the officer. + * Reference to command to previous AML-triggering event that gives + * us a payto-hash trait. */ - const char *name; + const char *account_ref_cmd; /** - * Is the officer supposed to be enabled? + * New AML state to use. */ - bool is_active; + enum TALER_AmlDecisionState new_state; /** - * Is access supposed to be read-only? + * Justification given. */ - bool read_only; + const char *justification; + /** + * Threshold transaction amount. + */ + const char *new_threshold; + + /** + * Expected response code. + */ + unsigned int expected_response; }; @@ -83,7 +93,7 @@ take_aml_decision_cb (void *cls, struct AmlDecisionState *ds = cls; ds->dh = NULL; - if (MHD_HTTP_NO_CONTENT != hr->response_code) + if (ds->expected_response != hr->http_status) { GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Unexpected response code %u to command %s in %s:%u\n", @@ -115,24 +125,56 @@ take_aml_decision_run (void *cls, { struct AmlDecisionState *ds = cls; struct GNUNET_TIME_Timestamp now; - struct TALER_MasterSignatureP master_sig; + struct TALER_Amount threshold; + const struct TALER_PaytoHashP *h_payto; + const struct TALER_AmlOfficerPrivateKeyP *officer_priv; + const struct TALER_TESTING_Command *ref; (void) cmd; + if (GNUNET_OK != + TALER_string_to_amount (ds->new_threshold, + &threshold)) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Failed to parse amount `%s' at %s\n", + ds->new_threshold, + cmd->label); + GNUNET_assert (0); + } now = GNUNET_TIME_timestamp_get (); ds->is = is; - TALER_exchange_offline_take_aml_decision_sign (&is->auditor_pub, - is->auditor_url, - now, - &is->master_priv, - &master_sig); - ds->dh = TALER_EXCHANGE_management_enable_auditor ( + ref = TALER_TESTING_interpreter_lookup_command (is, + ds->account_ref_cmd); + if (NULL == ref) + { + GNUNET_break (0); + TALER_TESTING_interpreter_fail (is); + return; + } + GNUNET_assert (GNUNET_OK == + TALER_TESTING_get_trait_h_payto (ref, + &h_payto)); + ref = TALER_TESTING_interpreter_lookup_command (is, + ds->officer_ref_cmd); + if (NULL == ref) + { + GNUNET_break (0); + TALER_TESTING_interpreter_fail (is); + return; + } + GNUNET_assert (GNUNET_OK == + TALER_TESTING_get_trait_officer_priv (ref, + &officer_priv)); + + ds->dh = TALER_EXCHANGE_add_aml_decision ( is->ctx, is->exchange_url, - &is->auditor_pub, - is->auditor_url, - "test-case auditor", /* human-readable auditor name */ + ds->justification, now, - &master_sig, + &threshold, + h_payto, + ds->new_state, + officer_priv, &take_aml_decision_cb, ds); if (NULL == ds->dh) @@ -163,7 +205,7 @@ take_aml_decision_cleanup (void *cls, "Command %u (%s) did not complete\n", ds->is->ip, cmd->label); - TALER_EXCHANGE_management_enable_auditor_cancel (ds->dh); + TALER_EXCHANGE_add_aml_decision_cancel (ds->dh); ds->dh = NULL; } GNUNET_free (ds); @@ -176,22 +218,25 @@ TALER_TESTING_cmd_take_aml_decision ( const char *ref_officer, const char *ref_operation, const char *new_threshold, - bool block) + const char *justification, + enum TALER_AmlDecisionState new_state, + unsigned int expected_response) { struct AmlDecisionState *ds; ds = GNUNET_new (struct AmlDecisionState); - ds->ref_cmd = ref_cmd; - ds->name = name; - ds->is_active = is_active; - ds->read_only = read_only; + ds->officer_ref_cmd = ref_officer; + ds->account_ref_cmd = ref_operation; + ds->new_threshold = new_threshold; + ds->new_state = new_state; + ds->justification = justification; + ds->expected_response = expected_response; { struct TALER_TESTING_Command cmd = { .cls = ds, .label = label, .run = &take_aml_decision_run, .cleanup = &take_aml_decision_cleanup - // FIXME: expose trait with officer-priv here! }; return cmd;