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

Revert parsing method to that of 3.1.4. New Method is allowing illegal lists through, and that is causing issues such as blocking www.google.com. This method will just throw away invalid list entries.

Browse Source 
Signed-off-by: Adam Warner <adamw@rner.email>
This commit is contained in:
Adam Warner 2017-12-12 12:36:09 +00:00
parent 47ed0b7627
commit cc3035267f
No known key found for this signature in database
GPG Key ID: F5410858022DA5EB
1 changed files with 13 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
gravity.sh
View File

@ -270,36 +270,22 @@ gravity_Pull() {
# Parse source files into domains format # Parse source files into domains format
gravity_ParseFileIntoDomains() { gravity_ParseFileIntoDomains() {
local source="${1}" destination="${2}" commentPattern firstLine abpFilter local source="${1}" destination="${2}" firstLine abpFilter
# Determine if we are parsing a consolidated list # Determine if we are parsing a consolidated list
if [[ "${source}" == "${piholeDir}/${matterAndLight}" ]]; then if [[ "${source}" == "${piholeDir}/${matterAndLight}" ]]; then
# Define symbols used as comments: #;@![/ # Remove comments and print only the domain name
commentPattern="[#;@![\\/]" # Most of the lists downloaded are already in hosts file format but the spacing/formating is not contigious
# This helps with that and makes it easier to read
# Parse Domains/Hosts files by removing comments & host IPs # It also helps with debugging so each stage of the script can be researched more in depth
# Logic: Ignore lines which begin with comments #Awk -F splits on given IFS, we grab the right hand side (chops trailing #coments and /'s to grab the domain only.
awk '!/^'"${commentPattern}"'/ { #Last awk command takes non-commented lines and if they have 2 fields, take the left field (the domain) and leave
# Determine if there are multiple words seperated by a space #+ the right (IP address), otherwise grab the single field.
if(NF>1) { cat ${source} | \
# Remove comments (including prefixed spaces/tabs) awk -F '#' '{print $1}' | \
if($0 ~ /'"${commentPattern}"'/) { gsub("( |\t)'"${commentPattern}"'.*", "", $0) } awk -F '/' '{print $1}' | \
# Determine if there are aliased domains awk '($1 !~ /^#/) { if (NF>1) {print $2} else {print $1}}' | \
if($3) { sed -nr -e 's/\.{2,}/./g' -e '/\./p' > ${destination}
# Remove IP address
$1=""
# Remove space which is left in $0 when removing $1
gsub("^ ", "", $0)
print $0
} else if($2) {
# Print single domain without IP
print $2
}
# If there are no words seperated by space
} else if($1) {
print $1
}
}' "${source}" 2> /dev/null > "${destination}"
return 0 return 0
fi fi