From 90f589b77491c37d2c5b1fd35f88e05a495af16a Mon Sep 17 00:00:00 2001
From: Michael <m.muenz@gmail.com>
Date: Mon, 15 Oct 2018 11:21:45 +0200
Subject: [PATCH] dns/bind: add dnsbls; closes #917

---
 dns/bind/Makefile                             |  1 +
 .../mvc/app/models/OPNsense/Bind/Dnsbl.xml    |  4 ++
 .../opnsense/scripts/OPNsense/Bind/dnsbl.sh   | 40 +++++++++++++++++++
 3 files changed, 45 insertions(+)

diff --git a/dns/bind/Makefile b/dns/bind/Makefile
index b79692278..750a9f3a9 100644
--- a/dns/bind/Makefile
+++ b/dns/bind/Makefile
@@ -1,5 +1,6 @@
 PLUGIN_NAME=		bind
 PLUGIN_VERSION=		1.2
+PLUGIN_REVISION=    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 e3a95905d..d0491bfb5 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
@@ -11,7 +11,9 @@
             <Required>N</Required>
             <Multiple>Y</Multiple>
             <OptionValues>
+                <aa>AdAway List</aa>
                 <ag>AdGuard List</ag>
+                <ca>Cameleon List</ca>
                 <el>Easy List</el>
                 <emd>EMD Malicious Domains List</emd>
                 <ep>Easyprivacy List</ep>
@@ -19,6 +21,8 @@
                 <nc>NoCoin List</nc>
                 <pt>PornTop1M List</pt>
                 <rw>Ransomware Tracker List</rw>
+                <ws>Windows Spyware Blocker</ws>
+                <yy>YoYo List</yy>
             </OptionValues>
         </type>
         <whitelists type="CSVListField">
diff --git a/dns/bind/src/opnsense/scripts/OPNsense/Bind/dnsbl.sh b/dns/bind/src/opnsense/scripts/OPNsense/Bind/dnsbl.sh
index 65d1c8384..05659a9ff 100755
--- a/dns/bind/src/opnsense/scripts/OPNsense/Bind/dnsbl.sh
+++ b/dns/bind/src/opnsense/scripts/OPNsense/Bind/dnsbl.sh
@@ -98,6 +98,34 @@ mwdomains() {
 	rm ${WORKDIR}/malwaredomains-raw
 }
 
+windowsspyblocker() {
+	# WindowsSpyBlocker
+	${FETCH} https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/spy.txt -o ${WORKDIR}/windowsspyblocker-raw
+	sed "/\.$/d" ${WORKDIR}/windowsspyblocker-raw | sed "/^#/d" | sed "/\_/d" | sed "/^\s*$/d" | sed "/\.\./d" | sed "s/^\.//g" | sed "/localhost/d" | tr -d '\r' | awk 'BEGIN{FS=OFS=" ";}{print $2;}' > ${WORKDIR}/windowsspyblocker
+	rm ${WORKDIR}/windowsspyblocker-raw
+}
+
+cameleon() {
+	# Cameleon List
+	${FETCH} http://sysctl.org/cameleon/hosts -o ${WORKDIR}/cameleon-raw
+	sed "/\.$/d" ${WORKDIR}/cameleon-raw | sed "/^#/d" | sed "/\_/d" | sed "/^\s*$/d" | sed "/\.\./d" | sed "s/^\.//g" | sed "/localhost/d" | tr -d '\r' | awk 'BEGIN{FS=OFS=" ";}{print $2;}' > ${WORKDIR}/cameleon
+	rm ${WORKDIR}/cameleon-raw
+}
+
+adaway() {
+	# AdAway List
+	${FETCH} https://adaway.org/hosts.txt -o ${WORKDIR}/adaway-raw
+	sed "/\.$/d" ${WORKDIR}/adaway-raw | sed "/^#/d" | sed "/\_/d" | sed "/^\s*$/d" | sed "/\.\./d" | sed "s/^\.//g" | sed "/localhost/d" | tr -d '\r' | awk 'BEGIN{FS=OFS=" ";}{print $2;}' > ${WORKDIR}/adaway
+	rm ${WORKDIR}/adaway-raw
+}
+
+yoyo() {
+	# YoYo List
+	${FETCH} "http://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&mimetype=plaintext" -o ${WORKDIR}/yoyo-raw
+	sed "/\.$/d" ${WORKDIR}/yoyo-raw | sed "/^#/d" | sed "/\_/d" | sed "/^\s*$/d" | sed "/\.\./d" | sed "s/^\.//g" | sed "/localhost/d" | tr -d '\r' | awk 'BEGIN{FS=OFS=" ";}{print $2;}' > ${WORKDIR}/yoyo
+	rm ${WORKDIR}/yoyo-raw
+}
+
 install() {
 	# Put all files in correct format
 	for FILE in $(find ${WORKDIR} -type f); do
@@ -111,9 +139,15 @@ install() {
 
 for CAT in $(echo ${1} | tr ',' ' '); do
 	case "${CAT}" in
+	aa)
+		adaway
+		;;
 	ag)
 		adguard
 		;;
+	ca)
+		cameleon
+		;;
 	el)
 		easylist
 		;;
@@ -138,6 +172,12 @@ for CAT in $(echo ${1} | tr ',' ' '); do
 	pt)
 		porntop
 		;;
+	ws)
+		windowsspyblocker
+		;;
+	yy)
+		yoyo
+		;;
 	esac
 done