mirror of
https://github.com/openwrt/packages.git
synced 2026-01-10 11:44:48 +00:00
adblock: limit domain name length
* limit domain name length to max. 63 chars to fix issues with energized sources Signed-off-by: Dirk Brenken <dev@brenken.org>
This commit is contained in:
@@ -677,7 +677,7 @@ f_list()
|
||||
src_name="${mode}"
|
||||
if [ "${src_name}" = "blacklist" ] && [ -s "${adb_blacklist}" ]
|
||||
then
|
||||
rset="/^([[:alnum:]_-]+\\.)+[[:alpha:]]+([[:space:]]|$)/{print tolower(\$1)}"
|
||||
rset="/^([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+([[:space:]]|$)/{print tolower(\$1)}"
|
||||
"${adb_awk}" "${rset}" "${adb_blacklist}" | \
|
||||
"${adb_awk}" 'BEGIN{FS="."}{for(f=NF;f>1;f--)printf "%s.",$f;print $1}' > "${adb_tmpdir}/tmp.raw.${src_name}"
|
||||
sort ${adb_srtopts} -u "${adb_tmpdir}/tmp.raw.${src_name}" 2>/dev/null > "${adb_tmpfile}.${src_name}"
|
||||
@@ -685,12 +685,12 @@ f_list()
|
||||
rm -f "${adb_tmpdir}/tmp.raw.${src_name}"
|
||||
elif [ "${src_name}" = "whitelist" ] && [ -s "${adb_whitelist}" ]
|
||||
then
|
||||
rset="/^([[:alnum:]_-]+\\.)+[[:alpha:]]+([[:space:]]|$)/{print tolower(\$1)}"
|
||||
rset="/^([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+([[:space:]]|$)/{print tolower(\$1)}"
|
||||
"${adb_awk}" "${rset}" "${adb_whitelist}" > "${adb_tmpdir}/tmp.raw.${src_name}"
|
||||
out_rc="${?}"
|
||||
if [ "${out_rc}" -eq 0 ]
|
||||
then
|
||||
rset="/^([[:alnum:]_-]+\\.)+[[:alpha:]]+([[:space:]]|$)/{gsub(\"\\\\.\",\"\\\\.\",\$1);print tolower(\"^(|.*\\\\.)\"\$1\"$\")}"
|
||||
rset="/^([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+([[:space:]]|$)/{gsub(\"\\\\.\",\"\\\\.\",\$1);print tolower(\"^(|.*\\\\.)\"\$1\"$\")}"
|
||||
"${adb_awk}" "${rset}" "${adb_tmpdir}/tmp.raw.${src_name}" > "${adb_tmpdir}/tmp.rem.${src_name}"
|
||||
out_rc="${?}"
|
||||
if [ "${out_rc}" -eq 0 ] && [ "${adb_dnsallow}" != "1" ]
|
||||
@@ -714,7 +714,7 @@ f_list()
|
||||
"safesearch")
|
||||
case "${src_name}" in
|
||||
"google")
|
||||
rset="/^(\\.[[:alnum:]_-]+\\.)+[[:alpha:]]+([[:space:]]|$)/{printf \"%s\n%s\n\",tolower(\"www\"\$1),tolower(substr(\$1,2,length(\$1)))}"
|
||||
rset="/^(\\.[[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+([[:space:]]|$)/{printf \"%s\n%s\n\",tolower(\"www\"\$1),tolower(substr(\$1,2,length(\$1)))}"
|
||||
safe_url="https://www.google.com/supported_domains"
|
||||
safe_ips="216.239.38.120 2001:4860:4802:32::78"
|
||||
safe_cname="forcesafesearch.google.com"
|
||||
|
||||
Reference in New Issue
Block a user