From bd3914606a177fcc2b9d67f35292c900ac3d46c7 Mon Sep 17 00:00:00 2001
From: Michael <m.muenz@gmail.com>
Date: Mon, 20 May 2019 10:42:56 +0200
Subject: [PATCH] dns/dnscrypt-proxy: add 7 new dnsbl blacklists (#1339)

---
 dns/dnscrypt-proxy/Makefile                   |  2 +-
 dns/dnscrypt-proxy/pkg-descr                  |  4 ++
 .../models/OPNsense/Dnscryptproxy/Dnsbl.xml   |  7 ++
 .../scripts/OPNsense/Dnscryptproxy/dnsbl.sh   | 70 +++++++++++++++++++
 4 files changed, 82 insertions(+), 1 deletion(-)

diff --git a/dns/dnscrypt-proxy/Makefile b/dns/dnscrypt-proxy/Makefile
index ab1b5b906..39b909044 100644
--- a/dns/dnscrypt-proxy/Makefile
+++ b/dns/dnscrypt-proxy/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		dnscrypt-proxy
-PLUGIN_VERSION=		1.3
+PLUGIN_VERSION=		1.4
 PLUGIN_COMMENT=		Flexible DNS proxy supporting DNSCrypt and DoH
 PLUGIN_DEPENDS=		dnscrypt-proxy2
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
diff --git a/dns/dnscrypt-proxy/pkg-descr b/dns/dnscrypt-proxy/pkg-descr
index b28bb8ba1..2758fca2e 100644
--- a/dns/dnscrypt-proxy/pkg-descr
+++ b/dns/dnscrypt-proxy/pkg-descr
@@ -5,6 +5,10 @@ such as DNSCrypt v2 and DNS-over-HTTPS.
 Plugin Changelog
 ================
 
+1.4
+
+* Added 7 new DNSBL blacklists
+
 1.3
 
 * Add DNS blacklisting
diff --git a/dns/dnscrypt-proxy/src/opnsense/mvc/app/models/OPNsense/Dnscryptproxy/Dnsbl.xml b/dns/dnscrypt-proxy/src/opnsense/mvc/app/models/OPNsense/Dnscryptproxy/Dnsbl.xml
index 93fd42130..f313c6070 100644
--- a/dns/dnscrypt-proxy/src/opnsense/mvc/app/models/OPNsense/Dnscryptproxy/Dnsbl.xml
+++ b/dns/dnscrypt-proxy/src/opnsense/mvc/app/models/OPNsense/Dnscryptproxy/Dnsbl.xml
@@ -13,10 +13,17 @@
             <OptionValues>
                 <aa>AdAway List</aa>
                 <ag>AdGuard List</ag>
+                <bla>Blocklist.site Ads</bla>
+                <blf>Blocklist.site Fraud</blf>
+                <blp>Blocklist.site Phishing</blp>
                 <ca>Cameleon List</ca>
                 <el>Easy List</el>
                 <emd>EMD Malicious Domains List</emd>
                 <ep>Easyprivacy List</ep>
+                <hpa>hpHosts Ads</hpa>
+                <hpf>hpHosts FSA</hpf>
+                <hpp>hpHosts PSH</hpp>
+                <hup>hpHosts PUP</hup>
                 <ht>Hbbtv List</ht>
                 <mw>Malwaredomain List</mw>
                 <nc>NoCoin List</nc>
diff --git a/dns/dnscrypt-proxy/src/opnsense/scripts/OPNsense/Dnscryptproxy/dnsbl.sh b/dns/dnscrypt-proxy/src/opnsense/scripts/OPNsense/Dnscryptproxy/dnsbl.sh
index 8f9c136de..fcffeecd4 100755
--- a/dns/dnscrypt-proxy/src/opnsense/scripts/OPNsense/Dnscryptproxy/dnsbl.sh
+++ b/dns/dnscrypt-proxy/src/opnsense/scripts/OPNsense/Dnscryptproxy/dnsbl.sh
@@ -133,6 +133,55 @@ stevenblack() {
         rm ${WORKDIR}/stevenblack-raw
 }
 
+blocklistads() {
+        # Blocklist.site Ads
+        ${FETCH} https://blocklist.site/app/dl/ads -o ${WORKDIR}/blocklistads-raw
+        sed "/\.$/d" ${WORKDIR}/blocklistads-raw | sed "/^#/d" | sed "/\_/d" | sed "/^\s*$/d" | sed "/\.\./d" | sed "s/^\.//g" | sed "/localhost/d" | sed "/127\.0\.0\.1/d" | sed "/255\.255\.255\.255/d" | sed "/\:\:1/d" | sed "/fe80\:\:1/d" | sed "/ff00\:\:/d" | sed "/ff02\:\:/d" | sed "/0\.0\.0\.0 0\.0\.0\.0/d" > ${WORKDIR}/blocklistads
+        rm ${WORKDIR}/blocklistads-raw
+}
+
+blocklistfraud() {
+        # Blocklist.site Fraud
+        ${FETCH} https://blocklist.site/app/dl/fraud -o ${WORKDIR}/blocklistfraud-raw
+        sed "/\.$/d" ${WORKDIR}/blocklistfraud-raw | sed "/^#/d" | sed "/\_/d" | sed "/^\s*$/d" | sed "/\.\./d" | sed "s/^\.//g" | sed "/localhost/d" | sed "/127\.0\.0\.1/d" | sed "/255\.255\.255\.255/d" | sed "/\:\:1/d" | sed "/fe80\:\:1/d" | sed "/ff00\:\:/d" | sed "/ff02\:\:/d" | sed "/0\.0\.0\.0 0\.0\.0\.0/d" > ${WORKDIR}/blocklistfraud
+        rm ${WORKDIR}/blocklistfraud-raw
+}
+
+blocklistphishing() {
+        # Blocklist.site Phishing
+        ${FETCH} https://blocklist.site/app/dl/phishing -o ${WORKDIR}/blocklistphishing-raw
+        sed "/\.$/d" ${WORKDIR}/blocklistphishing-raw | sed "/^#/d" | sed "/\_/d" | sed "/^\s*$/d" | sed "/\.\./d" | sed "s/^\.//g" | sed "/localhost/d" | sed "/127\.0\.0\.1/d" | sed "/255\.255\.255\.255/d" | sed "/\:\:1/d" | sed "/fe80\:\:1/d" | sed "/ff00\:\:/d" | sed "/ff02\:\:/d" | sed "/0\.0\.0\.0 0\.0\.0\.0/d" > ${WORKDIR}/blocklistphishing
+        rm ${WORKDIR}/blocklistphishing-raw
+}
+
+hphosts-ads() {
+        # hphosts-ads
+        ${FETCH} https://hosts-file.net/ad_servers.txt -o ${WORKDIR}/hphosts-ads-raw
+        sed "/\.$/d" ${WORKDIR}/hphosts-ads-raw | sed "/^#/d" | sed "/\_/d" | sed "/^\s*$/d" | sed "/\.\./d" | sed "s/^\.//g" | sed "/localhost/d" | sed "/255\.255\.255\.255/d" | sed "/\:\:1/d" | sed "/fe80\:\:1/d" | sed "/ff00\:\:/d" | sed "/ff02\:\:/d" | sed "/0\.0\.0\.0 0\.0\.0\.0/d" | tr -d '\r' | awk 'BEGIN{FS=OFS=" ";}{print $2;}' > ${WORKDIR}/hphosts-ads
+        rm ${WORKDIR}/hphosts-ads-raw
+}
+
+hphosts-fsa() {
+        # hphosts-fsa
+        ${FETCH} https://hosts-file.net/fsa.txt -o ${WORKDIR}/hphosts-fsa-raw
+        sed "/\.$/d" ${WORKDIR}/hphosts-fsa-raw | sed "/^#/d" | sed "/\_/d" | sed "/^\s*$/d" | sed "/\.\./d" | sed "s/^\.//g" | sed "/localhost/d" | sed "/255\.255\.255\.255/d" | sed "/\:\:1/d" | sed "/fe80\:\:1/d" | sed "/ff00\:\:/d" | sed "/ff02\:\:/d" | sed "/0\.0\.0\.0 0\.0\.0\.0/d" | tr -d '\r' | awk 'BEGIN{FS=OFS=" ";}{print $2;}' > ${WORKDIR}/hphosts-fsa
+        rm ${WORKDIR}/hphosts-fsa-raw
+}
+
+hphosts-psh() {
+        # hphosts-psh
+        ${FETCH} https://hosts-file.net/psh.txt -o ${WORKDIR}/hphosts-psh-raw
+        sed "/\.$/d" ${WORKDIR}/hphosts-psh-raw | sed "/^#/d" | sed "/\_/d" | sed "/^\s*$/d" | sed "/\.\./d" | sed "s/^\.//g" | sed "/localhost/d" | sed "/255\.255\.255\.255/d" | sed "/\:\:1/d" | sed "/fe80\:\:1/d" | sed "/ff00\:\:/d" | sed "/ff02\:\:/d" | sed "/0\.0\.0\.0 0\.0\.0\.0/d" | tr -d '\r' | awk 'BEGIN{FS=OFS=" ";}{print $2;}' > ${WORKDIR}/hphosts-psh
+        rm ${WORKDIR}/hphosts-psh-raw
+}
+
+hphosts-pup() {
+        # hphosts-pup
+        ${FETCH} https://hosts-file.net/pup.txt -o ${WORKDIR}/hphosts-pup-raw
+        sed "/\.$/d" ${WORKDIR}/hphosts-pup-raw | sed "/^#/d" | sed "/\_/d" | sed "/^\s*$/d" | sed "/\.\./d" | sed "s/^\.//g" | sed "/localhost/d" | sed "/255\.255\.255\.255/d" | sed "/\:\:1/d" | sed "/fe80\:\:1/d" | sed "/ff00\:\:/d" | sed "/ff02\:\:/d" | sed "/0\.0\.0\.0 0\.0\.0\.0/d" | tr -d '\r' | awk 'BEGIN{FS=OFS=" ";}{print $2;}' > ${WORKDIR}/hphosts-pup
+        rm ${WORKDIR}/hphosts-pup-raw
+}
+
 hbbtv() {
 	# HBBTV List
 	${FETCH} https://raw.githubusercontent.com/Akamaru/Pi-Hole-Lists/master/hbbtv.txt -o ${WORKDIR}/hbbtv-raw
@@ -187,6 +236,15 @@ for CAT in $(echo ${DNSBL} | tr ',' ' '); do
 	ag)
 		adguard
 		;;
+	bla)
+		blocklistads
+		;;
+	blf)
+		blocklistfraud
+		;;
+	blp)
+		blocklistphishing
+		;;
 	ca)
 		cameleon
 		;;
@@ -199,6 +257,18 @@ for CAT in $(echo ${DNSBL} | tr ',' ' '); do
 	emd)
 		emdlist
 		;;
+	hpa)
+		hphosts-ads
+		;;
+	hpf)
+		hphosts-fsa
+		;;
+	hpp)
+		hphosts-psh
+		;;
+	hup)
+		hphosts-pup
+		;;
 	ht)
 		hbbtv
 		;;