From 030d7334e4ad832441178ecc5161e8caa58666a6 Mon Sep 17 00:00:00 2001 From: Raymond Hill Date: Tue, 10 Sep 2024 11:11:11 -0400 Subject: [PATCH] Add support for `lan`/`loopback` values to `ipaddress=` option Related issue: https://github.com/uBlockOrigin/uBlock-issues/issues/1070 --- src/js/static-net-filtering.js | 59 +++++++++++++++++++++++++++++++--- 1 file changed, 54 insertions(+), 5 deletions(-) diff --git a/src/js/static-net-filtering.js b/src/js/static-net-filtering.js index e8f6de911dd6d..967e8768756b0 100644 --- a/src/js/static-net-filtering.js +++ b/src/js/static-net-filtering.js @@ -2970,14 +2970,63 @@ registerFilterClass(FilterOnHeaders); class FilterIPAddress { static match(idata) { + const ipaddr = $requestAddress; const details = filterRefs[filterData[idata+1]]; - if ( details.isRegex === false ) { - return $requestAddress === details.pattern; + if ( details.isRegex ) { + if ( details.$re === undefined ) { + details.$re = new RegExp(details.pattern.slice(1, -1)); + } + return details.$re.test(ipaddr); + } + if ( ipaddr === '' ) { return false; } + if ( details.pattern === 'lan' ) { + return this.isLAN(ipaddr); + } + if ( details.pattern === 'loopback' ) { + return this.isLoopback(ipaddr); + } + return ipaddr.startsWith(details.pattern); + } + + // https://github.com/uBlockOrigin/uAssets/blob/master/filters/lan-block.txt + // https://en.wikipedia.org/wiki/Reserved_IP_addresses + // `ipaddr` is assumed well-formed + static isLAN(ipaddr) { + const c0 = ipaddr.charCodeAt(0); + // ipv4 + if ( c0 === 0x30 /* 0 */ ) { + return ipaddr.startsWith('0.'); + } + if ( c0 === 0x31 /* 1 */ ) { + if ( ipaddr.startsWith('10.') ) { return true; } + if ( ipaddr.startsWith('127.') ) { return true; } + if ( ipaddr.startsWith('169.254.') ) { return true; } + if ( ipaddr.startsWith('172.') ) { + const v = parseInt(ipaddr.slice(4), 10); + return v >= 16 && v <= 31; + } + return ipaddr.startsWith('192.168.'); + } + if ( c0 !== 0x5B /* [ */ ) { return false; } + // ipv6 + const c1 = ipaddr.charCodeAt(1); + if ( c1 === 0x3A /* : */ ) { + if ( ipaddr.startsWith('[::') === false ) { return false; } + if ( ipaddr === '[::]' || ipaddr === '[::1]' ) { return true; } + if ( ipaddr.startsWith('[::ffff:') === false ) { return false; } + return /^\[::ffff:(7f\w{2}|a\w{2}|a9fe|c0a8):\w+\]$/.test(ipaddr); + } + if ( c1 === 0x36 /* 6 */ ) { + return ipaddr.startsWith('[64:ff9b:'); } - if ( details.$re === undefined ) { - details.$re = new RegExp(details.pattern.slice(1, -1)); + if ( c1 === 0x66 /* f */ ) { + return /^\[f[cd]\w{2}:/.test(ipaddr); } - return details.$re.test($requestAddress); + return false; + } + + static isLoopback(ipaddr) { + return ipaddr === '127.0.0.1' || ipaddr === '[::1]'; } static compile(details) {