@ -8,45 +8,42 @@
# This file is copyright under the latest version of the EUPL. # This file is copyright under the latest version of the EUPL.
# Please see LICENSE file for your rights under this license. # Please see LICENSE file for your rights under this license.
# Run this script as root or under sudo # Run this script as root or under sudo
echo ":::"
coltable = "/opt/pihole/COL_TABLE"
source ${ coltable }
helpFunc( ) {
helpFunc( ) {
cat << EOM
echo " Usage: pihole -g
::: Pull in domains from adlists
Update domains from blocklists specified in adlists.list
:::
::: Usage: pihole -g
Options:
:::
-f, --force Force the download of all specified blocklists
::: Options:
-h, --help Show this help dialog"
::: -f, --force Force lists to be downloaded, even if they don' t need updating.
exit 0
::: -h, --help Show this help dialog
EOM
exit 0
} }
PIHOLE_COMMAND = "/usr/local/bin/pihole" PIHOLE_COMMAND = "/usr/local/bin/pihole"
adListFile = /etc/pihole/adlists.listadListFile = /etc/pihole/adlists.list
adListDefault = /etc/pihole/adlists.default # being d eprecatedadListDefault = /etc/pihole/adlists.default # D eprecated
adListRepoDefault = /etc/.pihole/adlists.defaultadListRepoDefault = /etc/.pihole/adlists.default
whitelistScript = " ${ PIHOLE_COMMAND } -w " whitelistScript = " ${ PIHOLE_COMMAND } -w "
whitelistFile = /etc/pihole/whitelist.txtwhitelistFile = /etc/pihole/whitelist.txt
blacklistFile = /etc/pihole/blacklist.txtblacklistFile = /etc/pihole/blacklist.txt
readonly wildcardlist = "/etc/dnsmasq.d/03-pihole-wildcard.conf" readonly wildcardlist = "/etc/dnsmasq.d/03-pihole-wildcard.conf"
# Source the setupVars from install script for the IP# Source the setupVars from install script for the IP
setupVars = /etc/pihole/setupVars.confsetupVars = /etc/pihole/setupVars.conf
if [ [ -f ${ setupVars } ] ] ; then if [ [ -f " ${ setupVars } " ] ] ; then
. /etc/pihole/setupVars.conf . /etc/pihole/setupVars.conf
else else
echo "::: WARNING: /etc/pihole/setupVars.conf missing. Possible installation failure." echo -e " ${ COL_LIGHT_RED } Error: /etc/pihole/setupVars.conf missing. Possible installation failure. ${ COL_NC }
echo "::: Please run 'pihole -r', and choose the 'reconfigure' option to reconfigure." Please run
exit 1 exit 1
fi fi
# Remove the /* from the end of the IPv4addr.# Remove the /* from the end of the IPv4addr.
IPV4_ADDRESS = ${ IPV4_ADDRESS %/* } IPV4_ADDRESS = ${ IPV4_ADDRESS %/* }
IPV6_ADDRESS = ${ IPV6_ADDRESS } IPV6_ADDRESS = ${ IPV6_ADDRESS }
@ -65,13 +62,13 @@ accretionDisc=${basename}.3.accretionDisc.txt
skipDownload = falseskipDownload = false
# Warn users still using pihole.conf that it no longer has any effect (I imagine about 2 people use it) # Warn users still using pihole.conf that it no longer has any effect
if [ [ -r ${ piholeDir } /pihole.conf ] ] ; then if [ [ -r ${ piholeDir } /pihole.conf ] ] ; then
echo "::: pihole.conf file no longer supported. Over-rides in this file are ignored. "echo -e " ${ COL_LIGHT_RED } pihole.conf file no longer supported. Overrides in this file are ignored. ${ COL_NC }
fi fi
########################### ###########################
# c ollapse - begin formation of pihole# C ollapse - begin formation of pihole
gravity_collapse( ) {
gravity_collapse( ) {
#New Logic:
#New Logic:
@ -79,266 +76,276 @@ gravity_collapse() {
# If not, cp /etc/.pihole/adlists.default /etc/pihole/adlists.list
# If not, cp /etc/.pihole/adlists.default /etc/pihole/adlists.list
# Read from adlists.list
# Read from adlists.list
# The following two blocks will sort out any missing adlists in the /etc/pihole directory, and remove legacy adlists.default
# The following two blocks will sort out any missing adlists in the /etc/pihole directory, and remove legacy adlists.default
if [ -f ${ adListDefault } ] && [ -f ${ adListFile } ] ; then
if [ [ " ${ adListDefault } " ] ] && [ [ " ${ adListFile } " ] ] ; then
rm ${ adListDefault }
rm " ${ adListDefault } "
fi
fi
if [ ! -f ${ adListFile } ] ; then
if [ ! -f " ${ adListFile } " ] ; then
cp ${ adListRepoDefault } ${ adListFile }
cp " ${ adListRepoDefault } " " ${ adListFile } "
fi
fi
echo "::: Neutrino emissions detected..."
echo -e " ${ INFO } Neutrino emissions detected... "
echo ":::"
echo ""
echo -n "::: Pulling source lists into range..."
local str = "Pulling source lists into range"
echo -ne " ${ INFO } ${ str } ... "
sources = ( )
sources = ( )
while IFS = read -r line || [ [ -n " $line " ] ] ; do
while IFS = read -r line || [ [ -n " $line " ] ] ; do
# Do not read commented out or blank lines
# Do not read commented out or blank lines
if [ [ ${ line } = \# * ] ] || [ [ ! ${ line } ] ] ; then
if [ [ ${ line } = \# * ] ] || [ [ ! ${ line } ] ] ; then
echo "" > /dev/null
echo "" > /dev/null
else
else
sources += ( ${ line } )
sources += ( ${ line } )
fi
fi
done < ${ adListFile }
done < ${ adListFile }
echo " done!"
echo -e " ${ OVER } ${ TICK } ${ str } "
} }
# patternCheck - check to see if curl downloaded any new files. # patternCheck - check to see if curl downloaded any new files.
gravity_patternCheck( ) {
gravity_patternCheck( ) {
patternBuffer = $1
patternBuffer = $1
success = $2
success = $2
error = $3
error = $3
if [ $success = true ] ; then
if [ [ " ${ success } " = true ] ] ; then
# check if download was successful but list has not been modified
# Check if download was successful but list has not been modified
if [ " ${ error } " = = "304" ] ; then
if [ [ " ${ error } " = = "304" ] ] ; then
echo "::: No changes detected, transport skipped!"
echo -e " ${ TICK } No changes detected, transport skipped! "
# check if the patternbuffer is a non-zero length file
# Check if the patternbuffer is a non-zero length file
elif [ [ -s " ${ patternBuffer } " ] ] ; then
elif [ [ -s " ${ patternBuffer } " ] ] ; then
# Some of the blocklists are copyright, they need to be downloaded
# Some blocklists are copyright, they need to be downloaded and stored
# and stored as is. They can be processed for content after they
# as is. They can be processed for content after they have been saved.
# have been saved.
mv " ${ patternBuffer } " " ${ saveLocation } "
mv " ${ patternBuffer } " " ${ saveLocation } "
echo -e " ${ TICK } List updated, transport successful! "
echo "::: List updated, transport successful!"
else
else
# Empty file -> use previously downloaded list
# Empty file -> use previously downloaded list
echo -e " ${ INFO } Received empty file, ${ COL_LIGHT_GREEN } using cached one ${ COL_NC } (list not updated!) "
echo "::: Received empty file, using cached one (list not updated!)"
fi
fi
else
else
# Check if cached list exists
# check if cached list exists
if [ [ -r " ${ saveLocation } " ] ] ; then
if [ [ -r " ${ saveLocation } " ] ] ; then
echo -e " ${ CROSS } List download failed, using cached list (list not updated!) "
echo "::: List download failed, using cached list (list not updated!)"
else
else
echo -e " ${ CROSS } Download failed and no cached list available (list will not be considered) "
echo "::: Download failed and no cached list available (list will not be considered)"
fi
fi
fi
fi
} }
# transport - curl the specified url with any needed command extentions # transport - curl the specified url with any needed command extentions
gravity_transport( ) {
gravity_transport( ) {
url = $1
url = $1
cmd_ext = $2
cmd_ext = $2
agent = $3
agent = $3
# tmp file, so we don't have to store the (long!) lists in RAM
# tmp file, so we don't have to store the (long!) lists in RAM
patternBuffer = $( mktemp)
patternBuffer = $( mktemp)
heisenbergCompensator = ""
heisenbergCompensator = ""
if [ [ -r ${ saveLocation } ] ] ; then
if [ [ -r ${ saveLocation } ] ] ; then
# if domain has been saved, add file for date check to only download newer
# If domain has been saved, add file for date check to only download newer
heisenbergCompensator = " -z ${ saveLocation } "
heisenbergCompensator = " -z ${ saveLocation } "
fi
fi
# Silently curl url
# Silently curl url
err = $( curl -s -L ${ cmd_ext } ${ heisenbergCompensator } -w %{ http_code} -A " ${ agent } " ${ url } -o ${ patternBuffer } )
echo -e " ${ OVER } ${ TICK } ${ str } "
local str = "Status:"
echo " done"
echo -ne " ${ INFO } ${ str } Pending "
# Analyze http response
err = $( curl -s -L ${ cmd_ext } ${ heisenbergCompensator } -w %{ http_code} -A " ${ agent } " ${ url } -o ${ patternBuffer } )
echo -n "::: Status: "
case " $err " in
# Analyze http response
"200" ) echo "Success (OK)" ; success = true; ;
case " $err " in
"304" ) echo "Not modified" ; success = true; ;
"200" ) echo -e " ${ OVER } ${ TICK } ${ str } Success (OK) " ; success = true; ;
"403" ) echo "Forbidden" ; success = false; ;
"304" ) echo -e " ${ OVER } ${ TICK } ${ str } Not modified " ; success = true; ;
"404" ) echo "Not found" ; success = false; ;
"403" ) echo -e " ${ OVER } ${ CROSS } ${ str } Forbidden " ; success = false; ;
"408" ) echo "Time-out" ; success = false; ;
"404" ) echo -e " ${ OVER } ${ CROSS } ${ str } Not found " ; success = false; ;
"451" ) echo "Unavailable For Legal Reasons" ; success = false; ;
"408" ) echo -e " ${ OVER } ${ CROSS } ${ str } Time-out " ; success = false; ;
"521" ) echo "Web Server Is Down (Cloudflare)" ; success = false; ;
"451" ) echo -e " ${ OVER } ${ CROSS } ${ str } Unavailable For Legal Reasons " ; success = false; ;
"522" ) echo "Connection Timed Out (Cloudflare)" ; success = false; ;
"521" ) echo -e " ${ OVER } ${ CROSS } ${ str } Web Server Is Down (Cloudflare) " ; success = false; ;
"500" ) echo "Internal Server Error" ; success = false; ;
"522" ) echo -e " ${ OVER } ${ CROSS } ${ str } Connection Timed Out (Cloudflare) " ; success = false; ;
* ) echo " Status $err " ; success = false; ;
"500" ) echo -e " ${ OVER } ${ CROSS } ${ str } Internal Server Error " ; success = false; ;
esac
* ) echo -e " ${ OVER } ${ CROSS } ${ str } Status $err " ; success = false; ;
esac
# Process result
gravity_patternCheck " ${ patternBuffer } " ${ success } " ${ err } "
# Process result
gravity_patternCheck " ${ patternBuffer } " " ${ success } " " ${ err } "
# Delete temp file if it hasn't been moved
if [ [ -f " ${ patternBuffer } " ] ] ; then
# Delete temp file if it hasn't been moved
rm " ${ patternBuffer } "
if [ [ -f " ${ patternBuffer } " ] ] ; then
fi
rm " ${ patternBuffer } "
fi
} }
# spinup - main gravity function # spinup - main gravity function
gravity_spinup( ) {
gravity_spinup( ) {
echo ":::"
echo ""
# Loop through domain list. Download each one and remove commented lines (lines beginning with '# 'or '/') and # blank lines
# Loop through domain list. Download each one and remove commented lines (lines beginning with '# 'or '/') and # blank lines
for ( ( i = 0; i < " ${# sources [@] } " ; i++) ) ; do
for ( ( i = 0; i < " ${# sources [@] } " ; i++) ) ; do
url = ${ sources [ $i ] }
url = ${ sources [ $i ] }
# Get just the domain from the URL
# Get just the domain from the URL
domain = $( echo " ${ url } " | cut -d'/' -f3)
domain = $( cut -d'/' -f3 <<< " ${ url } " )
# Save the file as list.#.domain
# Save the file as list.#.domain
saveLocation = ${ piholeDir } /list.${ i } .${ domain } .${ justDomainsExtension }
saveLocation = ${ piholeDir } /list.${ i } .${ domain } .${ justDomainsExtension }
activeDomains[ $i ] = ${ saveLocation }
activeDomains[ $i ] = ${ saveLocation }
agent = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2227.0 Safari/537.36"
agent = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2227.0 Safari/537.36"
# Use a case statement to download lists that need special cURL commands
# Use a case statement to download lists that need special cURL commands
# to complete properly and reset the user agent when required
# to complete properly and reset the user agent when required
case " ${ domain } " in
case " ${ domain } " in
"adblock.mahakala.is" )
"pgl.yoyo.org" )
agent = 'Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36'
cmd_ext = "-d mimetype=plaintext -d hostformat=hosts"
cmd_ext = "-e http://forum.xda-developers.com/"
; ;
; ;
# Default is a simple request
"adaway.org" )
*) cmd_ext = ""
agent = 'Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36'
esac
; ;
if [ [ " ${ skipDownload } " = = false ] ] ; then
"pgl.yoyo.org" )
local str = " Aiming tractor beam at $domain "
cmd_ext = "-d mimetype=plaintext -d hostformat=hosts"
echo -ne " ${ INFO } ${ str } ... "
; ;
gravity_transport " $url " " $cmd_ext " " $agent " " $str "
# Default is a simple request
echo ""
*) cmd_ext = ""
fi
esac
done
if [ [ " ${ skipDownload } " = = false ] ] ; then
echo -n " ::: Getting $domain list... "
gravity_transport " $url " " $cmd_ext " " $agent "
fi
done
} }
# Schwarzchild - aggregate domains to one list and add blacklisted domains # Schwarzchild - aggregate domains to one list and add blacklisted domains
gravity_Schwarzchild( ) {
gravity_Schwarzchild( ) {
echo "::: "
echo ""
# Find all active domains and compile them into one file and remove CRs
# Find all active domains and compile them into one file and remove CRs
echo -n "::: Aggregating list of domains..."
local str = "Aggregating list of domains"
truncate -s 0 ${ piholeDir } /${ matterAndLight }
echo -ne " ${ INFO } ${ str } ... "
for i in " ${ activeDomains [@] } " ; do
# Only assimilate list if it is available (download might have faild permanently)
truncate -s 0 ${ piholeDir } /${ matterAndLight }
if [ [ -r " ${ i } " ] ] ; then
for i in " ${ activeDomains [@] } " ; do
cat " ${ i } " | tr -d '\r' >> ${ piholeDir } /${ matterAndLight }
# Only assimilate list if it is available (download might have failed permanently)
fi
if [ [ -r " ${ i } " ] ] ; then
done
cat " ${ i } " | tr -d '\r' >> ${ piholeDir } /${ matterAndLight }
echo " done!"
fi
done
echo -e " ${ OVER } ${ TICK } ${ str } "
} }
gravity_Blacklist( ) {
gravity_Blacklist( ) {
# Append blacklist entries to eventHorizon if they exist # Append blacklist entries to eventHorizon if they exist
if [ [ -f " ${ blacklistFile } " ] ] ; then if [ [ -f " ${ blacklistFile } " ] ] ; then
numBlacklisted = $( wc -l < " ${ blacklistFile } " ) numBlacklisted = $( wc -l < " ${ blacklistFile } " )
plural = ; [ [ " $numBlacklisted " != "1" ] ] && plural = s plural = ; [ [ " $numBlacklisted " != "1" ] ] && plural = s
echo " ::: Exact blocked domain${ plural } : $numBlacklisted " local str = " Exact blocked domain${ plural } : $numBlacklisted "
else echo -e " ${ INFO } ${ str } "
echo "::: Nothing to blacklist!" else
fi echo -e " ${ INFO } Nothing to blacklist! "
fi
} }
gravity_Wildcard( ) {
gravity_Wildcard( ) {
# Return number of wildcards in output - don't actually handle wildcards # Return number of wildcards in output - don't actually handle wildcards
if [ [ -f " ${ wildcardlist } " ] ] ; then if [ [ -f " ${ wildcardlist } " ] ] ; then
numWildcards = $( grep -c ^ " ${ wildcardlist } " ) numWildcards = $( grep -c ^ " ${ wildcardlist } " )
if [ [ -n " ${ IPV4_ADDRESS } " " ${ IPV6_ADDRESS } " ] ] ; then if [ [ -n " ${ IPV4_ADDRESS } " ]] && [ [ -n " ${ IPV6_ADDRESS } " ] ] ; then
let numWildcards/= 2 let numWildcards/= 2
fi fi
plural = ; [ [ " $numWildcards " != "1" ] ] && plural = s plural = ; [ [ " $numWildcards " != "1" ] ] && plural = s
echo " ::: Wildcard blocked domain${ plural } : $numWildcards " echo -e " ${ INFO } Wildcard blocked domain${ plural } : $numWildcards "
else else
echo "::: No wildcards used! " echo -e " ${ INFO } No wildcards used! "
fi fi
} }
gravity_Whitelist( ) {
gravity_Whitelist( ) {
#${piholeDir}/${eventHorizon})
echo ""
echo ":::"
# Prevent our sources from being pulled into the hole
# Prevent our sources from being pulled into the hole
plural = ; [ [ " ${ sources [@] } " != "1" ] ] && plural = s
plural = ; [ [ " ${ sources [@] } " != "1" ] ] && plural = s
local str = " Adding adlist source ${ plural } to the whitelist "
echo -n " ::: Adding adlist source ${ plural } to the whitelist... "
echo -ne " ${ INFO } ${ str } ... "
urls = ( )
urls = ( )
for url in " ${ sources [@] } " ; do
for url in " ${ sources [@] } " ; do
tmp = $( echo " ${ url } " | awk -F '/' '{print $3}' )
tmp = $( awk -F '/' '{print $3}' <<< " ${ url } " )
urls = ( " ${ urls [@] } " ${ tmp } )
urls = ( " ${ urls [@] } " ${ tmp } )
done
done
echo " done!"
echo -e " ${ OVER } ${ TICK } ${ str } "
# Ensure adlist domains are in whitelist.txt
${ whitelistScript } -nr -q " ${ urls [@] } " > /dev/null
# Ensure adlist domains are in whitelist.txt
${ whitelistScript } -nr -q " ${ urls [@] } " > /dev/null
# Check whitelist.txt exists.
if [ [ -f " ${ whitelistFile } " ] ] ; then
# Check whitelist.txt exists.
# Remove anything in whitelist.txt from the Event Horizon
if [ [ -f " ${ whitelistFile } " ] ] ; then
numWhitelisted = $( wc -l < " ${ whitelistFile } " )
# Remove anything in whitelist.txt from the Event Horizon
plural = ; [ [ " $numWhitelisted " != "1" ] ] && plural = s
numWhitelisted = $( wc -l < " ${ whitelistFile } " )
echo -n " ::: Whitelisting $numWhitelisted domain ${ plural } ... "
plural = ; [ [ " $numWhitelisted " != "1" ] ] && plural = s
#print everything from preEventHorizon into eventHorizon EXCEPT domains in whitelist.txt
local str = " Whitelisting $numWhitelisted domain ${ plural } "
grep -F -x -v -f ${ whitelistFile } ${ piholeDir } /${ preEventHorizon } > ${ piholeDir } /${ eventHorizon }
echo -ne " ${ INFO } ${ str } ... "
echo " done!"
else
# Print everything from preEventHorizon into eventHorizon EXCEPT domains in whitelist.txt
echo "::: Nothing to whitelist!"
grep -F -x -v -f ${ whitelistFile } ${ piholeDir } /${ preEventHorizon } > ${ piholeDir } /${ eventHorizon }
fi
echo -e " ${ OVER } ${ TICK } ${ str } "
else
echo -e " ${ INFO } Nothing to whitelist! "
fi
} }
gravity_unique( ) {
gravity_unique( ) {
# Sort and remove duplicates
# Sort and remove duplicates
echo -n "::: Removing duplicate domains...."
local str = "Removing duplicate domains"
sort -u ${ piholeDir } /${ supernova } > ${ piholeDir } /${ preEventHorizon }
echo -ne " ${ INFO } ${ str } ... "
echo " done!"
numberOf = $( wc -l < ${ piholeDir } /${ preEventHorizon } )
sort -u ${ piholeDir } /${ supernova } > ${ piholeDir } /${ preEventHorizon }
echo " ::: $numberOf unique domains trapped in the event horizon. "
echo -e " ${ OVER } ${ TICK } ${ str } "
numberOf = $( wc -l < ${ piholeDir } /${ preEventHorizon } )
echo -e " ${ INFO } ${ COL_LIGHT_BLUE } ${ numberOf } ${ COL_NC } unique domains trapped in the event horizon. "
} }
gravity_doHostFormat( ) {
gravity_doHostFormat( ) {
# Check vars from setupVars.conf to see if we're using IPv4, IPv6, Or both.
# Check vars from setupVars.conf to see if we're using IPv4, IPv6, Or both.
if [ [ -n " ${ IPV4_ADDRESS } " && -n " ${ IPV6_ADDRESS } " ] ] ; then
if [ [ -n " ${ IPV4_ADDRESS } " ] ] && [ [ -n " ${ IPV6_ADDRESS } " ] ] ; then
# Both IPv4 and IPv6
# Both IPv4 and IPv6
awk -v ipv4addr = " $IPV4_ADDRESS " -v ipv6addr = " $IPV6_ADDRESS " '{sub(/\r$/,""); print ipv4addr" "$0"\n"ipv6addr" "$0}' >> " ${ 2 } " < " ${ 1 } "
awk -v ipv4addr = " $IPV4_ADDRESS " -v ipv6addr = " $IPV6_ADDRESS " '{sub(/\r$/,""); print ipv4addr" "$0"\n"ipv6addr" "$0}' >> " ${ 2 } " < " ${ 1 } "
elif [ [ -n " ${ IPV4_ADDRESS } " && -z " ${ IPV6_ADDRESS } " ] ] ; then
elif [ [ -n " ${ IPV4_ADDRESS } " ] ] && [ [ -z " ${ IPV6_ADDRESS } " ] ] ; then
# Only IPv4
# Only IPv4
awk -v ipv4addr = " $IPV4_ADDRESS " '{sub(/\r$/,""); print ipv4addr" "$0}' >> " ${ 2 } " < " ${ 1 } "
awk -v ipv4addr = " $IPV4_ADDRESS " '{sub(/\r$/,""); print ipv4addr" "$0}' >> " ${ 2 } " < " ${ 1 } "
elif [ [ -z " ${ IPV4_ADDRESS } " && -n " ${ IPV6_ADDRESS } " ] ] ; then
elif [ [ -z " ${ IPV4_ADDRESS } " ] ] && [ [ -n " ${ IPV6_ADDRESS } " ] ] ; then
# Only IPv6
# Only IPv6
awk -v ipv6addr = " $IPV6_ADDRESS " '{sub(/\r$/,""); print ipv6addr" "$0}' >> " ${ 2 } " < " ${ 1 } "
awk -v ipv6addr = " $IPV6_ADDRESS " '{sub(/\r$/,""); print ipv6addr" "$0}' >> " ${ 2 } " < " ${ 1 } "
elif [ [ -z " ${ IPV4_ADDRESS } " && -z " ${ IPV6_ADDRESS } " ] ] ; then
elif [ [ -z " ${ IPV4_ADDRESS } " ] ] && [ [ -z " ${ IPV6_ADDRESS } " ] ] ; then
echo "::: No IP Values found! Please run 'pihole -r' and choose reconfigure to restore values"
echo -e " ${ OVER } ${ CROSS } ${ str } "
exit 1
echo -e " ${ COL_LIGHT_RED } No IP Values found! Please run 'pihole -r' and choose reconfigure to restore values ${ COL_NC } "
exit 1
fi
fi
} }
gravity_hostFormatLocal( ) {
gravity_hostFormatLocal( ) {
# Format domain list as "192.168.x.x domain.com" # Format domain list as "192.168.x.x domain.com"
if [ [ -f /etc/hostname ] ] ; then if [ [ -f "/etc/hostname" ] ] ; then
hostname = $( < /etc/hostname) hostname = $( < /etc/hostname)
elif [ -x " $( command -v hostname) " ] ; then elif [ -x " $( command -v hostname) " ] ; then
hostname = $( hostname -f) hostname = $( hostname -f)
else else
echo "::: Error: Unable to determine fully qualified domain name of host" echo -e " ${ CROSS } Unable to determine fully qualified domain name of host
fi fi
echo -e " ${ hostname } \npi.hole " > " ${ localList } .tmp " echo -e " ${ hostname } \npi.hole " > " ${ localList } .tmp "
# Copy the file over as /etc/pihole/local.list so dnsmasq can use it # Copy the file over as /etc/pihole/local.list so dnsmasq can use it
rm " ${ localList } " rm " ${ localList } "
gravity_doHostFormat " ${ localList } .tmp " " ${ localList } " gravity_doHostFormat " ${ localList } .tmp " " ${ localList } "
rm " ${ localList } .tmp " rm " ${ localList } .tmp "
} }
gravity_hostFormatGravity( ) {
gravity_hostFormatGravity( ) {
# Format domain list as "192.168.x.x domain.com"
# Format domain list as "192.168.x.x domain.com"
echo "" > " ${ piholeDir } / ${ accretionDisc } "
echo "" > " ${ piholeDir } / ${ accretionDisc } "
gravity_doHostFormat " ${ piholeDir } / ${ eventHorizon } " " ${ piholeDir } / ${ accretionDisc } "
gravity_doHostFormat " ${ piholeDir } / ${ eventHorizon } " " ${ piholeDir } / ${ accretionDisc } "
# Copy the file over as /etc/pihole/gravity.list so dnsmasq can use it
# Copy the file over as /etc/pihole/gravity.list so dnsmasq can use it
mv " ${ piholeDir } / ${ accretionDisc } " " ${ adList } "
mv " ${ piholeDir } / ${ accretionDisc } " " ${ adList } "
} }
gravity_hostFormatBlack( ) {
gravity_hostFormatBlack( ) {
@ -349,76 +356,83 @@ gravity_hostFormatBlack() {
# Copy the file over as /etc/pihole/black.list so dnsmasq can use it
# Copy the file over as /etc/pihole/black.list so dnsmasq can use it
mv " ${ blackList } .tmp " " ${ blackList } "
mv " ${ blackList } .tmp " " ${ blackList } "
else
else
echo "::: Nothing to blacklist!
echo -e " ${ INFO } Nothing to blacklist! "
fi
fi
} }
# blackbody - remove any remnant files from script processes # blackbody - remove any remnant files from script processes
gravity_blackbody( ) {
gravity_blackbody( ) {
# Loop through list files # Loop through list files
for file in ${ piholeDir } /*.${ justDomainsExtension } ; do for file in ${ piholeDir } /*.${ justDomainsExtension } ; do
# If list is in active array then leave it (noop) else rm the list # If list is in active array then leave it (noop) else rm the list
if [ [ " ${ activeDomains [@] } " = ~ ${ file } ] ] ; then if [ [ " ${ activeDomains [@] } " = ~ ${ file } ] ] ; then
: :
else else
rm -f " ${ file } " rm -f " ${ file } "
fi fi
done done
} }
gravity_advanced( ) {
gravity_advanced( ) {
# Remove comments and print only the domain name
# Remove comments and print only the domain name
# Most of the lists downloaded are already in hosts file format but the spacing/formating is not contigious
# Most of the lists downloaded are already in hosts file format but the spacing/formating is not contigious
# This helps with that and makes it easier to read
# This helps with that and makes it easier to read
# It also helps with debugging so each stage of the script can be researched more in depth
# It also helps with debugging so each stage of the script can be researched more in depth
echo -n "::: Formatting list of domains to remove comments...."
local str = "Formatting list of domains to remove comments"
#awk '($1 !~ /^#/) { if (NF>1) {print $2} else {print $1}}' ${piholeDir}/${matterAndLight} | sed -nr -e 's/\.{2,}/./g' -e '/\./p' > ${piholeDir}/${supernova}
echo -ne " ${ INFO } ${ str } ... "
#Above line does not correctly grab domains where comment is on the same line (e.g 'addomain.com #comment')
#Awk -F splits on given IFS, we grab the right hand side (chops trailing #coments and /'s to grab the domain only.
#awk '($1 !~ /^#/) { if (NF>1) {print $2} else {print $1}}' ${piholeDir}/${matterAndLight} | sed -nr -e 's/\.{2,}/./g' -e '/\./p' > ${piholeDir}/${supernova}
#Last awk command takes non-commented lines and if they have 2 fields, take the left field (the domain) and leave
#Above line does not correctly grab domains where comment is on the same line (e.g 'addomain.com #comment')
#+ the right (IP address), otherwise grab the single field.
#Awk -F splits on given IFS, we grab the right hand side (chops trailing #coments and /'s to grab the domain only.
cat ${ piholeDir } /${ matterAndLight } | \
#Last awk command takes non-commented lines and if they have 2 fields, take the left field (the domain) and leave
awk -F '#' '{print $1}' | \
#+ the right (IP address), otherwise grab the single field.
awk -F '/' '{print $1}' | \
cat ${ piholeDir } /${ matterAndLight } | \
awk '($1 !~ /^#/) { if (NF>1) {print $2} else {print $1}}' | \
awk -F '#' '{print $1}' | \
sed -nr -e 's/\.{2,}/./g' -e '/\./p' > ${ piholeDir } /${ supernova }
awk -F '/' '{print $1}' | \
echo " done!"
awk '($1 !~ /^#/) { if (NF>1) {print $2} else {print $1}}' | \
sed -nr -e 's/\.{2,}/./g' -e '/\./p' > ${ piholeDir } /${ supernova }
numberOf = $( wc -l < ${ piholeDir } /${ supernova } )
echo " ::: ${ numberOf } domains being pulled in by gravity... "
echo -e " ${ OVER } ${ TICK } ${ str } "
gravity_unique
numberOf = $( wc -l < ${ piholeDir } /${ supernova } )
echo -e " ${ INFO } ${ COL_LIGHT_BLUE } ${ numberOf } ${ COL_NC } domains being pulled in by gravity "
gravity_unique
} }
gravity_reload( ) {
gravity_reload( ) {
# Reload hosts file
# Reload hosts file
echo ""
echo ":::"
local str = "Refreshing lists in dnsmasq"
echo -n "::: Refresh lists in dnsmasq..."
echo -e " ${ INFO } ${ str } ... "
#ensure /etc/dnsmasq.d/01-pihole.conf is pointing at the correct list!
# Ensure /etc/dnsmasq.d/01-pihole.conf is pointing at the correct list!
#First escape forward slashes in the path:
# First escape forward slashes in the path:
adList = ${ adList // \/ / \\ \/ }
adList = ${ adList // \/ / \\ \/ }
#Now replace the line in dnsmasq file
# Now replace the line in dnsmasq file
# sed -i "s/^addn-hosts.*/addn-hosts=$adList/" /etc/dnsmasq.d/01-pihole.conf # sed -i "s/^addn-hosts.*/addn-hosts=$adList/" /etc/dnsmasq.d/01-pihole.conf
" ${ PIHOLE_COMMAND } " restartdns
" ${ PIHOLE_COMMAND } " restartdns
echo " done!"
} }
for var in " $@ " ; do for var in " $@ " ; do
case " ${ var } " in case " ${ var } " in
"-f" | "--force" ) forceGrav = true; ; "-f" | "--force" ) forceGrav = true; ;
"-h" | "--help" ) helpFunc; ; "-h" | "--help" ) helpFunc; ;
"-sd" | "--skip-download" ) skipDownload = true; ; "-sd" | "--skip-download" ) skipDownload = true; ;
"-b" | "--blacklist-only" ) blackListOnly = true; ; "-b" | "--blacklist-only" ) blackListOnly = true; ;
esac esac
done done
if [ [ " ${ forceGrav } " = = true ] ] ; then if [ [ " ${ forceGrav } " = = true ] ] ; then
echo -n "::: Deleting exising list cache..."
str = "Deleting exising list cache"
rm /etc/pihole/list.*
echo -ne " ${ INFO } ${ str } ... "
echo " done!"
if rm /etc/pihole/list.* 2> /dev/null; then
echo -e " ${ OVER } ${ TICK } ${ str } "
else
echo -e " ${ OVER } ${ CROSS } ${ str } "
fi
fi fi
if [ [ ! " ${ blackListOnly } " = = true ] ] ; then if [ [ ! " ${ blackListOnly } " = = true ] ] ; then
@ -428,31 +442,34 @@ if [[ ! "${blackListOnly}" == true ]]; then
gravity_Schwarzchild
gravity_Schwarzchild
gravity_advanced
gravity_advanced
else
else
echo "::: Using cached Event Horizon list...
echo -e " ${ INFO } Using cached Event Horizon list... "
numberOf = $( wc -l < ${ piholeDir } /${ preEventHorizon } )
numberOf = $( wc -l < ${ piholeDir } /${ preEventHorizon } )
echo " ::: $numberOf unique domains trapped in the event horizon. "
echo -e " ${ INFO } ${ COL_LIGHT_BLUE } $numberOf ${ COL_NC } unique domains trapped in the event horizon. "
fi
fi
gravity_Whitelist
gravity_Whitelist
fi fi
gravity_Blacklist
gravity_Blacklist
gravity_Wildcard
gravity_Wildcard
echo -n "::: Formatting domains into a HOSTS file..." str = "Formatting domains into a HOSTS file"
echo -ne " ${ INFO } ${ str } ... "
if [ [ ! " ${ blackListOnly } " = = true ] ] ; then if [ [ ! " ${ blackListOnly } " = = true ] ] ; then
gravity_hostFormatLocal
gravity_hostFormatLocal
gravity_hostFormatGravity
gravity_hostFormatGravity
fi fi
gravity_hostFormatBlack
gravity_hostFormatBlack
echo " done! echo -e " ${ OVER } ${ TICK } ${ str } "
gravity_blackbody
gravity_blackbody
if [ [ ! " ${ blackListOnly } " = = true ] ] ; then if [ [ ! " ${ blackListOnly } " = = true ] ] ; then
#Clear no longer needed files...
# Clear no longer needed files...
echo ":::"
str = "Cleaning up un-needed files"
echo -n "::: Cleaning up un-needed files..."
echo -ne " ${ INFO } ${ str } ... "
rm ${ piholeDir } /pihole.*.txt
echo " done!"
rm ${ piholeDir } /pihole.*.txt 2> /dev/null
echo -e " ${ OVER } ${ TICK } ${ str } "
fi fi
gravity_reload
gravity_reload
Adam Warner
7 years ago
committed by