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

more denom sig checking in auditor

Browse Source
This commit is contained in:
Christian Grothoff 2019-07-27 20:43:52 +02:00
parent 1057333666
commit ccfe99a82d
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
5 changed files with 92 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
src/auditor/taler-auditor.c
View File

@ -30,6 +30,7 @@
* (While as the exchange could easily falsify those, we should * (While as the exchange could easily falsify those, we should
* probably check as otherwise insider *without* RSA private key * probably check as otherwise insider *without* RSA private key
* access could still create false paybacks to drain exchange funds!) * access could still create false paybacks to drain exchange funds!)
* => See FIXME42 for last place (likely) missing!
* - error handling if denomination keys are used that are not known to the * - error handling if denomination keys are used that are not known to the
* auditor is, eh, awful / non-existent. We just throw the DB's constraint * auditor is, eh, awful / non-existent. We just throw the DB's constraint
* violation back at the user. Great UX. * violation back at the user. Great UX.
@ -1081,7 +1082,9 @@ handle_reserve_out (void *cls,
* @param timestamp when did we receive the payback request * @param timestamp when did we receive the payback request
* @param amount how much should be added back to the reserve * @param amount how much should be added back to the reserve
* @param reserve_pub public key of the reserve * @param reserve_pub public key of the reserve
* @param coin public information about the coin * @param coin public information about the coin, denomination signature is
* already verified in #check_payback()
* @param denom_pub public key of the denomionation of @a coin
* @param coin_sig signature with @e coin_pub of type #TALER_SIGNATURE_WALLET_COIN_PAYBACK * @param coin_sig signature with @e coin_pub of type #TALER_SIGNATURE_WALLET_COIN_PAYBACK
* @param coin_blind blinding factor used to blind the coin * @param coin_blind blinding factor used to blind the coin
* @return #GNUNET_OK to continue to iterate, #GNUNET_SYSERR to stop * @return #GNUNET_OK to continue to iterate, #GNUNET_SYSERR to stop
@ -1112,22 +1115,6 @@ handle_payback_by_reserve (void *cls,
ppr.last_reserve_payback_serial_id = rowid + 1; ppr.last_reserve_payback_serial_id = rowid + 1;
// FIXME: should probably check that denom_pub hashes to this hash code! // FIXME: should probably check that denom_pub hashes to this hash code!
pr.h_denom_pub = coin->denom_pub_hash; pr.h_denom_pub = coin->denom_pub_hash;
if (GNUNET_OK !=
TALER_test_coin_valid (coin,
denom_pub))
{
report (report_bad_sig_losses,
json_pack ("{s:s, s:I, s:o, s:o}",
"operation", "payback-verify",
"row", (json_int_t) rowid,
"loss", TALER_JSON_from_amount (amount),
"key_pub", GNUNET_JSON_from_data_auto (&pr.h_denom_pub)));
GNUNET_break (GNUNET_OK ==
TALER_amount_add (&total_bad_sig_loss,
&total_bad_sig_loss,
amount));
}
pr.purpose.purpose = htonl (TALER_SIGNATURE_WALLET_COIN_PAYBACK); pr.purpose.purpose = htonl (TALER_SIGNATURE_WALLET_COIN_PAYBACK);
pr.purpose.size = htonl (sizeof (pr)); pr.purpose.size = htonl (sizeof (pr));
pr.coin_pub = coin->coin_pub; pr.coin_pub = coin->coin_pub;
@ -1944,12 +1931,12 @@ struct WireCheckContext
* @return #GNUNET_OK on success, #GNUNET_SYSERR on error * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
*/ */
static int static int
check_transaction_history (const struct TALER_CoinSpendPublicKeyP *coin_pub, check_transaction_history_for_deposit (const struct TALER_CoinSpendPublicKeyP *coin_pub,
const struct GNUNET_HashCode *h_contract_terms, const struct GNUNET_HashCode *h_contract_terms,
const struct TALER_MerchantPublicKeyP *merchant_pub, const struct TALER_MerchantPublicKeyP *merchant_pub,
const struct TALER_EXCHANGEDB_DenominationKeyInformationP *dki, const struct TALER_EXCHANGEDB_DenominationKeyInformationP *dki,
const struct TALER_EXCHANGEDB_TransactionList *tl_head, const struct TALER_EXCHANGEDB_TransactionList *tl_head,
struct TALER_Amount *merchant_gain) struct TALER_Amount *merchant_gain)
{ {
struct TALER_Amount expenditures; struct TALER_Amount expenditures;
struct TALER_Amount refunds; struct TALER_Amount refunds;
@ -2237,6 +2224,7 @@ check_transaction_history (const struct TALER_CoinSpendPublicKeyP *coin_pub,
* @param account_details where did we transfer the funds? * @param account_details where did we transfer the funds?
* @param exec_time execution time of the wire transfer (should be same for all callbacks with the same @e cls) * @param exec_time execution time of the wire transfer (should be same for all callbacks with the same @e cls)
* @param h_contract_terms which proposal was this payment about * @param h_contract_terms which proposal was this payment about
* @param denom_pub denomination of @a coin_pub
* @param coin_pub which public key was this payment about * @param coin_pub which public key was this payment about
* @param coin_value amount contributed by this coin in total (with fee) * @param coin_value amount contributed by this coin in total (with fee)
* @param deposit_fee applicable deposit fee for this coin, actual * @param deposit_fee applicable deposit fee for this coin, actual
@ -2250,6 +2238,7 @@ wire_transfer_information_cb (void *cls,
const json_t *account_details, const json_t *account_details,
struct GNUNET_TIME_Absolute exec_time, struct GNUNET_TIME_Absolute exec_time,
const struct GNUNET_HashCode *h_contract_terms, const struct GNUNET_HashCode *h_contract_terms,
const struct TALER_DenominationPublicKey *denom_pub,
const struct TALER_CoinSpendPublicKeyP *coin_pub, const struct TALER_CoinSpendPublicKeyP *coin_pub,
const struct TALER_Amount *coin_value, const struct TALER_Amount *coin_value,
const struct TALER_Amount *deposit_fee) const struct TALER_Amount *deposit_fee)
@ -2337,16 +2326,47 @@ wire_transfer_information_cb (void *cls,
"could not find denomination key for coin claimed in aggregation"); "could not find denomination key for coin claimed in aggregation");
return; return;
} }
if (GNUNET_OK !=
TALER_test_coin_valid (coin,
denom_pub))
{
report (report_bad_sig_losses,
json_pack ("{s:s, s:I, s:o, s:o}",
"operation", "wire",
"row", (json_int_t) rowid,
"loss", TALER_JSON_from_amount (coin_value),
"key_pub", GNUNET_JSON_from_data_auto (&dki->properties.denom_hash)));
GNUNET_break (GNUNET_OK ==
TALER_amount_add (&total_bad_sig_loss,
&total_bad_sig_loss,
coin_value));
edb->free_coin_transaction_list (edb->cls,
tl);
wcc->qs = GNUNET_DB_STATUS_HARD_ERROR;
report_row_inconsistency ("deposit",
rowid,
"coin denomination signature invalid");
return;
}
GNUNET_assert (NULL != dki); /* mostly to help static analysis */ GNUNET_assert (NULL != dki); /* mostly to help static analysis */
/* Check transaction history to see if it supports aggregate /* Check transaction history to see if it supports aggregate
valuation */ valuation */
check_transaction_history (coin_pub, if (GNUNET_OK !=
h_contract_terms, check_transaction_history_for_deposit (coin_pub,
merchant_pub, h_contract_terms,
dki, merchant_pub,
tl, dki,
&computed_value); tl,
&computed_value))
{
wcc->qs = GNUNET_DB_STATUS_HARD_ERROR;
report_row_inconsistency ("coin history",
rowid,
"failed to verify coin history (for deposit)");
return;
}
if (GNUNET_SYSERR == if (GNUNET_SYSERR ==
TALER_amount_subtract (&coin_value_without_fee, TALER_amount_subtract (&coin_value_without_fee,
coin_value, coin_value,
@ -3397,6 +3417,9 @@ refresh_session_cb (void *cls,
cc->qs = qs; cc->qs = qs;
return GNUNET_SYSERR; return GNUNET_SYSERR;
} }
// FIXME42: should verify that the
// coin was properly signed via TALER_test_coin_valid() here!
// (but would need more information from DB to do so!)
/* verify melt signature */ /* verify melt signature */
rmc.purpose.purpose = htonl (TALER_SIGNATURE_WALLET_COIN_MELT); rmc.purpose.purpose = htonl (TALER_SIGNATURE_WALLET_COIN_MELT);
@ -4007,6 +4030,7 @@ refund_cb (void *cls,
* @param rowid row identifier used to uniquely identify the payback operation * @param rowid row identifier used to uniquely identify the payback operation
* @param amount how much should be added back to the reserve * @param amount how much should be added back to the reserve
* @param coin public information about the coin * @param coin public information about the coin
* @param denom_pub public key of the denomionation of @a coin
* @param coin_sig signature with @e coin_pub of type #TALER_SIGNATURE_WALLET_COIN_PAYBACK * @param coin_sig signature with @e coin_pub of type #TALER_SIGNATURE_WALLET_COIN_PAYBACK
* @param coin_blind blinding factor used to blind the coin * @param coin_blind blinding factor used to blind the coin
* @return #GNUNET_OK to continue to iterate, #GNUNET_SYSERR to stop * @return #GNUNET_OK to continue to iterate, #GNUNET_SYSERR to stop
@ -4025,6 +4049,21 @@ check_payback (struct CoinContext *cc,
enum GNUNET_DB_QueryStatus qs; enum GNUNET_DB_QueryStatus qs;
const struct TALER_EXCHANGEDB_DenominationKeyInformationP *dki; const struct TALER_EXCHANGEDB_DenominationKeyInformationP *dki;
if (GNUNET_OK !=
TALER_test_coin_valid (coin,
denom_pub))
{
report (report_bad_sig_losses,
json_pack ("{s:s, s:I, s:o, s:o}",
"operation", "payback",
"row", (json_int_t) rowid,
"loss", TALER_JSON_from_amount (amount),
"key_pub", GNUNET_JSON_from_data_auto (&pr.h_denom_pub)));
GNUNET_break (GNUNET_OK ==
TALER_amount_add (&total_bad_sig_loss,
&total_bad_sig_loss,
amount));
}
qs = get_denomination_info (denom_pub, qs = get_denomination_info (denom_pub,
&dki, &dki,
&pr.h_denom_pub); &pr.h_denom_pub);
@ -4677,8 +4716,8 @@ setup_sessions_and_run ()
*/ */
static void static void
test_master_present (void *cls, test_master_present (void *cls,
const struct TALER_MasterPublicKeyP *mpub, const struct TALER_MasterPublicKeyP *mpub,
const char *exchange_url) const char *exchange_url)
{ {
int *found = cls; int *found = cls;

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

@ -253,6 +253,7 @@ handle_transaction_data (void *cls,
const json_t *wire, const json_t *wire,
struct GNUNET_TIME_Absolute exec_time, struct GNUNET_TIME_Absolute exec_time,
const struct GNUNET_HashCode *h_contract_terms, const struct GNUNET_HashCode *h_contract_terms,
const struct TALER_DenominationPublicKey *denom_pub,
const struct TALER_CoinSpendPublicKeyP *coin_pub, const struct TALER_CoinSpendPublicKeyP *coin_pub,
const struct TALER_Amount *deposit_value, const struct TALER_Amount *deposit_value,
const struct TALER_Amount *deposit_fee) const struct TALER_Amount *deposit_fee)
@ -262,6 +263,7 @@ handle_transaction_data (void *cls,
struct TEH_TrackTransferDetail *wdd; struct TEH_TrackTransferDetail *wdd;
char *wire_method; char *wire_method;
(void) denom_pub;
if (GNUNET_SYSERR == ctx->is_valid) if (GNUNET_SYSERR == ctx->is_valid)
return; return;
if (NULL == (wire_method = TALER_JSON_wire_to_method (wire))) if (NULL == (wire_method = TALER_JSON_wire_to_method (wire)))

28
src/exchangedb/plugin_exchangedb_postgres.c
View File

@ -1307,6 +1307,7 @@ postgres_prepare (PGconn *db_conn)
",denom.fee_deposit_val" ",denom.fee_deposit_val"
",denom.fee_deposit_frac" ",denom.fee_deposit_frac"
",denom.fee_deposit_curr" ",denom.fee_deposit_curr"
",denom.denom_pub"
" FROM aggregation_tracking" " FROM aggregation_tracking"
" JOIN deposits" " JOIN deposits"
" USING (deposit_serial_id)" " USING (deposit_serial_id)"
@ -4957,12 +4958,14 @@ handle_wt_result (void *cls,
struct GNUNET_TIME_Absolute exec_time; struct GNUNET_TIME_Absolute exec_time;
struct TALER_Amount amount_with_fee; struct TALER_Amount amount_with_fee;
struct TALER_Amount deposit_fee; struct TALER_Amount deposit_fee;
struct TALER_DenominationPublicKey denom_pub;
json_t *wire; json_t *wire;
struct GNUNET_PQ_ResultSpec rs[] = { struct GNUNET_PQ_ResultSpec rs[] = {
GNUNET_PQ_result_spec_uint64 ("aggregation_serial_id", &rowid), GNUNET_PQ_result_spec_uint64 ("aggregation_serial_id", &rowid),
GNUNET_PQ_result_spec_auto_from_type ("h_contract_terms", &h_contract_terms), GNUNET_PQ_result_spec_auto_from_type ("h_contract_terms", &h_contract_terms),
TALER_PQ_result_spec_json ("wire", &wire), TALER_PQ_result_spec_json ("wire", &wire),
GNUNET_PQ_result_spec_auto_from_type ("h_wire", &h_wire), GNUNET_PQ_result_spec_auto_from_type ("h_wire", &h_wire),
GNUNET_PQ_result_spec_rsa_public_key ("denom_pub", &denom_pub.rsa_public_key),
GNUNET_PQ_result_spec_auto_from_type ("coin_pub", &coin_pub), GNUNET_PQ_result_spec_auto_from_type ("coin_pub", &coin_pub),
GNUNET_PQ_result_spec_auto_from_type ("merchant_pub", &merchant_pub), GNUNET_PQ_result_spec_auto_from_type ("merchant_pub", &merchant_pub),
TALER_PQ_result_spec_absolute_time ("execution_date", &exec_time), TALER_PQ_result_spec_absolute_time ("execution_date", &exec_time),
@ -4981,15 +4984,16 @@ handle_wt_result (void *cls,
return; return;
} }
ctx->cb (ctx->cb_cls, ctx->cb (ctx->cb_cls,
rowid, rowid,
&merchant_pub, &merchant_pub,
&h_wire, &h_wire,
wire, wire,
exec_time, exec_time,
&h_contract_terms, &h_contract_terms,
&coin_pub, &denom_pub,
&amount_with_fee, &coin_pub,
&deposit_fee); &amount_with_fee,
&deposit_fee);
GNUNET_PQ_cleanup_result (rs); GNUNET_PQ_cleanup_result (rs);
} }
} }
@ -5025,10 +5029,10 @@ postgres_lookup_wire_transfer (void *cls,
ctx.status = GNUNET_OK; ctx.status = GNUNET_OK;
/* check if the melt record exists and get it */ /* check if the melt record exists and get it */
qs = GNUNET_PQ_eval_prepared_multi_select (session->conn, qs = GNUNET_PQ_eval_prepared_multi_select (session->conn,
"lookup_transactions", "lookup_transactions",
params, params,
&handle_wt_result, &handle_wt_result,
&ctx); &ctx);
if (GNUNET_OK != ctx.status) if (GNUNET_OK != ctx.status)
return GNUNET_DB_STATUS_HARD_ERROR; return GNUNET_DB_STATUS_HARD_ERROR;
return qs; return qs;

2
src/exchangedb/test_exchangedb.c
View File

@ -749,6 +749,7 @@ cb_wt_never (void *cls,
const json_t *wire, const json_t *wire,
struct GNUNET_TIME_Absolute exec_time, struct GNUNET_TIME_Absolute exec_time,
const struct GNUNET_HashCode *h_contract_terms, const struct GNUNET_HashCode *h_contract_terms,
const struct TALER_DenominationPublicKey *denom_pub,
const struct TALER_CoinSpendPublicKeyP *coin_pub, const struct TALER_CoinSpendPublicKeyP *coin_pub,
const struct TALER_Amount *coin_value, const struct TALER_Amount *coin_value,
const struct TALER_Amount *coin_fee) const struct TALER_Amount *coin_fee)
@ -793,6 +794,7 @@ cb_wt_check (void *cls,
const json_t *wire, const json_t *wire,
struct GNUNET_TIME_Absolute exec_time, struct GNUNET_TIME_Absolute exec_time,
const struct GNUNET_HashCode *h_contract_terms, const struct GNUNET_HashCode *h_contract_terms,
const struct TALER_DenominationPublicKey *denom_pub,
const struct TALER_CoinSpendPublicKeyP *coin_pub, const struct TALER_CoinSpendPublicKeyP *coin_pub,
const struct TALER_Amount *coin_value, const struct TALER_Amount *coin_value,
const struct TALER_Amount *coin_fee) const struct TALER_Amount *coin_fee)

2
src/include/taler_exchangedb_plugin.h
View File

@ -1055,6 +1055,7 @@ typedef void
* @param account_details which account did the transfer go to? * @param account_details which account did the transfer go to?
* @param exec_time execution time of the wire transfer (should be same for all callbacks with the same @e cls) * @param exec_time execution time of the wire transfer (should be same for all callbacks with the same @e cls)
* @param h_contract_terms which proposal was this payment about * @param h_contract_terms which proposal was this payment about
* @param denom_pub denomination of @a coin_pub
* @param coin_pub which public key was this payment about * @param coin_pub which public key was this payment about
* @param coin_value amount contributed by this coin in total (with fee) * @param coin_value amount contributed by this coin in total (with fee)
* @param coin_fee applicable fee for this coin * @param coin_fee applicable fee for this coin
@ -1067,6 +1068,7 @@ typedef void
const json_t *account_details, const json_t *account_details,
struct GNUNET_TIME_Absolute exec_time, struct GNUNET_TIME_Absolute exec_time,
const struct GNUNET_HashCode *h_contract_terms, const struct GNUNET_HashCode *h_contract_terms,
const struct TALER_DenominationPublicKey *denom_pub,
const struct TALER_CoinSpendPublicKeyP *coin_pub, const struct TALER_CoinSpendPublicKeyP *coin_pub,
const struct TALER_Amount *coin_value, const struct TALER_Amount *coin_value,
const struct TALER_Amount *coin_fee); const struct TALER_Amount *coin_fee);