From 11252ef643d3059ebbabb861d43826c84aef2b77 Mon Sep 17 00:00:00 2001
From: Dirk Brenken <dev@brenken.org>
Date: Wed, 8 Nov 2023 15:59:08 +0100
Subject: [PATCH] banip: update 0.9.2-2

* support backup/restore for remote allowlists
* report the used log variant in status message

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 2411bcffaf273b901e61193b18f1ca7355dc832f)
---
 net/banip/Makefile                 |  2 +-
 net/banip/files/banip-functions.sh | 28 ++++++++++++++++++++++------
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/net/banip/Makefile b/net/banip/Makefile
index ceadbc0fd8..7c559458f2 100644
--- a/net/banip/Makefile
+++ b/net/banip/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=banip
 PKG_VERSION:=0.9.2
-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-functions.sh b/net/banip/files/banip-functions.sh
index c75a2b5648..db2c15f6bb 100644
--- a/net/banip/files/banip-functions.sh
+++ b/net/banip/files/banip-functions.sh
@@ -674,8 +674,8 @@ f_down() {
 
 	# restore local backups
 	#
-	if { [ "${ban_action}" != "reload" ] || [ "${feed_url}" = "local" ] || [ -n "${ban_etagparm}" ]; } && [ "${feed%v*}" != "allowlist" ] && [ "${feed%v*}" != "blocklist" ]; then
-		if [ -n "${ban_etagparm}" ] && [ "${ban_action}" = "reload" ] && [ "${feed_url}" != "local" ]; then
+	if [ "${feed%v*}" != "blocklist" ]; then
+		if [ -n "${ban_etagparm}" ] && [ "${ban_action}" = "reload" ] && [ "${feed_url}" != "local" ] && [ "${feed%v*}" != "allowlist" ]; then
 			etag_rc="0"
 			if [ "${feed%v*}" = "country" ]; then
 				for country in ${ban_country}; do
@@ -697,16 +697,21 @@ f_down() {
 			fi
 		fi
 		if [ "${etag_rc}" = "0" ] || [ "${ban_action}" != "reload" ] || [ "${feed_url}" = "local" ]; then
-			f_restore "${feed}" "${feed_url}" "${tmp_load}" "${etag_rc}"
+			if [ "${feed%v*}" = "allowlist" ] && [ ! -f "${tmp_allow}" ]; then
+				f_restore "allowlist" "-" "${tmp_allow}" "${etag_rc}"
+			else
+				f_restore "${feed}" "${feed_url}" "${tmp_load}" "${etag_rc}"
+			fi
 			restore_rc="${?}"
 			feed_rc="${restore_rc}"
 		fi
 	fi
 
-	# prepare local allowlist
+	# prepare local/remote allowlist
 	#
 	if [ "${feed%v*}" = "allowlist" ] && [ ! -f "${tmp_allow}" ]; then
 		"${ban_catcmd}" "${ban_allowlist}" 2>/dev/null >"${tmp_allow}"
+		feed_rc="${?}"
 		for feed_url in ${ban_allowurl}; do
 			feed_log="$("${ban_fetchcmd}" ${ban_fetchparm} "${tmp_load}" "${feed_url}" 2>&1)"
 			feed_rc="${?}"
@@ -714,8 +719,15 @@ f_down() {
 				"${ban_catcmd}" "${tmp_load}" 2>/dev/null >>"${tmp_allow}"
 			else
 				f_log "info" "download for feed '${feed%v*}' failed (rc: ${feed_rc:-"-"}/log: ${feed_log})"
+				break
 			fi
 		done
+		if [ "${feed_rc}" = "0" ]; then
+			f_backup "allowlist" "${tmp_allow}"
+		elif [ -z "${restore_rc}" ] && [ "${feed_rc}" != "0" ]; then
+			f_restore "allowlist" "-" "${tmp_allow}" "${feed_rc}"
+		fi
+		feed_rc="${?}"
 	fi
 
 	# handle local feeds
@@ -980,7 +992,11 @@ f_down() {
 	# load generated nft file in banIP table
 	#
 	if [ "${feed_rc}" = "0" ]; then
-		cnt_dl="$("${ban_awkcmd}" 'END{printf "%d",NR}' "${tmp_split}" 2>/dev/null)"
+		if [ "${feed%v*}" = "allowlist" ]; then
+			cnt_dl="$("${ban_awkcmd}" 'END{printf "%d",NR}' "${tmp_allow}" 2>/dev/null)"
+		else
+			cnt_dl="$("${ban_awkcmd}" 'END{printf "%d",NR}' "${tmp_split}" 2>/dev/null)"
+		fi
 		if [ "${cnt_dl:-"0"}" -gt "0" ] || [ "${feed_url}" = "local" ] || [ "${feed%v*}" = "allowlist" ] || [ "${feed%v*}" = "blocklist" ]; then
 			feed_log="$("${ban_nftcmd}" -f "${tmp_nft}" 2>&1)"
 			feed_rc="${?}"
@@ -1098,7 +1114,7 @@ f_genstatus() {
 				cnt_elements="$((cnt_elements + $("${ban_nftcmd}" -j list set inet banIP "${object}" 2>/dev/null | "${ban_jsoncmd}" -qe '@.nftables[*].set.elem[*]' | wc -l 2>/dev/null)))"
 			done
 		fi
-		runtime="action: ${ban_action:-"-"}, fetch: ${ban_fetchcmd##*/}, duration: ${duration:-"-"}, date: $(date "+%Y-%m-%d %H:%M:%S")"
+		runtime="action: ${ban_action:-"-"}, log: ${ban_logreadcmd##*/}, fetch: ${ban_fetchcmd##*/}, duration: ${duration:-"-"}, date: $(date "+%Y-%m-%d %H:%M:%S")"
 	fi
 	[ -s "${ban_customfeedfile}" ] && custom_feed="1"
 	[ "${ban_splitsize:-"0"}" -gt "0" ] && split="1"
-- 
2.30.2