From 55d663d291419731b1ff49600adc89ac389aee13 Mon Sep 17 00:00:00 2001 From: Dirk Brenken Date: Wed, 17 Feb 2021 21:24:44 +0100 Subject: [PATCH] banip: update to 0.7.2 * add scanning for suspicious nginx events * add a log counter to track the number of the failed requests or login repetitions of the same ip in the log before banning, defaults are: ssh (3), luci (3), nginx (5) * optimize the background service handling * add 'greensnow' as a new source * update readme and LuCI frontend regarding the new log count options Signed-off-by: Dirk Brenken --- net/banip/Makefile | 4 +- net/banip/files/README.md | 62 +++++++++++++----------- net/banip/files/banip.init | 1 - net/banip/files/banip.service | 2 +- net/banip/files/banip.sh | 90 +++++++++++++++++++++++++++-------- net/banip/files/banip.sources | 8 +++- 6 files changed, 113 insertions(+), 54 deletions(-) diff --git a/net/banip/Makefile b/net/banip/Makefile index f70bdb08e6..69f3cee774 100644 --- a/net/banip/Makefile +++ b/net/banip/Makefile @@ -6,8 +6,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=banip -PKG_VERSION:=0.7.1 -PKG_RELEASE:=2 +PKG_VERSION:=0.7.2 +PKG_RELEASE:=1 PKG_LICENSE:=GPL-3.0-or-later PKG_MAINTAINER:=Dirk Brenken diff --git a/net/banip/files/README.md b/net/banip/files/README.md index a9f2f41183..498c95baa6 100644 --- a/net/banip/files/README.md +++ b/net/banip/files/README.md @@ -8,34 +8,35 @@ IP address blocking is commonly used to protect against brute force attacks, pre ## Main Features * Support of the following fully pre-configured domain blocklist sources (free for private usage, for commercial use please check their individual licenses) -| Source | Focus | Information | -| :------------------ | :--------------------------: | :-------------------------------------------------------------------------------- | -| asn | ASN block | [Link](https://asn.ipinfo.app) | -| bogon | Bogon prefixes | [Link](https://team-cymru.com) | -| country | Country blocks | [Link](https://www.ipdeny.com/ipblocks) | -| darklist | Attacker IP blacklist | [Link](https://darklist.de) | -| debl | Fail2ban IP blacklist | [Link](https://www.blocklist.de) | -| doh | Public DoH-Provider | [Link](https://github.com/dibdot/DoH-IP-blocklists) | -| drop | Spamhaus drop compilation | [Link](https://www.spamhaus.org) | -| dshield | Dshield IP blocklist | [Link](https://www.dshield.org) | -| edrop | Spamhaus edrop compilation | [Link](https://www.spamhaus.org) | -| feodo | Feodo Tracker | [Link](https://feodotracker.abuse.ch) | -| firehol1 | Firehol Level 1 compilation | [Link](https://iplists.firehol.org/?ipset=firehol_level1) | -| firehol2 | Firehol Level 2 compilation | [Link](https://iplists.firehol.org/?ipset=firehol_level2) | -| firehol3 | Firehol Level 3 compilation | [Link](https://iplists.firehol.org/?ipset=firehol_level3) | -| firehol4 | Firehol Level 4 compilation | [Link](https://iplists.firehol.org/?ipset=firehol_level4) | -| iblockads | Advertising blocklist | [Link](https://www.iblocklist.com) | -| iblockspy | Malicious spyware blocklist | [Link](https://www.iblocklist.com) | -| myip | Myip Live IP blacklist | [Link](https://myip.ms) | -| nixspam | iX spam protection | [Link](http://www.nixspam.org) | -| proxy | Firehol list of open proxies | [Link](https://iplists.firehol.org/?ipset=proxylists) | -| ssbl | SSL botnet IP blacklist | [Link](https://sslbl.abuse.ch) | -| threat | Emerging Threats | [Link](https://rules.emergingthreats.net) | -| tor | Tor exit nodes | [Link](https://fissionrelays.net/lists) | -| uceprotect1 | Spam protection level 1 | [Link](http://www.uceprotect.net/en/index.php) | -| uceprotect2 | Spam protection level 2 | [Link](http://www.uceprotect.net/en/index.php) | -| voip | VoIP fraud blocklist | [Link](http://www.voipbl.org) | -| yoyo | Ad protection blacklist | [Link](https://pgl.yoyo.org/adservers/) | +| Source | Focus | Information | +| :------------------ | :----------------------------: | :-------------------------------------------------------------------------------- | +| asn | ASN block | [Link](https://asn.ipinfo.app) | +| bogon | Bogon prefixes | [Link](https://team-cymru.com) | +| country | Country blocks | [Link](https://www.ipdeny.com/ipblocks) | +| darklist | blocks suspicious attacker IPs | [Link](https://darklist.de) | +| debl | Fail2ban IP blacklist | [Link](https://www.blocklist.de) | +| doh | Public DoH-Provider | [Link](https://github.com/dibdot/DoH-IP-blocklists) | +| drop | Spamhaus drop compilation | [Link](https://www.spamhaus.org) | +| dshield | Dshield IP blocklist | [Link](https://www.dshield.org) | +| edrop | Spamhaus edrop compilation | [Link](https://www.spamhaus.org) | +| feodo | Feodo Tracker | [Link](https://feodotracker.abuse.ch) | +| firehol1 | Firehol Level 1 compilation | [Link](https://iplists.firehol.org/?ipset=firehol_level1) | +| firehol2 | Firehol Level 2 compilation | [Link](https://iplists.firehol.org/?ipset=firehol_level2) | +| firehol3 | Firehol Level 3 compilation | [Link](https://iplists.firehol.org/?ipset=firehol_level3) | +| firehol4 | Firehol Level 4 compilation | [Link](https://iplists.firehol.org/?ipset=firehol_level4) | +| greensnow | blocks suspicious server IPs | [Link](https://greensnow.co) | +| iblockads | Advertising blocklist | [Link](https://www.iblocklist.com) | +| iblockspy | Malicious spyware blocklist | [Link](https://www.iblocklist.com) | +| myip | Myip Live IP blacklist | [Link](https://myip.ms) | +| nixspam | iX spam protection | [Link](http://www.nixspam.org) | +| proxy | Firehol list of open proxies | [Link](https://iplists.firehol.org/?ipset=proxylists) | +| ssbl | SSL botnet IP blacklist | [Link](https://sslbl.abuse.ch) | +| threat | Emerging Threats | [Link](https://rules.emergingthreats.net) | +| tor | Tor exit nodes | [Link](https://fissionrelays.net/lists) | +| uceprotect1 | Spam protection level 1 | [Link](http://www.uceprotect.net/en/index.php) | +| uceprotect2 | Spam protection level 2 | [Link](http://www.uceprotect.net/en/index.php) | +| voip | VoIP fraud blocklist | [Link](http://www.voipbl.org) | +| yoyo | Ad protection blacklist | [Link](https://pgl.yoyo.org/adservers/) | * zero-conf like automatic installation & setup, usually no manual changes needed * automatically selects one of the following download utilities: aria2c, curl, uclient-fetch, wget @@ -150,6 +151,11 @@ Available commands: | ban_maclist_timeout | option | - | individual maclist IPSet timeout | | ban_whitelist_timeout | option | - | individual whitelist IPSet timeout | | ban_blacklist_timeout | option | - | individual blacklist IPSet timeout | +| ban_logterms | list | dropbear, sshd, luci, nginx | limit the log monitor to certain log terms | +| ban_loglimit | option | 100 | parse only the last stated number of log entries for suspicious events | +| ban_ssh_logcount | option | 3 | number of the failed ssh login repetitions of the same ip in the log before banning | +| ban_luci_logcount | option | 3 | number of the failed luci login repetitions of the same ip in the log before banning | +| ban_nginx_logcount | option | 5 | number of the failed nginx requests of the same ip in the log before banning | ## Examples **list/edit banIP sources:** diff --git a/net/banip/files/banip.init b/net/banip/files/banip.init index 47f274daa8..05e380ba4d 100755 --- a/net/banip/files/banip.init +++ b/net/banip/files/banip.init @@ -339,7 +339,6 @@ service_triggers() fi if [ -n "${iface}" ] then - procd_add_interface_trigger "interface.*.up" "${iface}" "${ban_init}" "start" fi procd_add_reload_trigger "banip" diff --git a/net/banip/files/banip.service b/net/banip/files/banip.service index d41c8a28da..45e2babb67 100755 --- a/net/banip/files/banip.service +++ b/net/banip/files/banip.service @@ -30,7 +30,7 @@ f_log() if [ -x "${ban_logread}" ] then f_log "info" "log/banIP service started" - "${ban_logread}" -f | { grep -q "${ban_search}"; [ "${?}" = "0" ] && /etc/init.d/banip refresh; } + "${ban_logread}" -f | { grep -qE "${ban_search}"; [ "${?}" = "0" ] && { /etc/init.d/banip refresh; exit 0; }; } else f_log "err" "can't start log/banIP service" fi diff --git a/net/banip/files/banip.sh b/net/banip/files/banip.sh index 3b78e03d0b..179f6f4583 100755 --- a/net/banip/files/banip.sh +++ b/net/banip/files/banip.sh @@ -12,7 +12,7 @@ export LC_ALL=C export PATH="/usr/sbin:/usr/bin:/sbin:/bin" set -o pipefail -ban_ver="0.7.1" +ban_ver="0.7.2" ban_enabled="0" ban_mail_enabled="0" ban_proto4_enabled="0" @@ -25,6 +25,9 @@ ban_autoblacklist="1" ban_autowhitelist="1" ban_logterms="" ban_loglimit="100" +ban_ssh_logcount="3" +ban_luci_logcount="3" +ban_nginx_logcount="5" ban_mailactions="" ban_search="" ban_devs="" @@ -41,6 +44,7 @@ ban_ipt6_savecmd="$(command -v ip6tables-save)" ban_ipt6_restorecmd="$(command -v ip6tables-restore)" ban_ipset_cmd="$(command -v ipset)" ban_logger_cmd="$(command -v logger)" +ban_logread="$(command -v logread)" ban_allsources="" ban_sources="" ban_asns="" @@ -89,11 +93,11 @@ f_load() # if [ "${ban_enabled}" = "0" ] then - f_bgsrv "stop" f_ipset "destroy" f_jsnup "disabled" f_rmbckp f_rmtmp + f_bgsrv "stop" f_log "info" "banIP is currently disabled, please set the config option 'ban_enabled' to '1' to use this service" exit 0 fi @@ -234,7 +238,7 @@ f_conf() ban_target_dst="${ban_logchain_dst}" fi ban_localsources="${ban_localsources:-"maclist whitelist blacklist"}" - ban_logterms="${ban_logterms:-"dropbear sshd luci"}" + ban_logterms="${ban_logterms:-"dropbear sshd luci nginx"}" f_log "debug" "f_conf ::: ifaces: ${ban_ifaces:-"-"}, chain: ${ban_chain}, set_type: ${ban_global_settype}, log_chains (src/dst): ${ban_logchain_src}/${ban_logchain_dst}, targets (src/dst): ${ban_target_src}/${ban_target_dst}" f_log "debug" "f_conf ::: lan_inputs (4/6): ${ban_lan_inputchains_4}/${ban_lan_inputchains_6}, lan_forwards (4/6): ${ban_lan_forwardchains_4}/${ban_lan_forwardchains_6}, wan_inputs (4/6): ${ban_wan_inputchains_4}/${ban_wan_inputchains_6}, wan_forwards (4/6): ${ban_wan_forwardchains_4}/${ban_wan_forwardchains_6}" f_log "debug" "f_conf ::: local_sources: ${ban_localsources:-"-"}, extra_sources: ${ban_extrasources:-"-"}, log_terms: ${ban_logterms:-"-"}, log_prefixes (src/dst): ${ban_logprefix_src}/${ban_logprefix_dst}, log_options (src/dst): ${ban_logopts_src}/${ban_logopts_dst}" @@ -912,23 +916,31 @@ f_bgsrv() { local bg_pid action="${1}" - bg_pid="$(pgrep -f "^/bin/sh ${ban_logservice}|logread -f|^grep -q Exit|^grep -q error|^grep -q luci" | awk '{ORS=" "; print $1}')" - if [ -z "${bg_pid}" ] && [ "${action}" = "start" ] && [ -x "${ban_logservice}" ] && [ "${ban_monitor_enabled}" = "1" ] + bg_pid="$(pgrep -f "^/bin/sh ${ban_logservice}|${ban_logread}|^grep -qE Exit before auth|^grep -qE error: maximum|^grep -qE luci: failed|^grep -qE nginx" | awk '{ORS=" "; print $1}')" + if [ "${action}" = "start" ] && [ -x "${ban_logservice}" ] && [ "${ban_monitor_enabled}" = "1" ] then + if [ -n "${bg_pid}" ] + then + kill -HUP "${bg_pid}" 2>/dev/null + fi if [ -n "$(printf "%s\n" "${ban_logterms}" | grep -F "dropbear")" ] then - ban_search="Exit before auth from\|" + ban_search="Exit before auth from|" fi if [ -n "$(printf "%s\n" "${ban_logterms}" | grep -F "sshd")" ] then - ban_search="${ban_search}error: maximum authentication attempts exceeded\|sshd.*Connection closed by.*\[preauth\]\|" + ban_search="${ban_search}error: maximum authentication attempts exceeded|sshd.*Connection closed by.*\[preauth\]|" fi if [ -n "$(printf "%s\n" "${ban_logterms}" | grep -F "luci")" ] then - ban_search="${ban_search}luci: failed login" + ban_search="${ban_search}luci: failed login|" + fi + if [ -n "$(printf "%s\n" "${ban_logterms}" | grep -F "nginx")" ] + then + ban_search="${ban_search}nginx\[[0-9]+\]:.*\[error\].*open().*client: [[:alnum:].:]+" fi ( "${ban_logservice}" "${ban_ver}" "${ban_search}" & ) - elif [ -n "${bg_pid}" ] && [ "${action}" = "stop" ] + elif [ "${action}" = "stop" ] && [ -n "${bg_pid}" ] then kill -HUP "${bg_pid}" 2>/dev/null fi @@ -1137,26 +1149,65 @@ f_down() # f_main() { - local src_name src_url_4 src_rule_4 src_url_6 src_rule_6 src_comp src_rc src_ts log_raw log_merge hold err_file cnt_file cnt=0 + local src_name src_url_4 src_rule_4 src_url_6 src_rule_6 src_comp src_rc src_ts log_raw log_merge log_ips log_count hold err_file cnt_file cnt=0 # prepare logfile excerpts (dropbear, sshd, luci) # if [ "${ban_autoblacklist}" = "1" ] || [ "${ban_monitor_enabled}" = "1" ] then - log_raw="$(logread -l "${ban_loglimit}")" + log_raw="$(${ban_logread} -l "${ban_loglimit}")" if [ -n "$(printf "%s\n" "${ban_logterms}" | grep -F "dropbear")" ] then - log_merge="$(printf "%s\n" "${log_raw}" | grep "Exit before auth from" | awk 'match($0,/<[0-9A-f:\.]+:/){printf "%s\n",substr($0,RSTART+1,RLENGTH-2)}')" + log_ips="$(printf "%s\n" "${log_raw}" | grep -E "Exit before auth from" | \ + awk 'match($0,/<[0-9A-f:\.]+:/){printf "%s\n",substr($0,RSTART+1,RLENGTH-2)}' | awk '!seen[$NF]++' | awk '{ORS=" ";print $NF}')" + for ip in ${log_ips} + do + log_count="$(printf "%s\n" "${log_raw}" | grep -cE "Exit before auth from <${ip}")" + if [ "${log_count}" -ge "${ban_ssh_logcount}" ] + then + log_merge="${log_merge} ${ip}" + fi + done fi if [ -n "$(printf "%s\n" "${ban_logterms}" | grep -F "sshd")" ] then - log_merge="${log_merge} $(printf "%s\n" "${log_raw}" | grep "error: maximum authentication attempts exceeded\|sshd.*Connection closed by.*\[preauth\]" | awk 'match($0,/[0-9A-f:\.]+ port/){printf "%s\n",substr($0,RSTART,RLENGTH-5)}')" + log_ips="$(printf "%s\n" "${log_raw}" | grep -E "error: maximum authentication attempts exceeded|sshd.*Connection closed by.*\[preauth\]" | \ + awk 'match($0,/[0-9A-f:\.]+ port/){printf "%s\n",substr($0,RSTART,RLENGTH-5)}' | awk '!seen[$NF]++' | awk '{ORS=" ";print $NF}')" + for ip in ${log_ips} + do + log_count="$(printf "%s\n" "${log_raw}" | grep -cE "error: maximum authentication attempts exceeded.*${ip}|sshd.*Connection closed by.*${ip}.*\[preauth\]")" + if [ "${log_count}" -ge "${ban_ssh_logcount}" ] + then + log_merge="${log_merge} ${ip}" + fi + done fi if [ -n "$(printf "%s\n" "${ban_logterms}" | grep -F "luci")" ] then - log_merge="${log_merge} $(printf "%s\n" "${log_raw}" | grep "luci: failed login on " | awk 'match($0,/[0-9A-f:\.]+$/){printf "%s\n",substr($0,RSTART,RLENGTH)}')" + log_ips="$(printf "%s\n" "${log_raw}" | grep -E "luci: failed login on " | \ + awk 'match($0,/[0-9A-f:\.]+$/){printf "%s\n",substr($0,RSTART,RLENGTH)}' | awk '!seen[$NF]++' | awk '{ORS=" ";print $NF}')" + for ip in ${log_ips} + do + log_count="$(printf "%s\n" "${log_raw}" | grep -cE "luci: failed login on .*from ${ip}")" + if [ "${log_count}" -ge "${ban_luci_logcount}" ] + then + log_merge="${log_merge} ${ip}" + fi + done + fi + if [ -n "$(printf "%s\n" "${ban_logterms}" | grep -F "nginx")" ] + then + log_ips="$(printf "%s\n" "${log_raw}" | grep -oE "nginx\[[0-9]+\]:.*\[error\].*open().*client: [[:alnum:].:]+" | \ + awk '!seen[$NF]++' | awk '{ORS=" ";print $NF}')" + for ip in ${log_ips} + do + log_count="$(printf "%s\n" "${log_raw}" | grep -cE "nginx\[[0-9]+\]:.*\[error\].*open().*client: ${ip}")" + if [ "${log_count}" -ge "${ban_nginx_logcount}" ] + then + log_merge="${log_merge} ${ip}" + fi + done fi - log_merge="$(printf "%s" "${log_merge}" | awk '{ORS=" ";print $0}')" fi # prepare new black- and whitelist entries @@ -1334,9 +1385,9 @@ f_main() fi done f_log "info" "${ban_setcnt} IPSets with overall ${ban_cnt} IPs/Prefixes loaded successfully (${ban_sysver})" - f_bgsrv "start" f_jsnup f_rmtmp + f_bgsrv "start" } # query ipsets for certain IP @@ -1699,13 +1750,12 @@ fi f_load case "${ban_action}" in "stop") - f_bgsrv "stop" f_ipset "destroy" f_jsnup "stopped" f_rmbckp + f_bgsrv "stop" ;; "restart") - f_bgsrv "stop" f_ipset "destroy" f_rmbckp f_env @@ -1714,17 +1764,16 @@ case "${ban_action}" in "suspend") if [ "${ban_status}" = "enabled" ] then - f_bgsrv "stop" f_jsnup "running" f_ipset "suspend" f_jsnup "paused" + f_bgsrv "stop" fi f_rmtmp ;; "resume") if [ "${ban_status}" = "paused" ] then - f_bgsrv "stop" f_env f_main else @@ -1744,7 +1793,6 @@ case "${ban_action}" in fi ;; "start"|"reload"|"refresh") - f_bgsrv "stop" f_env f_main ;; diff --git a/net/banip/files/banip.sources b/net/banip/files/banip.sources index c08609ca21..3255e4fa48 100644 --- a/net/banip/files/banip.sources +++ b/net/banip/files/banip.sources @@ -26,7 +26,7 @@ "darklist": { "url_4": "https://darklist.de/raw.php", "rule_4": "/^(([0-9]{1,3}\\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])(\\/(1?[0-9]|2?[0-9]|3?[0-2]))?)([[:space:]]|$)/{print \"add darklist_4 \"$1}", - "focus": "Attacker IP blacklist", + "focus": "Blocks suspicious attacker IPs", "descurl": "https://darklist.de" }, "debl": { @@ -95,6 +95,12 @@ "focus": "Firehol Level 4 compilation", "descurl": "https://iplists.firehol.org/?ipset=firehol_level4" }, + "greensnow": { + "url_4": "https://blocklist.greensnow.co/greensnow.txt", + "rule_4": "/^(([0-9]{1,3}\\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])(\\/(1?[0-9]|2?[0-9]|3?[0-2]))?)([[:space:]]|$)/{print \"add greensnow_4 \"$1}", + "focus": "Blocks suspicious server IPs", + "descurl": "https://greensnow.co" + }, "iblockads": { "url_4": "https://list.iblocklist.com/?list=dgxtneitpuvgqqcpfulq&fileformat=cidr&archiveformat=gz", "rule_4": "/^(([0-9]{1,3}\\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])(\\/(1?[0-9]|2?[0-9]|3?[0-2]))?)([[:space:]]|$)/{print \"add iblockads_4 \"$1}", -- 2.30.2