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

fix refund check logic

Browse Source
This commit is contained in:
Christian Grothoff 2017-03-17 14:45:58 +01:00
parent 06c2327558
commit eee0674c86
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/exchange/taler-exchange-httpd_db.c
View File

@ -1,6 +1,6 @@
/* /*
This file is part of TALER This file is part of TALER
Copyright (C) 2014, 2015, 2016 GNUnet e.V. Copyright (C) 2014-2017 GNUnet e.V.
TALER is free software; you can redistribute it and/or modify it under the TALER is free software; you can redistribute it and/or modify it under the
terms of the GNU General Public License as published by the Free Software terms of the GNU General Public License as published by the Free Software
@ -375,14 +375,14 @@ TEH_DB_execute_refund (struct MHD_Connection *connection,
case TALER_EXCHANGEDB_TT_DEPOSIT: case TALER_EXCHANGEDB_TT_DEPOSIT:
if (GNUNET_NO == deposit_found) if (GNUNET_NO == deposit_found)
{ {
dep = tlp->details.deposit; if ( (0 == memcmp (&tlp->details.deposit.merchant_pub,
if ( (0 == memcmp (&dep->merchant_pub,
&refund->merchant_pub, &refund->merchant_pub,
sizeof (struct TALER_MerchantPublicKeyP))) && sizeof (struct TALER_MerchantPublicKeyP))) &&
(0 == memcmp (&dep->h_proposal_data, (0 == memcmp (&tlp->details.deposit.h_proposal_data,
&refund->h_proposal_data, &refund->h_proposal_data,
sizeof (struct GNUNET_HashCode))) ) sizeof (struct GNUNET_HashCode))) )
{ {
dep = tlp->details.deposit;
deposit_found = GNUNET_YES; deposit_found = GNUNET_YES;
break; break;
} }
@ -394,29 +394,29 @@ TEH_DB_execute_refund (struct MHD_Connection *connection,
case TALER_EXCHANGEDB_TT_REFUND: case TALER_EXCHANGEDB_TT_REFUND:
if (GNUNET_NO == refund_found) if (GNUNET_NO == refund_found)
{ {
ref = tlp->details.refund;
/* First, check if existing refund request is identical */ /* First, check if existing refund request is identical */
if ( (0 == memcmp (&ref->merchant_pub, if ( (0 == memcmp (&tlp->details.refund->merchant_pub,
&refund->merchant_pub, &refund->merchant_pub,
sizeof (struct TALER_MerchantPublicKeyP))) && sizeof (struct TALER_MerchantPublicKeyP))) &&
(0 == memcmp (&ref->h_proposal_data, (0 == memcmp (&tlp->details.refund->h_proposal_data,
&refund->h_proposal_data, &refund->h_proposal_data,
sizeof (struct GNUNET_HashCode))) && sizeof (struct GNUNET_HashCode))) &&
(ref->rtransaction_id == refund->rtransaction_id) ) (ref->rtransaction_id == refund->rtransaction_id) )
{ {
ref = tlp->details.refund;
refund_found = GNUNET_YES; refund_found = GNUNET_YES;
break; break;
} }
/* Second, check if existing refund request conflicts */ /* Second, check if existing refund request conflicts */
if ( (0 == memcmp (&ref->merchant_pub, if ( (0 == memcmp (&tlp->details.merchant_pub,
&refund->merchant_pub, &refund->merchant_pub,
sizeof (struct TALER_MerchantPublicKeyP))) && sizeof (struct TALER_MerchantPublicKeyP))) &&
(0 == memcmp (&ref->h_proposal_data, (0 == memcmp (&tlp->details.h_proposal_data,
&refund->h_proposal_data, &refund->h_proposal_data,
sizeof (struct GNUNET_HashCode))) && sizeof (struct GNUNET_HashCode))) &&
(ref->rtransaction_id != refund->rtransaction_id) ) (tlp->details.rtransaction_id != refund->rtransaction_id) )
{ {
GNUNET_break_op (0); /* conflicting refound found */ GNUNET_break_op (0); /* conflicting refund found */
refund_found = GNUNET_SYSERR; refund_found = GNUNET_SYSERR;
/* NOTE: Alternatively we could total up all existing /* NOTE: Alternatively we could total up all existing
refunds and check if the sum still permits the refunds and check if the sum still permits the