diff options
author | Florian Dold <florian.dold@gmail.com> | 2019-09-06 11:06:28 +0200 |
---|---|---|
committer | Florian Dold <florian.dold@gmail.com> | 2019-09-06 11:06:28 +0200 |
commit | f6c01085113dfb004ca4478f276cfef0d2c24138 (patch) | |
tree | c28ccddf3804b7467fdbeb04d849c44d776de6bc /src/wallet.ts | |
parent | 9297bbc8253650a2530afc3fd88c9bd102de0793 (diff) | |
download | wallet-core-f6c01085113dfb004ca4478f276cfef0d2c24138.tar.xz |
fix bug #5373: only allow existing payment redirection for contracts from the same merchant
Diffstat (limited to 'src/wallet.ts')
-rw-r--r-- | src/wallet.ts | 39 |
1 files changed, 30 insertions, 9 deletions
diff --git a/src/wallet.ts b/src/wallet.ts index ca829e3fa..bbdcf9224 100644 --- a/src/wallet.ts +++ b/src/wallet.ts @@ -733,10 +733,9 @@ export class Wallet { return fu.href(); } - /** * Check if a payment for the given taler://pay/ URI is possible. - * + * * If the payment is possible, the signature are already generated but not * yet send to the merchant. */ @@ -769,6 +768,31 @@ export class Wallet { console.log("proposal", proposal); + const differentPurchase = await this.q().getIndexed( + Stores.purchases.fulfillmentUrlIndex, + proposal.contractTerms.fulfillment_url, + ); + + if (differentPurchase) { + // We do this check to prevent merchant B to find out if we bought a + // digital product with merchant A by abusing the existing payment + // redirect feature. + if ( + differentPurchase.contractTerms.merchant_pub != + proposal.contractTerms.merchant_pub + ) { + console.warn( + "merchant with different public key offered contract with same fulfillment URL as an existing purchase", + ); + } else { + return { + status: "paid", + contractTerms: differentPurchase.contractTerms, + nextUrl: this.getNextUrl(differentPurchase.contractTerms), + }; + } + } + // First check if we already payed for it. const purchase = await this.q().get( Stores.purchases, @@ -779,7 +803,9 @@ export class Wallet { const paymentAmount = Amounts.parseOrThrow(proposal.contractTerms.amount); let wireFeeLimit; if (proposal.contractTerms.max_wire_fee) { - wireFeeLimit = Amounts.parseOrThrow(proposal.contractTerms.max_wire_fee); + wireFeeLimit = Amounts.parseOrThrow( + proposal.contractTerms.max_wire_fee, + ); } else { wireFeeLimit = Amounts.getZero(paymentAmount.currency); } @@ -835,16 +861,12 @@ export class Wallet { } if (uriResult.sessionId) { - await this.submitPay( - purchase.contractTermsHash, - uriResult.sessionId, - ); + await this.submitPay(purchase.contractTermsHash, uriResult.sessionId); } return { status: "paid", contractTerms: proposal.contractTerms, - proposalId: proposal.id!, nextUrl: this.getNextUrl(purchase.contractTerms), }; } @@ -1126,7 +1148,6 @@ export class Wallet { return sp; } - private async sendReserveInfoToBank(reservePub: string) { const reserve = await this.q().get<ReserveRecord>( Stores.reserves, |