1
0
mirror of https://github.com/gorhill/uBlock.git synced 2024-09-18 17:02:27 +02:00

Enable the blocking of CSP reports by default

Related issue:
- https://github.com/LiCybora/NanoDefenderFirefox/issues/196
This commit is contained in:
Raymond Hill 2020-12-11 12:34:09 -05:00
parent d0a0984ece
commit 7d90f97aa1
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
2 changed files with 9 additions and 25 deletions

View File

@ -26,7 +26,7 @@
/******************************************************************************/ /******************************************************************************/
µBlock.HnSwitches = (function() { µBlock.HnSwitches = (( ) => {
/******************************************************************************/ /******************************************************************************/

View File

@ -111,33 +111,16 @@ const onVersionReady = function(lastVersion) {
µb.redirectEngine.invalidateResourcesSelfie(); µb.redirectEngine.invalidateResourcesSelfie();
const lastVersionInt = vAPI.app.intFromVersion(lastVersion); const lastVersionInt = vAPI.app.intFromVersion(lastVersion);
if ( lastVersionInt === 0 ) { return; }
// https://github.com/uBlockOrigin/uBlock-issues/issues/494 // https://github.com/LiCybora/NanoDefenderFirefox/issues/196
// Remove useless per-site switches. // Toggle on the blocking of CSP reports by default.
if ( lastVersionInt <= 1019003007 ) { if ( lastVersionInt <= 1031003011 ) {
µb.sessionSwitches.toggle('no-scripting', 'behind-the-scene', 0); µb.sessionSwitches.toggle('no-csp-reports', '*', 1);
µb.permanentSwitches.toggle('no-scripting', 'behind-the-scene', 0); µb.permanentSwitches.toggle('no-csp-reports', '*', 1);
µb.saveHostnameSwitches(); µb.saveHostnameSwitches();
} }
// Configure new popup panel according to classic popup panel
// configuration.
if ( lastVersionInt !== 0 ) {
if ( lastVersionInt <= 1026003014 ) {
µb.userSettings.popupPanelSections =
µb.userSettings.dynamicFilteringEnabled === true ? 0b11111 : 0b01111;
µb.userSettings.dynamicFilteringEnabled = undefined;
µb.saveUserSettings();
} else if (
lastVersionInt <= 1026003016 &&
(µb.userSettings.popupPanelSections & 1) !== 0
) {
µb.userSettings.popupPanelSections =
(µb.userSettings.popupPanelSections << 1 | 1) & 0b111111;
µb.saveUserSettings();
}
}
vAPI.storage.set({ version: vAPI.app.version }); vAPI.storage.set({ version: vAPI.app.version });
}; };
@ -240,13 +223,14 @@ const fromFetch = function(to, fetched) {
const createDefaultProps = function() { const createDefaultProps = function() {
const fetchableProps = { const fetchableProps = {
'dynamicFilteringString': [ 'dynamicFilteringString': [
'no-csp-reports: * true',
'behind-the-scene * * noop', 'behind-the-scene * * noop',
'behind-the-scene * image noop', 'behind-the-scene * image noop',
'behind-the-scene * 3p noop', 'behind-the-scene * 3p noop',
'behind-the-scene * inline-script noop', 'behind-the-scene * inline-script noop',
'behind-the-scene * 1p-script noop', 'behind-the-scene * 1p-script noop',
'behind-the-scene * 3p-script noop', 'behind-the-scene * 3p-script noop',
'behind-the-scene * 3p-frame noop' 'behind-the-scene * 3p-frame noop',
].join('\n'), ].join('\n'),
'urlFilteringString': '', 'urlFilteringString': '',
'hostnameSwitchesString': [ 'hostnameSwitchesString': [