arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2024-12-22 23:08:07 +00:00
Code Issues Releases Wiki Activity

Use more descriptive names instead of directly using the IDs in list.sh

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER 2019-12-02 17:27:32 +00:00
parent 869473172c
commit b6cd7b8e3d
No known key found for this signature in database
GPG Key ID: 00135ACBD90B28DD
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
advanced/Scripts/list.sh
View File

@ -26,30 +26,37 @@ typeId=""
colfile="/opt/pihole/COL_TABLE" colfile="/opt/pihole/COL_TABLE"
source ${colfile} source ${colfile}
# IDs are hard-wired to domain interpretation in the gravity database scheme
# Clients (including FTL) will read them through the corresponding views
readonly whitelist="0"
readonly blacklist="1"
readonly regex_whitelist="2"
readonly regex_blacklist="3"
GetListnameFromTypeId() { GetListnameFromTypeId() {
if [[ "$1" == "0" ]]; then if [[ "$1" == "${whitelist}" ]]; then
echo "whitelist" echo "whitelist"
elif [[ "$1" == "1" ]]; then elif [[ "$1" == "${blacklist}" ]]; then
echo "blacklist" echo "blacklist"
elif [[ "$1" == "2" ]]; then elif [[ "$1" == "${regex_whitelist}" ]]; then
echo "regex whitelist" echo "regex whitelist"
elif [[ "$1" == "3" ]]; then elif [[ "$1" == "${regex_blacklist}" ]]; then
echo "regex blacklist" echo "regex blacklist"
fi fi
} }
GetListParamFromTypeId() { GetListParamFromTypeId() {
if [[ "${typeId}" == "0" ]]; then if [[ "${typeId}" == "${whitelist}" ]]; then
echo "w" echo "w"
elif [[ "${typeId}" == "1" ]]; then elif [[ "${typeId}" == "${blacklist}" ]]; then
echo "b" echo "b"
elif [[ "${typeId}" == "2" && "${wildcard}" == true ]]; then elif [[ "${typeId}" == "${regex_whitelist}" && "${wildcard}" == true ]]; then
echo "-white-wild" echo "-white-wild"
elif [[ "${typeId}" == "2" ]]; then elif [[ "${typeId}" == "${regex_whitelist}" ]]; then
echo "-white-regex" echo "-white-regex"
elif [[ "${typeId}" == "3" && "${wildcard}" == true ]]; then elif [[ "${typeId}" == "${regex_blacklist}" && "${wildcard}" == true ]]; then
echo "-wild" echo "-wild"
elif [[ "${typeId}" == "3" ]]; then elif [[ "${typeId}" == "${regex_blacklist}" ]]; then
echo "-regex" echo "-regex"
fi fi
} }
@ -81,7 +88,7 @@ ValidateDomain() {
# Check validity of domain (don't check for regex entries) # Check validity of domain (don't check for regex entries)
if [[ "${#domain}" -le 253 ]]; then if [[ "${#domain}" -le 253 ]]; then
if [[ ( "${typeId}" == "3" || "${typeId}" == "2" ) && "${wildcard}" == false ]]; then if [[ ( "${typeId}" == "${regex_blacklist}" || "${typeId}" == "${regex_whitelist}" ) && "${wildcard}" == false ]]; then
validDomain="${domain}" validDomain="${domain}"
else else
# Use regex to check the validity of the passed domain. see https://regexr.com/3abjr # Use regex to check the validity of the passed domain. see https://regexr.com/3abjr