wallenstein/algo
1
0
Fork 0
mirror of https://github.com/trailofbits/algo.git synced 2025-06-07 15:43:54 +02:00
Code Issues Projects Releases Wiki Activity

Some browsers (eg. Safari) stop loading pages if the element with ads can't be loaded (#633)

Browse source
This commit is contained in:
Jack Ivanov 2017-07-23 20:23:57 +02:00 • committed by Dan Guido
parent 4b02315f1b
commit 8da53f859b
3 changed files with 19 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
roles/dns_adblocking/tasks/main.yml
View file

@ -41,11 +41,10 @@
minute: 10 minute: 10
hour: 2 hour: 2
job: /usr/local/sbin/adblock.sh job: /usr/local/sbin/adblock.sh
user: dnsmasq user: root
- name: Update adblock hosts - name: Update adblock hosts
shell: > command: /usr/local/sbin/adblock.sh
sudo -u dnsmasq "/usr/local/sbin/adblock.sh"
- meta: flush_handlers - meta: flush_handlers

20
roles/dns_adblocking/templates/adblock.sh.j2
View file

@ -1,15 +1,11 @@
#!/bin/sh #!/bin/sh
# Block ads, malware, etc.. # Block ads, malware, etc..
# Redirect endpoint
ENDPOINT_IP4="0.0.0.0"
ENDPOINT_IP6="::"
IPV6="Y"
TEMP=`mktemp` TEMP=`mktemp`
TEMP_SORTED=`mktemp` TEMP_SORTED=`mktemp`
DNSMASQ_WHITELIST="/var/lib/dnsmasq/white.list" DNSMASQ_WHITELIST="/var/lib/dnsmasq/white.list"
DNSMASQ_BLACKLIST="/var/lib/dnsmasq/black.list" DNSMASQ_BLACKLIST="/var/lib/dnsmasq/black.list"
DNSMASQ_BLOCKHOSTS="/var/lib/dnsmasq/block.hosts" DNSMASQ_BLOCKHOSTS="{{ config_prefix|default('/') }}etc/dnsmasq.d/block.hosts.conf"
BLOCKLIST_URLS="{% for url in adblock_lists %}{{ url }} {% endfor %}" BLOCKLIST_URLS="{% for url in adblock_lists %}{{ url }} {% endfor %}"
#Delete the old block.hosts to make room for the updates #Delete the old block.hosts to make room for the updates
@ -18,18 +14,18 @@ rm -f $DNSMASQ_BLOCKHOSTS
echo 'Downloading hosts lists...' echo 'Downloading hosts lists...'
#Download and process the files needed to make the lists (enable/add more, if you want) #Download and process the files needed to make the lists (enable/add more, if you want)
for url in $BLOCKLIST_URLS; do for url in $BLOCKLIST_URLS; do
wget --timeout=2 --tries=3 -qO- "$url" | awk -v r="$ENDPOINT_IP4" '{sub(/^(0.0.0.0|127.0.0.1)/, r)} $0 ~ "^"r' >> "$TEMP" 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 done
#Add black list, if non-empty #Add black list, if non-empty
if [ -s "$DNSMASQ_BLACKLIST" ] if [ -s "$DNSMASQ_BLACKLIST" ]
then then
echo 'Adding blacklist...' echo 'Adding blacklist...'
awk -v r="$ENDPOINT_IP4" '/^[^#]/ { print r,$1 }' $DNSMASQ_BLACKLIST >> "$TEMP" cat $DNSMASQ_BLACKLIST >> "$TEMP"
fi fi
#Sort the download/black lists #Sort the download/black lists
awk '{sub(/\r$/,"");print $1,$2}' "$TEMP"|sort -u > "$TEMP_SORTED" awk '/^[^#]/ { print "local=/" $1 "/" }' "$TEMP" | sort -u > "$TEMP_SORTED"
#Filter (if applicable) #Filter (if applicable)
if [ -s "$DNSMASQ_WHITELIST" ] if [ -s "$DNSMASQ_WHITELIST" ]
@ -42,14 +38,6 @@ else
cat "$TEMP_SORTED" > $DNSMASQ_BLOCKHOSTS cat "$TEMP_SORTED" > $DNSMASQ_BLOCKHOSTS
fi fi
if [ "$IPV6" = "Y" ]
then
safe_pattern=$(printf '%s\n' "$ENDPOINT_IP4" | sed 's/[[\.*^$(){}?+|/]/\\&/g')
safe_addition=$(printf '%s\n' "$ENDPOINT_IP6" | sed 's/[\&/]/\\&/g')
echo 'Adding ipv6 support...'
sed -i -re "s/^(${safe_pattern}) (.*)$/\1 \2\n${safe_addition} \2/g" $DNSMASQ_BLOCKHOSTS
fi
service dnsmasq restart service dnsmasq restart
exit 0 exit 0

6
roles/dns_adblocking/templates/dnsmasq.conf.j2
View file

@ -130,7 +130,7 @@ bind-interfaces
#no-hosts #no-hosts
# or if you want it to read another file, as well as /etc/hosts, use # or if you want it to read another file, as well as /etc/hosts, use
# this. # this.
addn-hosts=/var/lib/dnsmasq/block.hosts # addn-hosts=/var/lib/dnsmasq/block.hosts
# Set this (and domain: see below) if you want to have a domain # Set this (and domain: see below) if you want to have a domain
# automatically added to simple names in a hosts-file. # automatically added to simple names in a hosts-file.
@ -659,11 +659,11 @@ addn-hosts=/var/lib/dnsmasq/block.hosts
# Include another lot of configuration options. # Include another lot of configuration options.
#conf-file=/etc/dnsmasq.more.conf #conf-file=/etc/dnsmasq.more.conf
#conf-dir=/etc/dnsmasq.d conf-dir=/etc/dnsmasq.d
# Include all the files in a directory except those ending in .bak # Include all the files in a directory except those ending in .bak
#conf-dir=/etc/dnsmasq.d,.bak #conf-dir=/etc/dnsmasq.d,.bak
# Include all files in a directory which end in .conf # Include all files in a directory which end in .conf
#conf-dir=/etc/dnsmasq.d/,*.conf # conf-dir=/etc/dnsmasq.d/,*.conf
# #