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

Add info when list cotains ABP style domains

Browse Source 
Signed-off-by: Christian König <ckoenig@posteo.de>
This commit is contained in:
Christian König 2023-02-24 22:18:41 +01:00
parent eedd93d782
commit 821c7dc190
No known key found for this signature in database
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gravity.sh
View File

@ -520,23 +520,29 @@ gravity_DownloadBlocklists() {
} }
parseList() { parseList() {
local adlistID="${1}" src="${2}" target="${3}" temp_file non_domains sample_non_domains local adlistID="${1}" src="${2}" target="${3}" temp_file temp_file_base non_domains sample_non_domains
# Create a temporary file for the sed magic instead of using "${target}" directly # Create a temporary file for the sed magic instead of using "${target}" directly
# this allows to split the sed commands to improve readability # this allows to split the sed commands to improve readability
# we use a file handle here and remove the temporary file immediately so the content will be deleted in any case # we use a file handle here and remove the temporary file immediately so the content will be deleted in any case
# when the script stops # when the script stops
temp_file="$(mktemp -p "/tmp" --suffix=".gravity")" temp_file_base="$(mktemp -p "/tmp" --suffix=".gravity")"
exec 3>"$temp_file" exec 3>"$temp_file_base"
rm "${temp_file}" rm "${temp_file_base}"
temp_file="/proc/$$/fd/3" temp_file="/proc/$$/fd/3"
# 1. Add all valid domains (adapted from https://stackoverflow.com/a/30007882) # 1. Add all valid domains (adapted from https://stackoverflow.com/a/30007882)
# no need to include uppercase letters, as we convert to lowercase in gravity_ParseFileIntoDomains() already # no need to include uppercase letters, as we convert to lowercase in gravity_ParseFileIntoDomains() already
sed -r "/^([a-z0-9]([a-z0-9_-]{0,61}[a-z0-9]){0,1}\.)+[a-z0-9][a-z0-9-]{0,61}[a-z0-9]$/!d" "${src}" > "${temp_file}" sed -r "/^([a-z0-9]([a-z0-9_-]{0,61}[a-z0-9]){0,1}\.)+[a-z0-9][a-z0-9-]{0,61}[a-z0-9]$/!d" "${src}" > "${temp_file}"
# if there is at least one ABP style domains
if grep -E "^\|\|([a-z0-9]([a-z0-9_-]{0,61}[a-z0-9]){0,1}\.)+[a-z0-9][a-z0-9-]{0,61}[a-z0-9]" -m 1 -q "${src}"; then
echo " ${INFO} List contained AdBlock Plus style domains"
# 2. Add all supported ABP style lines (||subdomain.domain.tlp^) # 2. Add all supported ABP style lines (||subdomain.domain.tlp^)
sed -r "/^\|\|([a-z0-9]([a-z0-9_-]{0,61}[a-z0-9]){0,1}\.)+[a-z0-9][a-z0-9-]{0,61}[a-z0-9]\^$/!d" "${src}" >> "${temp_file}" sed -r "/^\|\|([a-z0-9]([a-z0-9_-]{0,61}[a-z0-9]){0,1}\.)+[a-z0-9][a-z0-9-]{0,61}[a-z0-9]\^$/!d" "${src}" >> "${temp_file}"
fi
# Find lines containing no domains or with invalid characters (not matching regex above) # Find lines containing no domains or with invalid characters (not matching regex above)
# This is simply everything that is not in $temp_file compared to $src # This is simply everything that is not in $temp_file compared to $src