external/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-11-10 09:07:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix CSP/PP header injection in non-document resources

Browse source 
Related feedback:
https://github.com/uBlockOrigin/uBlock-issues/issues/229#issuecomment-2220354261
https://old.reddit.com/r/uBlockOrigin/comments/1dz6du7/

Regression from:
https://github.com/gorhill/uBlock/commit/7c3e060c01
This commit is contained in:
Raymond Hill 2024-07-10 11:41:55 -04:00
parent 9c1252ef9c
commit c90f4933df
No known key found for this signature in database
GPG key ID: 25E1490B761470C2
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/js/traffic.js
View file

@ -553,11 +553,16 @@ const onHeadersReceived = function(details) {
if ( httpheaderFilteringEngine.apply(fctxt, responseHeaders) === true ) { if ( httpheaderFilteringEngine.apply(fctxt, responseHeaders) === true ) {
modifiedHeaders = true; modifiedHeaders = true;
} }
if ( injectCSP(fctxt, pageStore, responseHeaders) === true ) {
modifiedHeaders = true; // https://github.com/uBlockOrigin/uBlock-issues/issues/229#issuecomment-2220354261
} // Inject CSP/PP in document resource only
if ( injectPP(fctxt, pageStore, responseHeaders) === true ) { if ( fctxt.isDocument() ) {
modifiedHeaders = true; if ( injectCSP(fctxt, pageStore, responseHeaders) === true ) {
modifiedHeaders = true;
}
if ( injectPP(fctxt, pageStore, responseHeaders) === true ) {
modifiedHeaders = true;
}
} }
// https://bugzilla.mozilla.org/show_bug.cgi?id=1376932 // https://bugzilla.mozilla.org/show_bug.cgi?id=1376932
@ -945,10 +950,6 @@ const bodyFilterer = (( ) => {
/******************************************************************************/ /******************************************************************************/
const injectCSP = function(fctxt, pageStore, responseHeaders) { const injectCSP = function(fctxt, pageStore, responseHeaders) {
// https://github.com/uBlockOrigin/uBlock-issues/issues/229#issuecomment-2220354261
// Inject CSP in document resource only
if ( fctxt.isDocument() === false ) { return; }
const cspSubsets = []; const cspSubsets = [];
const requestType = fctxt.type; const requestType = fctxt.type;