Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update fix for https://github.com/gorhill/uMatrix/issues/967

This commit is contained in:
Raymond Hill 2018-03-14 12:06:49 -04:00
parent 51bae66785
commit 11ccb4523a
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
1 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/js/traffic.js
View File

@ -1077,15 +1077,45 @@ var injectCSP = function(pageStore, details) {
// Ref.: https://www.w3.org/TR/CSP2/#implementation-considerations
//
// https://github.com/gorhill/uMatrix/issues/967
// Inject a new CSP header rather than modify an existing one.
details.responseHeaders.push({
// Inject a new CSP header rather than modify an existing one, except
// if the current environment does not support merging headers:
// Firefox 58/webext and less can't merge CSP headers, so we will merge
// them here.
var headers = details.responseHeaders;
if ( cantMergeCSPHeaders ) {
var i = headerIndexFromName('content-security-policy', headers);
if ( i !== -1 ) {
cspSubsets.unshift(headers[i].value.trim());
headers.splice(i, 1);
}
}
headers.push({
name: 'Content-Security-Policy',
value: cspSubsets.join(', ')
});
return { 'responseHeaders': details.responseHeaders };
return { 'responseHeaders': headers };
};
// https://github.com/gorhill/uMatrix/issues/967#issuecomment-373002011
// This can be removed once Firefox 60 ESR is released.
var cantMergeCSPHeaders = (function() {
if (
self.browser instanceof Object &&
typeof self.browser.runtime.getBrowserInfo === 'function'
) {
self.browser.runtime.getBrowserInfo().then(function(info) {
cantMergeCSPHeaders =
info.vendor === 'Mozilla' &&
info.name === 'Firefox' &&
parseInt(info.version, 10) < 59;
});
}
return false;
})();
/******************************************************************************/
// https://github.com/gorhill/uBlock/issues/1163