Reduce API hits and reduce complexity of iptables/nft client bash scr…

…ipts.
palner · Oct 21, 2020 · 7da0749 · 7da0749
1 parent bc13c72
commit 7da0749
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 25 deletions.
diff --git a/clients/bash/apiban-nft.sh b/clients/bash/apiban-nft.sh
@@ -30,8 +30,7 @@ if [ ! -e "${CONFIG}" ] ; then
 fi
 
 # APIKEY and last known ID are stored in apibanconfig.sys
-APIKEY=$(grep "APIKEY" $CONFIG | cut -d '=' -f 2)
-LKID=$(grep "LKID" $CONFIG | cut -d '=' -f 2)
+source $CONFIG
 
 # Exit if no APIKEY
 if [ -v "$APIKEY" ] ; then
@@ -54,8 +53,9 @@ if [ -z "$CURRIPS" ] ; then
     nft insert rule ip filter FORWARD counter jump APIBAN
 fi
 
-IPADDRESS=$(curl -s https://apiban.org/api/$APIKEY/banned/$LKID | jq -r ".ipaddress?")
-CURRID=$(curl -s https://apiban.org/api/$APIKEY/banned/$LKID | jq -r ".ID?")
+BANLIST=$(curl -s https://apiban.org/api/$APIKEY/banned/$LKID)
+IPADDRESS=$(echo $BANLIST | jq -r ".ipaddress? | .[]")
+CURRID=$(echo $BANLIST | jq -r ".ID?")
 
 # No new bans
 if [ "$CURRID" = "none" ] ; then
@@ -74,14 +74,7 @@ fi
 sed -i "s/^\(LKID=\).*$/\1${CURRID}/" $CONFIG
 
 # parse through IPs
-IPADDRESS=${IPADDRESS//$'\n'/}
-IPADDRESS=${IPADDRESS//$'\"'/}
-IPADDRESS=${IPADDRESS//$'['/}
-IPADDRESS=${IPADDRESS//$']'/}
-IPADDRESS=${IPADDRESS//$', '/}
-
-IPADDRESSARR=($IPADDRESS)
-
+IPADDRESSARR=(${IPADDRESS//$'\"'/})
 for i in "${IPADDRESSARR[@]}"
 do
   NOW=$(date +"%Y-%m-%d %H:%M:%S")

diff --git a/clients/bash/apiban.sh b/clients/bash/apiban.sh
@@ -30,8 +30,7 @@ if [ ! -e "${CONFIG}" ] ; then
 fi
 
 # APIKEY and last known ID are stored in apibanconfig.sys
-APIKEY=$(grep "APIKEY" $CONFIG | cut -d '=' -f 2)
-LKID=$(grep "LKID" $CONFIG | cut -d '=' -f 2)
+source $CONFIG
 
 # Exit if no APIKEY
 if [ -v "$APIKEY" ] ; then
@@ -54,8 +53,9 @@ if [ -z "$CURRIPS" ] ; then
     iptables -I FORWARD -j APIBAN
 fi
 
-IPADDRESS=$(curl -s https://apiban.org/api/$APIKEY/banned/$LKID | jq -r ".ipaddress?")
-CURRID=$(curl -s https://apiban.org/api/$APIKEY/banned/$LKID | jq -r ".ID?")
+BANLIST=$(curl -s https://apiban.org/api/$APIKEY/banned/$LKID)
+IPADDRESS=$(echo $BANLIST | jq -r ".ipaddress? | .[]")
+CURRID=$(echo $BANLIST | jq -r ".ID?")
 
 # No new bans
 if [ "$CURRID" = "none" ] ; then
@@ -74,14 +74,7 @@ fi
 sed -i "s/^\(LKID=\).*$/\1${CURRID}/" $CONFIG
 
 # parse through IPs
-IPADDRESS=${IPADDRESS//$'\n'/}
-IPADDRESS=${IPADDRESS//$'\"'/}
-IPADDRESS=${IPADDRESS//$'['/}
-IPADDRESS=${IPADDRESS//$']'/}
-IPADDRESS=${IPADDRESS//$', '/}
-
-IPADDRESSARR=($IPADDRESS)
-
+IPADDRESSARR=(${IPADDRESS//$'\"'/})
 for i in "${IPADDRESSARR[@]}"
 do
   NOW=$(date +"%Y-%m-%d %H:%M:%S")
@@ -93,4 +86,4 @@ do
   fi
 done
 
-echo "$NOW - All done. Exiting." >> $LOG
+echo "$NOW - All done. Exiting." >> $LOG