From: Dirk Brenken <redacted>
Date: Thu, 17 Jun 2021 20:23:24 +0000 (+0200)
Subject: banip: refine/fix nginx search pattern
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=0c16840e26ed0a8a808f22a1f5f4dbd265e0a903;p=openwrt-packages.git

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 7121375e8..1e7f59caa 100644
--- 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 88201ba64..31662e159 100755
--- 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}"