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

It's ok for toLogger() to be in derived class

Browse Source 
Related commit:
aa7f77aaad
This commit is contained in:
Raymond Hill 2023-12-21 11:14:33 -05:00
parent aa7f77aaad
commit 826bc7d457
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/js/messaging.js
View File

@ -718,18 +718,7 @@ const retrieveContentScriptParameters = async function(sender, request) {
if ( logger.enabled || request.needScriptlets ) {
const scriptletDetails = scriptletFilteringEngine.injectNow(request);
if ( scriptletDetails !== undefined ) {
if ( logger.enabled && typeof scriptletDetails.filters === 'string' ) {
const fctxt = µb.filteringContext
.duplicate()
.fromTabId(tabId)
.setRealm('extended')
.setType('scriptlet')
.setURL(request.url)
.setDocOriginFromURL(request.url);
for ( const raw of scriptletDetails.filters.split('\n') ) {
fctxt.setFilter({ source: 'extended', raw }).toLogger();
}
}
scriptletFilteringEngine.toLogger(request, scriptletDetails);
if ( request.needScriptlets ) {
response.scriptletDetails = scriptletDetails;
}

17
src/js/scriptlet-filtering.js
View File

@ -26,6 +26,7 @@
/******************************************************************************/
import µb from './background.js';
import logger from './logger.js';
import { onBroadcast } from './broadcast.js';
import { redirectEngine as reng } from './redirect-engine.js';
import { sessionFirewall } from './filtering-engines.js';
@ -300,6 +301,22 @@ export class ScriptletFilteringEngineEx extends ScriptletFilteringEngine {
return scriptletDetails;
}
toLogger(request, details) {
if ( details === undefined ) { return; }
if ( logger.enabled !== true ) { return; }
if ( typeof details.filters !== 'string' ) { return; }
const fctxt = µb.filteringContext
.duplicate()
.fromTabId(request.tabId)
.setRealm('extended')
.setType('scriptlet')
.setURL(request.url)
.setDocOriginFromURL(request.url);
for ( const raw of details.filters.split('\n') ) {
fctxt.setFilter({ source: 'extended', raw }).toLogger();
}
}
}
/******************************************************************************/