tyler.durden
/
pi-hole
mirror of https://github.com/pi-hole/pi-hole.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Spliting the regex into TLD_pattern and subdomain_pattern 

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
This commit is contained in:
RD WebDesign 2023-03-29 00:02:42 -03:00
parent c71460e4b6
commit 32fb2e69ff
No known key found for this signature in database
GPG Key ID: AE3C7FC910687F33
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gravity.sh
View File

@ -550,11 +550,14 @@ parseList() {
# 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
# adapted from https://stackoverflow.com/a/30007882 # adapted from https://stackoverflow.com/a/30007882
valid_domain_pattern="([a-z0-9]([a-z0-9_-]{0,61}[a-z0-9]){0,1}\.)+[a-z0-9][a-z0-9-]{0,61}[a-z0-9]" TLD_pattern="[a-z0-9][a-z0-9-]{0,61}[a-z0-9]"
subdomain_pattern="([a-z0-9]([a-z0-9_-]{0,61}[a-z0-9]){0,1}\.)"
valid_domain_pattern="${subdomain_pattern}+${TLD_pattern}"
# supported ABP style: ||subdomain.domain.tld^ # supported ABP style: ||subdomain.domain.tld^
# allow TLD blocking using ABP style: ||tld^ # Subdomain is optional for ABP style, allowing TLD blocking: ||tld^
abp_domain_pattern="\|\|([a-z0-9]([a-z0-9_-]{0,61}[a-z0-9]){0,1}\.)*[a-z0-9][a-z0-9-]{0,61}[a-z0-9]\^" abp_domain_pattern="\|\|${subdomain_pattern}*${TLD_pattern}\^"
# A list of items of common local hostnames not to report as unusable # A list of items of common local hostnames not to report as unusable
# Some lists (i.e StevenBlack's) contain these as they are supposed to be used as HOST files # Some lists (i.e StevenBlack's) contain these as they are supposed to be used as HOST files