From c531b6daea6962c32813b5815105343a76746147 Mon Sep 17 00:00:00 2001 From: Dirk Brenken Date: Sat, 17 Apr 2021 09:41:17 +0200 Subject: adblock: update to 4.1.1 * support the RPZ trigger 'RPZ-CLIENT-IP' to always allow/block certain clients based on their IP (currently only supported by bind!) * avoid promiscuous mode in tcpdump setup for adblock reporting * speed up dns report preparation * support dns report mailing (/etc/init.d/adblock report mail) * fix bind autodetection * update LuCI-frontend (separate PR) * update readme Signed-off-by: Dirk Brenken --- net/adblock/files/adblock.mail | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'net/adblock/files/adblock.mail') diff --git a/net/adblock/files/adblock.mail b/net/adblock/files/adblock.mail index be5d26072..010e45b2a 100755 --- a/net/adblock/files/adblock.mail +++ b/net/adblock/files/adblock.mail @@ -34,7 +34,7 @@ f_log() then "${adb_logger}" -p "${class}" -t "adblock-${adb_ver}[${$}]" "${log_msg}" else - printf "%s %s %s\\n" "${class}" "adblock-${adb_ver}[${$}]" "${log_msg}" + printf "%s %s %s\n" "${class}" "adblock-${adb_ver}[${$}]" "${log_msg}" fi } @@ -44,17 +44,18 @@ then exit ${adb_rc} fi -if [ "${adb_debug}" -eq 1 ] +if [ "${adb_debug}" = "1" ] then debug="--debug" fi -adb_mailhead="From: ${adb_mailsender}\\nTo: ${adb_mailreceiver}\\nSubject: ${adb_mailtopic}\\nReply-to: ${adb_mailsender}\\nMime-Version: 1.0\\nContent-Type: text/html\\nContent-Disposition: inline\\n\\n" +adb_mailhead="From: ${adb_mailsender}\nTo: ${adb_mailreceiver}\nSubject: ${adb_mailtopic}\nReply-to: ${adb_mailsender}\nMime-Version: 1.0\nContent-Type: text/html;charset=utf-8\nContent-Disposition: inline\n\n" # info preparation # sys_info="$(strings /etc/banner 2>/dev/null; ubus call system board | sed -e 's/\"release\": {//' | sed -e 's/^[ \t]*//' | sed -e 's/[{}\",]//g' | sed -e 's/[ ]/ \t/' | sed '/^$/d' 2>/dev/null)" adb_info="$(/etc/init.d/adblock status 2>/dev/null)" +rep_info="${2}" if [ -x "${adb_logread}" ] then log_info="$("${adb_logread}" -l 100 -e "adblock-" | awk '{NR=1;max=120;if(length($0)>max+1)while($0){if(NR==1){print substr($0,1,max)}else{print substr($0,1,max)}{$0=substr($0,max+1);NR=NR+1}}else print}')" @@ -63,9 +64,13 @@ fi # mail body # adb_mailtext="
"
-adb_mailtext="${adb_mailtext}\\n++\\n++ System Information ++\\n++\\n${sys_info}"
-adb_mailtext="${adb_mailtext}\\n\\n++\\n++ Adblock Information ++\\n++\\n${adb_info}"
-adb_mailtext="${adb_mailtext}\\n\\n++\\n++ Logfile Information ++\\n++\\n${log_info}"
+adb_mailtext="${adb_mailtext}\n++\n++ System Information ++\n++\n${sys_info}"
+adb_mailtext="${adb_mailtext}\n\n++\n++ Adblock Information ++\n++\n${adb_info}"
+if [ -n "${rep_info}" ]
+then
+	adb_mailtext="${adb_mailtext}\n\n++\n++ Report Information ++\n++\n${rep_info}"
+fi
+adb_mailtext="${adb_mailtext}\n\n++\n++ Logfile Information ++\n++\n${log_info}"
 adb_mailtext="${adb_mailtext}
" # send mail -- cgit v1.2.3