From 25e4e165ee9cf9aa4e919fbfe651bfae24e9a26c Mon Sep 17 00:00:00 2001 From: MDLeom <2809763-curben@users.noreply.gitlab.com> Date: Sun, 16 Feb 2025 00:40:32 +0000 Subject: [PATCH] feat: wildcard asterisk --- README.md | 7 +++++++ src/script.sh | 14 +++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index eb5b8574..9563c8dd 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,7 @@ - Formats - [URL-based](#url-based) - [Domain-based](#domain-based) + - [Wildcard asterisk](#wildcard-asterisk) - [Hosts-based](#hosts-based) - [Domain-based (AdGuard Home)](#domain-based-adguard-home) - [URL-based (AdGuard)](#url-based-adguard) @@ -41,6 +42,7 @@ A blocklist of malicious websites that are being used for malware distribution, | BIND [zone](#bind) | [link](https://malware-filter.gitlab.io/malware-filter/urlhaus-filter-bind-online.conf) | [link](https://curbengh.github.io/malware-filter/urlhaus-filter-bind-online.conf) | [link](https://curbengh.github.io/urlhaus-filter/urlhaus-filter-bind-online.conf) | [link](https://malware-filter.gitlab.io/urlhaus-filter/urlhaus-filter-bind-online.conf) | [link](https://malware-filter.pages.dev/urlhaus-filter-bind-online.conf) | [link](https://urlhaus-filter.pages.dev/urlhaus-filter-bind-online.conf) | | BIND [RPZ](#response-policy-zone) | [link](https://malware-filter.gitlab.io/malware-filter/urlhaus-filter-rpz-online.conf) | [link](https://curbengh.github.io/malware-filter/urlhaus-filter-rpz-online.conf) | [link](https://curbengh.github.io/urlhaus-filter/urlhaus-filter-rpz-online.conf) | [link](https://malware-filter.gitlab.io/urlhaus-filter/urlhaus-filter-rpz-online.conf) | [link](https://malware-filter.pages.dev/urlhaus-filter-rpz-online.conf) | [link](https://urlhaus-filter.pages.dev/urlhaus-filter-rpz-online.conf) | | [dnscrypt-proxy](#dnscrypt-proxy) | [names-online.txt](https://malware-filter.gitlab.io/malware-filter/urlhaus-filter-dnscrypt-blocked-names-online.txt), [ips-online.txt](https://malware-filter.gitlab.io/malware-filter/urlhaus-filter-dnscrypt-blocked-ips-online.txt) | [names-online.txt](https://curbengh.github.io/malware-filter/urlhaus-filter-dnscrypt-blocked-names-online.txt), [ips-online.txt](https://curbengh.github.io/malware-filter/urlhaus-filter-dnscrypt-blocked-ips-online.txt) | [names-online.txt](https://curbengh.github.io/urlhaus-filter/urlhaus-filter-dnscrypt-blocked-names-online.txt), [ips-online.txt](https://curbengh.github.io/urlhaus-filter/urlhaus-filter-dnscrypt-blocked-ips-online.txt) | [names-online.txt](https://malware-filter.gitlab.io/urlhaus-filter/urlhaus-filter-dnscrypt-blocked-names-online.txt), [ips-online.txt](https://malware-filter.gitlab.io/urlhaus-filter/urlhaus-filter-dnscrypt-blocked-ips-online.txt) | [names-online.txt](https://malware-filter.pages.dev/urlhaus-filter-dnscrypt-blocked-names-online.txt), [ips-online.txt](https://malware-filter.pages.dev/urlhaus-filter-dnscrypt-blocked-ips-online.txt) | [names-online.txt](https://urlhaus-filter.pages.dev/urlhaus-filter-dnscrypt-blocked-names-online.txt), [ips-online.txt](https://urlhaus-filter.pages.dev/urlhaus-filter-dnscrypt-blocked-ips-online.txt) | +| [blocky](#wildcard-asterisk) | [link](https://malware-filter.gitlab.io/malware-filter/urlhaus-filter-wildcard-online.txt) | [link](https://curbengh.github.io/malware-filter/urlhaus-filter-wildcard-online.txt) | [link](https://curbengh.github.io/phishing-filter/urlhaus-filter-wildcard-online.txt) | [link](https://malware-filter.gitlab.io/phishing-filter/urlhaus-filter-wildcard-online.txt) | [link](https://malware-filter.pages.dev/urlhaus-filter-wildcard-online.txt) | [link](https://phishing-filter.pages.dev/urlhaus-filter-wildcard-online.txt) | | [Internet Explorer](#tracking-protection-list-ie) | [link](https://malware-filter.gitlab.io/malware-filter/urlhaus-filter.tpl) | [link](https://curbengh.github.io/malware-filter/urlhaus-filter.tpl) | [link](https://curbengh.github.io/urlhaus-filter/urlhaus-filter.tpl) | [link](https://malware-filter.gitlab.io/urlhaus-filter/urlhaus-filter.tpl) | [link](https://malware-filter.pages.dev/urlhaus-filter.tpl) | [link](https://urlhaus-filter.pages.dev/urlhaus-filter.tpl) | | [Snort2](#snort2) | [link](https://malware-filter.gitlab.io/malware-filter/urlhaus-filter-snort2-online.rules) | [link](https://curbengh.github.io/malware-filter/urlhaus-filter-snort2-online.rules) | [link](https://curbengh.github.io/urlhaus-filter/urlhaus-filter-snort2-online.rules) | [link](https://malware-filter.gitlab.io/urlhaus-filter/urlhaus-filter-snort2-online.rules) | [link](https://malware-filter.pages.dev/urlhaus-filter-snort2-online.rules) | [link](https://urlhaus-filter.pages.dev/urlhaus-filter-snort2-online.rules) | | [Snort3](#snort3) | [link](https://malware-filter.gitlab.io/malware-filter/urlhaus-filter-snort3-online.rules) | [link](https://curbengh.github.io/malware-filter/urlhaus-filter-snort3-online.rules) | [link](https://curbengh.github.io/urlhaus-filter/urlhaus-filter-snort3-online.rules) | [link](https://malware-filter.gitlab.io/urlhaus-filter/urlhaus-filter-snort3-online.rules) | [link](https://malware-filter.pages.dev/urlhaus-filter-snort3-online.rules) | [link](https://urlhaus-filter.pages.dev/urlhaus-filter-snort3-online.rules) | @@ -60,6 +62,7 @@ A blocklist of malicious websites that are being used for malware distribution, | BIND [zone](#bind) | [link](https://malware-filter.gitlab.io/malware-filter/urlhaus-filter-bind.conf) | [link](https://curbengh.github.io/malware-filter/urlhaus-filter-bind.conf) | [link](https://curbengh.github.io/urlhaus-filter/urlhaus-filter-bind.conf) | [link](https://malware-filter.gitlab.io/urlhaus-filter/urlhaus-filter-bind.conf) | [link](https://malware-filter.pages.dev/urlhaus-filter-bind.conf) | [link](https://urlhaus-filter.pages.dev/urlhaus-filter-bind.conf) | | BIND [RPZ](#response-policy-zone) | [link](https://malware-filter.gitlab.io/malware-filter/urlhaus-filter-rpz.conf) | [link](https://curbengh.github.io/malware-filter/urlhaus-filter-rpz.conf) | [link](https://curbengh.github.io/urlhaus-filter/urlhaus-filter-rpz.conf) | [link](https://malware-filter.gitlab.io/urlhaus-filter/urlhaus-filter-rpz.conf) | [link](https://malware-filter.pages.dev/urlhaus-filter-rpz.conf) | [link](https://urlhaus-filter.pages.dev/urlhaus-filter-rpz.conf) | | [dnscrypt-proxy](#dnscrypt-proxy) | [names.txt](https://malware-filter.gitlab.io/malware-filter/urlhaus-filter-dnscrypt-blocked-names.txt), [ips.txt](https://malware-filter.gitlab.io/malware-filter/urlhaus-filter-dnscrypt-blocked-ips.txt) | [names.txt](https://curbengh.github.io/malware-filter/urlhaus-filter-dnscrypt-blocked-names.txt), [ips.txt](https://curbengh.github.io/malware-filter/urlhaus-filter-dnscrypt-blocked-ips.txt) | [names.txt](https://curbengh.github.io/urlhaus-filter/urlhaus-filter-dnscrypt-blocked-names.txt), [ips.txt](https://curbengh.github.io/urlhaus-filter/urlhaus-filter-dnscrypt-blocked-ips.txt) | [names.txt](https://malware-filter.gitlab.io/urlhaus-filter/urlhaus-filter-dnscrypt-blocked-names.txt), [ips.txt](https://malware-filter.gitlab.io/urlhaus-filter/urlhaus-filter-dnscrypt-blocked-ips.txt) | [names.txt](https://malware-filter.pages.dev/urlhaus-filter-dnscrypt-blocked-names.txt), [ips.txt](https://malware-filter.pages.dev/urlhaus-filter-dnscrypt-blocked-ips.txt) | [names.txt](https://urlhaus-filter.pages.dev/urlhaus-filter-dnscrypt-blocked-names.txt), [ips.txt](https://urlhaus-filter.pages.dev/urlhaus-filter-dnscrypt-blocked-ips.txt) | +| [blocky](#wildcard-asterisk) | [link](https://malware-filter.gitlab.io/malware-filter/urlhaus-filter-wildcard.txt) | [link](https://curbengh.github.io/malware-filter/urlhaus-filter-wildcard.txt) | [link](https://curbengh.github.io/phishing-filter/urlhaus-filter-wildcard.txt) | [link](https://malware-filter.gitlab.io/phishing-filter/urlhaus-filter-wildcard.txt) | [link](https://malware-filter.pages.dev/urlhaus-filter-wildcard.txt) | [link](https://phishing-filter.pages.dev/urlhaus-filter-wildcard.txt) | | [Internet Explorer](#tracking-protection-list-ie) | [link](https://malware-filter.gitlab.io/malware-filter/urlhaus-filter.tpl) | [link](https://curbengh.github.io/malware-filter/urlhaus-filter.tpl) | [link](https://curbengh.github.io/urlhaus-filter/urlhaus-filter.tpl) | [link](https://malware-filter.gitlab.io/urlhaus-filter/urlhaus-filter.tpl) | [link](https://malware-filter.pages.dev/urlhaus-filter.tpl) | [link](https://urlhaus-filter.pages.dev/urlhaus-filter.tpl) | For other programs, see [Compatibility](https://gitlab.com/malware-filter/malware-filter/wikis/compatibility) page in the wiki. @@ -107,6 +110,10 @@ Lite version includes **online** links only. This blocklist includes domains and IP addresses. +## Wildcard asterisk + +This blocklist includes domains and IP addresses. + ## Domain-based (AdGuard Home) This AdGuard Home-compatible blocklist includes domains and IP addresses. Also compatible with Pi-hole. diff --git a/src/script.sh b/src/script.sh index ea64cb51..3c4231d3 100644 --- a/src/script.sh +++ b/src/script.sh @@ -409,7 +409,7 @@ cat "malware-hosts-online.txt" | \ sed "1i $COMMENT_ONLINE" | \ sed "1s/Domains/Names/" > "../public/urlhaus-filter-dnscrypt-blocked-names-online.txt" -## IPv4-based +# IPv4-based cat "malware-domains.txt" | \ sort | \ grep -E "^([0-9]{1,3}[\.]){3}[0-9]{1,3}$" | \ @@ -423,6 +423,18 @@ sed "1i $COMMENT_ONLINE" | \ sed "1s/Domains/IPs/" > "../public/urlhaus-filter-dnscrypt-blocked-ips-online.txt" +## Wildcard subdomain +cat "malware-domains.txt" | \ +sed "s/^/*./g" | \ +sed "1i $COMMENT" | \ +sed "1s/Blocklist/Wildcard Asterisk Blocklist/" > "../public/urlhaus-filter-wildcard.txt" + +cat "malware-domains-online.txt" | \ +sed "s/^/*./g" | \ +sed "1i $COMMENT" | \ +sed "1s/Blocklist/Wildcard Asterisk Blocklist/" > "../public/urlhaus-filter-wildcard-online.txt" + + ## Temporarily disable command print set +x