From ad482533facdc3faad37278bef498378e67ef280 Mon Sep 17 00:00:00 2001
From: AR2000 <ar2000@ar2000.me>
Date: Thu, 16 Jan 2025 15:33:16 +0100
Subject: [PATCH] add jq to container

---
 Dockerfile | 8 ++++----
 bouncer.sh | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 56d5251..13a619b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,20 +1,20 @@
 ARG IPTABLES_MODE=nft
 
 #install iptables
-FROM ubuntu:noble AS iptables
+FROM ubuntu:noble AS apt
 RUN --mount=type=cache,target=/var/lib/apt/lists,sharing=locked --mount=type=cache,target=/var/cache/apt,sharing=locked <<EOF
 apt update
 apt upgrade -y
-apt install iptables -y
+apt install iptables jq -y
 EOF
 
 #set alternative to use iptables-legacy
-FROM iptables AS iptables-legacy
+FROM apt AS iptables-legacy
 RUN update-alternatives --set iptables /usr/sbin/iptables-legacy
 RUN update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy
 
 #set alternative to use iptables-nft
-FROM iptables AS iptables-nft
+FROM apt AS iptables-nft
 RUN update-alternatives --set iptables /usr/sbin/iptables-nft
 RUN update-alternatives --set ip6tables /usr/sbin/ip6tables-nft
 
diff --git a/bouncer.sh b/bouncer.sh
index eec8534..711bcbe 100755
--- a/bouncer.sh
+++ b/bouncer.sh
@@ -63,7 +63,7 @@ function processAction() {
 }
 
 while read line; do
-  echo "$line"
-  processAction "$(echo "$line" | jq -r .action)" "$(echo "$line" | jq -r .value)" "$(echo "$line" | jq -r .duration)" "$(echo "$line" | jq -r .scenario)"
+  echo processAction $(echo "$line" | jq -r .action) $(echo "$line" | jq -r .value) $(echo "$line" | jq -r .duration) $(echo "$line" | jq -r .scenario) | tee bouncer.sh.out
+  processAction $(echo "$line" | jq -r .action) $(echo "$line" | jq -r .value) $(echo "$line" | jq -r .duration) $(echo "$line" | jq -r .scenario)
 done
 #{"duration":"-1h1m9s","origin":"CAPI","scenario":"crowdsecurity/ssh-bf","scope":"Ip","type":"ban","value":"122.117.32.192","id":22739513,"action":"del"}