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

fix #6065

Browse Source
This commit is contained in:
Christian Grothoff 2020-02-04 20:57:11 +01:00
parent 5a11839002
commit 9bfeec352b
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
8 changed files with 34 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/exchange/taler-exchange-httpd_mhd.c
View File

@ -128,11 +128,10 @@ TEH_MHD_handler_send_json_pack_error (struct TEH_RequestHandler *rh,
(void) connection_cls; (void) connection_cls;
(void) upload_data; (void) upload_data;
(void) upload_data_size; (void) upload_data_size;
return TALER_MHD_reply_json_pack (connection, return TALER_MHD_reply_with_error (connection,
rh->response_code, rh->response_code,
"{s:s}", TALER_EC_METHOD_INVALID,
"error", rh->data);
rh->data);
} }

2
src/exchange/taler-exchange-httpd_refresh_melt.c
View File

@ -69,7 +69,7 @@ reply_refresh_melt_insufficient_funds (struct MHD_Connection *connection,
return TALER_MHD_reply_json_pack (connection, return TALER_MHD_reply_json_pack (connection,
MHD_HTTP_CONFLICT, MHD_HTTP_CONFLICT,
"{s:s, s:I, s:o, s:o, s:o, s:o, s:o}", "{s:s, s:I, s:o, s:o, s:o, s:o, s:o}",
"error", "hint",
"insufficient funds", "insufficient funds",
"code", "code",
(json_int_t) (json_int_t)

2
src/exchange/taler-exchange-httpd_refresh_reveal.c
View File

@ -108,7 +108,7 @@ reply_refresh_reveal_mismatch (struct MHD_Connection *connection,
return TALER_MHD_reply_json_pack (connection, return TALER_MHD_reply_json_pack (connection,
MHD_HTTP_CONFLICT, MHD_HTTP_CONFLICT,
"{s:s, s:I, s:o}", "{s:s, s:I, s:o}",
"error", "commitment violation", "hint", "commitment violation",
"code", "code",
(json_int_t) (json_int_t)
TALER_EC_REFRESH_REVEAL_COMMITMENT_VIOLATION, TALER_EC_REFRESH_REVEAL_COMMITMENT_VIOLATION,

57
src/exchange/taler-exchange-httpd_refund.c
View File

@ -82,28 +82,6 @@ reply_refund_success (struct MHD_Connection *connection,
} }
/**
* Generate generic refund failure message. All the details
* are in the @a response_code. The body can be empty.
*
* @param connection connection to the client
* @param response_code response code to generate
* @param ec taler error code to include
* @return MHD result code
*/
static int
reply_refund_failure (struct MHD_Connection *connection,
unsigned int response_code,
enum TALER_ErrorCode ec)
{
return TALER_MHD_reply_json_pack (connection,
response_code,
"{s:s, s:I}",
"hint", "refund failure",
"code", (json_int_t) ec);
}
/** /**
* Generate refund conflict failure message. Returns the * Generate refund conflict failure message. Returns the
* transaction list @a tl with the details about the conflict. * transaction list @a tl with the details about the conflict.
@ -194,9 +172,10 @@ refund_transaction (void *cls,
if (0 > qs) if (0 > qs)
{ {
if (GNUNET_DB_STATUS_HARD_ERROR == qs) if (GNUNET_DB_STATUS_HARD_ERROR == qs)
*mhd_ret = reply_refund_failure (connection, *mhd_ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_NOT_FOUND, MHD_HTTP_NOT_FOUND,
TALER_EC_REFUND_COIN_NOT_FOUND); TALER_EC_REFUND_COIN_NOT_FOUND,
"database transaction failure");
return qs; return qs;
} }
deposit_found = GNUNET_NO; deposit_found = GNUNET_NO;
@ -319,9 +298,10 @@ refund_transaction (void *cls,
GNUNET_break_op (0); /* currency mismatch */ GNUNET_break_op (0); /* currency mismatch */
TEH_plugin->free_coin_transaction_list (TEH_plugin->cls, TEH_plugin->free_coin_transaction_list (TEH_plugin->cls,
tl); tl);
*mhd_ret = reply_refund_failure (connection, *mhd_ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_PRECONDITION_FAILED, MHD_HTTP_PRECONDITION_FAILED,
TALER_EC_REFUND_CURRENCY_MISSMATCH); TALER_EC_REFUND_CURRENCY_MISSMATCH,
"currencies involved do not match");
return GNUNET_DB_STATUS_HARD_ERROR; return GNUNET_DB_STATUS_HARD_ERROR;
} }
@ -353,9 +333,10 @@ refund_transaction (void *cls,
/* money was already transferred to merchant, can no longer refund */ /* money was already transferred to merchant, can no longer refund */
TEH_plugin->free_coin_transaction_list (TEH_plugin->cls, TEH_plugin->free_coin_transaction_list (TEH_plugin->cls,
tl); tl);
*mhd_ret = reply_refund_failure (connection, *mhd_ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_GONE, MHD_HTTP_GONE,
TALER_EC_REFUND_MERCHANT_ALREADY_PAID); TALER_EC_REFUND_MERCHANT_ALREADY_PAID,
"money already sent to merchant");
return GNUNET_DB_STATUS_HARD_ERROR; return GNUNET_DB_STATUS_HARD_ERROR;
} }
@ -366,9 +347,10 @@ refund_transaction (void *cls,
GNUNET_break_op (0); /* cannot refund more than original value */ GNUNET_break_op (0); /* cannot refund more than original value */
TEH_plugin->free_coin_transaction_list (TEH_plugin->cls, TEH_plugin->free_coin_transaction_list (TEH_plugin->cls,
tl); tl);
*mhd_ret = reply_refund_failure (connection, *mhd_ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_PRECONDITION_FAILED, MHD_HTTP_PRECONDITION_FAILED,
TALER_EC_REFUND_INSUFFICIENT_FUNDS); TALER_EC_REFUND_INSUFFICIENT_FUNDS,
"refund requested exceeds original value");
return GNUNET_DB_STATUS_HARD_ERROR; return GNUNET_DB_STATUS_HARD_ERROR;
} }
/* Check refund fee matches fee of denomination key! */ /* Check refund fee matches fee of denomination key! */
@ -481,9 +463,10 @@ verify_and_execute_refund (struct MHD_Connection *connection,
if (0 > qs) if (0 > qs)
{ {
GNUNET_break (GNUNET_DB_STATUS_HARD_ERROR == qs); GNUNET_break (GNUNET_DB_STATUS_HARD_ERROR == qs);
return reply_refund_failure (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_NOT_FOUND, MHD_HTTP_NOT_FOUND,
TALER_EC_REFUND_COIN_NOT_FOUND); TALER_EC_REFUND_COIN_NOT_FOUND,
"denomination of coin to be refunded not found in DB");
} }
} }

