Attachment 247430 Details for Bug 276096 – patch for crowdsec-firewall-bouncer 0.0.28.r3

[patch] patch for crowdsec-firewall-bouncer 0.0.28.r3

0001-security-crowdsec-firewall-bouncer-fix-file-quoting.patch (text/plain), 2.12 KB, created by marco on 2024-01-03 12:26:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: marco

Created: 2024-01-03 12:26:03 UTC

Size: 2.12 KB

patch

obsolete

>From 5c30e4c2eebf1d04a3a1e77c8cd95aba53ad1398 Mon Sep 17 00:00:00 2001
>From: marco <marco@crowdsec.net>
>Date: Wed, 3 Jan 2024 13:03:52 +0100
>Subject: [PATCH] security/crowdsec-firewall-bouncer: fix file quoting
>
>When the api key contains a '/' character, if the yaml field is
>not quoted it will include the comment as well. fix: quote the field and
>remove the comment with the bouncer name.
>---
> security/crowdsec-firewall-bouncer/Makefile                   | 2 +-
> security/crowdsec-firewall-bouncer/files/crowdsec_firewall.in | 3 ++-
> 2 files changed, 3 insertions(+), 2 deletions(-)
>
>diff --git a/security/crowdsec-firewall-bouncer/Makefile b/security/crowdsec-firewall-bouncer/Makefile
>index 1c8190e6538d..c07268416620 100644
>--- a/security/crowdsec-firewall-bouncer/Makefile
>+++ b/security/crowdsec-firewall-bouncer/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	crowdsec-firewall-bouncer
>-PORTREVISION=	2
>+PORTREVISION=	3
> DISTVERSIONPREFIX=	v
> DISTVERSION=	0.0.28
> CATEGORIES=	security
>diff --git a/security/crowdsec-firewall-bouncer/files/crowdsec_firewall.in b/security/crowdsec-firewall-bouncer/files/crowdsec_firewall.in
>index 78fed46c27f2..47c4c25cfae1 100644
>--- a/security/crowdsec-firewall-bouncer/files/crowdsec_firewall.in
>+++ b/security/crowdsec-firewall-bouncer/files/crowdsec_firewall.in
>@@ -49,7 +49,7 @@ crowdsec_firewall_precmd() {
>             # THEN, register it to the local API
>             API_KEY=$($CSCLI bouncers add "${crowdsec_firewall_name}" -o raw)
>             if [ -n "$API_KEY" ]; then
>-                sed -i "" "s|^${orig_line}|api_key: ${API_KEY}     # ${crowdsec_firewall_name}|" "${crowdsec_firewall_config}"
>+                sed -i "" "s|^${orig_line}|api_key: '${API_KEY}'|" "${crowdsec_firewall_config}"
>                 echo "Registered: ${crowdsec_firewall_name}"
>             fi
>         fi
>@@ -85,6 +85,7 @@ crowdsec_firewall_stop()
> crowdsec_firewall_start() {
>     # ensure we have a backend if the config file was not patched
>     export BACKEND=pf
>+    # shellcheck disable=SC2086
>     /usr/sbin/daemon -f -p "$pidfile" -t "$desc" -- \
>         "$command" -c "$crowdsec_firewall_config" ${crowdsec_firewall_flags}
> }
>-- 
>2.40.1
>

Flags:

marco: maintainer-approval+

Actions: View | Diff

Attachments on bug 276096: 247430