From 26be379c82ae3ca0d1495dc3c5fb044d37ae3aac Mon Sep 17 00:00:00 2001
From: Dirk Brenken <dev@brenken.org>
Date: Thu, 17 Jun 2021 22:23:24 +0200
Subject: [PATCH] banip: refine/fix nginx search pattern
* fix issue with nginx search pattern reported in forum support thread
Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 0c16840e26ed0a8a808f22a1f5f4dbd265e0a903)
---
net/banip/Makefile | 2 +-
net/banip/files/banip.sh | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/net/banip/Makefile b/net/banip/Makefile
index 7121375e84..1e7f59caa5 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 88201ba643..31662e159b 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}"
--
GitLab