From 504412ccdbe9e6f1f65b34cf28641ec9aa9b7c22 Mon Sep 17 00:00:00 2001 From: Dirk Brenken Date: Thu, 15 Aug 2019 14:02:30 +0200 Subject: adblock: release 3.8.0 * add support for 'DNS File Reset', where the final DNS blockfile will be purged after DNS backend loading (save storage space). A small background service will be started to trace/handle dns backend reloads/restarts * add support for the 'null' blocking variant in dnsmasq (via addn-hosts), which may provide better response times in dnsmasq * enhance the report & search engine to support the new blocking variants. Search now includes backups & black-/whitelist as well * compressed source list backups are now mandatory (default to '/tmp') * speed up TLD compression * E-Mail notification setup is now integrated in UCI/LuCI * update the LuCI frontend to reflect all changes (separate PR) * drop preliminary dnscrypt-proxy-support (use dnsmasq instead) * drop additional 'dnsjail' blocklist support (not used by anyone) * procd cleanups in init * various shellcheck cleanups * update readme Signed-off-by: Dirk Brenken --- net/adblock/files/adblock.mail | 71 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100755 net/adblock/files/adblock.mail (limited to 'net/adblock/files/adblock.mail') diff --git a/net/adblock/files/adblock.mail b/net/adblock/files/adblock.mail new file mode 100755 index 000000000..3b4d69cb6 --- /dev/null +++ b/net/adblock/files/adblock.mail @@ -0,0 +1,71 @@ +#!/bin/sh +# +# send mail script for adblock notifications +# written by Dirk Brenken (dev@brenken.org) +# Please note: you have to manually install and configure the package 'msmtp' before using this script + +# This is free software, licensed under the GNU General Public License v3. +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +LC_ALL=C +PATH="/usr/sbin:/usr/bin:/sbin:/bin" + +if [ -r "/lib/functions.sh" ] +then + . "/lib/functions.sh" + adb_basever="$(uci_get adblock global adb_basever)" + adb_debug="$(uci_get adblock extra adb_debug "0")" + adb_msender="$(uci_get adblock extra adb_msender "no-reply@adblock")" + adb_mreceiver="$(uci_get adblock extra adb_mreceiver)" + adb_mtopic="$(uci_get adblock extra adb_mtopic "adblock notification")" + adb_mprofile="$(uci_get adblock extra adb_mprofile "adb_notify")" +fi +adb_mail="$(command -v msmtp)" +adb_rc=1 + +if [ "${adb_debug}" -eq 1 ] +then + debug="--debug" +fi + +# mail header & receiver check +# +if [ -z "${adb_mreceiver}" ] +then + logger -p "err" -t "adblock-${adb_basever} [${$}]" "please set the mail receiver with the 'adb_mreceiver' option" + exit ${adb_rc} +fi +adb_mhead="From: ${adb_msender}\\nTo: ${adb_mreceiver}\\nSubject: ${adb_mtopic}\\nReply-to: ${adb_msender}\\nMime-Version: 1.0\\nContent-Type: text/html\\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)" +if [ -f "/var/log/messages" ] +then + log_info="$(awk '/adblock-/{NR=1;max=79;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}' /var/log/messages)" +else + log_info="$(logread -e "adblock-" | awk '{NR=1;max=79;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}')" +fi + +# mail body +# +adb_mtext="

"
+adb_mtext="${adb_mtext}\\n++\\n++ System Information ++\\n++\\n${sys_info}"
+adb_mtext="${adb_mtext}\\n\\n++\\n++ Adblock Information ++\\n++\\n${adb_info}"
+adb_mtext="${adb_mtext}\\n\\n++\\n++ Logfile Information ++\\n++\\n${log_info}"
+adb_mtext="${adb_mtext}

" + +# send mail +# +if [ -x "${adb_mail}" ] +then + printf "%b" "${adb_mhead}${adb_mtext}" 2>/dev/null | "${adb_mail}" ${debug} -a "${adb_mprofile}" "${adb_mreceiver}" >/dev/null 2>&1 + adb_rc=${?} + logger -p "info" -t "adblock-${adb_basever} [${$}]" "mail sent to '${adb_mreceiver}' with rc '${adb_rc}'" +else + logger -p "err" -t "adblock-${adb_basever} [${$}]" "msmtp mail daemon not found" +fi + +exit ${adb_rc} -- cgit v1.2.3