tyler.durden
/
pi-hole
mirror of https://github.com/pi-hole/pi-hole.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Consistency 

More of the same
This commit is contained in:
Marcus Hildum 2016-10-22 10:12:05 -07:00
parent 69ba8a3c2f
commit 07a66a70fc
1 changed files with 118 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
advanced/Scripts/whitelist.sh
View File

@ -55,7 +55,7 @@ if [[ -f ${piholeIPfile} ]];then
else else
# Otherwise, the IP address can be taken directly from the machine, which will happen when the script is run by the user and not the installation script # Otherwise, the IP address can be taken directly from the machine, which will happen when the script is run by the user and not the installation script
IPv4dev=$(ip route get 8.8.8.8 | awk '{for(i=1;i<=NF;i++)if($i~/dev/)print $(i+1)}') IPv4dev=$(ip route get 8.8.8.8 | awk '{for(i=1;i<=NF;i++)if($i~/dev/)print $(i+1)}')
piholeIPCIDR=$(ip -o -f inet addr show dev "$IPv4dev" | awk '{print $4}' | awk 'END {print}') piholeIPCIDR=$(ip -o -f inet addr show dev "${IPv4dev}" | awk '{print $4}' | awk 'END {print}')
piholeIP=${piholeIPCIDR%/*} piholeIP=${piholeIPCIDR%/*}
fi fi
@ -75,7 +75,7 @@ fi
HandleOther() { HandleOther() {
#check validity of domain #check validity of domain
validDomain=$(echo "$1" | perl -ne'print if /\b((?=[a-z0-9-]{1,63}\.)(xn--)?[a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,63}\b/') validDomain=$(echo "$1" | perl -ne'print if /\b((?=[a-z0-9-]{1,63}\.)(xn--)?[a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,63}\b/')
if [ -z "$validDomain" ]; then if [ -z "${validDomain}" ]; then
echo "::: $1 is not a valid argument or domain name" echo "::: $1 is not a valid argument or domain name"
else else
domList=("${domList[@]}" ${validDomain}) domList=("${domList[@]}" ${validDomain})
@ -87,12 +87,11 @@ PopWhitelistFile() {
if [[ ! -f ${whitelist} ]]; then if [[ ! -f ${whitelist} ]]; then
touch ${whitelist} touch ${whitelist}
fi fi
for dom in "${domList[@]}" for dom in "${domList[@]}"; do
do
if ${addmode}; then if ${addmode}; then
AddDomain "$dom" AddDomain "${dom}"
else else
RemoveDomain "$dom" RemoveDomain "${dom}"
fi fi
done done
} }
@ -105,16 +104,16 @@ AddDomain() {
if ${bool}; then if ${bool}; then
#domain not found in the whitelist file, add it! #domain not found in the whitelist file, add it!
if ${verbose}; then if ${verbose}; then
echo -n "::: Adding $1 to $whitelist..." echo -n "::: Adding ${1}to ${whitelist}..."
fi fi
echo "$1" >> ${whitelist} echo "${1}" >> ${whitelist}
modifyHost=true modifyHost=true
if ${verbose}; then if ${verbose}; then
echo " done!" echo " done!"
fi fi
else else
if ${verbose}; then if ${verbose}; then
echo "::: $1 already exists in $whitelist, no need to add!" echo "::: ${1} already exists in ${whitelist}, no need to add!"
fi fi
fi fi
} }
@ -126,14 +125,14 @@ RemoveDomain() {
if ${bool}; then if ${bool}; then
#Domain is not in the whitelist file, no need to Remove #Domain is not in the whitelist file, no need to Remove
if ${verbose}; then if ${verbose}; then
echo "::: $1 is NOT whitelisted! No need to remove" echo "::: ${1} is NOT whitelisted! No need to remove"
fi fi
else else
#Domain is in the whitelist file, add to a temporary array and remove from whitelist file #Domain is in the whitelist file, add to a temporary array and remove from whitelist file
#if $verbose; then #if $verbose; then
#echo "::: Un-whitelisting $dom..." #echo "::: Un-whitelisting $dom..."
#fi #fi
domToRemoveList=("${domToRemoveList[@]}" $1) domToRemoveList=("${domToRemoveList[@]}" ${1})
modifyHost=true modifyHost=true
fi fi
} }
@ -144,11 +143,11 @@ ModifyHostFile() {
if [[ -r ${whitelist} ]]; then if [[ -r ${whitelist} ]]; then
# Remove whitelist entries # Remove whitelist entries
numberOf=$(cat ${whitelist} | sed '/^\s*$/d' | wc -l) numberOf=$(cat ${whitelist} | sed '/^\s*$/d' | wc -l)
plural=; [[ "$numberOf" != "1" ]] && plural=s plural=; [[ "${numberOf}" != "1" ]] && plural=s
echo ":::" echo ":::"
echo -n "::: Modifying HOSTS file to whitelist $numberOf domain${plural}..." echo -n "::: Modifying HOSTS file to whitelist $numberOf domain${plural}..."
awk -F':' '{print $1}' ${whitelist} | while read -r line; do echo "$piholeIP $line"; done > /etc/pihole/whitelist.tmp awk -F':' '{print $1}' ${whitelist} | while read -r line; do echo "${piholeIP} ${line}"; done > /etc/pihole/whitelist.tmp
awk -F':' '{print $1}' ${whitelist} | while read -r line; do echo "$piholeIPv6 $line"; done >> /etc/pihole/whitelist.tmp awk -F':' '{print $1}' ${whitelist} | while read -r line; do echo "${piholeIPv6} ${line}"; done >> /etc/pihole/whitelist.tmp
echo "l" >> /etc/pihole/whitelist.tmp echo "l" >> /etc/pihole/whitelist.tmp
grep -F -x -v -f ${piholeDir}/whitelist.tmp ${adList} > ${piholeDir}/gravity.tmp grep -F -x -v -f ${piholeDir}/whitelist.tmp ${adList} > ${piholeDir}/gravity.tmp
rm ${adList} rm ${adList}
@ -161,17 +160,16 @@ ModifyHostFile() {
#we need to add the removed domains to the hosts file #we need to add the removed domains to the hosts file
echo ":::" echo ":::"
echo "::: Modifying HOSTS file to un-whitelist domains..." echo "::: Modifying HOSTS file to un-whitelist domains..."
for rdom in "${domToRemoveList[@]}" for rdom in "${domToRemoveList[@]}"; do
do if grep -q "${rdom}" /etc/pihole/*.domains; then
if grep -q "$rdom" /etc/pihole/*.domains; then echo "::: AdLists contain ${rdom}, re-adding block"
echo "::: AdLists contain $rdom, re-adding block"
if [[ -n ${piholeIPv6} ]]; then if [[ -n ${piholeIPv6} ]]; then
echo -n "::: Restoring block for $rdom on IPv4 and IPv6..." echo -n "::: Restoring block for ${rdom} on IPv4 and IPv6..."
echo "$rdom" | awk -v ipv4addr="$piholeIP" -v ipv6addr="$piholeIPv6" '{sub(/\r$/,""); print ipv4addr" "$0"\n"ipv6addr" "$0}' >> ${adList} echo "${rdom}" | awk -v ipv4addr="${piholeIP}" -v ipv6addr="${piholeIPv6}" '{sub(/\r$/,""); print ipv4addr" "$0"\n"ipv6addr" "$0}' >> ${adList}
echo " done!" echo " done!"
else else
echo -n "::: Restoring block for $rdom on IPv4..." echo -n "::: Restoring block for ${rdom} on IPv4..."
echo "$rdom" | awk -v ipv4addr="$piholeIP" '{sub(/\r$/,""); print ipv4addr" "$0}' >>${adList} echo "${rdom}" | awk -v ipv4addr="${piholeIP}" '{sub(/\r$/,""); print ipv4addr" "$0}' >>${adList}
echo " done!" echo " done!"
fi fi
fi fi
@ -210,25 +208,23 @@ DisplayWlist() {
verbose=false verbose=false
echo -e " Displaying Gravity Resistant Domains \n" echo -e " Displaying Gravity Resistant Domains \n"
count=1 count=1
while IFS= read -r RD while IFS= read -r RD; do
do echo "${count}: ${RD}"
echo "${count}: $RD"
count=$((count+1)) count=$((count+1))
done < "$whitelist" done < "${whitelist}"
} }
################################################### ###################################################
for var in "$@" for var in "$@"; do
do case "${var}" in
case "$var" in
"-nr"| "--noreload" ) reload=false;; "-nr"| "--noreload" ) reload=false;;
"-d" | "--delmode" ) addmode=false;; "-d" | "--delmode" ) addmode=false;;
"-f" | "--force" ) force=true;; "-f" | "--force" ) force=true;;
"-q" | "--quiet" ) verbose=false;; "-q" | "--quiet" ) verbose=false;;
"-h" | "--help" ) helpFunc;; "-h" | "--help" ) helpFunc;;
"-l" | "--list" ) DisplayWlist;; "-l" | "--list" ) DisplayWlist;;
* ) HandleOther "$var";; * ) HandleOther "${var}";;
esac esac
done done