taler/wallet-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

break merchant redirect loops

Browse Source
This commit is contained in:
Florian Dold 2016-09-28 19:37:05 +02:00
parent 9e93109358
commit de53505342
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
content_scripts/notify.ts
View File

@ -217,11 +217,15 @@ namespace TalerNotify {
};
chrome.runtime.sendMessage(walletMsg, (resp) => {
if (resp.rateLimitExceeded) {
console.error("rate limit exceeded, check for redirect loops");
}
if (!resp.success) {
if (msg.offering_url) {
window.location.href = msg.offering_url;
} else {
console.error("execute-payment failed");
console.error("execute-payment failed", resp);
}
return;
}

25
lib/wallet/wxMessaging.ts
View File

@ -130,7 +130,19 @@ function makeHandlers(db: IDBDatabase,
}
return wallet.checkPay(offer);
},
["execute-payment"]: function(detail, sender) {
["execute-payment"]: function(detail: any, sender: MessageSender) {
if (sender.tab && sender.tab.id) {
rateLimitCache[sender.tab.id]++;
if (rateLimitCache[sender.tab.id] > 10) {
console.warn("rate limit for execute payment exceeded");
let msg = {
error: "rate limit exceeded for execute-payment",
rateLimitExceeded: true,
hint: "Check for redirect loops",
};
return Promise.resolve(msg);
}
}
return wallet.executePayment(detail.H_contract);
},
["exchange-info"]: function(detail) {
@ -287,6 +299,13 @@ function handleHttpPayment(headerList: chrome.webRequest.HttpHeader[],
export let wallet: Wallet|undefined = undefined;
export let badge: ChromeBadge|undefined = undefined;
// Rate limit cache for executePayment operations, to break redirect loops
let rateLimitCache: {[n: number]: number} = {};
function clearRateLimitCache() {
rateLimitCache = {};
}
export function wxMain() {
chrome.browserAction.setBadgeText({text: ""});
badge = new ChromeBadge();
@ -306,6 +325,8 @@ export function wxMain() {
}
});
chrome.extension.getBackgroundPage().setInterval(clearRateLimitCache, 5000);
Promise.resolve()
.then(() => {
return openTalerDb();
@ -349,8 +370,6 @@ export function wxMain() {
details.url,
details.tabId);
}, {urls: ["<all_urls>"]}, ["responseHeaders", "blocking"]);
})
.catch((e) => {
console.error("could not initialize wallet messaging");