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

Expose hasQuery() and fix coarse test for query parameters

This commit is contained in:
Raymond Hill 2021-08-17 16:49:43 -04:00
parent 8959cea3cc
commit 60e254608a
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
platform/dig/snfe.js
View File

@ -206,11 +206,12 @@ async function matchRequestModifiers(engine, requests) {
details.url = request.url; details.url = request.url;
details.originURL = request.frameUrl; details.originURL = request.frameUrl;
const r = engine.matchRequest(details); const r = engine.matchRequest(details);
let modified = false;
if ( r !== 1 && details.type === 'sub_frame' ) { if ( r !== 1 && details.type === 'sub_frame' ) {
const reqstart = process.hrtime.bigint(); const reqstart = process.hrtime.bigint();
const directives = engine.matchAndFetchModifiers(details, 'csp'); const directives = engine.matchAndFetchModifiers(details, 'csp');
if ( directives !== undefined ) { if ( directives !== undefined ) {
modifiedCount += 1; modified = true;
if ( NEED_RESULTS ) { if ( NEED_RESULTS ) {
const reqstop = process.hrtime.bigint(); const reqstop = process.hrtime.bigint();
details.f = directives.map(a => a.logData().raw).sort().join(' '); details.f = directives.map(a => a.logData().raw).sort().join(' ');
@ -223,7 +224,7 @@ async function matchRequestModifiers(engine, requests) {
const reqstart = process.hrtime.bigint(); const reqstart = process.hrtime.bigint();
const directives = engine.matchAndFetchModifiers(details, 'redirect-rule'); const directives = engine.matchAndFetchModifiers(details, 'redirect-rule');
if ( directives !== undefined ) { if ( directives !== undefined ) {
modifiedCount += 1; modified = true;
if ( NEED_RESULTS ) { if ( NEED_RESULTS ) {
const reqstop = process.hrtime.bigint(); const reqstop = process.hrtime.bigint();
details.f = directives.map(a => a.logData().raw).sort().join(' '); details.f = directives.map(a => a.logData().raw).sort().join(' ');
@ -232,11 +233,11 @@ async function matchRequestModifiers(engine, requests) {
} }
} }
} }
if ( r !== 1 !== details.url.includes('?') ) { if ( r !== 1 && engine.hasQuery(details) ) {
const reqstart = process.hrtime.bigint(); const reqstart = process.hrtime.bigint();
const directives = engine.matchAndFetchModifiers(details, 'removeparam'); const directives = engine.matchAndFetchModifiers(details, 'removeparam');
if ( directives !== undefined ) { if ( directives !== undefined ) {
modifiedCount += 1; modified = true;
if ( NEED_RESULTS ) { if ( NEED_RESULTS ) {
const reqstop = process.hrtime.bigint(); const reqstop = process.hrtime.bigint();
details.f = directives.map(a => a.logData().raw).sort().join(' '); details.f = directives.map(a => a.logData().raw).sort().join(' ');
@ -245,12 +246,15 @@ async function matchRequestModifiers(engine, requests) {
} }
} }
} }
if ( modified ) {
modifiedCount += 1;
}
} }
const stop = process.hrtime.bigint(); const stop = process.hrtime.bigint();
console.log(`Matched-modified ${requests.length} requests in ${nanoToMilli(stop - start)}`); console.log(`Matched-modified ${requests.length} requests in ${nanoToMilli(stop - start)}`);
console.log(`\t${modifiedCount} modifiers found`); console.log(`\t${modifiedCount} modifiers found`);
console.log(`\tAverage: ${nanoToMicro((stop - start) / BigInt(requests.length))} per matched-modified request`); console.log(`\tAverage: ${nanoToMicro((stop - start) / BigInt(requests.length))} per request`);
if ( RECORD ) { if ( RECORD ) {
write('data/snfe.modifiers.json', JSON.stringify(results, null, 2)); write('data/snfe.modifiers.json', JSON.stringify(results, null, 2));

4
platform/nodejs/index.js
View File

@ -225,6 +225,10 @@ class StaticNetFilteringEngine {
return snfe.matchAndFetchModifiers(fctx.fromDetails(details), modifier); return snfe.matchAndFetchModifiers(fctx.fromDetails(details), modifier);
} }
hasQuery(details) {
return snfe.hasQuery(details);
}
toLogData() { toLogData() {
return snfe.toLogData(); return snfe.toLogData();
} }