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

handle changing permissions better

Browse Source
This commit is contained in:
Florian Dold 2020-05-01 15:04:12 +05:30
parent 609397d95a
commit 848f44733e
No known key found for this signature in database
GPG Key ID: D2E4F00F29D02A4B
2 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/webex/wxBackend.ts
View File

@ -498,6 +498,7 @@ try {
function headerListener( function headerListener(
details: chrome.webRequest.WebResponseHeadersDetails, details: chrome.webRequest.WebResponseHeadersDetails,
): chrome.webRequest.BlockingResponse | undefined { ): chrome.webRequest.BlockingResponse | undefined {
console.log("header listener");
if (chrome.runtime.lastError) { if (chrome.runtime.lastError) {
console.error(chrome.runtime.lastError); console.error(chrome.runtime.lastError);
return; return;
@ -507,6 +508,7 @@ function headerListener(
console.warn("wallet not available while handling header"); console.warn("wallet not available while handling header");
return; return;
} }
console.log("in header listener");
if (details.statusCode === 402 || details.statusCode === 202) { if (details.statusCode === 402 || details.statusCode === 202) {
console.log(`got 402/202 from ${details.url}`); console.log(`got 402/202 from ${details.url}`);
for (const header of details.responseHeaders || []) { for (const header of details.responseHeaders || []) {
@ -572,12 +574,29 @@ function headerListener(
} }
function setupHeaderListener(): void { function setupHeaderListener(): void {
console.log("setting up header listener");
// Handlers for catching HTTP requests // Handlers for catching HTTP requests
chrome.webRequest.onHeadersReceived.addListener( chrome.permissions.contains(extendedPermissions, (result: boolean) => {
headerListener, if (
{ urls: ["https://*/*", "http://*/*"] }, chrome.webRequest.onHeadersReceived &&
["responseHeaders", "blocking"], chrome.webRequest.onHeadersReceived.hasListener(headerListener)
); ) {
chrome.webRequest.onHeadersReceived.removeListener(headerListener);
}
if (result) {
console.log("actually adding listener");
chrome.webRequest.onHeadersReceived.addListener(
headerListener,
{ urls: ["<all_urls>"] },
["responseHeaders", "blocking"],
);
}
chrome.webRequest.handlerBehaviorChanged(() => {
if (chrome.runtime.lastError) {
console.error(chrome.runtime.lastError);
}
});
});
} }
/** /**
@ -602,4 +621,12 @@ export async function wxMain(): Promise<void> {
}); });
setupHeaderListener(); setupHeaderListener();
chrome.permissions.onAdded.addListener((perm) => {
if (chrome.runtime.lastError) {
console.error(chrome.runtime.lastError);
return;
}
setupHeaderListener();
});
} }

4
webextension/manifest.json
View File

@ -4,8 +4,8 @@
"name": "GNU Taler Wallet (git)", "name": "GNU Taler Wallet (git)",
"description": "Privacy preserving and transparent payments", "description": "Privacy preserving and transparent payments",
"author": "GNU Taler Developers", "author": "GNU Taler Developers",
"version": "0.6.75", "version": "0.6.77.1",
"version_name": "0.6.0pre10", "version_name": "0.7.0.dev.1",
"minimum_chrome_version": "51", "minimum_chrome_version": "51",
"minimum_opera_version": "36", "minimum_opera_version": "36",