2018-01-21 15:39:48 +01:00
|
|
|
/*
|
|
|
|
This file is part of TALER
|
2020-01-11 15:19:56 +01:00
|
|
|
Copyright (C) 2018-2020 Taler Systems SA
|
2018-01-21 15:39:48 +01:00
|
|
|
|
2018-01-23 10:28:24 +01:00
|
|
|
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
|
2018-01-21 15:39:48 +01:00
|
|
|
<http://www.gnu.org/licenses/>
|
|
|
|
*/
|
|
|
|
/**
|
2020-01-15 14:57:58 +01:00
|
|
|
* @file lib/testing_api_cmd_admin_add_incoming.c
|
2020-01-11 23:06:10 +01:00
|
|
|
* @brief implementation of a bank /admin/add-incoming command
|
2018-01-21 15:39:48 +01:00
|
|
|
* @author Christian Grothoff
|
|
|
|
* @author Marcello Stanisci
|
|
|
|
*/
|
|
|
|
#include "platform.h"
|
2020-01-11 23:06:10 +01:00
|
|
|
#include "backoff.h"
|
2018-01-21 15:39:48 +01:00
|
|
|
#include "taler_json_lib.h"
|
|
|
|
#include <gnunet/gnunet_curl_lib.h>
|
|
|
|
#include "taler_bank_service.h"
|
|
|
|
#include "taler_fakebank_lib.h"
|
|
|
|
#include "taler_signatures.h"
|
|
|
|
#include "taler_testing_lib.h"
|
2020-01-11 23:06:10 +01:00
|
|
|
|
2018-01-21 15:39:48 +01:00
|
|
|
|
|
|
|
/**
|
2018-05-26 10:51:37 +02:00
|
|
|
* State for a "fakebank transfer" CMD.
|
2018-01-21 15:39:48 +01:00
|
|
|
*/
|
2020-01-11 23:06:10 +01:00
|
|
|
struct AdminAddIncomingState
|
2018-01-21 15:39:48 +01:00
|
|
|
{
|
|
|
|
|
|
|
|
/**
|
2018-05-28 13:05:05 +02:00
|
|
|
* Label of any command that can trait-offer a reserve priv.
|
2018-01-21 15:39:48 +01:00
|
|
|
*/
|
|
|
|
const char *reserve_reference;
|
|
|
|
|
|
|
|
/**
|
2018-05-28 13:05:05 +02:00
|
|
|
* Wire transfer amount.
|
2018-01-21 15:39:48 +01:00
|
|
|
*/
|
|
|
|
struct TALER_Amount amount;
|
|
|
|
|
|
|
|
/**
|
2020-01-12 01:03:08 +01:00
|
|
|
* Base URL of the credited account.
|
2018-01-21 15:39:48 +01:00
|
|
|
*/
|
2020-01-12 01:03:08 +01:00
|
|
|
const char *exchange_credit_url;
|
2018-01-21 15:39:48 +01:00
|
|
|
|
2018-01-21 19:57:09 +01:00
|
|
|
/**
|
2020-01-12 01:03:08 +01:00
|
|
|
* Money sender account URL.
|
2018-01-21 19:57:09 +01:00
|
|
|
*/
|
2020-01-12 01:03:08 +01:00
|
|
|
const char *payto_debit_account;
|
2018-01-21 15:39:48 +01:00
|
|
|
|
2020-01-15 14:57:58 +01:00
|
|
|
/**
|
|
|
|
* Money sender account URL.
|
|
|
|
*/
|
|
|
|
char *payto_credit_account;
|
|
|
|
|
2018-01-21 15:39:48 +01:00
|
|
|
/**
|
|
|
|
* Username to use for authentication.
|
|
|
|
*/
|
2020-01-11 23:06:10 +01:00
|
|
|
struct TALER_BANK_AuthenticationData auth;
|
2018-01-21 15:39:48 +01:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Set (by the interpreter) to the reserve's private key
|
2018-05-28 13:05:05 +02:00
|
|
|
* we used to make a wire transfer subject line with.
|
2018-01-21 15:39:48 +01:00
|
|
|
*/
|
|
|
|
struct TALER_ReservePrivateKeyP reserve_priv;
|
|
|
|
|
2020-01-11 15:19:56 +01:00
|
|
|
/**
|
|
|
|
* Reserve public key matching @e reserve_priv.
|
|
|
|
*/
|
|
|
|
struct TALER_ReservePublicKeyP reserve_pub;
|
|
|
|
|
2018-01-21 15:39:48 +01:00
|
|
|
/**
|
2018-05-26 10:51:37 +02:00
|
|
|
* Handle to the pending request at the fakebank.
|
2018-01-21 15:39:48 +01:00
|
|
|
*/
|
|
|
|
struct TALER_BANK_AdminAddIncomingHandle *aih;
|
|
|
|
|
|
|
|
/**
|
2018-05-28 13:05:05 +02:00
|
|
|
* Interpreter state.
|
2018-01-21 15:39:48 +01:00
|
|
|
*/
|
|
|
|
struct TALER_TESTING_Interpreter *is;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Set to the wire transfer's unique ID.
|
|
|
|
*/
|
|
|
|
uint64_t serial_id;
|
|
|
|
|
2019-04-08 23:53:52 +02:00
|
|
|
/**
|
|
|
|
* Timestamp of the transaction (as returned from the bank).
|
|
|
|
*/
|
|
|
|
struct GNUNET_TIME_Absolute timestamp;
|
|
|
|
|
2018-02-21 12:23:45 +01:00
|
|
|
/**
|
|
|
|
* Merchant instance. Sometimes used to get the tip reserve
|
|
|
|
* private key by reading the appropriate config section.
|
|
|
|
*/
|
|
|
|
const char *instance;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Configuration filename. Used to get the tip reserve key
|
2018-05-28 13:05:05 +02:00
|
|
|
* filename (used to obtain a public key to write in the
|
|
|
|
* transfer subject).
|
2018-02-21 12:23:45 +01:00
|
|
|
*/
|
|
|
|
const char *config_filename;
|
2018-08-19 14:19:17 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Task scheduled to try later.
|
|
|
|
*/
|
|
|
|
struct GNUNET_SCHEDULER_Task *retry_task;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* How long do we wait until we retry?
|
|
|
|
*/
|
|
|
|
struct GNUNET_TIME_Relative backoff;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Was this command modified via
|
2020-01-12 01:03:08 +01:00
|
|
|
* #TALER_TESTING_cmd_admin_add_incoming_with_retry to
|
2018-08-19 14:19:17 +02:00
|
|
|
* enable retries?
|
|
|
|
*/
|
|
|
|
int do_retry;
|
2018-01-21 15:39:48 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
|
2018-08-19 14:19:17 +02:00
|
|
|
/**
|
|
|
|
* Run the "fakebank transfer" CMD.
|
|
|
|
*
|
|
|
|
* @param cls closure.
|
|
|
|
* @param cmd CMD being run.
|
|
|
|
* @param is interpreter state.
|
|
|
|
*/
|
|
|
|
static void
|
2020-01-12 01:03:08 +01:00
|
|
|
admin_add_incoming_run (void *cls,
|
|
|
|
const struct TALER_TESTING_Command *cmd,
|
|
|
|
struct TALER_TESTING_Interpreter *is);
|
2018-08-19 14:19:17 +02:00
|
|
|
|
|
|
|
|
|
|
|
/**
|
2020-01-12 01:03:08 +01:00
|
|
|
* Task scheduled to re-try #admin_add_incoming_run.
|
2018-08-19 14:19:17 +02:00
|
|
|
*
|
2020-01-11 23:06:10 +01:00
|
|
|
* @param cls a `struct AdminAddIncomingState`
|
2018-08-19 14:19:17 +02:00
|
|
|
*/
|
|
|
|
static void
|
|
|
|
do_retry (void *cls)
|
|
|
|
{
|
2020-01-11 23:06:10 +01:00
|
|
|
struct AdminAddIncomingState *fts = cls;
|
2018-08-19 14:19:17 +02:00
|
|
|
|
|
|
|
fts->retry_task = NULL;
|
2020-01-12 01:03:08 +01:00
|
|
|
admin_add_incoming_run (fts,
|
|
|
|
NULL,
|
|
|
|
fts->is);
|
2018-08-19 14:19:17 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2018-01-21 15:39:48 +01:00
|
|
|
/**
|
2018-05-28 13:05:05 +02:00
|
|
|
* This callback will process the fakebank response to the wire
|
|
|
|
* transfer. It just checks whether the HTTP response code is
|
|
|
|
* acceptable.
|
2018-01-21 15:39:48 +01:00
|
|
|
*
|
|
|
|
* @param cls closure with the interpreter state
|
2018-01-23 10:28:24 +01:00
|
|
|
* @param http_status HTTP response code, #MHD_HTTP_OK (200) for
|
|
|
|
* successful status request; 0 if the exchange's reply is
|
|
|
|
* bogus (fails to follow the protocol)
|
2018-01-21 15:39:48 +01:00
|
|
|
* @param ec taler-specific error code, #TALER_EC_NONE on success
|
|
|
|
* @param serial_id unique ID of the wire transfer
|
2019-04-08 23:53:52 +02:00
|
|
|
* @param timestamp time stamp of the transaction made.
|
2020-01-11 15:19:56 +01:00
|
|
|
* @param json raw response
|
2018-01-21 15:39:48 +01:00
|
|
|
*/
|
|
|
|
static void
|
2020-01-11 15:19:56 +01:00
|
|
|
confirmation_cb (void *cls,
|
2018-01-21 15:39:48 +01:00
|
|
|
unsigned int http_status,
|
2019-04-22 21:35:19 +02:00
|
|
|
enum TALER_ErrorCode ec,
|
|
|
|
uint64_t serial_id,
|
2019-04-08 23:53:52 +02:00
|
|
|
struct GNUNET_TIME_Absolute timestamp,
|
2020-01-11 15:19:56 +01:00
|
|
|
const json_t *json)
|
2018-01-21 15:39:48 +01:00
|
|
|
{
|
2020-01-11 23:06:10 +01:00
|
|
|
struct AdminAddIncomingState *fts = cls;
|
2018-01-21 15:39:48 +01:00
|
|
|
struct TALER_TESTING_Interpreter *is = fts->is;
|
|
|
|
|
|
|
|
fts->aih = NULL;
|
|
|
|
if (MHD_HTTP_OK != http_status)
|
|
|
|
{
|
2018-08-19 14:19:17 +02:00
|
|
|
if (GNUNET_YES == fts->do_retry)
|
|
|
|
{
|
|
|
|
if ( (0 == http_status) ||
|
|
|
|
(TALER_EC_DB_COMMIT_FAILED_ON_RETRY == ec) ||
|
2019-08-25 16:18:24 +02:00
|
|
|
(MHD_HTTP_INTERNAL_SERVER_ERROR == http_status) )
|
2018-08-19 14:19:17 +02:00
|
|
|
{
|
2019-04-08 23:53:52 +02:00
|
|
|
GNUNET_log
|
|
|
|
(GNUNET_ERROR_TYPE_INFO,
|
2019-08-25 16:18:24 +02:00
|
|
|
"Retrying fakebank transfer failed with %u/%d\n",
|
|
|
|
http_status,
|
|
|
|
(int) ec);
|
|
|
|
/* on DB conflicts, do not use backoff */
|
|
|
|
if (TALER_EC_DB_COMMIT_FAILED_ON_RETRY == ec)
|
|
|
|
fts->backoff = GNUNET_TIME_UNIT_ZERO;
|
|
|
|
else
|
|
|
|
fts->backoff = EXCHANGE_LIB_BACKOFF (fts->backoff);
|
|
|
|
fts->retry_task = GNUNET_SCHEDULER_add_delayed
|
|
|
|
(fts->backoff,
|
|
|
|
&do_retry,
|
|
|
|
fts);
|
|
|
|
return;
|
2018-08-19 14:19:17 +02:00
|
|
|
}
|
|
|
|
}
|
2018-01-21 15:39:48 +01:00
|
|
|
GNUNET_break (0);
|
2018-08-09 20:25:30 +02:00
|
|
|
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
|
|
|
|
"Fakebank returned HTTP status %u/%d\n",
|
|
|
|
http_status,
|
|
|
|
(int) ec);
|
2018-01-21 15:39:48 +01:00
|
|
|
TALER_TESTING_interpreter_fail (is);
|
|
|
|
return;
|
|
|
|
}
|
2019-04-08 23:53:52 +02:00
|
|
|
|
|
|
|
fts->serial_id = serial_id;
|
|
|
|
fts->timestamp = timestamp;
|
2018-01-21 15:39:48 +01:00
|
|
|
TALER_TESTING_interpreter_next (is);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
2018-05-28 13:05:05 +02:00
|
|
|
* Run the "fakebank transfer" CMD.
|
2018-01-21 15:39:48 +01:00
|
|
|
*
|
2018-05-28 13:05:05 +02:00
|
|
|
* @param cls closure.
|
|
|
|
* @param cmd CMD being run.
|
|
|
|
* @param is interpreter state.
|
2018-01-21 15:39:48 +01:00
|
|
|
*/
|
|
|
|
static void
|
2020-01-12 01:03:08 +01:00
|
|
|
admin_add_incoming_run (void *cls,
|
|
|
|
const struct TALER_TESTING_Command *cmd,
|
|
|
|
struct TALER_TESTING_Interpreter *is)
|
2018-01-21 15:39:48 +01:00
|
|
|
{
|
2020-01-11 23:06:10 +01:00
|
|
|
struct AdminAddIncomingState *fts = cls;
|
2018-01-21 15:39:48 +01:00
|
|
|
|
2020-01-11 15:19:56 +01:00
|
|
|
/* Use reserve public key as subject */
|
|
|
|
if (NULL != fts->reserve_reference)
|
2018-01-21 15:39:48 +01:00
|
|
|
{
|
2020-01-11 15:19:56 +01:00
|
|
|
const struct TALER_TESTING_Command *ref;
|
|
|
|
const struct TALER_ReservePrivateKeyP *reserve_priv;
|
|
|
|
|
|
|
|
ref = TALER_TESTING_interpreter_lookup_command
|
|
|
|
(is, fts->reserve_reference);
|
|
|
|
if (NULL == ref)
|
|
|
|
{
|
|
|
|
GNUNET_break (0);
|
|
|
|
TALER_TESTING_interpreter_fail (is);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (GNUNET_OK !=
|
|
|
|
TALER_TESTING_get_trait_reserve_priv (ref,
|
|
|
|
0,
|
|
|
|
&reserve_priv))
|
|
|
|
{
|
|
|
|
GNUNET_break (0);
|
|
|
|
TALER_TESTING_interpreter_fail (is);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
fts->reserve_priv.eddsa_priv = reserve_priv->eddsa_priv;
|
2018-01-21 15:39:48 +01:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2020-01-11 15:19:56 +01:00
|
|
|
if (NULL != fts->instance)
|
2018-01-21 15:39:48 +01:00
|
|
|
{
|
2020-01-11 15:19:56 +01:00
|
|
|
char *section;
|
|
|
|
char *keys;
|
|
|
|
struct GNUNET_CRYPTO_EddsaPrivateKey *priv;
|
|
|
|
struct GNUNET_CONFIGURATION_Handle *cfg;
|
2018-01-21 16:01:08 +01:00
|
|
|
|
2020-01-11 15:19:56 +01:00
|
|
|
GNUNET_assert (NULL != fts->config_filename);
|
|
|
|
cfg = GNUNET_CONFIGURATION_create ();
|
|
|
|
if (GNUNET_OK !=
|
|
|
|
GNUNET_CONFIGURATION_load (cfg,
|
|
|
|
fts->config_filename))
|
2018-01-21 16:01:08 +01:00
|
|
|
{
|
|
|
|
GNUNET_break (0);
|
|
|
|
TALER_TESTING_interpreter_fail (is);
|
|
|
|
return;
|
|
|
|
}
|
2020-01-11 15:19:56 +01:00
|
|
|
|
|
|
|
GNUNET_asprintf (§ion,
|
|
|
|
"instance-%s",
|
|
|
|
fts->instance);
|
2018-01-21 16:01:08 +01:00
|
|
|
if (GNUNET_OK !=
|
2020-01-11 15:19:56 +01:00
|
|
|
GNUNET_CONFIGURATION_get_value_filename
|
|
|
|
(cfg,
|
|
|
|
section,
|
|
|
|
"TIP_RESERVE_PRIV_FILENAME",
|
|
|
|
&keys))
|
2018-01-21 16:01:08 +01:00
|
|
|
{
|
2020-01-11 15:19:56 +01:00
|
|
|
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
|
|
|
|
"Configuration fails to specify reserve"
|
|
|
|
" private key filename in section %s\n",
|
|
|
|
section);
|
|
|
|
GNUNET_free (section);
|
2018-01-21 16:01:08 +01:00
|
|
|
TALER_TESTING_interpreter_fail (is);
|
|
|
|
return;
|
|
|
|
}
|
2020-01-11 15:19:56 +01:00
|
|
|
priv = GNUNET_CRYPTO_eddsa_key_create_from_file (keys);
|
|
|
|
GNUNET_free (keys);
|
|
|
|
if (NULL == priv)
|
2018-02-21 12:23:45 +01:00
|
|
|
{
|
2020-01-11 15:19:56 +01:00
|
|
|
GNUNET_log_config_invalid
|
|
|
|
(GNUNET_ERROR_TYPE_ERROR,
|
|
|
|
section,
|
|
|
|
"TIP_RESERVE_PRIV_FILENAME",
|
|
|
|
"Failed to read private key");
|
2019-06-18 14:54:26 +02:00
|
|
|
GNUNET_free (section);
|
2020-01-11 15:19:56 +01:00
|
|
|
TALER_TESTING_interpreter_fail (is);
|
|
|
|
return;
|
2018-02-21 12:23:45 +01:00
|
|
|
}
|
2020-01-11 15:19:56 +01:00
|
|
|
fts->reserve_priv.eddsa_priv = *priv;
|
|
|
|
GNUNET_free (section);
|
|
|
|
GNUNET_free (priv);
|
|
|
|
GNUNET_CONFIGURATION_destroy (cfg);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* No referenced reserve, no instance to take priv
|
|
|
|
* from, no explicit subject given: create new key! */
|
|
|
|
struct GNUNET_CRYPTO_EddsaPrivateKey *priv;
|
2018-01-21 15:39:48 +01:00
|
|
|
|
2020-01-11 15:19:56 +01:00
|
|
|
priv = GNUNET_CRYPTO_eddsa_key_create ();
|
|
|
|
fts->reserve_priv.eddsa_priv = *priv;
|
|
|
|
GNUNET_free (priv);
|
2018-01-21 15:39:48 +01:00
|
|
|
}
|
|
|
|
}
|
2020-01-11 15:19:56 +01:00
|
|
|
GNUNET_CRYPTO_eddsa_key_get_public (&fts->reserve_priv.eddsa_priv,
|
|
|
|
&fts->reserve_pub.eddsa_pub);
|
2018-01-21 15:39:48 +01:00
|
|
|
fts->is = is;
|
2020-01-11 23:06:10 +01:00
|
|
|
fts->aih
|
|
|
|
= TALER_BANK_admin_add_incoming
|
|
|
|
(TALER_TESTING_interpreter_get_context (is),
|
2020-01-12 01:03:08 +01:00
|
|
|
fts->exchange_credit_url,
|
2020-01-11 23:06:10 +01:00
|
|
|
&fts->auth,
|
|
|
|
&fts->reserve_pub,
|
|
|
|
&fts->amount,
|
2020-01-12 01:03:08 +01:00
|
|
|
fts->payto_debit_account,
|
2020-01-11 23:06:10 +01:00
|
|
|
&confirmation_cb,
|
|
|
|
fts);
|
2018-01-21 15:39:48 +01:00
|
|
|
if (NULL == fts->aih)
|
|
|
|
{
|
|
|
|
GNUNET_break (0);
|
|
|
|
TALER_TESTING_interpreter_fail (is);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
2020-01-12 01:03:08 +01:00
|
|
|
* Free the state of a "/admin/add-incoming" CMD, and possibly
|
2018-05-28 13:05:05 +02:00
|
|
|
* cancel a pending operation thereof.
|
2018-01-21 15:39:48 +01:00
|
|
|
*
|
|
|
|
* @param cls closure
|
2018-05-28 13:05:05 +02:00
|
|
|
* @param cmd current CMD being cleaned up.
|
2018-01-21 15:39:48 +01:00
|
|
|
*/
|
|
|
|
static void
|
2020-01-12 01:03:08 +01:00
|
|
|
admin_add_incoming_cleanup (void *cls,
|
|
|
|
const struct TALER_TESTING_Command *cmd)
|
2018-01-21 15:39:48 +01:00
|
|
|
{
|
2020-01-11 23:06:10 +01:00
|
|
|
struct AdminAddIncomingState *fts = cls;
|
2018-01-21 15:39:48 +01:00
|
|
|
|
|
|
|
if (NULL != fts->aih)
|
|
|
|
{
|
|
|
|
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
|
|
|
|
"Command %s did not complete\n",
|
|
|
|
cmd->label);
|
|
|
|
TALER_BANK_admin_add_incoming_cancel (fts->aih);
|
2020-01-11 15:19:56 +01:00
|
|
|
fts->aih = NULL;
|
2018-01-21 15:39:48 +01:00
|
|
|
}
|
2018-08-19 14:19:17 +02:00
|
|
|
if (NULL != fts->retry_task)
|
|
|
|
{
|
|
|
|
GNUNET_SCHEDULER_cancel (fts->retry_task);
|
|
|
|
fts->retry_task = NULL;
|
|
|
|
}
|
2020-01-15 14:57:58 +01:00
|
|
|
GNUNET_free (fts->payto_credit_account);
|
2018-01-21 15:39:48 +01:00
|
|
|
GNUNET_free (fts);
|
|
|
|
}
|
|
|
|
|
2019-10-31 12:59:50 +01:00
|
|
|
|
2018-01-21 15:39:48 +01:00
|
|
|
/**
|
2020-01-12 01:03:08 +01:00
|
|
|
* Offer internal data from a "/admin/add-incoming" CMD to other
|
2018-01-21 15:39:48 +01:00
|
|
|
* commands.
|
|
|
|
*
|
2018-05-28 13:05:05 +02:00
|
|
|
* @param cls closure.
|
2018-05-29 12:43:34 +02:00
|
|
|
* @param ret[out] result
|
2018-05-28 13:05:05 +02:00
|
|
|
* @param trait name of the trait.
|
2018-05-29 12:43:34 +02:00
|
|
|
* @param index index number of the object to offer.
|
2018-05-28 13:05:05 +02:00
|
|
|
* @return #GNUNET_OK on success.
|
2018-01-21 15:39:48 +01:00
|
|
|
*/
|
|
|
|
static int
|
2020-01-12 01:03:08 +01:00
|
|
|
admin_add_incoming_traits (void *cls,
|
|
|
|
const void **ret,
|
|
|
|
const char *trait,
|
|
|
|
unsigned int index)
|
2018-01-21 15:39:48 +01:00
|
|
|
{
|
2020-01-11 23:06:10 +01:00
|
|
|
struct AdminAddIncomingState *fts = cls;
|
2020-01-11 15:19:56 +01:00
|
|
|
struct TALER_TESTING_Trait traits[] = {
|
2020-01-15 22:29:09 +01:00
|
|
|
TALER_TESTING_make_trait_bank_row (&fts->serial_id),
|
2020-01-15 13:22:28 +01:00
|
|
|
TALER_TESTING_make_trait_payto (TALER_TESTING_PT_DEBIT,
|
|
|
|
fts->payto_debit_account),
|
|
|
|
TALER_TESTING_make_trait_payto (TALER_TESTING_PT_CREDIT,
|
2020-01-15 14:57:58 +01:00
|
|
|
fts->payto_credit_account),
|
|
|
|
TALER_TESTING_make_trait_url (0, fts->exchange_credit_url),
|
2018-02-22 14:51:12 +01:00
|
|
|
TALER_TESTING_make_trait_amount_obj (0, &fts->amount),
|
2020-01-11 15:19:56 +01:00
|
|
|
TALER_TESTING_make_trait_absolute_time (0, &fts->timestamp),
|
|
|
|
TALER_TESTING_make_trait_reserve_priv (0,
|
|
|
|
&fts->reserve_priv),
|
|
|
|
TALER_TESTING_make_trait_reserve_pub (0,
|
|
|
|
&fts->reserve_pub),
|
|
|
|
TALER_TESTING_trait_end ()
|
2018-01-21 15:39:48 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
return TALER_TESTING_get_trait (traits,
|
|
|
|
ret,
|
|
|
|
trait,
|
2018-01-23 10:28:24 +01:00
|
|
|
index);
|
2018-01-21 15:39:48 +01:00
|
|
|
}
|
|
|
|
|
2018-08-09 22:28:57 +02:00
|
|
|
|
2018-01-21 15:39:48 +01:00
|
|
|
/**
|
2020-01-15 14:57:58 +01:00
|
|
|
* Create internal state for "/admin/add-incoming" CMD.
|
2018-01-21 15:39:48 +01:00
|
|
|
*
|
2020-01-15 14:57:58 +01:00
|
|
|
* @param amount the amount to transfer.
|
|
|
|
* @param account_bank_url base URL of the exchange account receiving the money
|
|
|
|
* @param payto_debit_account which account sends money
|
2020-01-12 01:03:08 +01:00
|
|
|
* @param auth authentication data
|
2020-01-15 14:57:58 +01:00
|
|
|
* @return the internal state
|
2018-01-21 15:39:48 +01:00
|
|
|
*/
|
2020-01-15 14:57:58 +01:00
|
|
|
static struct AdminAddIncomingState *
|
|
|
|
make_fts (const char *amount,
|
|
|
|
const char *exchange_base_url,
|
|
|
|
const struct TALER_BANK_AuthenticationData *auth,
|
|
|
|
const char *payto_debit_account)
|
2018-01-21 15:39:48 +01:00
|
|
|
{
|
2020-01-11 23:06:10 +01:00
|
|
|
struct AdminAddIncomingState *fts;
|
2018-01-21 15:39:48 +01:00
|
|
|
|
2020-01-11 23:06:10 +01:00
|
|
|
fts = GNUNET_new (struct AdminAddIncomingState);
|
2020-01-12 01:03:08 +01:00
|
|
|
fts->exchange_credit_url = exchange_base_url;
|
|
|
|
fts->payto_debit_account = payto_debit_account;
|
2020-01-15 14:57:58 +01:00
|
|
|
fts->payto_credit_account
|
|
|
|
= TALER_payto_xtalerbank_make2 (exchange_base_url);
|
2020-01-11 23:06:10 +01:00
|
|
|
fts->auth = *auth;
|
2018-01-21 15:39:48 +01:00
|
|
|
if (GNUNET_OK !=
|
|
|
|
TALER_string_to_amount (amount,
|
|
|
|
&fts->amount))
|
|
|
|
{
|
|
|
|
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
|
2020-01-15 14:57:58 +01:00
|
|
|
"Failed to parse amount `%s'\n",
|
|
|
|
amount);
|
2018-01-21 15:39:48 +01:00
|
|
|
GNUNET_assert (0);
|
|
|
|
}
|
2020-01-15 14:57:58 +01:00
|
|
|
return fts;
|
|
|
|
}
|
2018-12-19 11:43:05 +01:00
|
|
|
|
2020-01-15 14:57:58 +01:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Helper function to create admin/add-incoming command.
|
|
|
|
*
|
|
|
|
* @param label command label.
|
|
|
|
* @param fts internal state to use
|
|
|
|
* @return the command.
|
|
|
|
*/
|
|
|
|
static struct TALER_TESTING_Command
|
|
|
|
make_command (const char *label,
|
|
|
|
struct AdminAddIncomingState *fts)
|
|
|
|
{
|
|
|
|
struct TALER_TESTING_Command cmd = {
|
|
|
|
.cls = fts,
|
|
|
|
.label = label,
|
|
|
|
.run = &admin_add_incoming_run,
|
|
|
|
.cleanup = &admin_add_incoming_cleanup,
|
|
|
|
.traits = &admin_add_incoming_traits
|
|
|
|
};
|
|
|
|
|
|
|
|
return cmd;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Create admin/add-incoming command.
|
|
|
|
*
|
|
|
|
* @param label command label.
|
|
|
|
* @param amount amount to transfer.
|
|
|
|
* @param exchange_base_url base URL of the account that receives this
|
|
|
|
* wire transer (which account receives money).
|
|
|
|
* @param payto_debit_account which account sends money.
|
|
|
|
* @param auth authentication data
|
|
|
|
* @return the command.
|
|
|
|
*/
|
|
|
|
struct TALER_TESTING_Command
|
|
|
|
TALER_TESTING_cmd_admin_add_incoming
|
|
|
|
(const char *label,
|
|
|
|
const char *amount,
|
|
|
|
const char *exchange_base_url,
|
|
|
|
const struct TALER_BANK_AuthenticationData *auth,
|
|
|
|
const char *payto_debit_account)
|
|
|
|
{
|
|
|
|
return make_command (label,
|
|
|
|
make_fts (amount,
|
|
|
|
exchange_base_url,
|
|
|
|
auth,
|
|
|
|
payto_debit_account));
|
2018-01-21 19:21:45 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
2020-01-12 01:03:08 +01:00
|
|
|
* Create "/admin/add-incoming" CMD, letting the caller specify
|
2018-05-28 13:05:05 +02:00
|
|
|
* a reference to a command that can offer a reserve private key.
|
|
|
|
* This private key will then be used to construct the subject line
|
|
|
|
* of the wire transfer.
|
2018-01-21 19:21:45 +01:00
|
|
|
*
|
2018-05-28 13:05:05 +02:00
|
|
|
* @param label command label.
|
|
|
|
* @param amount the amount to transfer.
|
2020-01-12 01:03:08 +01:00
|
|
|
* @param account_bank_url base URL of the exchange account receiving the money
|
|
|
|
* @param payto_debit_account which account sends money
|
|
|
|
* @param auth authentication data
|
2018-05-28 13:05:05 +02:00
|
|
|
* @param ref reference to a command that can offer a reserve
|
|
|
|
* private key.
|
|
|
|
* @return the command.
|
2018-01-21 19:21:45 +01:00
|
|
|
*/
|
|
|
|
struct TALER_TESTING_Command
|
2020-01-12 01:03:08 +01:00
|
|
|
TALER_TESTING_cmd_admin_add_incoming_with_ref
|
2018-01-23 10:28:24 +01:00
|
|
|
(const char *label,
|
2019-08-25 16:18:24 +02:00
|
|
|
const char *amount,
|
2020-01-11 15:19:56 +01:00
|
|
|
const char *account_base_url,
|
2020-01-11 23:06:10 +01:00
|
|
|
const struct TALER_BANK_AuthenticationData *auth,
|
2020-01-12 01:03:08 +01:00
|
|
|
const char *payto_debit_account,
|
2020-01-11 23:06:10 +01:00
|
|
|
const char *ref)
|
2018-01-21 19:21:45 +01:00
|
|
|
{
|
2020-01-11 23:06:10 +01:00
|
|
|
struct AdminAddIncomingState *fts;
|
2018-01-21 19:21:45 +01:00
|
|
|
|
2020-01-15 14:57:58 +01:00
|
|
|
fts = make_fts (amount,
|
|
|
|
account_base_url,
|
|
|
|
auth,
|
|
|
|
payto_debit_account);
|
2018-01-21 19:21:45 +01:00
|
|
|
fts->reserve_reference = ref;
|
2020-01-15 14:57:58 +01:00
|
|
|
return make_command (label,
|
|
|
|
fts);
|
2018-01-21 19:21:45 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2018-02-21 12:23:45 +01:00
|
|
|
/**
|
2020-01-12 01:03:08 +01:00
|
|
|
* Create "/admin/add-incoming" CMD, letting the caller specifying
|
2018-05-28 13:05:05 +02:00
|
|
|
* the merchant instance. This version is useful when a tip
|
|
|
|
* reserve should be topped up, in fact the interpreter will need
|
|
|
|
* the "tipping instance" in order to get the instance public key
|
|
|
|
* and make a wire transfer subject out of it.
|
|
|
|
*
|
|
|
|
* @param label command label.
|
|
|
|
* @param amount amount to transfer.
|
2020-01-12 01:03:08 +01:00
|
|
|
* @param account_bank_url base URL of the exchange bank account
|
|
|
|
* that receives the wire transfer
|
|
|
|
* @param payto_debit_account which account (expressed as a number)
|
|
|
|
* gives money
|
|
|
|
* @param auth authentication data
|
2018-05-28 13:05:05 +02:00
|
|
|
* @param instance the instance that runs the tipping. Under this
|
|
|
|
* instance, the configuration file will provide the private
|
|
|
|
* key of the tipping reserve. This data will then used to
|
|
|
|
* construct the wire transfer subject line.
|
|
|
|
* @param config_filename configuration file to use.
|
|
|
|
* @return the command.
|
2018-02-21 12:23:45 +01:00
|
|
|
*/
|
|
|
|
struct TALER_TESTING_Command
|
2020-01-12 01:03:08 +01:00
|
|
|
TALER_TESTING_cmd_admin_add_incoming_with_instance
|
2018-02-21 12:23:45 +01:00
|
|
|
(const char *label,
|
2019-08-25 16:18:24 +02:00
|
|
|
const char *amount,
|
2020-01-11 15:19:56 +01:00
|
|
|
const char *account_base_url,
|
2020-01-11 23:06:10 +01:00
|
|
|
const struct TALER_BANK_AuthenticationData *auth,
|
2020-01-12 01:03:08 +01:00
|
|
|
const char *payto_debit_account,
|
2019-08-25 16:18:24 +02:00
|
|
|
const char *instance,
|
|
|
|
const char *config_filename)
|
2018-02-21 12:23:45 +01:00
|
|
|
{
|
2020-01-11 23:06:10 +01:00
|
|
|
struct AdminAddIncomingState *fts;
|
2018-02-21 12:23:45 +01:00
|
|
|
|
2020-01-15 14:57:58 +01:00
|
|
|
fts = make_fts (amount,
|
|
|
|
account_base_url,
|
|
|
|
auth,
|
|
|
|
payto_debit_account);
|
2018-02-21 12:23:45 +01:00
|
|
|
fts->instance = instance;
|
|
|
|
fts->config_filename = config_filename;
|
2020-01-15 14:57:58 +01:00
|
|
|
|
|
|
|
return make_command (label,
|
|
|
|
fts);
|
2018-02-21 12:23:45 +01:00
|
|
|
}
|
|
|
|
|
2018-08-19 14:19:17 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Modify a fakebank transfer command to enable retries when the
|
|
|
|
* reserve is not yet full or we get other transient errors from the
|
|
|
|
* fakebank.
|
|
|
|
*
|
|
|
|
* @param cmd a fakebank transfer command
|
|
|
|
* @return the command with retries enabled
|
|
|
|
*/
|
|
|
|
struct TALER_TESTING_Command
|
2020-01-12 01:03:08 +01:00
|
|
|
TALER_TESTING_cmd_admin_add_incoming_retry (struct TALER_TESTING_Command cmd)
|
2018-08-19 14:19:17 +02:00
|
|
|
{
|
2020-01-11 23:06:10 +01:00
|
|
|
struct AdminAddIncomingState *fts;
|
2018-08-19 14:19:17 +02:00
|
|
|
|
2020-01-12 01:03:08 +01:00
|
|
|
GNUNET_assert (&admin_add_incoming_run == cmd.run);
|
2018-08-19 14:19:17 +02:00
|
|
|
fts = cmd.cls;
|
|
|
|
fts->do_retry = GNUNET_YES;
|
|
|
|
return cmd;
|
|
|
|
}
|
|
|
|
|
2019-10-31 12:59:50 +01:00
|
|
|
|
2020-01-15 14:57:58 +01:00
|
|
|
/* end of testing_api_cmd_bank_admin_add_incoming.c */
|