wallenstein/algo
1
0
Fork 0
mirror of https://github.com/trailofbits/algo.git synced 2025-08-09 14:23:05 +02:00
Code Issues Projects Releases Wiki Activity

Add wildcard blocking

Browse source
This commit is contained in:
rodeodomino 2019-06-20 16:34:37 -04:00 • committed by GitHub
parent 4fd05ca87d
commit b946b29168
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
roles/dns/templates/adblock.sh.j2
View file

@ -5,6 +5,7 @@ TEMP="$(mktemp)"
TEMP_SORTED="$(mktemp)"
WHITELIST="/etc/dnscrypt-proxy/white.list"
BLACKLIST="/etc/dnscrypt-proxy/black.list"
WILDCARDS="{{ config_prefix|default('/') }}etc/dnscrypt-proxy/wildcard.list"
BLOCKHOSTS="{{ config_prefix|default('/') }}etc/dnscrypt-proxy/blacklist.txt"
BLOCKLIST_URLS="{% for url in adblock_lists %}{{ url }} {% endfor %}"
@ -17,6 +18,13 @@ for url in $BLOCKLIST_URLS; do
wget --timeout=2 --tries=3 -qO- "$url" | grep -Ev "(localhost)" | grep -Ew "(0.0.0.0|127.0.0.1)" | awk '{sub(/\r$/,"");print $2}' >> "$TEMP"
done
#Add wildcards, if non empty
if [ -s "$WILDCARDS" ]
then
echo 'Adding wildcards...'
cat $WILDCARDS >> "$TEMP"
fi
#Add black list, if non-empty
if [ -s "$BLACKLIST" ]
then