Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-09-14 23:12:28 +02:00
Code Issues Releases Wiki Activity

Prevent duplicate inline-script entries in the logger

Browse Source 
Related discussion:
- https://www.reddit.com/r/uBlockOrigin/comments/c4340z/filter_problem/ervpjd8/
This commit is contained in:
Raymond Hill 2019-06-24 11:40:14 -04:00
parent 5caa369229
commit 8e7384ba84
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/js/contentscript.js
View File

@ -202,7 +202,8 @@ vAPI.SafeAnimationFrame.prototype = {
// are properly reported in the logger.
{
const events = new Set();
const newEvents = new Set();
const allEvents = new Set();
let timer;
const send = function() {
@ -212,14 +213,17 @@ vAPI.SafeAnimationFrame.prototype = {
what: 'securityPolicyViolation',
type: 'net',
docURL: document.location.href,
violations: Array.from(events),
violations: Array.from(newEvents),
},
response => {
if ( response === true ) { return; }
stop();
}
);
events.clear();
for ( const event of newEvents ) {
allEvents.add(event);
}
newEvents.clear();
};
const sendAsync = function() {
@ -233,16 +237,19 @@ vAPI.SafeAnimationFrame.prototype = {
const listener = function(ev) {
if ( ev.isTrusted !== true ) { return; }
if ( ev.disposition !== 'enforce' ) { return; }
events.add(JSON.stringify({
const json = JSON.stringify({
url: ev.blockedURL || ev.blockedURI,
policy: ev.originalPolicy,
directive: ev.effectiveDirective || ev.violatedDirective,
}));
});
if ( allEvents.has(json) ) { return; }
newEvents.add(json);
sendAsync();
};
const stop = function() {
events.clear();
newEvents.clear();
allEvents.clear();
if ( timer !== undefined ) {
self.cancelIdleCallback(timer);
timer = undefined;