open.source/stylus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

explicitly parse a text response into JSON

Browse Source
This commit is contained in:
tophf 2018-07-05 11:40:23 +03:00
parent 561e7c585b
commit 9992ae3374
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
content/install-hook-userstyles.js
View File

@ -364,12 +364,13 @@ document.documentElement.appendChild(document.createElement('script')).text = `(
return; return;
} }
const xhr = new XMLHttpRequest(); const xhr = new XMLHttpRequest();
xhr.responseType = 'json';
xhr.onloadend = xhr.onerror = () => { xhr.onloadend = xhr.onerror = () => {
window.stop(); window.stop();
top.postMessage({ top.postMessage({
id: data.xhr.id, id: data.xhr.id,
status: xhr.status, status: xhr.status,
// [being overcautious] a string response is used instead of relying on responseType=json
// because it was invoked in a web page context so another extension may have incorrectly spoofed it
response: xhr.response, response: xhr.response,
}, EXTENSION_ORIGIN); }, EXTENSION_ORIGIN);
}; };

7
popup/search-results.js
View File

@ -832,8 +832,11 @@ window.addEventListener('showStyles:done', function _() {
chrome.webRequest.onBeforeRequest.removeListener(stripResources); chrome.webRequest.onBeforeRequest.removeListener(stripResources);
searchFrameQueue.delete(data.id); searchFrameQueue.delete(data.id);
clearTimeout(timeout); clearTimeout(timeout);
if (data.response && data.status < 400) { // [being overcautious] a string response is used instead of relying on responseType=json
resolve(data.response); // because it was invoked in a web page context so another extension may have incorrectly spoofed it
const json = tryJSONparse(data.response);
if (json && data.status < 400) {
resolve(json);
} else { } else {
reject(data.status); reject(data.status);
} }