diff options
Diffstat (limited to 'src/auditor/taler-auditor-httpd_deposit-confirmation.c')
| -rw-r--r-- | src/auditor/taler-auditor-httpd_deposit-confirmation.c | 148 |
1 files changed, 112 insertions, 36 deletions
diff --git a/src/auditor/taler-auditor-httpd_deposit-confirmation.c b/src/auditor/taler-auditor-httpd_deposit-confirmation.c index f4d89b7ca..8b449bf47 100644 --- a/src/auditor/taler-auditor-httpd_deposit-confirmation.c +++ b/src/auditor/taler-auditor-httpd_deposit-confirmation.c @@ -1,6 +1,6 @@ /* This file is part of TALER - Copyright (C) 2014-2020 Taler Systems SA + Copyright (C) 2014-2023 Taler Systems SA TALER is free software; you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software @@ -31,7 +31,6 @@ #include "taler-auditor-httpd.h" #include "taler-auditor-httpd_deposit-confirmation.h" - GNUNET_NETWORK_STRUCT_BEGIN /** @@ -115,9 +114,14 @@ verify_and_execute_deposit_confirmation ( .end = GNUNET_TIME_timestamp_hton (es->ep_end), .signkey_pub = es->exchange_pub }; + const struct TALER_CoinSpendSignatureP *coin_sigps[ + GNUNET_NZL (dc->num_coins)]; + + for (unsigned int i = 0; i < dc->num_coins; i++) + coin_sigps[i] = &dc->coin_sigs[i]; if (GNUNET_TIME_absolute_is_future (es->ep_start.abs_time) || - GNUNET_TIME_absolute_is_past (es->ep_expire.abs_time) ) + GNUNET_TIME_absolute_is_past (es->ep_expire.abs_time)) { /* Signing key expired */ TALER_LOG_WARNING ("Expired exchange signing key\n"); @@ -129,7 +133,7 @@ verify_and_execute_deposit_confirmation ( /* check our cache */ GNUNET_CRYPTO_hash (&skv, - sizeof (skv), + sizeof(skv), &h); GNUNET_assert (0 == pthread_mutex_lock (&lock)); cached = GNUNET_CONTAINER_multihashmap_get (cache, @@ -153,7 +157,7 @@ verify_and_execute_deposit_confirmation ( es->ep_start, es->ep_expire, es->ep_end, - &es->master_public_key, + &TAH_master_public_key, &es->master_sig)) { TALER_LOG_WARNING ("Invalid signature on exchange signing key\n"); @@ -227,12 +231,13 @@ verify_and_execute_deposit_confirmation ( TALER_exchange_online_deposit_confirmation_verify ( &dc->h_contract_terms, &dc->h_wire, - NULL /* h_extensions! */, + &dc->h_policy, dc->exchange_timestamp, dc->wire_deadline, dc->refund_deadline, - &dc->amount_without_fee, - &dc->coin_pub, + &dc->total_without_fee, + dc->num_coins, + coin_sigps, &dc->merchant, &dc->exchange_pub, &dc->exchange_sig)) @@ -265,40 +270,47 @@ verify_and_execute_deposit_confirmation ( MHD_RESULT -TAH_DEPOSIT_CONFIRMATION_handler (struct TAH_RequestHandler *rh, - struct MHD_Connection *connection, - void **connection_cls, - const char *upload_data, - size_t *upload_data_size) +TAH_DEPOSIT_CONFIRMATION_handler ( + struct TAH_RequestHandler *rh, + struct MHD_Connection *connection, + void **connection_cls, + const char *upload_data, + size_t *upload_data_size) { - struct TALER_AUDITORDB_DepositConfirmation dc; + struct TALER_AUDITORDB_DepositConfirmation dc = { + .refund_deadline = GNUNET_TIME_UNIT_ZERO_TS + }; struct TALER_AUDITORDB_ExchangeSigningKey es; + const json_t *jcoin_sigs; + const json_t *jcoin_pubs; struct GNUNET_JSON_Specification spec[] = { GNUNET_JSON_spec_fixed_auto ("h_contract_terms", &dc.h_contract_terms), - GNUNET_JSON_spec_fixed_auto ("h_extensions", - &dc.h_extensions), + GNUNET_JSON_spec_fixed_auto ("h_policy", + &dc.h_policy), GNUNET_JSON_spec_fixed_auto ("h_wire", &dc.h_wire), GNUNET_JSON_spec_timestamp ("exchange_timestamp", &dc.exchange_timestamp), - GNUNET_JSON_spec_timestamp ("refund_deadline", - &dc.refund_deadline), + GNUNET_JSON_spec_mark_optional ( + GNUNET_JSON_spec_timestamp ("refund_deadline", + &dc.refund_deadline), + NULL), GNUNET_JSON_spec_timestamp ("wire_deadline", &dc.wire_deadline), - TALER_JSON_spec_amount ("amount_without_fee", + TALER_JSON_spec_amount ("total_without_fee", TAH_currency, - &dc.amount_without_fee), - GNUNET_JSON_spec_fixed_auto ("coin_pub", - &dc.coin_pub), + &dc.total_without_fee), + GNUNET_JSON_spec_array_const ("coin_pubs", + &jcoin_pubs), + GNUNET_JSON_spec_array_const ("coin_sigs", + &jcoin_sigs), GNUNET_JSON_spec_fixed_auto ("merchant_pub", &dc.merchant), GNUNET_JSON_spec_fixed_auto ("exchange_sig", &dc.exchange_sig), GNUNET_JSON_spec_fixed_auto ("exchange_pub", &dc.exchange_pub), - GNUNET_JSON_spec_fixed_auto ("master_pub", - &es.master_public_key), GNUNET_JSON_spec_timestamp ("ep_start", &es.ep_start), GNUNET_JSON_spec_timestamp ("ep_expire", @@ -309,13 +321,14 @@ TAH_DEPOSIT_CONFIRMATION_handler (struct TAH_RequestHandler *rh, &es.master_sig), GNUNET_JSON_spec_end () }; + unsigned int num_coins; + json_t *json; (void) rh; (void) connection_cls; (void) upload_data; (void) upload_data_size; { - json_t *json; enum GNUNET_GenericReturnValue res; res = TALER_MHD_parse_post_json (connection, @@ -325,28 +338,94 @@ TAH_DEPOSIT_CONFIRMATION_handler (struct TAH_RequestHandler *rh, &json); if (GNUNET_SYSERR == res) return MHD_NO; - if ( (GNUNET_NO == res) || - (NULL == json) ) + if ((GNUNET_NO == res) || + (NULL == json)) return MHD_YES; res = TALER_MHD_parse_json_data (connection, json, spec); - json_decref (json); if (GNUNET_SYSERR == res) - return MHD_NO; /* hard failure */ + { + json_decref (json); + return MHD_NO; /* hard failure */ + } if (GNUNET_NO == res) - return MHD_YES; /* failure */ + { + json_decref (json); + return MHD_YES; /* failure */ + } } - - es.exchange_pub = dc.exchange_pub; /* used twice! */ - dc.master_public_key = es.master_public_key; + num_coins = json_array_size (jcoin_sigs); + if (num_coins != json_array_size (jcoin_pubs)) { + GNUNET_break_op (0); + json_decref (json); + return TALER_MHD_reply_with_ec ( + connection, + TALER_EC_GENERIC_PARAMETER_MALFORMED, + "coin_pubs.length != coin_sigs.length"); + } + if (0 == num_coins) + { + GNUNET_break_op (0); + json_decref (json); + return TALER_MHD_reply_with_ec ( + connection, + TALER_EC_GENERIC_PARAMETER_MALFORMED, + "coin_pubs array is empty"); + } + { + struct TALER_CoinSpendPublicKeyP coin_pubs[num_coins]; + struct TALER_CoinSpendSignatureP coin_sigs[num_coins]; MHD_RESULT res; + for (unsigned int i = 0; i < num_coins; i++) + { + json_t *jpub = json_array_get (jcoin_pubs, + i); + json_t *jsig = json_array_get (jcoin_sigs, + i); + const char *ps = json_string_value (jpub); + const char *ss = json_string_value (jsig); + + if ((NULL == ps) || + (GNUNET_OK != + GNUNET_STRINGS_string_to_data (ps, + strlen (ps), + &coin_pubs[i], + sizeof(coin_pubs[i])))) + { + GNUNET_break_op (0); + json_decref (json); + return TALER_MHD_reply_with_ec ( + connection, + TALER_EC_GENERIC_PARAMETER_MALFORMED, + "coin_pub[] malformed"); + } + if ((NULL == ss) || + (GNUNET_OK != + GNUNET_STRINGS_string_to_data (ss, + strlen (ss), + &coin_sigs[i], + sizeof(coin_sigs[i])))) + { + GNUNET_break_op (0); + json_decref (json); + return TALER_MHD_reply_with_ec ( + connection, + TALER_EC_GENERIC_PARAMETER_MALFORMED, + "coin_sig[] malformed"); + } + } + dc.num_coins = num_coins; + dc.coin_pubs = coin_pubs; + dc.coin_sigs = coin_sigs; + es.exchange_pub = dc.exchange_pub; /* used twice! */ res = verify_and_execute_deposit_confirmation (connection, &dc, &es); GNUNET_JSON_parse_free (spec); + json_decref (json); return res; } } @@ -371,6 +450,3 @@ TEAH_DEPOSIT_CONFIRMATION_done (void) GNUNET_assert (0 == pthread_mutex_destroy (&lock)); } } - - -/* end of taler-auditor-httpd_deposit-confirmation.c */ |