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

pre-pull merging

Browse Source
This commit is contained in:
Christian Grothoff 2019-03-11 02:56:05 +01:00
commit 82ce84fe67
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
2 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
doc/taler-exchange.texi
View File

@ -472,14 +472,17 @@ ENABLE for each account whether it should be used, and for what
[account-1] [account-1]
URL = "payto://sepa/CH9300762011623852957" URL = "payto://sepa/CH9300762011623852957"
WIRE_RESPONSE = $@{TALER_CONFIG_HOME@}/account-1.json WIRE_RESPONSE = $@{TALER_CONFIG_HOME@}/account-1.json
PLUGIN = ebics
# Currently, only the 'taler_bank' plugin is implemented.
PLUGIN = <plugin_name_here>
# Use for exchange-aggregator (outgoing transfers) # Use for exchange-aggregator (outgoing transfers)
ENABLE_DEBIT = YES ENABLE_DEBIT = YES
# Use for exchange-wirewatch (and listed in /wire) # Use for exchange-wirewatch (and listed in /wire)
ENABLE_CREDIT = YES ENABLE_CREDIT = YES
# ... add authentication options here # Authentication options for the chosen plugin go here.
# (Next sections have examples of authentication mechanisms)
@end example @end example
The command line tool @cite{taler-exchange-wire} is used to create The command line tool @cite{taler-exchange-wire} is used to create
@ -509,9 +512,7 @@ requests.
The @code{taler_bank} plugin implements the wire method ``x-taler-bank''. The @code{taler_bank} plugin implements the wire method ``x-taler-bank''.
The format of the @code{payto://} URL is @code{payto://x-taler-bank/HOSTNAME:PORT}, The format of the @code{payto://} URL is @code{payto://x-taler-bank/HOSTNAME[:PORT]}.
possibly followed by other parameters like the amount and wire transfer subject
as per the @code{payto://} standard.
For basic authentication, the @code{taler_bank} plugin only supports For basic authentication, the @code{taler_bank} plugin only supports
simple password-based authentication. For this, the configuration simple password-based authentication. For this, the configuration
@ -520,8 +521,14 @@ account at the bank.
@setsyntax ini @setsyntax ini
@example @example
[account-2] [account-1]
URL = "payto://test/localhost:8080"
# Bank account details here..
# ..
# Authentication options for the taler_bank plugin below:
TALER_BANK_AUTH_METHOD = basic
USERNAME = exchange USERNAME = exchange
PASSWORD = super-secure PASSWORD = super-secure
@end example @end example

19
src/exchange/taler-exchange-httpd_keystate.c
View File

@ -783,16 +783,27 @@ revocations_iter (void *cls,
GNUNET_h2s (denom_hash)); GNUNET_h2s (denom_hash));
dki = GNUNET_CONTAINER_multihashmap_get (key_state->denomkey_map, dki = GNUNET_CONTAINER_multihashmap_get (key_state->denomkey_map,
denom_hash); denom_hash);
if (NULL == dki) // FIXME: what do we do if dki is not known?
// especially what if we have neither private key NOR
// DB entry? (maybe ancient revocation? should we ignore it?)
if (NULL != dki)
{ {
GNUNET_assert (GNUNET_YES == GNUNET_assert (GNUNET_YES ==
GNUNET_CONTAINER_multihashmap_remove (key_state->denomkey_map, GNUNET_CONTAINER_multihashmap_remove (key_state->denomkey_map,
denom_hash, denom_hash,
dki)); dki));
res = store_in_map (key_state->revoked_map, if (GNUNET_NO ==
dki); GNUNET_CONTAINER_multihashmap_put (key_state->revoked_map,
if (GNUNET_NO == res) &dki->issue.properties.denom_hash,
dki,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY))
{
/* revocation file must exist twice, keep only one of the dkis */
GNUNET_CRYPTO_rsa_private_key_free (dki->denom_priv.rsa_private_key);
GNUNET_CRYPTO_rsa_public_key_free (dki->denom_pub.rsa_public_key);
GNUNET_free (dki);
return GNUNET_OK; return GNUNET_OK;
}
} }
/* Try to insert DKI into DB until we succeed; note that if the DB /* Try to insert DKI into DB until we succeed; note that if the DB
failure is persistent, we need to die, as we cannot continue failure is persistent, we need to die, as we cannot continue