external/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-11-10 09:07:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix #2283

Browse source
This commit is contained in:
gorhill 2017-09-13 23:41:20 -04:00
parent 3b67516aee
commit faeedeaf56
No known key found for this signature in database
GPG key ID: 25E1490B761470C2
1 changed files with 27 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/js/static-net-filtering.js
View file

@ -72,7 +72,8 @@ var typeNameToTypeValue = {
'inline-script': 15 << 4,
'data': 16 << 4, // special: a generic data holder
'redirect': 17 << 4,
'webrtc': 18 << 4
'webrtc': 18 << 4,
'unsupported': 19 << 4
};
var otherTypeBitValue = typeNameToTypeValue.other;
@ -94,15 +95,10 @@ var typeValueToTypeName = {
15: 'inline-script',
16: 'data',
17: 'redirect',
18: 'webrtc'
18: 'webrtc',
19: 'unsupported'
};
// All network request types to bitmap
// bring origin to 0 (from 4 -- see typeNameToTypeValue)
// left-shift 1 by the above-calculated value
// subtract 1 to set all type bits
var allNetRequestTypesBitmap = (1 << (otherTypeBitValue >>> 4)) - 1;
var BlockAnyTypeAnyParty = BlockAction | AnyType | AnyParty;
var BlockAnyType = BlockAction | AnyType;
var BlockAnyParty = BlockAction | AnyParty;
@ -1330,6 +1326,12 @@ var FilterParser = function() {
this.reBadCSP = /(?:^|;)\s*report-(?:to|uri)\b/;
this.domainOpt = '';
this.noTokenHash = µb.urlTokenizer.tokenHashFromString('*');
this.unsupportedTypeBit = this.bitFromType('unsupported');
// All network request types to bitmap
// bring origin to 0 (from 4 -- see typeNameToTypeValue)
// left-shift 1 by the above-calculated value
// subtract 1 to set all type bits
this.allNetRequestTypeBits = (1 << (otherTypeBitValue >>> 4)) - 1;
this.reset();
};
@ -1344,6 +1346,7 @@ FilterParser.prototype.toNormalizedType = {
'document': 'main_frame',
'elemhide': 'generichide',
'font': 'font',
'genericblock' : 'unsupported',
'generichide': 'generichide',
'image': 'image',
'inline-script': 'inline-script',
@ -1358,7 +1361,7 @@ FilterParser.prototype.toNormalizedType = {
'stylesheet': 'stylesheet',
'subdocument': 'sub_frame',
'xmlhttprequest': 'xmlhttprequest',
'webrtc': 'webrtc',
'webrtc': 'unsupported',
'websocket': 'websocket'
};
@ -1410,16 +1413,16 @@ FilterParser.prototype.parseTypeOption = function(raw, not) {
}
// Non-discrete network types can't be negated.
if ( (typeBit & allNetRequestTypesBitmap) === 0 ) {
if ( (typeBit & this.allNetRequestTypeBits) === 0 ) {
return;
}
// Negated type: set all valid network request type bits to 1
if (
(typeBit & allNetRequestTypesBitmap) !== 0 &&
(this.types & allNetRequestTypesBitmap) === 0
(typeBit & this.allNetRequestTypeBits) !== 0 &&
(this.types & this.allNetRequestTypeBits) === 0
) {
this.types |= allNetRequestTypesBitmap;
this.types |= this.allNetRequestTypeBits;
}
this.types &= ~typeBit;
};
@ -1685,12 +1688,22 @@ FilterParser.prototype.parse = function(raw) {
pos = s.lastIndexOf('$');
if ( pos !== -1 ) {
// https://github.com/gorhill/uBlock/issues/952
// Discard Adguard-specific `$$` filters.
// Discard Adguard-specific `$$` filters.
if ( s.indexOf('$$') !== -1 ) {
this.unsupported = true;
return this;
}
this.parseOptions(s.slice(pos + 1));
// https://github.com/gorhill/uBlock/issues/2283
// Abort if type is only for unsupported types, otherwise
// toggle off `unsupported` bit.
if ( this.types & this.unsupportedTypeBit ) {
this.types &= ~(this.unsupportedTypeBit | this.allNetRequestTypeBits);
if ( this.types === 0 ) {
this.unsupported = true;
return this;
}
}
s = s.slice(0, pos);
}
}