Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2025-04-27 01:30:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add support for whitelist regex filter management via CLI.

Browse source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER 2019-07-22 19:35:16 +02:00
parent 65fdbc85d5
commit 96031214c6
No known key found for this signature in database
GPG key ID: FB60471F0575164A
3 changed files with 41 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
advanced/Scripts/list.sh
View file

@ -38,6 +38,9 @@ helpFunc() {
elif [[ "${listType}" == "regex_blacklist" ]]; then
param="-regex"
type="regex blacklist filter"
elif [[ "${listType}" == "regex_blacklist" ]]; then
param="-whiteregex"
type="regex whitelist filter"
else
param="b"
type="blacklist"
@ -89,8 +92,11 @@ HandleOther() {
ProcessDomainList() {
if [[ "${listType}" == "regex_blacklist" ]]; then
# Regex filter list
# Regex black filter list
listname="regex blacklist filters"
elif [[ "${listType}" == "regex_whitelist" ]]; then
# Regex white filter list
listname="regex whitelist filters"
else
# Whitelist / Blacklist
listname="${listType}"
@ -106,7 +112,7 @@ ProcessDomainList() {
# if delmode then remove from desired list but do not add to the other
if ${addmode}; then
AddDomain "${dom}" "${listType}"
if [[ ! "${listType}" == "regex_blacklist" ]]; then
if [[ ! "${listType}" == "regex_"*"list" ]]; then
RemoveDomain "${dom}" "${listAlt}"
fi
else
@ -173,7 +179,7 @@ Displaylist() {
data="$(sqlite3 "${gravityDBfile}" "SELECT domain,enabled,date_modified FROM ${listType};" 2> /dev/null)"
if [[ -z $data ]]; then
echo -e "Not showing empty ${listname}"
echo -e "Not showing empty list"
else
echo -e "Displaying ${listname}:"
count=1
@ -217,6 +223,7 @@ for var in "$@"; do
"-b" | "blacklist" ) listType="blacklist"; listAlt="whitelist";;
"--wild" | "wildcard" ) listType="regex_blacklist"; wildcard=true;;
"--regex" | "regex" ) listType="regex_blacklist";;
"--whiteregex" | "whiteregex" ) listType="regex_whitelist";;
"-nr"| "--noreload" ) reload=false;;
"-d" | "--delmode" ) addmode=false;;
"-q" | "--quiet" ) verbose=false;;