LAN: reduce duplication

cleanup

lan-block.txt

@@ -1,22 +1,10 @@
 [uBlock Origin]
 ! Title: Block access to LAN
 ! Expires: 30 days
-! Description: Block access to 3p local LAN resourcess, experimental, incomplete.
+! Description: Block internet pages from accessing LAN resourcess. Experimental, incomplete.
 ! Requested here: https://github.com/uBlockOrigin/uAssets/issues/4318
 ! Homepage: https://github.com/gwarser/filter-lists
 !
-! Regular expressions are not efficient in general. uBO avoids performance problems by executing 
-! them only when URL contains specific string of characters extracted from Regular Expression at
-! filter parsing time. This process is called tokenization.
-! uBO can tokenize Regular Expression filter when:
-! - they contain `reRegexToken` /[%0-9A-Za-z]{2,}/g,
-! - above token is not preceded by `reRegexTokenAbort` /[([]/,
-! - not directly preceded by `reRegexBadPrefix` /(^|[^\\]\.|[*?{}\\])$/,
-! - and not directly followed by `reRegexBadSuffix` /^([^\\]\.|\\[dw]|[([{}?*.]|$)/.
-! Commonly used tokens are discarded - `badTokens`.
-! See `extractTokenFromRegex` function in `src/js/static-net-filtering.js`.
-! Filters in this list should be tokenized by first IP octet.
-! Tool for tokenization check would be handy.
 ! Tools:
 ! http://gamon.webfactional.com/regexnumericrangegenerator/
 ! http://www.analyticsmarket.com/freetools/ipregex
@@ -26,20 +14,22 @@
 ! ——— LAN
 ! https://en.wikipedia.org/wiki/Private_network
 !
-/^https?://10\.(?:(?:[0-9]|[1-9][0-9]|1(?:[0-9][0-9])|2(?:[0-4][0-9]|5[0-5]))\.){2}(?:[0-9]|[1-9][0-9]|1(?:[0-9][0-9])|2(?:[0-4][0-9]|5[0-5]))[:/]/$third-party,~websocket
-/^https?://172\.(?:1[6-9]|2[0-9]|3[01])(?:\.(?:[0-9]|[1-9][0-9]|1(?:[0-9][0-9])|2(?:[0-4][0-9]|5[0-5]))){2}[:/]/$third-party,~websocket
-/^https?://192\.168(?:\.(?:[0-9]|[1-9][0-9]|1(?:[0-9][0-9])|2(?:[0-4][0-9]|5[0-5]))){2}[:/]/$third-party,~websocket
-/^wss?://10\.(?:(?:[0-9]|[1-9][0-9]|1(?:[0-9][0-9])|2(?:[0-4][0-9]|5[0-5]))\.){2}(?:[0-9]|[1-9][0-9]|1(?:[0-9][0-9])|2(?:[0-4][0-9]|5[0-5]))[:/]/$third-party,websocket
-/^wss?://172\.(?:1[6-9]|2[0-9]|3[01])(?:\.(?:[0-9]|[1-9][0-9]|1(?:[0-9][0-9])|2(?:[0-4][0-9]|5[0-5]))){2}[:/]/$third-party,websocket
-/^wss?://192\.168(?:\.(?:[0-9]|[1-9][0-9]|1(?:[0-9][0-9])|2(?:[0-4][0-9]|5[0-5]))){2}[:/]/$third-party,websocket
+/^\w+://10\.(?:(?:[0-9]|[1-9][0-9]|1(?:[0-9][0-9])|2(?:[0-4][0-9]|5[0-5]))\.){2}(?:[0-9]|[1-9][0-9]|1(?:[0-9][0-9])|2(?:[0-4][0-9]|5[0-5]))[:/]/$third-party
+/^\w+://172\.(?:1[6-9]|2[0-9]|3[01])(?:\.(?:[0-9]|[1-9][0-9]|1(?:[0-9][0-9])|2(?:[0-4][0-9]|5[0-5]))){2}[:/]/$third-party
+/^\w+://192\.168(?:\.(?:[0-9]|[1-9][0-9]|1(?:[0-9][0-9])|2(?:[0-4][0-9]|5[0-5]))){2}[:/]/$third-party
 ! Includes link-local
 /^(?:http|ws)s?://\[f(?:[cd][0-9a-f]|e[89a-f])[0-9a-f]:[0-9a-f:]+\][:/]/$third-party
 !
+! Ipv4 link-local addresses for network autoconfiguration #5
+! TODO:
+!
+! Ipv6 from ipv4 transition addresses #6
+! TODO:
+!
 ! ——— localhost
 ! https://en.wikipedia.org/wiki/Localhost
 !
-/^https?://127\.(?:(?:[0-9]|[1-9][0-9]|1(?:[0-9][0-9])|2(?:[0-4][0-9]|5[0-5]))\.){2}(?:[0-9]|[1-9][0-9]|1(?:[0-9][0-9])|2(?:[0-4][0-9]|5[0-5]))[:/]/$third-party,~websocket
-/^wss?://127\.(?:(?:[0-9]|[1-9][0-9]|1(?:[0-9][0-9])|2(?:[0-4][0-9]|5[0-5]))\.){2}(?:[0-9]|[1-9][0-9]|1(?:[0-9][0-9])|2(?:[0-4][0-9]|5[0-5]))[:/]/$third-party,websocket
+/^\w+://127\.(?:(?:[0-9]|[1-9][0-9]|1(?:[0-9][0-9])|2(?:[0-4][0-9]|5[0-5]))\.){2}(?:[0-9]|[1-9][0-9]|1(?:[0-9][0-9])|2(?:[0-4][0-9]|5[0-5]))[:/]/$third-party
 ||[::1]^$third-party
 ||localhost^$third-party
 !