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

generate better regex for hostname-anchored generic filters

This commit is contained in:
gorhill 2017-08-24 18:30:05 -04:00
parent c31d29c2e3
commit b2e89c9ece
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -200,7 +200,7 @@ var rawToRegexStr = function(s, anchor) {
.replace(me.escape3, '') .replace(me.escape3, '')
.replace(me.escape4, '[^ ]*?'); .replace(me.escape4, '[^ ]*?');
if ( anchor & 0x4 ) { if ( anchor & 0x4 ) {
reStr = '[0-9a-z.-]*?' + reStr; reStr = rawToRegexStr.reTextHostnameAnchor + reStr;
} else if ( anchor & 0x2 ) { } else if ( anchor & 0x2 ) {
reStr = '^' + reStr; reStr = '^' + reStr;
} }
@ -213,6 +213,7 @@ rawToRegexStr.escape1 = /[.+?${}()|[\]\\]/g;
rawToRegexStr.escape2 = /\^/g; rawToRegexStr.escape2 = /\^/g;
rawToRegexStr.escape3 = /^\*|\*$/g; rawToRegexStr.escape3 = /^\*|\*$/g;
rawToRegexStr.escape4 = /\*/g; rawToRegexStr.escape4 = /\*/g;
rawToRegexStr.reTextHostnameAnchor = '^[a-z-]+://(?:[^/?#]+\\.)?';
var filterFingerprinter = µb.CompiledLineWriter.fingerprint; var filterFingerprinter = µb.CompiledLineWriter.fingerprint;
@ -627,10 +628,13 @@ FilterGenericHnAnchored.prototype.match = function(url) {
return matchStart !== -1 && isHnAnchored(url, matchStart); return matchStart !== -1 && isHnAnchored(url, matchStart);
}; };
FilterGenericHnAnchored.prototype.reSourceOffset =
(new RegExp(rawToRegexStr.reTextHostnameAnchor)).source.length;
FilterGenericHnAnchored.prototype.logData = function() { FilterGenericHnAnchored.prototype.logData = function() {
var out = { var out = {
raw: '||' + this.s, raw: '||' + this.s,
regex: this.re.source, regex: this.re.source.slice(this.reSourceOffset),
compiled: this.compile() compiled: this.compile()
}; };
return out; return out;