2015-11-11 08:43:00 +00:00
|
|
|
#!/usr/bin/env bash
|
2017-07-24 11:24:34 +00:00
|
|
|
# shellcheck disable=SC1090
|
|
|
|
|
2015-11-23 10:52:12 +00:00
|
|
|
# Pi-hole: A black hole for Internet advertisements
|
2017-02-22 17:55:20 +00:00
|
|
|
# (c) 2017 Pi-hole, LLC (https://pi-hole.net)
|
|
|
|
# Network-wide ad blocking via your own hardware.
|
|
|
|
#
|
2017-07-24 11:24:34 +00:00
|
|
|
# Usage: "pihole -g"
|
2015-11-06 23:03:55 +00:00
|
|
|
# Compiles a list of ad-serving domains by downloading them from multiple sources
|
2015-12-06 13:55:50 +00:00
|
|
|
#
|
2017-02-22 17:55:20 +00:00
|
|
|
# This file is copyright under the latest version of the EUPL.
|
|
|
|
# Please see LICENSE file for your rights under this license.
|
|
|
|
|
2017-06-21 11:49:05 +00:00
|
|
|
coltable="/opt/pihole/COL_TABLE"
|
2017-07-27 02:34:35 +00:00
|
|
|
source "${coltable}"
|
2016-04-11 10:29:14 +00:00
|
|
|
|
2017-07-24 11:24:34 +00:00
|
|
|
basename="pihole"
|
|
|
|
PIHOLE_COMMAND="/usr/local/bin/${basename}"
|
2017-06-21 11:49:05 +00:00
|
|
|
|
2017-07-24 11:24:34 +00:00
|
|
|
piholeDir="/etc/${basename}"
|
|
|
|
piholeRepo="/etc/.${basename}"
|
|
|
|
|
|
|
|
adListFile="${piholeDir}/adlists.list"
|
|
|
|
adListDefault="${piholeDir}/adlists.default"
|
|
|
|
adListRepoDefault="${piholeRepo}/adlists.default"
|
2016-08-17 17:59:00 +00:00
|
|
|
|
2017-07-24 11:24:34 +00:00
|
|
|
whitelistFile="${piholeDir}/whitelist.txt"
|
|
|
|
blacklistFile="${piholeDir}/blacklist.txt"
|
|
|
|
wildcardFile="/etc/dnsmasq.d/03-pihole-wildcard.conf"
|
2016-01-21 22:14:55 +00:00
|
|
|
|
2017-07-24 11:24:34 +00:00
|
|
|
adList="${piholeDir}/gravity.list"
|
|
|
|
blackList="${piholeDir}/black.list"
|
|
|
|
localList="${piholeDir}/local.list"
|
2017-09-14 06:39:30 +00:00
|
|
|
VPNList="/etc/openvpn/ipp.txt"
|
2016-01-26 20:26:09 +00:00
|
|
|
|
2017-07-24 11:24:34 +00:00
|
|
|
domainsExtension="domains"
|
|
|
|
matterAndLight="${basename}.0.matterandlight.txt"
|
2017-07-27 02:34:35 +00:00
|
|
|
parsedMatter="${basename}.1.parsedmatter.txt"
|
|
|
|
whitelistMatter="${basename}.2.whitelistmatter.txt"
|
2017-07-24 11:24:34 +00:00
|
|
|
accretionDisc="${basename}.3.accretionDisc.txt"
|
2017-07-27 02:34:35 +00:00
|
|
|
preEventHorizon="list.preEventHorizon"
|
2017-07-24 11:24:34 +00:00
|
|
|
|
|
|
|
skipDownload="false"
|
|
|
|
|
|
|
|
# Source setupVars from install script
|
|
|
|
setupVars="${piholeDir}/setupVars.conf"
|
2017-06-21 11:49:05 +00:00
|
|
|
if [[ -f "${setupVars}" ]];then
|
2017-07-24 11:24:34 +00:00
|
|
|
source "${setupVars}"
|
|
|
|
|
|
|
|
# Remove CIDR mask from IPv4/6 addresses
|
|
|
|
IPV4_ADDRESS="${IPV4_ADDRESS%/*}"
|
|
|
|
IPV6_ADDRESS="${IPV6_ADDRESS%/*}"
|
2017-09-15 12:39:17 +00:00
|
|
|
|
|
|
|
# Determine if IPv4/6 addresses exist
|
|
|
|
if [[ -z "${IPV4_ADDRESS}" ]] && [[ -z "${IPV6_ADDRESS}" ]]; then
|
|
|
|
echo -e " ${COL_LIGHT_RED}No IP addresses found! Please run 'pihole -r' to reconfigure${COL_NC}"
|
|
|
|
exit 1
|
|
|
|
fi
|
2016-10-15 19:03:33 +00:00
|
|
|
else
|
2017-07-24 11:24:34 +00:00
|
|
|
echo -e " ${COL_LIGHT_RED}Installation Failure: ${setupVars} does not exist! ${COL_NC}
|
|
|
|
Please run 'pihole -r', and choose the 'reconfigure' option to fix."
|
2017-06-21 11:49:05 +00:00
|
|
|
exit 1
|
2016-10-15 19:03:33 +00:00
|
|
|
fi
|
|
|
|
|
2017-09-15 12:39:17 +00:00
|
|
|
# Determine if superseded pihole.conf exists
|
2017-07-24 11:24:34 +00:00
|
|
|
if [[ -r "${piholeDir}/pihole.conf" ]]; then
|
|
|
|
echo -e " ${COL_LIGHT_RED}Ignoring overrides specified within pihole.conf! ${COL_NC}"
|
2015-11-06 23:03:55 +00:00
|
|
|
fi
|
2015-11-26 23:48:52 +00:00
|
|
|
|
2017-09-15 12:39:17 +00:00
|
|
|
# Determine if DNS resolution is available before proceeding
|
2017-07-27 02:34:35 +00:00
|
|
|
gravity_DNSLookup() {
|
2017-09-15 12:39:17 +00:00
|
|
|
local lookupDomain="pi.hole" plural=""
|
2017-07-24 11:24:34 +00:00
|
|
|
|
2017-09-15 12:39:17 +00:00
|
|
|
# Determine if $localList does not exist
|
|
|
|
if [[ ! -e "${localList}" ]]; then
|
2017-09-14 06:39:30 +00:00
|
|
|
lookupDomain="raw.githubusercontent.com"
|
|
|
|
fi
|
|
|
|
|
2017-09-15 12:39:17 +00:00
|
|
|
# Determine if $lookupDomain is resolvable
|
|
|
|
if timeout 5 getent hosts "${lookupDomain}" &> /dev/null; then
|
|
|
|
# Print confirmation of resolvability if it had previously failed
|
|
|
|
if [[ -n "${secs:-}" ]]; then
|
|
|
|
echo -e "${OVER} ${TICK} DNS resolution is now available\\n"
|
2017-07-27 02:34:35 +00:00
|
|
|
fi
|
2017-09-15 12:39:17 +00:00
|
|
|
return 0
|
|
|
|
elif [[ -n "${secs:-}" ]]; then
|
|
|
|
echo -e "${OVER} ${CROSS} DNS resolution is still unavailable, cancelling"
|
|
|
|
exit 1
|
|
|
|
fi
|
2017-07-27 02:34:35 +00:00
|
|
|
|
2017-09-15 12:39:17 +00:00
|
|
|
# Determine error output message
|
|
|
|
if pidof dnsmasq &> /dev/null; then
|
|
|
|
echo -e " ${CROSS} DNS resolution is currently unavailable"
|
|
|
|
else
|
|
|
|
echo -e " ${CROSS} DNS service is not running"
|
|
|
|
"${PIHOLE_COMMAND}" restartdns
|
2017-07-27 02:34:35 +00:00
|
|
|
fi
|
2017-09-15 12:39:17 +00:00
|
|
|
|
|
|
|
# Give time for DNS server to be resolvable
|
|
|
|
secs="30"
|
|
|
|
while [[ "${secs}" -ne 0 ]]; do
|
|
|
|
[[ "${secs}" -ne 1 ]] && plural="s"
|
|
|
|
echo -ne "${OVER} ${INFO} Waiting $secs second${plural} before continuing..."
|
|
|
|
sleep 1
|
|
|
|
: $((secs--))
|
|
|
|
done
|
|
|
|
|
|
|
|
# Try again
|
|
|
|
gravity_DNSLookup
|
2017-07-24 11:24:34 +00:00
|
|
|
}
|
2017-03-31 18:16:09 +00:00
|
|
|
|
2017-07-27 02:34:35 +00:00
|
|
|
# Retrieve blocklist URLs and parse domains from adlists.list
|
2017-07-24 11:24:34 +00:00
|
|
|
gravity_Collapse() {
|
2017-09-15 12:39:17 +00:00
|
|
|
echo -e " ${INFO} ${COL_BOLD}Neutrino emissions detected${COL_NC}..."
|
2017-03-31 18:16:09 +00:00
|
|
|
|
2017-09-15 12:39:17 +00:00
|
|
|
# Determine if adlists file needs handling
|
|
|
|
if [[ ! -f "${adListFile}" ]]; then
|
|
|
|
# Create "adlists.list" by copying "adlists.default" from internal core repo
|
|
|
|
cp "${adListRepoDefault}" "${adListFile}" 2> /dev/null || \
|
|
|
|
echo -e " ${CROSS} Unable to copy ${adListFile##*/} from ${piholeRepo}"
|
|
|
|
elif [[ -f "${adListDefault}" ]] && [[ -f "${adListFile}" ]]; then
|
2017-07-24 11:24:34 +00:00
|
|
|
# Remove superceded $adListDefault file
|
|
|
|
rm "${adListDefault}" 2> /dev/null || \
|
|
|
|
echo -e " ${CROSS} Unable to remove ${adListDefault}"
|
2017-03-31 18:16:09 +00:00
|
|
|
fi
|
|
|
|
|
2017-07-24 11:24:34 +00:00
|
|
|
local str="Pulling blocklist source list into range"
|
2017-06-21 11:49:05 +00:00
|
|
|
echo -ne " ${INFO} ${str}..."
|
|
|
|
|
2017-07-24 11:24:34 +00:00
|
|
|
# Retrieve source URLs from $adListFile
|
2017-09-20 12:25:33 +00:00
|
|
|
# Logic: Remove comments and empty lines
|
|
|
|
mapfile -t sources <<< "$(grep -v -E "^(#|$)" "${adListFile}" 2> /dev/null)"
|
2017-07-24 11:24:34 +00:00
|
|
|
|
|
|
|
# Parse source domains from $sources
|
2017-09-20 12:25:33 +00:00
|
|
|
mapfile -t sourceDomains <<< "$(
|
2017-09-15 12:39:17 +00:00
|
|
|
# Logic: Split by folder/port
|
2017-07-24 11:24:34 +00:00
|
|
|
awk -F '[/:]' '{
|
2017-09-15 12:39:17 +00:00
|
|
|
# Remove URL protocol & optional username:password@
|
2017-07-24 11:24:34 +00:00
|
|
|
gsub(/(.*:\/\/|.*:.*@)/, "", $0)
|
|
|
|
print $1
|
|
|
|
}' <<< "$(printf '%s\n' "${sources[@]}")" 2> /dev/null
|
2017-09-20 12:25:33 +00:00
|
|
|
)"
|
2017-07-24 11:24:34 +00:00
|
|
|
|
2017-07-27 02:34:35 +00:00
|
|
|
if [[ -n "${sources[*]}" ]] && [[ -n "${sourceDomains[*]}" ]]; then
|
2017-07-24 11:24:34 +00:00
|
|
|
echo -e "${OVER} ${TICK} ${str}"
|
|
|
|
else
|
|
|
|
echo -e "${OVER} ${CROSS} ${str}"
|
|
|
|
gravity_Cleanup "error"
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
|
2017-07-27 02:34:35 +00:00
|
|
|
# Define options for when retrieving blocklists
|
|
|
|
gravity_Supernova() {
|
|
|
|
local url domain agent cmd_ext str
|
|
|
|
|
|
|
|
echo ""
|
|
|
|
|
2017-09-15 12:39:17 +00:00
|
|
|
# Loop through $sources and download each one
|
2017-07-27 02:34:35 +00:00
|
|
|
for ((i = 0; i < "${#sources[@]}"; i++)); do
|
|
|
|
url="${sources[$i]}"
|
|
|
|
domain="${sourceDomains[$i]}"
|
|
|
|
|
|
|
|
# Save the file as list.#.domain
|
|
|
|
saveLocation="${piholeDir}/list.${i}.${domain}.${domainsExtension}"
|
|
|
|
activeDomains[$i]="${saveLocation}"
|
|
|
|
|
2017-08-28 01:36:02 +00:00
|
|
|
# Default user-agent (for Cloudflare's Browser Integrity Check: https://support.cloudflare.com/hc/en-us/articles/200170086-What-does-the-Browser-Integrity-Check-do-)
|
2017-07-27 02:34:35 +00:00
|
|
|
agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2227.0 Safari/537.36"
|
|
|
|
|
2017-08-28 01:36:02 +00:00
|
|
|
# Provide special commands for blocklists which may need them
|
2017-07-27 02:34:35 +00:00
|
|
|
case "${domain}" in
|
|
|
|
"pgl.yoyo.org") cmd_ext="-d mimetype=plaintext -d hostformat=hosts";;
|
|
|
|
*) cmd_ext="";;
|
|
|
|
esac
|
|
|
|
|
|
|
|
if [[ "${skipDownload}" == false ]]; then
|
2017-09-15 12:39:17 +00:00
|
|
|
echo -e " ${INFO} Target: ${domain} (${url##*/})"
|
|
|
|
gravity_Pull "${url}" "${cmd_ext}" "${agent}"
|
2017-07-27 02:34:35 +00:00
|
|
|
echo ""
|
|
|
|
fi
|
|
|
|
done
|
|
|
|
}
|
|
|
|
|
2017-09-14 10:23:49 +00:00
|
|
|
# Download specified URL and perform checks on HTTP status and file content
|
2017-07-27 02:34:35 +00:00
|
|
|
gravity_Pull() {
|
2017-09-15 12:39:17 +00:00
|
|
|
local url="${1}" cmd_ext="${2}" agent="${3}" heisenbergCompensator="" patternBuffer str httpCode success=""
|
2017-07-27 02:34:35 +00:00
|
|
|
|
2017-09-15 12:39:17 +00:00
|
|
|
# Create temp file to store content on disk instead of RAM
|
|
|
|
patternBuffer=$(mktemp -p "/tmp" --suffix=".phgpb")
|
2017-08-28 01:36:02 +00:00
|
|
|
|
2017-09-15 12:39:17 +00:00
|
|
|
# Determine if $saveLocation has read permission
|
2017-07-27 02:34:35 +00:00
|
|
|
if [[ -r "${saveLocation}" ]]; then
|
2017-09-15 12:39:17 +00:00
|
|
|
# Have curl determine if a remote file has been modified since last retrieval
|
|
|
|
# Uses "Last-Modified" header, which certain web servers do not provide (e.g: raw github urls)
|
2017-07-27 02:34:35 +00:00
|
|
|
heisenbergCompensator="-z ${saveLocation}"
|
|
|
|
fi
|
|
|
|
|
|
|
|
str="Status:"
|
|
|
|
echo -ne " ${INFO} ${str} Pending..."
|
|
|
|
# shellcheck disable=SC2086
|
|
|
|
httpCode=$(curl -s -L ${cmd_ext} ${heisenbergCompensator} -w "%{http_code}" -A "${agent}" "${url}" -o "${patternBuffer}" 2> /dev/null)
|
|
|
|
|
|
|
|
# Determine "Status:" output based on HTTP response
|
2017-08-28 01:36:02 +00:00
|
|
|
case "${httpCode}" in
|
2017-09-15 12:39:17 +00:00
|
|
|
"200") echo -e "${OVER} ${TICK} ${str} Retrieval successful"; success=true;;
|
|
|
|
"304") echo -e "${OVER} ${TICK} ${str} No changes detected"; success=true;;
|
|
|
|
"000") echo -e "${OVER} ${CROSS} ${str} Connection Refused";;
|
|
|
|
"403") echo -e "${OVER} ${CROSS} ${str} Forbidden";;
|
|
|
|
"404") echo -e "${OVER} ${CROSS} ${str} Not found";;
|
|
|
|
"408") echo -e "${OVER} ${CROSS} ${str} Time-out";;
|
|
|
|
"451") echo -e "${OVER} ${CROSS} ${str} Unavailable For Legal Reasons";;
|
|
|
|
"500") echo -e "${OVER} ${CROSS} ${str} Internal Server Error";;
|
2017-09-18 07:36:03 +00:00
|
|
|
"504") echo -e "${OVER} ${CROSS} ${str} Connection Timed Out (Gateway)";;
|
2017-09-15 12:39:17 +00:00
|
|
|
"521") echo -e "${OVER} ${CROSS} ${str} Web Server Is Down (Cloudflare)";;
|
|
|
|
"522") echo -e "${OVER} ${CROSS} ${str} Connection Timed Out (Cloudflare)";;
|
|
|
|
* ) echo -e "${OVER} ${CROSS} ${str} ${httpCode}";;
|
2017-07-27 02:34:35 +00:00
|
|
|
esac
|
|
|
|
|
|
|
|
# Determine if the blocklist was downloaded and saved correctly
|
2017-09-15 12:39:17 +00:00
|
|
|
if [[ "${success}" == true ]]; then
|
2017-07-27 02:34:35 +00:00
|
|
|
if [[ "${httpCode}" == "304" ]]; then
|
2017-09-14 10:23:49 +00:00
|
|
|
: # Do not attempt to re-parse file
|
|
|
|
# Check if $patternbuffer is a non-zero length file
|
2017-07-27 02:34:35 +00:00
|
|
|
elif [[ -s "${patternBuffer}" ]]; then
|
|
|
|
# Determine if blocklist is non-standard and parse as appropriate
|
|
|
|
gravity_ParseFileIntoDomains "${patternBuffer}" "${saveLocation}"
|
|
|
|
else
|
2017-09-14 10:23:49 +00:00
|
|
|
# Fall back to previously cached list if $patternBuffer is empty
|
2017-07-27 02:34:35 +00:00
|
|
|
echo -e " ${INFO} Received empty file: ${COL_LIGHT_GREEN}using previously cached list${COL_NC}"
|
|
|
|
fi
|
|
|
|
else
|
2017-09-15 12:39:17 +00:00
|
|
|
# Determine if cached list has read permission
|
2017-07-27 02:34:35 +00:00
|
|
|
if [[ -r "${saveLocation}" ]]; then
|
|
|
|
echo -e " ${CROSS} List download failed: ${COL_LIGHT_GREEN}using previously cached list${COL_NC}"
|
|
|
|
else
|
|
|
|
echo -e " ${CROSS} List download failed: ${COL_LIGHT_RED}no cached list available${COL_NC}"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
|
2017-09-15 12:39:17 +00:00
|
|
|
# Parse source files into domains format
|
2017-07-27 02:34:35 +00:00
|
|
|
gravity_ParseFileIntoDomains() {
|
2017-09-14 10:23:49 +00:00
|
|
|
local source="${1}" destination="${2}" commentPattern firstLine abpFilter
|
2017-07-24 11:24:34 +00:00
|
|
|
|
2017-09-15 12:39:17 +00:00
|
|
|
# Determine if we are parsing a consolidated list
|
2017-07-24 11:24:34 +00:00
|
|
|
if [[ "${source}" == "${piholeDir}/${matterAndLight}" ]]; then
|
2017-08-28 01:36:02 +00:00
|
|
|
# Define symbols used as comments: #;@![/
|
2017-07-24 11:24:34 +00:00
|
|
|
commentPattern="[#;@![\\/]"
|
|
|
|
|
2017-09-15 12:39:17 +00:00
|
|
|
# Parse Domains/Hosts files by removing comments & host IPs
|
|
|
|
# Logic: Ignore lines which begin with comments
|
2017-07-24 11:24:34 +00:00
|
|
|
awk '!/^'"${commentPattern}"'/ {
|
2017-09-15 12:39:17 +00:00
|
|
|
# Determine if there are multiple words seperated by a space
|
|
|
|
if(NF>1) {
|
2017-08-28 01:36:02 +00:00
|
|
|
# Remove comments (including prefixed spaces/tabs)
|
2017-09-15 12:39:17 +00:00
|
|
|
if($0 ~ /'"${commentPattern}"'/) { gsub("( |\t)'"${commentPattern}"'.*", "", $0) }
|
|
|
|
# Determine if there are aliased domains
|
|
|
|
if($3) {
|
|
|
|
# Remove IP address
|
2017-07-24 11:24:34 +00:00
|
|
|
$1=""
|
2017-07-27 02:34:35 +00:00
|
|
|
# Remove space which is left in $0 when removing $1
|
2017-07-24 11:24:34 +00:00
|
|
|
gsub("^ ", "", $0)
|
|
|
|
print $0
|
2017-09-15 12:39:17 +00:00
|
|
|
} else if($2) {
|
|
|
|
# Print single domain without IP
|
2017-07-24 11:24:34 +00:00
|
|
|
print $2
|
|
|
|
}
|
2017-07-27 02:34:35 +00:00
|
|
|
# If there are no words seperated by space
|
2017-07-24 11:24:34 +00:00
|
|
|
} else if($1) {
|
|
|
|
print $1
|
|
|
|
}
|
|
|
|
}' "${source}" 2> /dev/null > "${destination}"
|
2017-09-15 12:39:17 +00:00
|
|
|
return 0
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Individual file parsing: Keep comments, while parsing domains from each line
|
|
|
|
# We keep comments to respect the list maintainer's licensing
|
|
|
|
read -r firstLine < "${source}"
|
|
|
|
|
|
|
|
# Determine how to parse individual source file formats
|
|
|
|
if [[ "${firstLine,,}" =~ (adblock|ublock|^!) ]]; then
|
|
|
|
# Compare $firstLine against lower case words found in Adblock lists
|
2017-09-18 07:36:03 +00:00
|
|
|
echo -ne " ${INFO} Format: Adblock"
|
2017-09-15 12:39:17 +00:00
|
|
|
|
|
|
|
# Define symbols used as comments: [!
|
|
|
|
# "||.*^" includes the "Example 2" domains we can extract
|
2017-09-19 18:02:50 +00:00
|
|
|
# https://adblockplus.org/filter-cheatsheet
|
2017-09-15 12:39:17 +00:00
|
|
|
abpFilter="/^(\\[|!)|^(\\|\\|.*\\^)/"
|
|
|
|
|
|
|
|
# Parse Adblock lists by extracting "Example 2" domains
|
|
|
|
# Logic: Ignore lines which do not include comments or domain name anchor
|
|
|
|
awk ''"${abpFilter}"' {
|
|
|
|
# Remove valid adblock type options
|
2017-09-18 07:36:03 +00:00
|
|
|
gsub(/\$?~?(important|third-party|popup|subdocument|websocket),?/, "", $0)
|
|
|
|
# Remove starting domain name anchor "||" and ending seperator "^"
|
|
|
|
gsub(/^(\|\|)|(\^)/, "", $0)
|
|
|
|
# Remove invalid characters (*/,=$)
|
|
|
|
if($0 ~ /[*\/,=\$]/) { $0="" }
|
|
|
|
# Remove lines which are only IPv4 addresses
|
|
|
|
if($0 ~ /^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$/) { $0="" }
|
2017-09-15 12:39:17 +00:00
|
|
|
if($0) { print $0 }
|
2017-09-18 07:36:03 +00:00
|
|
|
}' "${source}" > "${destination}"
|
|
|
|
|
|
|
|
# Determine if there are Adblock exception rules
|
|
|
|
# https://adblockplus.org/filters
|
|
|
|
if grep -q "^@@||" "${source}" &> /dev/null; then
|
|
|
|
# Parse Adblock lists by extracting exception rules
|
|
|
|
# Logic: Ignore lines which do not include exception format "@@||example.com^"
|
|
|
|
awk -F "[|^]" '/^@@\|\|.*\^/ {
|
|
|
|
# Remove valid adblock type options
|
|
|
|
gsub(/\$?~?(third-party)/, "", $0)
|
|
|
|
# Remove invalid characters (*/,=$)
|
|
|
|
if($0 ~ /[*\/,=\$]/) { $0="" }
|
|
|
|
if($3) { print $3 }
|
|
|
|
}' "${source}" > "${destination}.exceptionsFile.tmp"
|
|
|
|
|
|
|
|
# Remove exceptions
|
|
|
|
grep -F -x -v -f "${destination}.exceptionsFile.tmp" "${destination}" > "${source}"
|
|
|
|
mv "${source}" "${destination}"
|
|
|
|
fi
|
|
|
|
|
|
|
|
echo -e "${OVER} ${TICK} Format: Adblock"
|
2017-09-15 12:39:17 +00:00
|
|
|
elif grep -q "^address=/" "${source}" &> /dev/null; then
|
2017-09-14 10:23:49 +00:00
|
|
|
# Parse Dnsmasq format lists
|
2017-09-18 07:36:03 +00:00
|
|
|
echo -e " ${CROSS} Format: Dnsmasq (list type not supported)"
|
|
|
|
elif grep -q -E "^https?://" "${source}" &> /dev/null; then
|
|
|
|
# Parse URL list if source file contains "http://" or "https://"
|
2017-09-15 12:39:17 +00:00
|
|
|
# Scanning for "^IPv4$" is too slow with large (1M) lists on low-end hardware
|
2017-09-18 07:36:03 +00:00
|
|
|
echo -ne " ${INFO} Format: URL"
|
2017-09-15 12:39:17 +00:00
|
|
|
|
|
|
|
awk '{
|
|
|
|
# Remove URL protocol, optional "username:password@", and ":?/;"
|
|
|
|
if ($0 ~ /[:?\/;]/) { gsub(/(^.*:\/\/(.*:.*@)?|[:?\/;].*)/, "", $0) }
|
|
|
|
# Remove lines which are only IPv4 addresses
|
|
|
|
if ($0 ~ /^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$/) { $0="" }
|
|
|
|
if ($0) { print $0 }
|
|
|
|
}' "${source}" 2> /dev/null > "${destination}"
|
2017-09-18 07:36:03 +00:00
|
|
|
|
|
|
|
echo -e "${OVER} ${TICK} Format: URL"
|
2017-09-15 12:39:17 +00:00
|
|
|
else
|
|
|
|
# Default: Keep hosts/domains file in same format as it was downloaded
|
|
|
|
output=$( { mv "${source}" "${destination}"; } 2>&1 )
|
|
|
|
|
|
|
|
if [[ ! -e "${destination}" ]]; then
|
|
|
|
echo -e " ${CROSS} Unable to move tmp file to ${piholeDir}
|
|
|
|
${output}"
|
|
|
|
gravity_Cleanup "error"
|
2017-03-31 18:16:09 +00:00
|
|
|
fi
|
2017-07-24 11:24:34 +00:00
|
|
|
fi
|
2015-11-23 08:36:01 +00:00
|
|
|
}
|
2015-11-23 07:49:38 +00:00
|
|
|
|
2017-09-15 12:39:17 +00:00
|
|
|
# Create (unfiltered) "Matter and Light" consolidated list
|
2017-07-24 11:24:34 +00:00
|
|
|
gravity_Schwarzschild() {
|
|
|
|
local str lastLine
|
|
|
|
|
|
|
|
str="Consolidating blocklists"
|
2017-06-21 11:49:05 +00:00
|
|
|
echo -ne " ${INFO} ${str}..."
|
2017-07-24 11:24:34 +00:00
|
|
|
|
2017-07-27 02:34:35 +00:00
|
|
|
# Empty $matterAndLight if it already exists, otherwise, create it
|
|
|
|
: > "${piholeDir}/${matterAndLight}"
|
|
|
|
|
2017-09-15 12:39:17 +00:00
|
|
|
# Loop through each *.domains file
|
2017-06-21 11:49:05 +00:00
|
|
|
for i in "${activeDomains[@]}"; do
|
2017-09-15 12:39:17 +00:00
|
|
|
# Determine if file has read permissions, as download might have failed
|
2017-06-21 11:49:05 +00:00
|
|
|
if [[ -r "${i}" ]]; then
|
2017-09-15 12:39:17 +00:00
|
|
|
# Remove windows CRs from file, and append into $matterAndLight
|
2017-07-24 11:24:34 +00:00
|
|
|
tr -d '\r' < "${i}" >> "${piholeDir}/${matterAndLight}"
|
|
|
|
|
2017-09-15 12:39:17 +00:00
|
|
|
# Ensure that the first line of a new list is on a new line
|
2017-07-24 11:24:34 +00:00
|
|
|
lastLine=$(tail -1 "${piholeDir}/${matterAndLight}")
|
2017-09-15 12:39:17 +00:00
|
|
|
if [[ "${#lastLine}" -gt 0 ]]; then
|
|
|
|
echo "" >> "${piholeDir}/${matterAndLight}"
|
|
|
|
fi
|
2017-06-21 11:49:05 +00:00
|
|
|
fi
|
|
|
|
done
|
|
|
|
|
|
|
|
echo -e "${OVER} ${TICK} ${str}"
|
2015-11-26 23:48:52 +00:00
|
|
|
}
|
2015-05-19 18:31:37 +00:00
|
|
|
|
2017-09-15 12:39:17 +00:00
|
|
|
# Parse consolidated list into (filtered, unique) domains-only format
|
2017-07-27 02:34:35 +00:00
|
|
|
gravity_Filter() {
|
|
|
|
local str num
|
2017-07-24 11:24:34 +00:00
|
|
|
|
2017-07-27 02:34:35 +00:00
|
|
|
str="Extracting domains from blocklists"
|
|
|
|
echo -ne " ${INFO} ${str}..."
|
|
|
|
|
2017-08-28 01:36:02 +00:00
|
|
|
# Parse into hosts file
|
2017-07-27 02:34:35 +00:00
|
|
|
gravity_ParseFileIntoDomains "${piholeDir}/${matterAndLight}" "${piholeDir}/${parsedMatter}"
|
|
|
|
|
2017-09-15 12:39:17 +00:00
|
|
|
# Format $parsedMatter line total as currency
|
2017-07-27 02:34:35 +00:00
|
|
|
num=$(printf "%'.0f" "$(wc -l < "${piholeDir}/${parsedMatter}")")
|
|
|
|
echo -e "${OVER} ${TICK} ${str}
|
2017-09-20 12:25:33 +00:00
|
|
|
${INFO} ${COL_BLUE}${num}${COL_NC} domains being pulled in by gravity"
|
2017-07-27 02:34:35 +00:00
|
|
|
|
|
|
|
str="Removing duplicate domains"
|
|
|
|
echo -ne " ${INFO} ${str}..."
|
|
|
|
sort -u "${piholeDir}/${parsedMatter}" > "${piholeDir}/${preEventHorizon}"
|
|
|
|
echo -e "${OVER} ${TICK} ${str}"
|
|
|
|
|
2017-09-15 12:39:17 +00:00
|
|
|
# Format $preEventHorizon line total as currency
|
2017-07-27 02:34:35 +00:00
|
|
|
num=$(printf "%'.0f" "$(wc -l < "${piholeDir}/${preEventHorizon}")")
|
2017-09-20 12:25:33 +00:00
|
|
|
echo -e " ${INFO} ${COL_BLUE}${num}${COL_NC} unique domains trapped in the Event Horizon"
|
2017-01-29 12:46:27 +00:00
|
|
|
}
|
|
|
|
|
2017-09-15 12:39:17 +00:00
|
|
|
# Whitelist unique blocklist domain sources
|
2017-07-27 02:34:35 +00:00
|
|
|
gravity_WhitelistBLD() {
|
2017-09-20 12:25:33 +00:00
|
|
|
local uniqDomains plural="" str
|
2017-07-24 11:24:34 +00:00
|
|
|
|
2017-06-21 11:49:05 +00:00
|
|
|
echo ""
|
|
|
|
|
2017-07-24 11:24:34 +00:00
|
|
|
# Create array of unique $sourceDomains
|
2017-09-14 07:09:52 +00:00
|
|
|
mapfile -t uniqDomains <<< "$(awk '{ if(!a[$1]++) { print $1 } }' <<< "$(printf '%s\n' "${sourceDomains[@]}")")"
|
2017-09-20 12:25:33 +00:00
|
|
|
[[ "${#uniqDomains[@]}" -ne 1 ]] && plural="s"
|
|
|
|
|
|
|
|
str="Adding ${#uniqDomains[@]} blocklist source domain${plural} to the whitelist"
|
|
|
|
echo -ne " ${INFO} ${str}..."
|
2017-06-21 11:49:05 +00:00
|
|
|
|
2017-09-15 12:39:17 +00:00
|
|
|
# Whitelist $uniqDomains
|
|
|
|
"${PIHOLE_COMMAND}" -w -nr -q "${uniqDomains[*]}" &> /dev/null
|
2017-06-21 11:49:05 +00:00
|
|
|
|
2017-07-24 11:24:34 +00:00
|
|
|
echo -e "${OVER} ${TICK} ${str}"
|
2017-07-27 02:34:35 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
# Whitelist user-defined domains
|
|
|
|
gravity_Whitelist() {
|
2017-09-15 12:39:17 +00:00
|
|
|
local num plural="" str
|
2017-06-21 11:49:05 +00:00
|
|
|
|
2017-09-15 12:39:17 +00:00
|
|
|
if [[ ! -f "${whitelistFile}" ]]; then
|
2017-06-21 11:49:05 +00:00
|
|
|
echo -e " ${INFO} Nothing to whitelist!"
|
2017-09-15 12:39:17 +00:00
|
|
|
return 0
|
2017-06-21 11:49:05 +00:00
|
|
|
fi
|
2017-09-15 12:39:17 +00:00
|
|
|
|
|
|
|
num=$(wc -l < "${whitelistFile}")
|
|
|
|
[[ "${num}" -ne 1 ]] && plural="s"
|
|
|
|
str="Whitelisting ${num} domain${plural}"
|
|
|
|
echo -ne " ${INFO} ${str}..."
|
|
|
|
|
|
|
|
# Print everything from preEventHorizon into whitelistMatter EXCEPT domains in $whitelistFile
|
|
|
|
grep -F -x -v -f "${whitelistFile}" "${piholeDir}/${preEventHorizon}" > "${piholeDir}/${whitelistMatter}"
|
|
|
|
|
|
|
|
echo -e "${OVER} ${TICK} ${str}"
|
2015-11-23 09:16:00 +00:00
|
|
|
}
|
|
|
|
|
2017-07-27 02:34:35 +00:00
|
|
|
# Output count of blacklisted domains and wildcards
|
|
|
|
gravity_ShowBlockCount() {
|
2017-09-15 12:39:17 +00:00
|
|
|
local num plural
|
2017-06-21 11:49:05 +00:00
|
|
|
|
2017-07-27 02:34:35 +00:00
|
|
|
if [[ -f "${blacklistFile}" ]]; then
|
|
|
|
num=$(printf "%'.0f" "$(wc -l < "${blacklistFile}")")
|
2017-09-14 10:23:49 +00:00
|
|
|
plural=; [[ "${num}" -ne 1 ]] && plural="s"
|
2017-09-15 12:39:17 +00:00
|
|
|
echo -e " ${INFO} Blacklisted ${num} domain${plural}"
|
2017-07-27 02:34:35 +00:00
|
|
|
fi
|
2017-07-24 11:24:34 +00:00
|
|
|
|
2017-07-27 02:34:35 +00:00
|
|
|
if [[ -f "${wildcardFile}" ]]; then
|
|
|
|
num=$(grep -c "^" "${wildcardFile}")
|
|
|
|
# If IPv4 and IPv6 is used, divide total wildcard count by 2
|
|
|
|
if [[ -n "${IPV4_ADDRESS}" ]] && [[ -n "${IPV6_ADDRESS}" ]];then
|
|
|
|
num=$(( num/2 ))
|
|
|
|
fi
|
2017-09-14 10:23:49 +00:00
|
|
|
plural=; [[ "${num}" -ne 1 ]] && plural="s"
|
2017-09-15 12:39:17 +00:00
|
|
|
echo -e " ${INFO} Wildcard blocked ${num} domain${plural}"
|
2017-07-27 02:34:35 +00:00
|
|
|
fi
|
2015-11-23 11:11:16 +00:00
|
|
|
}
|
2015-11-26 23:48:52 +00:00
|
|
|
|
2017-07-24 11:24:34 +00:00
|
|
|
# Parse list of domains into hosts format
|
|
|
|
gravity_ParseDomainsIntoHosts() {
|
2017-09-15 12:39:17 +00:00
|
|
|
awk -v ipv4="$IPV4_ADDRESS" -v ipv6="$IPV6_ADDRESS" '{
|
|
|
|
# Remove windows CR line endings
|
|
|
|
sub(/\r$/, "")
|
|
|
|
# Parse each line as "ipaddr domain"
|
|
|
|
if(ipv6 && ipv4) {
|
|
|
|
print ipv4" "$0"\n"ipv6" "$0
|
|
|
|
} else if(!ipv6) {
|
|
|
|
print ipv4" "$0
|
|
|
|
} else {
|
|
|
|
print ipv6" "$0
|
|
|
|
}
|
|
|
|
}' >> "${2}" < "${1}"
|
2017-06-17 11:50:10 +00:00
|
|
|
}
|
|
|
|
|
2017-09-14 06:39:30 +00:00
|
|
|
# Create "localhost" entries into hosts format
|
2017-07-24 11:24:34 +00:00
|
|
|
gravity_ParseLocalDomains() {
|
2017-07-27 02:34:35 +00:00
|
|
|
local hostname
|
|
|
|
|
2017-09-15 12:39:17 +00:00
|
|
|
if [[ -s "/etc/hostname" ]]; then
|
2017-07-24 11:24:34 +00:00
|
|
|
hostname=$(< "/etc/hostname")
|
2017-09-14 06:39:30 +00:00
|
|
|
elif command -v hostname &> /dev/null; then
|
2017-06-21 11:49:05 +00:00
|
|
|
hostname=$(hostname -f)
|
|
|
|
else
|
|
|
|
echo -e " ${CROSS} Unable to determine fully qualified domain name of host"
|
2017-09-15 12:39:17 +00:00
|
|
|
return 0
|
2017-06-21 11:49:05 +00:00
|
|
|
fi
|
|
|
|
|
2017-07-24 11:24:34 +00:00
|
|
|
echo -e "${hostname}\\npi.hole" > "${localList}.tmp"
|
2017-09-15 12:39:17 +00:00
|
|
|
|
|
|
|
# Empty $localList if it already exists, otherwise, create it
|
|
|
|
: > "${localList}"
|
|
|
|
|
2017-07-24 11:24:34 +00:00
|
|
|
gravity_ParseDomainsIntoHosts "${localList}.tmp" "${localList}"
|
2017-09-14 06:39:30 +00:00
|
|
|
|
2017-09-15 12:39:17 +00:00
|
|
|
# Add additional LAN hosts provided by OpenVPN (if available)
|
2017-09-14 06:39:30 +00:00
|
|
|
if [[ -f "${VPNList}" ]]; then
|
|
|
|
awk -F, '{printf $2"\t"$1"\n"}' "${VPNList}" >> "${localList}"
|
|
|
|
fi
|
2017-06-17 11:57:27 +00:00
|
|
|
}
|
2016-04-02 00:19:47 +00:00
|
|
|
|
2017-07-24 11:24:34 +00:00
|
|
|
# Create primary blacklist entries
|
|
|
|
gravity_ParseBlacklistDomains() {
|
2017-07-27 02:34:35 +00:00
|
|
|
local output status
|
2017-07-24 11:24:34 +00:00
|
|
|
|
2017-07-27 02:34:35 +00:00
|
|
|
# Empty $accretionDisc if it already exists, otherwise, create it
|
|
|
|
: > "${piholeDir}/${accretionDisc}"
|
2017-07-24 11:24:34 +00:00
|
|
|
|
2017-07-27 02:34:35 +00:00
|
|
|
gravity_ParseDomainsIntoHosts "${piholeDir}/${whitelistMatter}" "${piholeDir}/${accretionDisc}"
|
|
|
|
|
|
|
|
# Move the file over as /etc/pihole/gravity.list so dnsmasq can use it
|
2017-07-24 11:24:34 +00:00
|
|
|
output=$( { mv "${piholeDir}/${accretionDisc}" "${adList}"; } 2>&1 )
|
|
|
|
status="$?"
|
2017-06-21 11:49:05 +00:00
|
|
|
|
2017-07-24 11:24:34 +00:00
|
|
|
if [[ "${status}" -ne 0 ]]; then
|
2017-08-28 01:36:02 +00:00
|
|
|
echo -e " ${CROSS} Unable to move ${accretionDisc} from ${piholeDir}\\n ${output}"
|
2017-07-24 11:24:34 +00:00
|
|
|
gravity_Cleanup "error"
|
|
|
|
fi
|
2017-06-17 11:57:27 +00:00
|
|
|
}
|
2017-06-17 11:50:10 +00:00
|
|
|
|
2017-07-24 11:24:34 +00:00
|
|
|
# Create user-added blacklist entries
|
|
|
|
gravity_ParseUserDomains() {
|
2017-09-15 12:39:17 +00:00
|
|
|
if [[ ! -f "${blacklistFile}" ]]; then
|
|
|
|
return 0
|
2017-06-17 12:24:30 +00:00
|
|
|
fi
|
2017-09-15 12:39:17 +00:00
|
|
|
|
|
|
|
gravity_ParseDomainsIntoHosts "${blacklistFile}" "${blackList}.tmp"
|
|
|
|
# Copy the file over as /etc/pihole/black.list so dnsmasq can use it
|
|
|
|
mv "${blackList}.tmp" "${blackList}" 2> /dev/null || \
|
|
|
|
echo -e " ${CROSS} Unable to move ${blackList##*/}.tmp to ${piholeDir}"
|
2015-11-23 11:11:16 +00:00
|
|
|
}
|
2015-11-26 23:48:52 +00:00
|
|
|
|
2017-07-24 11:24:34 +00:00
|
|
|
# Trap Ctrl-C
|
|
|
|
gravity_Trap() {
|
|
|
|
trap '{ echo -e "\\n\\n ${INFO} ${COL_LIGHT_RED}User-abort detected${COL_NC}"; gravity_Cleanup "error"; }' INT
|
2015-12-26 18:37:51 +00:00
|
|
|
}
|
2015-12-05 03:41:37 +00:00
|
|
|
|
2017-09-15 12:39:17 +00:00
|
|
|
# Clean up after Gravity upon exit or cancellation
|
2017-07-24 11:24:34 +00:00
|
|
|
gravity_Cleanup() {
|
|
|
|
local error="${1:-}"
|
|
|
|
|
2017-07-27 02:34:35 +00:00
|
|
|
str="Cleaning up stray matter"
|
2017-07-24 11:24:34 +00:00
|
|
|
echo -ne " ${INFO} ${str}..."
|
2017-06-21 11:49:05 +00:00
|
|
|
|
2017-09-15 12:39:17 +00:00
|
|
|
# Delete tmp content generated by Gravity
|
2017-07-24 11:24:34 +00:00
|
|
|
rm ${piholeDir}/pihole.*.txt 2> /dev/null
|
|
|
|
rm ${piholeDir}/*.tmp 2> /dev/null
|
2017-09-15 12:39:17 +00:00
|
|
|
rm /tmp/*.phgpb 2> /dev/null
|
2017-07-24 11:24:34 +00:00
|
|
|
|
|
|
|
# Remove any unused .domains files
|
|
|
|
for file in ${piholeDir}/*.${domainsExtension}; do
|
2017-07-27 02:34:35 +00:00
|
|
|
# If list is not in active array, then remove it
|
2017-09-14 06:39:30 +00:00
|
|
|
if [[ ! "${activeDomains[*]}" == *"${file}"* ]]; then
|
2017-07-24 11:24:34 +00:00
|
|
|
rm -f "${file}" 2> /dev/null || \
|
|
|
|
echo -e " ${CROSS} Failed to remove ${file##*/}"
|
|
|
|
fi
|
|
|
|
done
|
2017-06-21 11:49:05 +00:00
|
|
|
|
2017-07-24 11:24:34 +00:00
|
|
|
echo -e "${OVER} ${TICK} ${str}"
|
|
|
|
|
|
|
|
# Only restart DNS service if offline
|
|
|
|
if ! pidof dnsmasq &> /dev/null; then
|
|
|
|
"${PIHOLE_COMMAND}" restartdns
|
2017-09-14 10:23:49 +00:00
|
|
|
dnsWasOffline=true
|
2017-07-24 11:24:34 +00:00
|
|
|
fi
|
|
|
|
|
2017-07-27 02:34:35 +00:00
|
|
|
# Print Pi-hole status if an error occured
|
2017-08-28 01:36:02 +00:00
|
|
|
if [[ -n "${error}" ]]; then
|
2017-07-24 11:24:34 +00:00
|
|
|
"${PIHOLE_COMMAND}" status
|
|
|
|
exit 1
|
|
|
|
fi
|
2015-11-06 02:11:34 +00:00
|
|
|
}
|
2015-08-23 04:44:41 +00:00
|
|
|
|
2017-07-27 02:34:35 +00:00
|
|
|
helpFunc() {
|
|
|
|
echo "Usage: pihole -g
|
|
|
|
Update domains from blocklists specified in adlists.list
|
|
|
|
|
|
|
|
Options:
|
|
|
|
-f, --force Force the download of all specified blocklists
|
|
|
|
-h, --help Show this help dialog"
|
|
|
|
exit 0
|
|
|
|
}
|
|
|
|
|
2016-10-22 06:02:45 +00:00
|
|
|
for var in "$@"; do
|
2017-06-21 11:49:05 +00:00
|
|
|
case "${var}" in
|
2017-07-24 11:24:34 +00:00
|
|
|
"-f" | "--force" ) forceDelete=true;;
|
|
|
|
"-h" | "--help" ) helpFunc;;
|
|
|
|
"-sd" | "--skip-download" ) skipDownload=true;;
|
2017-07-27 02:34:35 +00:00
|
|
|
"-b" | "--blacklist-only" ) listType="blacklist";;
|
|
|
|
"-w" | "--whitelist-only" ) listType="whitelist";;
|
2017-09-15 12:39:17 +00:00
|
|
|
"-wild" | "--wildcard-only" ) listType="wildcard"; dnsRestartType="restart";;
|
2017-06-21 11:49:05 +00:00
|
|
|
esac
|
2016-08-17 18:08:55 +00:00
|
|
|
done
|
|
|
|
|
2017-09-15 12:39:17 +00:00
|
|
|
# Trap Ctrl-C
|
2017-07-24 11:24:34 +00:00
|
|
|
gravity_Trap
|
|
|
|
|
2017-09-15 12:39:17 +00:00
|
|
|
if [[ "${forceDelete:-}" == true ]]; then
|
2017-09-18 07:36:03 +00:00
|
|
|
str="Deleting existing list cache"
|
2017-06-21 11:49:05 +00:00
|
|
|
echo -ne "${INFO} ${str}..."
|
|
|
|
|
2017-09-18 07:36:03 +00:00
|
|
|
rm /etc/pihole/list.* 2> /dev/null || true
|
|
|
|
echo -e "${OVER} ${TICK} ${str}"
|
2016-08-17 18:08:55 +00:00
|
|
|
fi
|
|
|
|
|
2017-07-27 02:34:35 +00:00
|
|
|
# Determine which functions to run
|
|
|
|
if [[ "${skipDownload}" == false ]]; then
|
|
|
|
# Gravity needs to download blocklists
|
|
|
|
gravity_DNSLookup
|
2017-07-24 11:24:34 +00:00
|
|
|
gravity_Collapse
|
2017-07-27 02:34:35 +00:00
|
|
|
gravity_Supernova
|
|
|
|
gravity_Schwarzschild
|
|
|
|
gravity_Filter
|
|
|
|
gravity_WhitelistBLD
|
|
|
|
else
|
|
|
|
# Gravity needs to modify Blacklist/Whitelist/Wildcards
|
|
|
|
echo -e " ${INFO} Using cached Event Horizon list..."
|
|
|
|
numberOf=$(printf "%'.0f" "$(wc -l < "${piholeDir}/${preEventHorizon}")")
|
2017-09-20 12:25:33 +00:00
|
|
|
echo -e " ${INFO} ${COL_BLUE}${numberOf}${COL_NC} unique domains trapped in the Event Horizon"
|
2017-07-27 02:34:35 +00:00
|
|
|
fi
|
2017-07-24 11:24:34 +00:00
|
|
|
|
2017-07-27 02:34:35 +00:00
|
|
|
# Perform when downloading blocklists, or modifying the whitelist
|
|
|
|
if [[ "${skipDownload}" == false ]] || [[ "${listType}" == "whitelist" ]]; then
|
2017-06-17 11:57:27 +00:00
|
|
|
gravity_Whitelist
|
2016-10-19 22:52:54 +00:00
|
|
|
fi
|
2017-07-24 11:24:34 +00:00
|
|
|
|
2017-07-27 02:34:35 +00:00
|
|
|
gravity_ShowBlockCount
|
2016-10-19 22:15:05 +00:00
|
|
|
|
2017-09-21 16:23:43 +00:00
|
|
|
# Perform when downloading blocklists, or modifying the white/blacklist (not wildcards)
|
|
|
|
if [[ "${skipDownload}" == false ]] || [[ "${listType}" == *"list" ]]; then
|
2017-07-27 02:34:35 +00:00
|
|
|
str="Parsing domains into hosts format"
|
|
|
|
echo -ne " ${INFO} ${str}..."
|
2017-07-24 11:24:34 +00:00
|
|
|
|
2017-07-27 02:34:35 +00:00
|
|
|
gravity_ParseUserDomains
|
2017-06-17 11:57:27 +00:00
|
|
|
|
2017-07-27 02:34:35 +00:00
|
|
|
# Perform when downloading blocklists
|
2017-09-15 12:39:17 +00:00
|
|
|
if [[ ! "${listType:-}" == "blacklist" ]]; then
|
2017-07-27 02:34:35 +00:00
|
|
|
gravity_ParseLocalDomains
|
|
|
|
gravity_ParseBlacklistDomains
|
|
|
|
fi
|
|
|
|
|
|
|
|
echo -e "${OVER} ${TICK} ${str}"
|
2016-10-19 22:15:05 +00:00
|
|
|
|
2017-07-24 11:24:34 +00:00
|
|
|
gravity_Cleanup
|
2017-06-17 11:57:27 +00:00
|
|
|
fi
|
|
|
|
|
2017-07-24 11:24:34 +00:00
|
|
|
echo ""
|
2017-09-14 10:23:49 +00:00
|
|
|
|
|
|
|
# Determine if DNS has been restarted by this instance of gravity
|
|
|
|
if [[ -z "${dnsWasOffline:-}" ]]; then
|
|
|
|
# Use "force-reload" when restarting dnsmasq for everything but Wildcards
|
2017-09-15 12:39:17 +00:00
|
|
|
"${PIHOLE_COMMAND}" restartdns "${dnsRestartType:-force-reload}"
|
2017-09-14 10:23:49 +00:00
|
|
|
fi
|
2017-03-12 22:15:23 +00:00
|
|
|
"${PIHOLE_COMMAND}" status
|