From 3100810052b89e8b68342681f9d50ba30bfdd650 Mon Sep 17 00:00:00 2001 From: AR2000 Date: Thu, 16 Jan 2025 14:33:05 +0100 Subject: [PATCH] test --- Dockerfile | 1 + bouncer.sh | 56 +++++--------------------------------------------- publish-dev.sh | 3 +++ 3 files changed, 9 insertions(+), 51 deletions(-) create mode 100755 publish-dev.sh diff --git a/Dockerfile b/Dockerfile index 26e3693..56d5251 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,6 +33,7 @@ COPY --from=build-stage /app/cs-custom-bouncer/crowdsec-custom-bouncer \ /usr/bin/crowdsec-custom-bouncer COPY --from=build-stage /app/cs-custom-bouncer/config/crowdsec-custom-bouncer.yaml \ /crowdsec-custom-bouncer.yaml +RUN sed -i "s/total_retries: .*/total_retries: 1/g" /crowdsec-custom-bouncer.yaml ADD --chmod=770 bouncer.sh /bouncer.sh ENV BINARY_PATH=/bouncer.sh LABEL me.ar2000.gitea.buildargs.iptablesmode="${IPTABLES_MODE}" diff --git a/bouncer.sh b/bouncer.sh index b7413b4..83af966 100755 --- a/bouncer.sh +++ b/bouncer.sh @@ -1,52 +1,6 @@ #!/bin/bash -# -# Script to add /remove IPs to iptables - -[[ -n "${IPTABLES_COMMENT}" ]] && comment="-m comment --comment \"$4\"" || comment="" -: ${IPTABLES_CHAIN:=INPUT} - -function iptableAdd () { - if [[ -z "${IPTABLES_INSERT}" ]]; then - iptables $comment -A $IPTABLES_CHAIN -s "$1" -j DROP - - else - iptables $comment -I $IPTABLES_CHAIN "$IPTABLES_INSERT" -s "$1" -j DROP - fi -} - -function iptableDel () { - iptables $comment -D $IPTABLES_CHAIN -s "$1" -j DROP -} - -function ip6tableAdd () { - if [[ -z "${IPTABLES_INSERT}" ]]; then - ip6tables $comment -A $IPTABLES_CHAIN -s "$1" -j DROP - else - ip6tables $comment -I $IPTABLES_CHAIN "$IPTABLES_INSERT" -s "$1" -j DROP - fi -} - -function ip6tableDel () { - ip6tables $comment -D $IPTABLES_CHAIN -s "$1" -j DROP -} - -#determine action -if [ "$1" = "add" ]; then #add - if [[ "$2" =~ .*[.].* ]]; then #ipv4 - echo "add $2 for $3 with $4" - iptableAdd "$2" - elif [[ "$2" =~ .*[:].* ]]; then #ipv6 - echo "IPV6 : add $2 for $3 with $4" - ip6tableAdd "$2" - fi -elif [ "$1" = "del" ]; then #del - if [[ "$2" =~ .*[.].* ]]; then #ipv4 - echo "del $2 for $3 with $4" - iptableDel "$2" - elif [[ "$2" =~ .*[:].* ]]; then #ipv6 - echo "IPV6 : add $2 for $3 with $4" - ip6tableDel "$2" - fi -else - echo "unknown action" -fi \ No newline at end of file +echo test >> /bouncer.stdin.out +while read line +do + echo "$line" >> /bouncer.stdin.out +done \ No newline at end of file diff --git a/publish-dev.sh b/publish-dev.sh new file mode 100755 index 0000000..910261e --- /dev/null +++ b/publish-dev.sh @@ -0,0 +1,3 @@ +#!/bin/bash +docker image tag gitea.ar2000.me/ar2000/crowdsec-legacy-firewall-bouncer:legacy gitea.ar2000.me/ar2000/crowdsec-legacy-firewall-bouncer:dev +docker push gitea.ar2000.me/ar2000/crowdsec-legacy-firewall-bouncer:dev