2
src/exchange/taler-exchange-httpd_reserve_status.c
View File

@ -164,7 +164,7 @@ TEH_RESERVE_handler_reserve_status (struct TEH_RequestHandler *rh,
return TALER_MHD_reply_json_pack (connection, return TALER_MHD_reply_json_pack (connection,
MHD_HTTP_NOT_FOUND, MHD_HTTP_NOT_FOUND,
"{s:s, s:s, s:I}", "{s:s, s:s, s:I}",
"error", "Reserve not found", "hint", "Reserve not found",
"parameter", "reserve_pub", "parameter", "reserve_pub",
"code", "code",
(json_int_t) (json_int_t)

2
src/exchange/taler-exchange-httpd_reserve_withdraw.c
View File

@ -74,7 +74,7 @@ reply_reserve_withdraw_insufficient_funds (struct MHD_Connection *connection,
return TALER_MHD_reply_json_pack (connection, return TALER_MHD_reply_json_pack (connection,
MHD_HTTP_CONFLICT, MHD_HTTP_CONFLICT,
"{s:s, s:I, s:o, s:o}", "{s:s, s:I, s:o, s:o}",
"error", "Insufficient funds", "hint", "insufficient funds",
"code", "code",
(json_int_t) (json_int_t)
TALER_EC_WITHDRAW_INSUFFICIENT_FUNDS, TALER_EC_WITHDRAW_INSUFFICIENT_FUNDS,

2
src/exchange/taler-exchange-httpd_responses.c
View File

@ -446,7 +446,7 @@ TEH_RESPONSE_reply_coin_insufficient_funds (struct MHD_Connection *connection,
return TALER_MHD_reply_json_pack (connection, return TALER_MHD_reply_json_pack (connection,
MHD_HTTP_CONFLICT, MHD_HTTP_CONFLICT,
"{s:s, s:I, s:o}", "{s:s, s:I, s:o}",
"error", "insufficient funds", "hint", "insufficient funds",
"code", (json_int_t) ec, "code", (json_int_t) ec,
"history", history); "history", history);
} }

5
src/include/taler_error_codes.h
View File

@ -80,6 +80,11 @@ enum TALER_ErrorCode
*/ */
TALER_EC_JSON_ALLOCATION_FAILURE = 7, TALER_EC_JSON_ALLOCATION_FAILURE = 7,
/**
* HTTP method invalid for this URL.
*/
TALER_EC_METHOD_INVALID = 8,
/** /**
* The exchange failed to even just initialize its connection to the * The exchange failed to even just initialize its connection to the
* database. This response is provided with HTTP status code * database. This response is provided with HTTP status code