Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-09-18 08:52:26 +02:00
Code Issues Releases Wiki Activity

code review

Browse Source
This commit is contained in:
gorhill 2015-06-09 17:01:31 -04:00
parent fa3b4c887c
commit 61dc1b7808
2 changed files with 72 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
src/js/static-net-filtering.js
View File

@ -158,6 +158,8 @@ histogram = function(label, categories) {
*/ */
/******************************************************************************/ /******************************************************************************/
// Local helpers
// Could be replaced with encodeURIComponent/decodeURIComponent, // Could be replaced with encodeURIComponent/decodeURIComponent,
// which seems faster on Firefox. // which seems faster on Firefox.
var encode = JSON.stringify; var encode = JSON.stringify;
@ -210,6 +212,10 @@ var strToRegex = function(s, anchor, flags) {
return new RegExp(reStr, flags); return new RegExp(reStr, flags);
}; };
var toHex = function(category) {
return category.toString(16);
};
/******************************************************************************* /*******************************************************************************
Filters family tree: Filters family tree:
@ -1739,12 +1745,6 @@ FilterContainer.prototype.fromSelfie = function(selfie) {
/******************************************************************************/ /******************************************************************************/
FilterContainer.prototype.makeCategoryKey = function(category) {
return category.toString(16);
};
/******************************************************************************/
FilterContainer.prototype.compile = function(raw, out) { FilterContainer.prototype.compile = function(raw, out) {
// ORDER OF TESTS IS IMPORTANT! // ORDER OF TESTS IS IMPORTANT!
@ -1808,7 +1808,7 @@ FilterContainer.prototype.compileHostnameOnlyFilter = function(parsed, out) {
if ( type === 0 ) { if ( type === 0 ) {
out.push( out.push(
'n\v' + 'n\v' +
this.makeCategoryKey(keyShard) + '\v' + toHex(keyShard) + '\v' +
'.\v' + '.\v' +
parsed.f parsed.f
); );
@ -1820,7 +1820,7 @@ FilterContainer.prototype.compileHostnameOnlyFilter = function(parsed, out) {
if ( type & 1 ) { if ( type & 1 ) {
out.push( out.push(
'n\v' + 'n\v' +
this.makeCategoryKey(keyShard | (bitOffset << 4)) + '\v' + toHex(keyShard | (bitOffset << 4)) + '\v' +
'.\v' + '.\v' +
parsed.f parsed.f
); );
@ -1920,7 +1920,7 @@ FilterContainer.prototype.compileToAtomicFilter = function(filterClass, parsed,
if ( type === 0 ) { if ( type === 0 ) {
out.push( out.push(
'n\v' + 'n\v' +
this.makeCategoryKey(bits) + '\v' + toHex(bits) + '\v' +
parsed.token + '\v' + parsed.token + '\v' +
filterClass.fid + '\v' + filterClass.fid + '\v' +
filterClass.compile(parsed, hostname) filterClass.compile(parsed, hostname)
@ -1932,7 +1932,7 @@ FilterContainer.prototype.compileToAtomicFilter = function(filterClass, parsed,
if ( type & 1 ) { if ( type & 1 ) {
out.push( out.push(
'n\v' + 'n\v' +
this.makeCategoryKey(bits | (bitOffset << 4)) + '\v' + toHex(bits | (bitOffset << 4)) + '\v' +
parsed.token + '\v' + parsed.token + '\v' +
filterClass.fid + '\v' + filterClass.fid + '\v' +
filterClass.compile(parsed, hostname) filterClass.compile(parsed, hostname)
@ -2241,39 +2241,43 @@ FilterContainer.prototype.matchStringExactType = function(context, requestURL, r
return undefined; return undefined;
} }
var categories = this.categories;
var bucket;
// Tokenize only once // Tokenize only once
this.tokenize(url); this.tokenize(url);
this.fRegister = null; this.fRegister = null;
var categories = this.categories;
var key, bucket;
// https://github.com/chrisaljoudi/uBlock/issues/139 // https://github.com/chrisaljoudi/uBlock/issues/139
// Test against important block filters // Test against important block filters
if ( bucket = categories[this.makeCategoryKey(BlockAnyParty | Important | type)] ) { key = toHex(BlockAnyParty | Important | type);
if ( bucket = categories[key] ) {
if ( this.matchTokens(bucket, url) ) { if ( this.matchTokens(bucket, url) ) {
this.keyRegister = BlockAnyParty | Important | type; this.keyRegister = key;
return true; return true;
} }
} }
if ( bucket = categories[this.makeCategoryKey(BlockAction | Important | type | party)] ) { key = toHex(BlockAction | Important | type | party);
if ( bucket = categories[key] ) {
if ( this.matchTokens(bucket, url) ) { if ( this.matchTokens(bucket, url) ) {
this.keyRegister = BlockAction | Important | type | party; this.keyRegister = key;
return true; return true;
} }
} }
// Test against block filters // Test against block filters
if ( bucket = categories[this.makeCategoryKey(BlockAnyParty | type)] ) { key = toHex(BlockAnyParty | type);
if ( bucket = categories[key] ) {
if ( this.matchTokens(bucket, url) ) { if ( this.matchTokens(bucket, url) ) {
this.keyRegister = BlockAnyParty | type; this.keyRegister = key;
} }
} }
if ( this.fRegister === null ) { if ( this.fRegister === null ) {
if ( bucket = categories[this.makeCategoryKey(BlockAction | type | party)] ) { key = toHex(BlockAction | type | party);
if ( bucket = categories[key] ) {
if ( this.matchTokens(bucket, url) ) { if ( this.matchTokens(bucket, url) ) {
this.keyRegister = BlockAction | type | party; this.keyRegister = key;
} }
} }
} }
@ -2284,15 +2288,17 @@ FilterContainer.prototype.matchStringExactType = function(context, requestURL, r
} }
// Test against allow filters // Test against allow filters
if ( bucket = categories[this.makeCategoryKey(AllowAnyParty | type)] ) { key = toHex(AllowAnyParty | type);
if ( bucket = categories[key] ) {
if ( this.matchTokens(bucket, url) ) { if ( this.matchTokens(bucket, url) ) {
this.keyRegister = AllowAnyParty | type; this.keyRegister = key;
return false; return false;
} }
} }
if ( bucket = categories[this.makeCategoryKey(AllowAction | type | party)] ) { key = toHex(AllowAction | type | party);
if ( bucket = categories[key] ) {
if ( this.matchTokens(bucket, url) ) { if ( this.matchTokens(bucket, url) ) {
this.keyRegister = AllowAction | type | party; this.keyRegister = key;
return false; return false;
} }
} }
@ -2343,67 +2349,75 @@ FilterContainer.prototype.matchString = function(context) {
pageHostnameRegister = context.pageHostname || ''; pageHostnameRegister = context.pageHostname || '';
requestHostnameRegister = context.requestHostname; requestHostnameRegister = context.requestHostname;
var party = isFirstParty(context.pageDomain, context.requestHostname) ? FirstParty : ThirdParty;
var filterClasses = this.categories;
var bucket;
// Tokenize only once // Tokenize only once
this.tokenize(url); this.tokenize(url);
this.fRegister = null; this.fRegister = null;
var party = isFirstParty(context.pageDomain, context.requestHostname) ? FirstParty : ThirdParty;
var categories = this.categories;
var key, bucket;
// https://github.com/chrisaljoudi/uBlock/issues/139 // https://github.com/chrisaljoudi/uBlock/issues/139
// Test against important block filters. // Test against important block filters.
// The purpose of the `important` option is to reverse the order of // The purpose of the `important` option is to reverse the order of
// evaluation. Normally, it is "evaluate block then evaluate allow", with // evaluation. Normally, it is "evaluate block then evaluate allow", with
// the `important` property it is "evaluate allow then evaluate block". // the `important` property it is "evaluate allow then evaluate block".
if ( bucket = filterClasses[this.makeCategoryKey(BlockAnyTypeAnyParty | Important)] ) { key = toHex(BlockAnyTypeAnyParty | Important);
if ( bucket = categories[key] ) {
if ( this.matchTokens(bucket, url) ) { if ( this.matchTokens(bucket, url) ) {
this.keyRegister = BlockAnyTypeAnyParty | Important; this.keyRegister = key;
return true; return true;
} }
} }
if ( bucket = filterClasses[this.makeCategoryKey(BlockAnyType | Important | party)] ) { key = toHex(BlockAnyType | Important | party);
if ( bucket = categories[key] ) {
if ( this.matchTokens(bucket, url) ) { if ( this.matchTokens(bucket, url) ) {
this.keyRegister = BlockAnyType | Important | party; this.keyRegister = key;
return true; return true;
} }
} }
if ( bucket = filterClasses[this.makeCategoryKey(BlockAnyParty | Important | type)] ) { key = toHex(BlockAnyParty | Important | type);
if ( bucket = categories[key] ) {
if ( this.matchTokens(bucket, url) ) { if ( this.matchTokens(bucket, url) ) {
this.keyRegister = BlockAnyParty | Important | type; this.keyRegister = key;
return true; return true;
} }
} }
if ( bucket = filterClasses[this.makeCategoryKey(BlockAction | Important | type | party)] ) { key = toHex(BlockAction | Important | type | party);
if ( bucket = categories[key] ) {
if ( this.matchTokens(bucket, url) ) { if ( this.matchTokens(bucket, url) ) {
this.keyRegister = BlockAction | Important | type | party; this.keyRegister = key;
return true; return true;
} }
} }
// Test against block filters // Test against block filters
if ( bucket = filterClasses[this.makeCategoryKey(BlockAnyTypeAnyParty)] ) { key = toHex(BlockAnyTypeAnyParty);
if ( bucket = categories[key] ) {
if ( this.matchTokens(bucket, url) ) { if ( this.matchTokens(bucket, url) ) {
this.keyRegister = BlockAnyTypeAnyParty; this.keyRegister = key;
} }
} }
if ( this.fRegister === null ) { if ( this.fRegister === null ) {
if ( bucket = filterClasses[this.makeCategoryKey(BlockAnyType | party)] ) { key = toHex(BlockAnyType | party);
if ( bucket = categories[key] ) {
if ( this.matchTokens(bucket, url) ) { if ( this.matchTokens(bucket, url) ) {
this.keyRegister = BlockAnyType | party; this.keyRegister = key;
} }
} }
if ( this.fRegister === null ) { if ( this.fRegister === null ) {
if ( bucket = filterClasses[this.makeCategoryKey(BlockAnyParty | type)] ) { key = toHex(BlockAnyParty | type);
if ( bucket = categories[key] ) {
if ( this.matchTokens(bucket, url) ) { if ( this.matchTokens(bucket, url) ) {
this.keyRegister = BlockAnyParty | type; this.keyRegister = key;
} }
} }
if ( this.fRegister === null ) { if ( this.fRegister === null ) {
if ( bucket = filterClasses[this.makeCategoryKey(BlockAction | type | party)] ) { key = toHex(BlockAction | type | party);
if ( bucket = categories[key] ) {
if ( this.matchTokens(bucket, url) ) { if ( this.matchTokens(bucket, url) ) {
this.keyRegister = BlockAction | type | party; this.keyRegister = key;
} }
} }
} }
@ -2416,27 +2430,31 @@ FilterContainer.prototype.matchString = function(context) {
} }
// Test against allow filters // Test against allow filters
if ( bucket = filterClasses[this.makeCategoryKey(AllowAnyTypeAnyParty)] ) { key = toHex(AllowAnyTypeAnyParty);
if ( bucket = categories[key] ) {
if ( this.matchTokens(bucket, url) ) { if ( this.matchTokens(bucket, url) ) {
this.keyRegister = AllowAnyTypeAnyParty; this.keyRegister = key;
return false; return false;
} }
} }
if ( bucket = filterClasses[this.makeCategoryKey(AllowAnyType | party)] ) { key = toHex(AllowAnyType | party);
if ( bucket = categories[key] ) {
if ( this.matchTokens(bucket, url) ) { if ( this.matchTokens(bucket, url) ) {
this.keyRegister = AllowAnyType | party; this.keyRegister = key;
return false; return false;
} }
} }
if ( bucket = filterClasses[this.makeCategoryKey(AllowAnyParty | type)] ) { key = toHex(AllowAnyParty | type);
if ( bucket = categories[key] ) {
if ( this.matchTokens(bucket, url) ) { if ( this.matchTokens(bucket, url) ) {
this.keyRegister = AllowAnyParty | type; this.keyRegister = key;
return false; return false;
} }
} }
if ( bucket = filterClasses[this.makeCategoryKey(AllowAction | type | party)] ) { key = toHex(AllowAction | type | party);
if ( bucket = categories[key] ) {
if ( this.matchTokens(bucket, url) ) { if ( this.matchTokens(bucket, url) ) {
this.keyRegister = AllowAction | type | party; this.keyRegister = key;
return false; return false;
} }
} }
@ -2458,7 +2476,7 @@ FilterContainer.prototype.toResultString = function(verbose) {
if ( !verbose ) { if ( !verbose ) {
return s; return s;
} }
s += 'n\v' + this.makeCategoryKey(this.keyRegister) + '\v' + this.tokenRegister + '\v'; s += 'n\v' + this.keyRegister + '\v' + this.tokenRegister + '\v';
if ( this.tokenRegister === '.' ) { if ( this.tokenRegister === '.' ) {
s += this.fRegister.rtCompile(); s += this.fRegister.rtCompile();
} else { } else {

1
src/js/storage.js
View File

@ -577,7 +577,6 @@
continue; continue;
} }
//staticNetFilteringEngine.add(line);
staticNetFilteringEngine.compile(line, compiledFilters); staticNetFilteringEngine.compile(line, compiledFilters);
} }