taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cmd to del auditor

Browse Source
This commit is contained in:
Christian Grothoff 2020-11-26 22:54:33 +01:00
parent 1c1d4d9974
commit 98f5960411
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
6 changed files with 342 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/taler_exchange_service.h
View File

@ -2398,7 +2398,6 @@ struct TALER_EXCHANGE_ManagementAuditorDisableHandle;
* @param ctx the context
* @param url HTTP base URL for the exchange
* @param auditor_pub the public signing key of the auditor
* @param auditor_url base URL of the auditor
* @param validity_end when was this decided?
* @param master_sig signature affirming the auditor addition
* @param cb function to call with the exchange's result
@ -2410,7 +2409,6 @@ TALER_EXCHANGE_management_disable_auditor (
struct GNUNET_CURL_Context *ctx,
const char *url,
const struct TALER_AuditorPublicKeyP *auditor_pub,
const char *auditor_url,
struct GNUNET_TIME_Absolute validity_end,
const struct TALER_MasterSignatureP *master_sig,
TALER_EXCHANGE_ManagementAuditorDisableCallback cb,

6
src/include/taler_testing_lib.h
View File

@ -2041,10 +2041,14 @@ TALER_TESTING_cmd_auditor_add (const char *label,
* "[auditor]" section in the configuration file.
*
* @param label command label.
* @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_auditor_del (const char *label);
TALER_TESTING_cmd_auditor_del (const char *label,
unsigned int expected_http_status,
bool bad_sig);
/**

1
src/lib/exchange_api_management_auditor_disable.c
View File

@ -128,7 +128,6 @@ TALER_EXCHANGE_management_disable_auditor (
struct GNUNET_CURL_Context *ctx,
const char *url,
const struct TALER_AuditorPublicKeyP *auditor_pub,
const char *auditor_url,
struct GNUNET_TIME_Absolute validity_end,
const struct TALER_MasterSignatureP *master_sig,
TALER_EXCHANGE_ManagementAuditorDisableCallback cb,

1
src/testing/Makefile.am
View File

@ -36,6 +36,7 @@ libtalertesting_la_LDFLAGS = \
-no-undefined
libtalertesting_la_SOURCES = \
testing_api_cmd_auditor_add.c \
testing_api_cmd_auditor_del.c \
testing_api_cmd_auditor_deposit_confirmation.c \
testing_api_cmd_auditor_exchanges.c \
testing_api_cmd_auditor_exec_auditor.c \

35
src/testing/testing_api_cmd_auditor_add.c
View File

@ -1,6 +1,6 @@
/*
This file is part of TALER
Copyright (C) 2018-2020 Taler Systems SA
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
@ -19,7 +19,7 @@
/**
* @file testing/testing_api_cmd_auditor_add.c
* @brief command for testing /auditor_add.
* @author Marcello Stanisci
* @author Christian Grothoff
*/
#include "platform.h"
#include "taler_json_lib.h"
@ -112,6 +112,18 @@ auditor_add_run (void *cls,
now = GNUNET_TIME_absolute_get ();
(void) GNUNET_TIME_round_abs (&now);
ds->is = is;
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_filename (is->cfg,
"auditor",
"BASE_URL",
&auditor_url))
{
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
"auditor",
"BASE_URL");
TALER_TESTING_interpreter_next (ds->is);
return;
}
if (ds->bad_sig)
{
memset (&master_sig,
@ -134,6 +146,7 @@ auditor_add_run (void *cls,
"exchange-offline",
"MASTER_PRIV_FILE");
TALER_TESTING_interpreter_next (ds->is);
GNUNET_free (auditor_url);
return;
}
if (GNUNET_SYSERR ==
@ -144,6 +157,7 @@ auditor_add_run (void *cls,
fn);
GNUNET_free (fn);
TALER_TESTING_interpreter_next (ds->is);
GNUNET_free (auditor_url);
return;
}
if (GNUNET_OK !=
@ -156,11 +170,11 @@ auditor_add_run (void *cls,
fn);
GNUNET_free (fn);
TALER_TESTING_interpreter_next (ds->is);
GNUNET_free (auditor_url);
return;
}
GNUNET_free (fn);
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_filename (is->cfg,
"auditor",
@ -171,6 +185,7 @@ auditor_add_run (void *cls,
"auditor",
"AUDITOR_PRIV_FILE");
TALER_TESTING_interpreter_next (ds->is);
GNUNET_free (auditor_url);
return;
}
if (GNUNET_SYSERR ==
@ -181,6 +196,7 @@ auditor_add_run (void *cls,
fn);
GNUNET_free (fn);
TALER_TESTING_interpreter_next (ds->is);
GNUNET_free (auditor_url);
return;
}
if (GNUNET_OK !=
@ -193,6 +209,7 @@ auditor_add_run (void *cls,
fn);
GNUNET_free (fn);
TALER_TESTING_interpreter_next (ds->is);
GNUNET_free (auditor_url);
return;
}
GNUNET_free (fn);
@ -217,18 +234,6 @@ auditor_add_run (void *cls,
&master_sig.eddsa_signature);
}
}
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_filename (is->cfg,
"auditor",
"BASE_URL",
&auditor_url))
{
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
"auditor",
"BASE_URL");
TALER_TESTING_interpreter_next (ds->is);
return;
}
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_string (is->cfg,
"exchange",

316
src/testing/testing_api_cmd_auditor_del.c Normal file
View File

@ -0,0 +1,316 @@
/*
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_auditor_del.c
* @brief command for testing /management/auditor/disable.
* @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 "auditor_del" CMD.
*/
struct AuditorDelState
{
/**
* Auditor enable handle while operation is running.
*/
struct TALER_EXCHANGE_ManagementAuditorDisableHandle *dh;
/**
* Our interpreter.
*/
struct TALER_TESTING_Interpreter *is;
/**
* 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/auditors response, just used to check
* if the response code is acceptable.
*
* @param cls closure.
* @param hr HTTP response details
*/
static void
auditor_del_cb (void *cls,
const struct TALER_EXCHANGE_HttpResponse *hr)
{
struct AuditorDelState *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
auditor_del_run (void *cls,
const struct TALER_TESTING_Command *cmd,
struct TALER_TESTING_Interpreter *is)
{
struct AuditorDelState *ds = cls;
struct TALER_AuditorPublicKeyP auditor_pub;
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;
struct TALER_AuditorPrivateKeyP auditor_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);
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_filename (is->cfg,
"auditor",
"AUDITOR_PRIV_FILE",
&fn))
{
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
"auditor",
"AUDITOR_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 auditor 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,
&auditor_priv.eddsa_priv))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Could not load auditor private key from `%s'\n",
fn);
GNUNET_free (fn);
TALER_TESTING_interpreter_next (ds->is);
return;
}
GNUNET_free (fn);
GNUNET_CRYPTO_eddsa_key_get_public (&auditor_priv.eddsa_priv,
&auditor_pub.eddsa_pub);
/* now sign */
{
struct TALER_ExchangeDelAuditorPS kv = {
.purpose.purpose = htonl (TALER_SIGNATURE_MASTER_DEL_AUDITOR),
.purpose.size = htonl (sizeof (kv)),
.end_date = GNUNET_TIME_absolute_hton (now),
.auditor_pub = auditor_pub,
};
/* Finally sign ... */
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_auditor (
is->ctx,
exchange_url,
&auditor_pub,
now,
&master_sig,
&auditor_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 "auditor_del" CMD, and possibly cancel a
* pending operation thereof.
*
* @param cls closure, must be a `struct AuditorDelState`.
* @param cmd the command which is being cleaned up.
*/
static void
auditor_del_cleanup (void *cls,
const struct TALER_TESTING_Command *cmd)
{
struct AuditorDelState *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_auditor_cancel (ds->dh);
ds->dh = NULL;
}
GNUNET_free (ds);
}
/**
* Offer internal data from a "auditor_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
auditor_del_traits (void *cls,
const void **ret,
const char *trait,
unsigned int index)
{
return GNUNET_NO;
}
struct TALER_TESTING_Command
TALER_TESTING_cmd_auditor_del (const char *label,
unsigned int expected_http_status,
bool bad_sig)
{
struct AuditorDelState *ds;
ds = GNUNET_new (struct AuditorDelState);
ds->expected_response_code = expected_http_status;
ds->bad_sig = bad_sig;
{
struct TALER_TESTING_Command cmd = {
.cls = ds,
.label = label,
.run = &auditor_del_run,
.cleanup = &auditor_del_cleanup,
.traits = &auditor_del_traits
};
return cmd;
}
}
/* end of testing_api_cmd_auditor_del.c */