banip: refine/fix nginx search pattern

* fix issue with nginx search pattern reported in forum support thread

Signed-off-by: Dirk Brenken <redacted>

diff --git a/net/banip/Makefile b/net/banip/Makefile
index 7121375e847ef242b03df0842b52727c20e1a0ef..1e7f59caa553e3a3ca0ca3ae1003429d29ff9c33 100644 (file)
--- a/net/banip/Makefile
+++ b/net/banip/Makefile
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=banip
 PKG_VERSION:=0.7.9
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
 

diff --git a/net/banip/files/banip.sh b/net/banip/files/banip.sh
index 88201ba643770cdefd6fffab1e44a074df4ed1ad..31662e159b16a6438f8002a883d2c3ca231ee5ff 100755 (executable)
--- a/net/banip/files/banip.sh
+++ b/net/banip/files/banip.sh
@@ -1254,11 +1254,11 @@ f_main()
                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:].:]+" | \
+                       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}")"
+                               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}"