|
|
|
@ -9,11 +9,11 @@
|
|
|
|
# Please see LICENSE file for your rights under this license.
|
|
|
|
# Please see LICENSE file for your rights under this license.
|
|
|
|
|
|
|
|
|
|
|
|
readonly PI_HOLE_SCRIPT_DIR="/opt/pihole"
|
|
|
|
readonly PI_HOLE_SCRIPT_DIR="/opt/pihole"
|
|
|
|
|
|
|
|
|
|
|
|
readonly wildcardlist="/etc/dnsmasq.d/03-pihole-wildcard.conf"
|
|
|
|
readonly wildcardlist="/etc/dnsmasq.d/03-pihole-wildcard.conf"
|
|
|
|
|
|
|
|
|
|
|
|
# Must be root to use this tool
|
|
|
|
# Must be root to use this tool
|
|
|
|
if [[ ! $EUID -eq 0 ]];then
|
|
|
|
if [[ ! $EUID -eq 0 ]];then
|
|
|
|
if [ -x "$(command -v sudo)" ];then
|
|
|
|
if [[ -x "$(command -v sudo)" ]]; then
|
|
|
|
exec sudo bash "$0" "$@"
|
|
|
|
exec sudo bash "$0" "$@"
|
|
|
|
exit $?
|
|
|
|
exit $?
|
|
|
|
else
|
|
|
|
else
|
|
|
|
@ -85,7 +85,7 @@ scanList(){
|
|
|
|
list="${2}"
|
|
|
|
list="${2}"
|
|
|
|
method="${3}"
|
|
|
|
method="${3}"
|
|
|
|
|
|
|
|
|
|
|
|
if [[ ${method} == "-exact" ]]; then
|
|
|
|
if [[ "${method}" == "-exact" ]]; then
|
|
|
|
grep -i -E -l "(^|\s|\/)${domain}($|\s|\/)" ${list}
|
|
|
|
grep -i -E -l "(^|\s|\/)${domain}($|\s|\/)" ${list}
|
|
|
|
else
|
|
|
|
else
|
|
|
|
grep -i "${domain}" ${list}
|
|
|
|
grep -i "${domain}" ${list}
|
|
|
|
@ -97,11 +97,11 @@ queryFunc() {
|
|
|
|
|
|
|
|
|
|
|
|
# If domain contains non ASCII characters, convert domain to punycode if python exists
|
|
|
|
# If domain contains non ASCII characters, convert domain to punycode if python exists
|
|
|
|
# Cr: https://serverfault.com/a/335079
|
|
|
|
# Cr: https://serverfault.com/a/335079
|
|
|
|
if [ -z "${2}" ]; then
|
|
|
|
if [[ -z "${2}" ]]; then
|
|
|
|
echo "::: No domain specified"
|
|
|
|
echo "::: No domain specified"
|
|
|
|
exit 1
|
|
|
|
exit 1
|
|
|
|
elif [[ ${2} = *[![:ascii:]]* ]]; then
|
|
|
|
elif [[ "${2}" = *[![:ascii:]]* ]]; then
|
|
|
|
[ `which python` ] && domain=$(python -c 'import sys;print sys.argv[1].decode("utf-8").encode("idna")' "${2}")
|
|
|
|
[[ "$(which python)" ]] && domain=$(python -c 'import sys;print sys.argv[1].decode("utf-8").encode("idna")' "${2}")
|
|
|
|
else
|
|
|
|
else
|
|
|
|
domain="${2}"
|
|
|
|
domain="${2}"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
@ -109,14 +109,14 @@ queryFunc() {
|
|
|
|
# Scan Whitelist, Blacklist and Wildcards
|
|
|
|
# Scan Whitelist, Blacklist and Wildcards
|
|
|
|
lists="/etc/pihole/whitelist.txt /etc/pihole/blacklist.txt $wildcardlist"
|
|
|
|
lists="/etc/pihole/whitelist.txt /etc/pihole/blacklist.txt $wildcardlist"
|
|
|
|
result=$(scanList ${domain} "${lists}" ${method})
|
|
|
|
result=$(scanList ${domain} "${lists}" ${method})
|
|
|
|
if [ -n "$result" ]; then
|
|
|
|
if [[ -n "$result" ]]; then
|
|
|
|
echo "$result"
|
|
|
|
echo "$result"
|
|
|
|
[[ ! -t 1 ]] && exit 0
|
|
|
|
[[ ! -t 1 ]] && exit 0
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
# Scan Domains lists
|
|
|
|
# Scan Domains lists
|
|
|
|
result=$(scanList ${domain} "/etc/pihole/*.domains" ${method})
|
|
|
|
result=$(scanList ${domain} "/etc/pihole/*.domains" ${method})
|
|
|
|
if [ -n "$result" ]; then
|
|
|
|
if [[ -n "$result" ]]; then
|
|
|
|
sort -t . -k 2 -g <<< "$result"
|
|
|
|
sort -t . -k 2 -g <<< "$result"
|
|
|
|
else
|
|
|
|
else
|
|
|
|
[ -n "$method" ] && exact="exact "
|
|
|
|
[ -n "$method" ] && exact="exact "
|
|
|
|
@ -146,16 +146,16 @@ versionFunc() {
|
|
|
|
|
|
|
|
|
|
|
|
restartDNS() {
|
|
|
|
restartDNS() {
|
|
|
|
dnsmasqPid=$(pidof dnsmasq)
|
|
|
|
dnsmasqPid=$(pidof dnsmasq)
|
|
|
|
if [[ ${dnsmasqPid} ]]; then
|
|
|
|
if [[ "${dnsmasqPid}" ]]; then
|
|
|
|
# service already running - reload config
|
|
|
|
# Service already running - reload config
|
|
|
|
if [ -x "$(command -v systemctl)" ]; then
|
|
|
|
if [[ -x "$(command -v systemctl)" ]]; then
|
|
|
|
systemctl restart dnsmasq
|
|
|
|
systemctl restart dnsmasq
|
|
|
|
else
|
|
|
|
else
|
|
|
|
service dnsmasq restart
|
|
|
|
service dnsmasq restart
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
else
|
|
|
|
else
|
|
|
|
# service not running, start it up
|
|
|
|
# Service not running, start it up
|
|
|
|
if [ -x "$(command -v systemctl)" ]; then
|
|
|
|
if [[ -x "$(command -v systemctl)" ]]; then
|
|
|
|
systemctl start dnsmasq
|
|
|
|
systemctl start dnsmasq
|
|
|
|
else
|
|
|
|
else
|
|
|
|
service dnsmasq start
|
|
|
|
service dnsmasq start
|
|
|
|
@ -164,16 +164,25 @@ restartDNS() {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
piholeEnable() {
|
|
|
|
piholeEnable() {
|
|
|
|
if [[ "${1}" == "0" ]] ; then
|
|
|
|
if [[ "${2}" == "-h" ]] || [[ "${2}" == "--help" ]]; then
|
|
|
|
#Disable Pihole
|
|
|
|
echo "Usage: pihole disable [time]
|
|
|
|
|
|
|
|
Example: 'pihole disable', or 'pihole disable 5m'
|
|
|
|
|
|
|
|
Disable Pi-hole subsystems
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Time:
|
|
|
|
|
|
|
|
#s Disable Pi-hole functionality for # second(s)
|
|
|
|
|
|
|
|
#m Disable Pi-hole functionality for # minute(s)"
|
|
|
|
|
|
|
|
exit 0
|
|
|
|
|
|
|
|
elif [[ "${1}" == "0" ]]; then
|
|
|
|
|
|
|
|
# Disable Pi-hole
|
|
|
|
sed -i 's/^addn-hosts=\/etc\/pihole\/gravity.list/#addn-hosts=\/etc\/pihole\/gravity.list/' /etc/dnsmasq.d/01-pihole.conf
|
|
|
|
sed -i 's/^addn-hosts=\/etc\/pihole\/gravity.list/#addn-hosts=\/etc\/pihole\/gravity.list/' /etc/dnsmasq.d/01-pihole.conf
|
|
|
|
echo "::: Blocking has been disabled!"
|
|
|
|
echo "::: Blocking has been disabled!"
|
|
|
|
if [[ $# > 1 ]]; then
|
|
|
|
if [[ $# > 1 ]]; then
|
|
|
|
if [[ ${2} == *"s"* ]] ; then
|
|
|
|
if [[ "${2}" == *"s"* ]]; then
|
|
|
|
tt=${2%"s"}
|
|
|
|
tt=${2%"s"}
|
|
|
|
echo "::: Blocking will be re-enabled in ${tt} seconds"
|
|
|
|
echo "::: Blocking will be re-enabled in ${tt} seconds"
|
|
|
|
nohup bash -c "sleep ${tt}; pihole enable" </dev/null &>/dev/null &
|
|
|
|
nohup bash -c "sleep ${tt}; pihole enable" </dev/null &>/dev/null &
|
|
|
|
elif [[ ${2} == *"m"* ]] ; then
|
|
|
|
elif [[ "${2}" == *"m"* ]]; then
|
|
|
|
tt=${2%"m"}
|
|
|
|
tt=${2%"m"}
|
|
|
|
echo "::: Blocking will be re-enabled in ${tt} minutes"
|
|
|
|
echo "::: Blocking will be re-enabled in ${tt} minutes"
|
|
|
|
tt=$((${tt}*60))
|
|
|
|
tt=$((${tt}*60))
|
|
|
|
@ -187,7 +196,7 @@ piholeEnable() {
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
else
|
|
|
|
else
|
|
|
|
#Enable pihole
|
|
|
|
# Enable Pi-hole
|
|
|
|
echo "::: Blocking has been enabled!"
|
|
|
|
echo "::: Blocking has been enabled!"
|
|
|
|
sed -i 's/^#addn-hosts/addn-hosts/' /etc/dnsmasq.d/01-pihole.conf
|
|
|
|
sed -i 's/^#addn-hosts/addn-hosts/' /etc/dnsmasq.d/01-pihole.conf
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
@ -196,9 +205,17 @@ piholeEnable() {
|
|
|
|
|
|
|
|
|
|
|
|
piholeLogging() {
|
|
|
|
piholeLogging() {
|
|
|
|
shift
|
|
|
|
shift
|
|
|
|
|
|
|
|
if [[ "${1}" == "-h" ]] || [[ "${1}" == "--help" ]]; then
|
|
|
|
if [[ "${1}" == "off" ]] ; then
|
|
|
|
echo "Usage: pihole logging [options]
|
|
|
|
#Disable Logging
|
|
|
|
Example: 'pihole logging on'
|
|
|
|
|
|
|
|
Specify whether the Pi-hole log should be used
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Options:
|
|
|
|
|
|
|
|
on Enable the Pi-hole log at /var/log/pihole.log
|
|
|
|
|
|
|
|
off Disable the Pi-hole log at /var/log/pihole.log"
|
|
|
|
|
|
|
|
exit 0
|
|
|
|
|
|
|
|
elif [[ "${1}" == "off" ]]; then
|
|
|
|
|
|
|
|
# Disable logging
|
|
|
|
sed -i 's/^log-queries/#log-queries/' /etc/dnsmasq.d/01-pihole.conf
|
|
|
|
sed -i 's/^log-queries/#log-queries/' /etc/dnsmasq.d/01-pihole.conf
|
|
|
|
sed -i 's/^QUERY_LOGGING=true/QUERY_LOGGING=false/' /etc/pihole/setupVars.conf
|
|
|
|
sed -i 's/^QUERY_LOGGING=true/QUERY_LOGGING=false/' /etc/pihole/setupVars.conf
|
|
|
|
pihole -f
|
|
|
|
pihole -f
|
|
|
|
@ -216,7 +233,7 @@ piholeLogging() {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
piholeStatus() {
|
|
|
|
piholeStatus() {
|
|
|
|
if [[ $(netstat -plnt | grep -c ':53 ') > 0 ]]; then
|
|
|
|
if [[ "$(netstat -plnt | grep -c ':53 ')" -gt "0" ]]; then
|
|
|
|
if [[ "${1}" != "web" ]]; then
|
|
|
|
if [[ "${1}" != "web" ]]; then
|
|
|
|
echo "::: DNS service is running"
|
|
|
|
echo "::: DNS service is running"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
@ -229,28 +246,28 @@ piholeStatus() {
|
|
|
|
return
|
|
|
|
return
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
if [[ $(grep -i "^#addn-hosts=/" /etc/dnsmasq.d/01-pihole.conf) ]] ; then
|
|
|
|
if [[ "$(grep -i "^#addn-hosts=/" /etc/dnsmasq.d/01-pihole.conf)" ]]; then
|
|
|
|
#list is commented out
|
|
|
|
# List is commented out
|
|
|
|
if [[ "${1}" == "web" ]]; then
|
|
|
|
if [[ "${1}" == "web" ]]; then
|
|
|
|
echo 0;
|
|
|
|
echo 0;
|
|
|
|
else
|
|
|
|
else
|
|
|
|
echo "::: Pi-hole blocking is Disabled";
|
|
|
|
echo "::: Pi-hole blocking is Disabled";
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
elif [[ $(grep -i "^addn-hosts=/" /etc/dnsmasq.d/01-pihole.conf) ]] ; then
|
|
|
|
elif [[ "$(grep -i "^addn-hosts=/" /etc/dnsmasq.d/01-pihole.conf)" ]]; then
|
|
|
|
#list set
|
|
|
|
# List set
|
|
|
|
if [[ "${1}" == "web" ]]; then
|
|
|
|
if [[ "${1}" == "web" ]]; then
|
|
|
|
echo 1;
|
|
|
|
echo 1;
|
|
|
|
else
|
|
|
|
else
|
|
|
|
echo "::: Pi-hole blocking is Enabled";
|
|
|
|
echo "::: Pi-hole blocking is Enabled";
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
else
|
|
|
|
else
|
|
|
|
#addn-host not found
|
|
|
|
# Addn-host not found
|
|
|
|
if [[ "${1}" == "web" ]]; then
|
|
|
|
if [[ "${1}" == "web" ]]; then
|
|
|
|
echo 99
|
|
|
|
echo 99
|
|
|
|
else
|
|
|
|
else
|
|
|
|
echo "::: No hosts file linked to dnsmasq, adding it in enabled state"
|
|
|
|
echo "::: No hosts file linked to dnsmasq, adding it in enabled state"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
#add addn-host= to dnsmasq
|
|
|
|
# Add addn-host= to dnsmasq
|
|
|
|
echo "addn-hosts=/etc/pihole/gravity.list" >> /etc/dnsmasq.d/01-pihole.conf
|
|
|
|
echo "addn-hosts=/etc/pihole/gravity.list" >> /etc/dnsmasq.d/01-pihole.conf
|
|
|
|
restartDNS
|
|
|
|
restartDNS
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
@ -263,55 +280,66 @@ tailFunc() {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
piholeCheckoutFunc() {
|
|
|
|
piholeCheckoutFunc() {
|
|
|
|
|
|
|
|
if [[ "$2" == "-h" ]] || [[ "$2" == "--help" ]]; then
|
|
|
|
|
|
|
|
echo "Usage: pihole checkout [repo] [branch]
|
|
|
|
|
|
|
|
Example: 'pihole checkout master' or 'pihole checkout core dev'
|
|
|
|
|
|
|
|
Switch Pi-hole subsystems to a different Github branch
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Repositories:
|
|
|
|
|
|
|
|
core [branch] Change the branch of Pi-hole's core subsystem
|
|
|
|
|
|
|
|
web [branch] Change the branch of Admin Console subsystem
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Branches:
|
|
|
|
|
|
|
|
master Update subsystems to the latest stable release
|
|
|
|
|
|
|
|
dev Update subsystems to the latest development release"
|
|
|
|
|
|
|
|
exit 0
|
|
|
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
source "${PI_HOLE_SCRIPT_DIR}"/piholeCheckout.sh
|
|
|
|
source "${PI_HOLE_SCRIPT_DIR}"/piholeCheckout.sh
|
|
|
|
shift
|
|
|
|
shift
|
|
|
|
checkout "$@"
|
|
|
|
checkout "$@"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
tricorderFunc() {
|
|
|
|
|
|
|
|
if command -v openssl &> /dev/null; then
|
|
|
|
|
|
|
|
openssl s_client -quiet -connect tricorder.pi-hole.net:9998 2> /dev/null < /dev/stdin
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
nc tricorder.pi-hole.net 9999 < /dev/stdin
|
|
|
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
helpFunc() {
|
|
|
|
helpFunc() {
|
|
|
|
cat << EOM
|
|
|
|
echo "Usage: pihole [options]
|
|
|
|
::: Control all Pi-hole specific functions
|
|
|
|
Example: 'pihole -w -h'
|
|
|
|
:::
|
|
|
|
Add '-h' after specific commands for more information on usage
|
|
|
|
::: Usage: pihole [options]
|
|
|
|
|
|
|
|
::: Add -h after -w (whitelist), -b (blacklist), -c (chronometer), or -a (admin) for more information on usage
|
|
|
|
Whitelist/Blacklist Options:
|
|
|
|
:::
|
|
|
|
-w, whitelist Whitelist domain(s)
|
|
|
|
::: Options:
|
|
|
|
-b, blacklist Blacklist domain(s)
|
|
|
|
::: -w, whitelist Whitelist domain(s)
|
|
|
|
-wild, wildcard Blacklist domain(s), and all its subdomains
|
|
|
|
::: -b, blacklist Blacklist domain(s) (exact match)
|
|
|
|
Add '-h' for more info on whitelist/blacklist usage
|
|
|
|
::: -wild, wildcard Blacklist whole domain(s) (wildcard)
|
|
|
|
|
|
|
|
::: -d, debug Start a debugging session
|
|
|
|
Debugging Options:
|
|
|
|
::: Automated debugging can be enabled with '-a'.
|
|
|
|
-d, debug Start a debugging session
|
|
|
|
::: 'pihole -d -a'
|
|
|
|
Add '-a' to enable automated debugging
|
|
|
|
::: -f, flush Flush the 'pihole.log' file
|
|
|
|
-f, flush Flush the Pi-hole log
|
|
|
|
::: -t, tail Output the last lines of the 'pihole.log' file. Lines are appended as the file grows
|
|
|
|
-r, reconfigure Reconfigure or Repair Pi-hole subsystems
|
|
|
|
::: -up, updatePihole Update Pi-hole components
|
|
|
|
-t, tail View the live output of the Pi-hole log
|
|
|
|
::: -r, reconfigure Reconfigure or Repair Pi-hole
|
|
|
|
|
|
|
|
::: -g, updateGravity Update the list of ad-serving domains
|
|
|
|
Options:
|
|
|
|
::: -c, chronometer Calculates stats and displays to an LCD
|
|
|
|
-a, admin Admin Console options
|
|
|
|
::: -h, help Show this help dialog
|
|
|
|
Add '-h' for more info on admin console usage
|
|
|
|
::: -v, version Show installed versions of Pi-hole and Web-Admin
|
|
|
|
-c, chronometer Calculates stats and displays to an LCD
|
|
|
|
::: -q, query Query the adlists for a specific domain
|
|
|
|
Add '-h' for more info on chronometer usage
|
|
|
|
::: 'pihole -q domain -exact' shows exact matches only
|
|
|
|
-g, updateGravity Update the list of ad-serving domains
|
|
|
|
::: -l, logging Enable or Disable logging (pass 'on' or 'off')
|
|
|
|
-h, --help, help Show this help dialog
|
|
|
|
::: -a, admin Admin webpage options
|
|
|
|
-l, logging Specify whether the Pi-hole log should be used
|
|
|
|
::: uninstall Uninstall Pi-hole from your system! :(
|
|
|
|
Add '-h' for more info on logging usage
|
|
|
|
::: status Display if Pi-hole is Enabled or Disabled
|
|
|
|
-q, query Query the adlists for a specified domain
|
|
|
|
::: enable Enable Pi-hole DNS Blocking
|
|
|
|
Add '-exact' AFTER a specified domain for exact match
|
|
|
|
::: disable Disable Pi-hole DNS Blocking
|
|
|
|
-up, updatePihole Update Pi-hole subsystems
|
|
|
|
::: Blocking can also be disabled only temporarily, e.g.,
|
|
|
|
-v, version Show installed versions of Pi-hole, Admin Console & FTL
|
|
|
|
::: 'pihole disable 5m' - will disable blocking for 5 minutes
|
|
|
|
Add '-h' for more info on version usage
|
|
|
|
::: restartdns Restart dnsmasq
|
|
|
|
uninstall Uninstall Pi-hole from your system
|
|
|
|
::: checkout Check out different branches
|
|
|
|
status Display the running status of Pi-hole subsystems
|
|
|
|
::: tricorder Upload log to Pi-hole's medical tricorder (uses SSL when possible)
|
|
|
|
enable Enable Pi-hole subsystems
|
|
|
|
EOM
|
|
|
|
disable Disable Pi-hole subsystems
|
|
|
|
|
|
|
|
Add '-h' for more info on disable usage
|
|
|
|
|
|
|
|
restartdns Restart Pi-hole subsystems
|
|
|
|
|
|
|
|
checkout Switch Pi-hole subsystems to a different Github branch
|
|
|
|
|
|
|
|
Add '-h' for more info on checkout usage";
|
|
|
|
exit 0
|
|
|
|
exit 0
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@ -336,12 +364,11 @@ case "${1}" in
|
|
|
|
"-l" | "logging" ) piholeLogging "$@";;
|
|
|
|
"-l" | "logging" ) piholeLogging "$@";;
|
|
|
|
"uninstall" ) uninstallFunc;;
|
|
|
|
"uninstall" ) uninstallFunc;;
|
|
|
|
"enable" ) piholeEnable 1;;
|
|
|
|
"enable" ) piholeEnable 1;;
|
|
|
|
"disable" ) piholeEnable 0 $2;;
|
|
|
|
"disable" ) piholeEnable 0 "$2";;
|
|
|
|
"status" ) piholeStatus "$2";;
|
|
|
|
"status" ) piholeStatus "$2";;
|
|
|
|
"restartdns" ) restartDNS;;
|
|
|
|
"restartdns" ) restartDNS;;
|
|
|
|
"-a" | "admin" ) webpageFunc "$@";;
|
|
|
|
"-a" | "admin" ) webpageFunc "$@";;
|
|
|
|
"-t" | "tail" ) tailFunc;;
|
|
|
|
"-t" | "tail" ) tailFunc;;
|
|
|
|
"checkout" ) piholeCheckoutFunc "$@";;
|
|
|
|
"checkout" ) piholeCheckoutFunc "$@";;
|
|
|
|
"tricorder" ) tricorderFunc;;
|
|
|
|
|
|
|
|
* ) helpFunc;;
|
|
|
|
* ) helpFunc;;
|
|
|
|
esac
|
|
|
|
esac
|
|
|
|
|
Adam Warner
7 years ago
committed by