From c76558bbff71885836ac14ff444b9200c8dd30e6 Mon Sep 17 00:00:00 2001
From: Michael <m.muenz@gmail.com>
Date: Mon, 20 Aug 2018 14:54:23 +0200
Subject: [PATCH] dns/bind: add 3 new DNSBLs (#802)

---
 dns/bind/Makefile                             |  2 +-
 .../mvc/app/models/OPNsense/Bind/Dnsbl.xml    |  5 ++-
 .../opnsense/scripts/OPNsense/Bind/dnsbl.sh   | 42 ++++++++++++++++---
 3 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/dns/bind/Makefile b/dns/bind/Makefile
index f0615ebd8..5b8e8af1a 100644
--- a/dns/bind/Makefile
+++ b/dns/bind/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		bind
-PLUGIN_VERSION=		1.0
+PLUGIN_VERSION=		1.1
 PLUGIN_COMMENT=		BIND domain name service
 PLUGIN_DEPENDS=		bind912
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
diff --git a/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Dnsbl.xml b/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Dnsbl.xml
index 86e4fb58b..45fa90307 100644
--- a/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Dnsbl.xml
+++ b/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Dnsbl.xml
@@ -1,7 +1,7 @@
 <model>
     <mount>//OPNsense/bind/dnsbl</mount>
     <description>DNSBL configuration</description>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
     <items>
         <enabled type="BooleanField">
             <default>0</default>
@@ -13,9 +13,12 @@
             <OptionValues>
                 <ag>AdGuard List</ag>
                 <el>Easy List</el>
+                <emd>EMD Malicious Domains List</emd>
                 <ep>Easyprivacy List</ep>
                 <mw>Malwaredomain List</mw>
                 <nc>NoCoin List</nc>
+                <pa>PornAll List</pa>
+                <pt>PornTop1M List</pt>
                 <rw>Ransomware Tracker List</rw>
             </OptionValues>
         </type>
diff --git a/dns/bind/src/opnsense/scripts/OPNsense/Bind/dnsbl.sh b/dns/bind/src/opnsense/scripts/OPNsense/Bind/dnsbl.sh
index bed944deb..c51007ca4 100755
--- a/dns/bind/src/opnsense/scripts/OPNsense/Bind/dnsbl.sh
+++ b/dns/bind/src/opnsense/scripts/OPNsense/Bind/dnsbl.sh
@@ -38,42 +38,63 @@ mkdir -p ${WORKDIR}
 easylist() {
 	# EasyList
 	${FETCH} https://justdomains.github.io/blocklists/lists/easylist-justdomains.txt -o ${WORKDIR}/easylist-raw
-	sed "/\.$/d" ${WORKDIR}/easylist-raw | sed "/^#/ d" | sed "/\_/d" > ${WORKDIR}/easylist
+	sed "/\.$/d" ${WORKDIR}/easylist-raw | sed "/^#/d" | sed "/\_/d" > ${WORKDIR}/easylist
 	rm ${WORKDIR}/easylist-raw
 }
 
 easyprivacy() {
 	# EasyPrivacy
 	${FETCH} https://justdomains.github.io/blocklists/lists/easyprivacy-justdomains.txt -o ${WORKDIR}/easyprivacy-raw
-	sed "/\.$/d" ${WORKDIR}/easyprivacy-raw | sed "/^#/ d" | sed "/\_/d" > ${WORKDIR}/easyprivacy
+	sed "/\.$/d" ${WORKDIR}/easyprivacy-raw | sed "/^#/d" | sed "/\_/d" > ${WORKDIR}/easyprivacy
 	rm ${WORKDIR}/easyprivacy-raw
 }
 
+pornall() {
+	# PornAll
+	${FETCH} https://raw.githubusercontent.com/chadmayfield/my-pihole-blocklists/master/lists/pi_blocklist_porn_all.list -o ${WORKDIR}/pornall-raw
+	sed "/\.$/d" ${WORKDIR}/pornall-raw | sed "/^#/d" | sed "/\_/d" > ${WORKDIR}/pornall
+	rm ${WORKDIR}/pornall-raw
+}
+
+porntop() {
+	# PornTop1M
+	${FETCH} https://raw.githubusercontent.com/chadmayfield/pihole-blocklists/master/lists/pi_blocklist_porn_top1m.list -o ${WORKDIR}/porntop-raw
+	sed "/\.$/d" ${WORKDIR}/porntop-raw | sed "/^#/d" | sed "/\_/d" > ${WORKDIR}/porntop
+	rm ${WORKDIR}/porntop-raw
+}
+
+emdlist() {
+	# EMD
+	${FETCH} https://hosts-file.net/emd.txt -o ${WORKDIR}/emdlist-raw
+	sed "/\.$/d" ${WORKDIR}/emdlist-raw | sed "/^#/d" | sed "/\_/d" | sed "/localhost/d" | tr -d '\r' | awk 'BEGIN{FS=OFS=" ";}{print $2;}' > ${WORKDIR}/emdlist
+	rm ${WORKDIR}/emdlist-raw
+}
+
 adguard() {
 	# AdGuard
 	${FETCH} https://justdomains.github.io/blocklists/lists/adguarddns-justdomains.txt -o ${WORKDIR}/adguard-raw
-	sed "/\.$/d" ${WORKDIR}/adguard-raw | sed "/^#/ d" | sed "/\_/d" > ${WORKDIR}/adguard
+	sed "/\.$/d" ${WORKDIR}/adguard-raw | sed "/^#/d" | sed "/\_/d" > ${WORKDIR}/adguard
 	rm ${WORKDIR}/adguard-raw
 }
 
 nocoin() {
 	# NoCoin
 	${FETCH} https://justdomains.github.io/blocklists/lists/nocoin-justdomains.txt -o ${WORKDIR}/nocoin-raw
-	sed "/\.$/d" ${WORKDIR}/nocoin-raw | sed "/^#/ d" | sed "/\_/d" > ${WORKDIR}/nocoin
+	sed "/\.$/d" ${WORKDIR}/nocoin-raw | sed "/^#/d" | sed "/\_/d" > ${WORKDIR}/nocoin
 	rm ${WORKDIR}/nocoin-raw
 }
 
 rwtracker() {
 	# RansomWare Tracker abuse.ch
 	${FETCH} https://ransomwaretracker.abuse.ch/downloads/RW_DOMBL.txt -o ${WORKDIR}/rwtracker-raw
-	sed "/\.$/d" ${WORKDIR}/rwtracker-raw | sed "/^#/ d" | sed "/\_/d" > ${WORKDIR}/rwtracker
+	sed "/\.$/d" ${WORKDIR}/rwtracker-raw | sed "/^#/d" | sed "/\_/d" > ${WORKDIR}/rwtracker
 	rm ${WORKDIR}/rwtracker-raw
 }
 
 mwdomains() {
 	# MalwareDomains
 	${FETCH} http://malwaredomains.lehigh.edu/files/justdomains -o ${WORKDIR}/malwaredomains-raw
-	sed "/\.$/d" ${WORKDIR}/malwaredomains-raw | sed "/^#/ d" | sed "/\_/d" > ${WORKDIR}/malwaredomains
+	sed "/\.$/d" ${WORKDIR}/malwaredomains-raw | sed "/^#/d" | sed "/\_/d" > ${WORKDIR}/malwaredomains
 	rm ${WORKDIR}/malwaredomains-raw
 }
 
@@ -99,6 +120,9 @@ for CAT in $(echo ${1} | tr ',' ' '); do
 	ep)
 		easyprivacy
 		;;
+	emd)
+		emdlist
+		;;
 	nc)
 		nocoin
 		;;
@@ -108,6 +132,12 @@ for CAT in $(echo ${1} | tr ',' ' '); do
 	mw)
 		mwdomains
 		;;
+	pa)
+		pornall
+		;;
+	pt)
+		porntop
+		;;
 	esac
 done