diff options
author | Christian Grothoff <christian@grothoff.org> | 2020-03-10 18:51:08 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2020-03-10 18:51:08 +0100 |
commit | 6e3765d85253867fcc8cb6409ac65d0dd637c479 (patch) | |
tree | aa9654785a5e4fc7a27f435f3bdac1a6d8d79fe2 /src/lib/exchange_api_refund.c | |
parent | f32193aae212d7d61f60e7056c0e6bbfd487c442 (diff) | |
download | exchange-6e3765d85253867fcc8cb6409ac65d0dd637c479.tar.xz |
more careful use of TALER_JSON_get_error_code(), limit to cases where we expect to get one
Diffstat (limited to 'src/lib/exchange_api_refund.c')
-rw-r--r-- | src/lib/exchange_api_refund.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/src/lib/exchange_api_refund.c b/src/lib/exchange_api_refund.c index d14481e7b..826c39b17 100644 --- a/src/lib/exchange_api_refund.c +++ b/src/lib/exchange_api_refund.c @@ -145,11 +145,13 @@ handle_refund_finished (void *cls, struct TALER_ExchangePublicKeyP exchange_pub; struct TALER_ExchangePublicKeyP *ep = NULL; const json_t *j = response; + enum TALER_ErrorCode ec; rh->job = NULL; switch (response_code) { case 0: + ec = TALER_EC_INVALID_RESPONSE; break; case MHD_HTTP_OK: if (GNUNET_OK != @@ -159,53 +161,64 @@ handle_refund_finished (void *cls, { GNUNET_break_op (0); response_code = 0; + ec = TALER_EC_REFUND_INVALID_SIGNATURE_BY_EXCHANGE; } else { ep = &exchange_pub; + ec = TALER_EC_NONE; } break; case MHD_HTTP_BAD_REQUEST: /* This should never happen, either us or the exchange is buggy (or API version conflict); just pass JSON reply to the application */ + ec = TALER_JSON_get_error_code (j); break; case MHD_HTTP_FORBIDDEN: /* Nothing really to verify, exchange says one of the signatures is invalid; as we checked them, this should never happen, we should pass the JSON reply to the application */ + ec = TALER_JSON_get_error_code (j); break; case MHD_HTTP_NOT_FOUND: /* Nothing really to verify, this should never happen, we should pass the JSON reply to the application */ + ec = TALER_JSON_get_error_code (j); break; case MHD_HTTP_GONE: /* Kind of normal: the money was already sent to the merchant (it was too late for the refund). */ + ec = TALER_JSON_get_error_code (j); break; case MHD_HTTP_PRECONDITION_FAILED: /* Client request was inconsistent; might be a currency mismatch problem. */ + ec = TALER_JSON_get_error_code (j); break; case MHD_HTTP_CONFLICT: /* Two refund requests were made about the same deposit, but carrying different refund transaction ids. */ + ec = TALER_JSON_get_error_code (j); break; case MHD_HTTP_INTERNAL_SERVER_ERROR: /* Server had an internal issue; we should retry, but this API leaves this to the application */ + ec = TALER_JSON_get_error_code (j); break; default: /* unexpected response code */ + ec = TALER_JSON_get_error_code (j); GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Unexpected response code %u\n", - (unsigned int) response_code); + "Unexpected response code %u/%d\n", + (unsigned int) response_code, + ec); GNUNET_break (0); response_code = 0; break; } rh->cb (rh->cb_cls, response_code, - TALER_JSON_get_error_code (j), + ec, ep, j); TALER_EXCHANGE_refund_cancel (rh); |