diff options
| author | Christian Grothoff <christian@grothoff.org> | 2020-07-08 21:24:10 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2020-07-08 21:24:10 +0200 |
| commit | 92ac6dd11a35f3c484a54ecb47ef3ca66cf30d0f (patch) | |
| tree | 8053e3afe268f0c6998b4be135273a89feb5a66f /src/lib/exchange_api_recoup.c | |
| parent | 8a1402a5d56907a01ca64a6f7a3a82c5591d8007 (diff) | |
implement new behavior in exchange httpd and libtalerexchange (for #6416)
Diffstat (limited to 'src/lib/exchange_api_recoup.c')
| -rw-r--r-- | src/lib/exchange_api_recoup.c | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/src/lib/exchange_api_recoup.c b/src/lib/exchange_api_recoup.c index 723b41789..d8c59827c 100644 --- a/src/lib/exchange_api_recoup.c +++ b/src/lib/exchange_api_recoup.c @@ -187,7 +187,9 @@ handle_recoup_finished (void *cls, /* Insufficient funds, proof attached */ json_t *history; struct TALER_Amount total; + struct GNUNET_HashCode h_denom_pub; const struct TALER_EXCHANGE_DenomPublicKey *dki; + enum TALER_ErrorCode ec; dki = &ph->pk; history = json_object_get (j, @@ -197,6 +199,7 @@ handle_recoup_finished (void *cls, dki->fee_deposit.currency, &ph->coin_pub, history, + &h_denom_pub, &total)) { GNUNET_break_op (0); @@ -208,6 +211,43 @@ handle_recoup_finished (void *cls, hr.ec = TALER_JSON_get_error_code (j); hr.hint = TALER_JSON_get_error_hint (j); } + ec = TALER_JSON_get_error_code (j); + switch (ec) + { + case TALER_EC_RECOUP_COIN_BALANCE_ZERO: + if (0 > TALER_amount_cmp (&total, + &dki->value)) + { + /* recoup MAY have still been possible */ + /* FIXME: This code may falsely complain, as we do not + know that the smallest denomination offered by the + exchange is here. We should look at the key + structure of ph->exchange, and find the smallest + _currently withdrawable_ denomination and check + if the value remaining would suffice... */GNUNET_break_op (0); + hr.http_status = 0; + hr.ec = TALER_EC_RECOUP_REPLY_MALFORMED; + break; + } + break; + case TALER_EC_COIN_CONFLICTING_DENOMINATION_KEY: + if (0 == GNUNET_memcmp (&ph->pk.h_key, + &h_denom_pub)) + { + /* invalid proof provided */ + GNUNET_break_op (0); + hr.http_status = 0; + hr.ec = TALER_EC_RECOUP_REPLY_MALFORMED; + break; + } + /* valid error from exchange */ + break; + default: + GNUNET_break_op (0); + hr.http_status = 0; + hr.ec = TALER_EC_RECOUP_REPLY_MALFORMED; + break; + } ph->cb (ph->cb_cls, &hr, NULL, |