Fix issue on service-setup (#7)

* tag grep on first occurence only * fix grep tag * fix crowdsec-firewall-bouncer Makefile * crowdsec-fix service-setup script Signed-off-by: Kerma Gérald <gandalf@gk2.net> * fix_runas_root: fix empty function Signed-off-by: Kerma Gérald <gandalf@gk2.net>
crowdsecurity · Mar 25, 2022 · c4a1822 · c4a1822
1 parent a058a00
commit c4a1822
Show file tree

Hide file tree

Showing 4 changed files with 278 additions and 278 deletions.
diff --git a/spk/crowdsec-firewall-bouncer/Makefile b/spk/crowdsec-firewall-bouncer/Makefile
@@ -38,17 +38,17 @@ OPTIONAL_DEPENDS = "crowdsec"
 include ../../mk/spksrc.common.mk
 
 ifeq ($(call version_ge, ${TCVERSION}, 7.0),1)
-    CONF_DIR = src/conf_7
-    SPK_GROUP = sc-crowdsec
-    SPK_USER = crowdsec
-    SYSTEM_GROUP = system
-    SERVICE_USER = auto
+	CONF_DIR = src/conf_7
+	SPK_GROUP = sc-crowdsec
+	SPK_USER = crowdsec
+	SYSTEM_GROUP = system
+	SERVICE_USER = auto
 else ifeq ($(call version_ge, ${TCVERSION}, 6.0),1)
-    CONF_DIR = src/conf_6
-    SPK_GROUP = sc-crowdsec
-    SPK_USER = crowdsec
-    SYSTEM_GROUP = system
-    SERVICE_USER = root
+	CONF_DIR = src/conf_6
+	SPK_GROUP = sc-crowdsec
+	SPK_USER = crowdsec
+	SYSTEM_GROUP = system
+	SERVICE_USER = root
 endif
 
 SERVICE_SETUP = src/service-setup.sh

diff --git a/spk/crowdsec-firewall-bouncer/src/service-setup.sh b/spk/crowdsec-firewall-bouncer/src/service-setup.sh
@@ -71,128 +71,128 @@ CSFNAME=${PACKAGE}
 
 GenConfigApiKey ()
 {
-    ## Gen&ConfigApiKey
-    if grep -q "{API_KEY}" "${CSFB_CUSTOMCONFIG}"; then
-        API_KEY=$("${CSCLI}" -c "${CFG_FILE}" bouncers add "${CSFNAME}" -o raw)
-        if [ -n "${API_KEY}" ]; then
-            sed -i "s,^\(\s*api_key\s*:\s*\).*\$,\1${API_KEY}," "${CSFB_CUSTOMCONFIG}"
-        else
-	        echo "ERROR: NO API key registered…"
-        fi
-    else
-        FW_BOUNCER=$("${CSCLI}" -c "${CFG_FILE}" bouncers list | grep "${CSFNAME}")
-        if [ -n "${FW_BOUNCER}" ]; then
-            echo "INFO: API key already registered…"
-        else
-            API_KEY=$(sed -rn "s,^api_key\s*:\s*([^\n]+)$,\1,p" "${CSFB_CUSTOMCONFIG}")
-            if [ -n "${API_KEY}" ]; then
-                NEW_API_KEY=$("${CSCLI}" -c "${CFG_FILE}" bouncers add "${CSFNAME}" -k "${API_KEY}" -o raw)
-                if [ -n "${NEW_API_KEY}" ]; then
-                    if [ "${NEW_API_KEY}" = "${API_KEY}" ]; then
-                        echo "INFO: API key already registered but bouncer re-registered with success…"
-                    else
-                        echo "ERROR: API key already registered but bouncer re-register attempt error!"
-                    fi
-                else
-                    echo "ERROR: API key already registered but bouncer re-registered without success!"
-                fi
-            else
-                echo "ERROR: Unrecoverable API key registration error!"
-            fi
-        fi
-    fi
+	## Gen&ConfigApiKey
+	if grep -q "{API_KEY}" "${CSFB_CUSTOMCONFIG}"; then
+		API_KEY=$("${CSCLI}" -c "${CFG_FILE}" bouncers add "${CSFNAME}" -o raw)
+		if [ -n "${API_KEY}" ]; then
+			sed -i "s,^\(\s*api_key\s*:\s*\).*\$,\1${API_KEY}," "${CSFB_CUSTOMCONFIG}"
+		else
+			echo "ERROR: NO API key registered…"
+		fi
+	else
+		FW_BOUNCER=$("${CSCLI}" -c "${CFG_FILE}" bouncers list | grep "${CSFNAME}")
+		if [ -n "${FW_BOUNCER}" ]; then
+			echo "INFO: API key already registered…"
+		else
+			API_KEY=$(sed -rn "s,^api_key\s*:\s*([^\n]+)$,\1,p" "${CSFB_CUSTOMCONFIG}")
+			if [ -n "${API_KEY}" ]; then
+				NEW_API_KEY=$("${CSCLI}" -c "${CFG_FILE}" bouncers add "${CSFNAME}" -k "${API_KEY}" -o raw)
+				if [ -n "${NEW_API_KEY}" ]; then
+					if [ "${NEW_API_KEY}" = "${API_KEY}" ]; then
+						echo "INFO: API key already registered but bouncer re-registered with success…"
+					else
+						echo "ERROR: API key already registered but bouncer re-register attempt error!"
+					fi
+				else
+					echo "ERROR: API key already registered but bouncer re-registered without success!"
+				fi
+			else
+				echo "ERROR: Unrecoverable API key registration error!"
+			fi
+		fi
+	fi
 }
 
 fix_perms ()
 {
-    # Fix permissions
-    echo "Fix permissions: ${PACKAGE}"
-    chmod ug+Xrw "${PKG_DIR}" -Rf
+	# Fix permissions
+	echo "Fix permissions: ${PACKAGE}"
+	chmod ug+Xrw "${PKG_DIR}" -Rf
 	chmod ug+Xrw "${CONFIGDIR}" -Rf
-    chmod ug+Xrw "${DATA_DIR}" -Rf
-    chmod ug+Xrw "${TMP_DIR}" -Rf
-    chown sc-crowdsec:sc-crowdsec "${PKG_DIR}" -Rf
+	chmod ug+Xrw "${DATA_DIR}" -Rf
+	chmod ug+Xrw "${TMP_DIR}" -Rf
+	chown sc-crowdsec:sc-crowdsec "${PKG_DIR}" -Rf
 	chown sc-crowdsec:sc-crowdsec "${CONFIGDIR}" -Rf
-    chown sc-crowdsec:sc-crowdsec "${DATA_DIR}" -Rf
-    chown sc-crowdsec:sc-crowdsec "${TMP_DIR}" -Rf
+	chown sc-crowdsec:sc-crowdsec "${DATA_DIR}" -Rf
+	chown sc-crowdsec:sc-crowdsec "${TMP_DIR}" -Rf
 }
 
 service_prepare ()
 {
-    fix_perms
-    # Create bouncers dir & permissions if needed
-    if [ ! -d "${CONFIGDIR}/bouncers" ]; then
-        echo "Create initial run directory: ${CONFIGDIR}/bouncers"
-        mkdir -m 0775 -p "${CONFIGDIR}/bouncers"
-        chown sc-crowdsec:sc-crowdsec "${CONFIGDIR}/bouncers" -R
-    fi
-
-    # Create the config file on demand
-    if [ ! -e "${CSFB_CUSTOMCONFIG}" ]; then
-        echo "Create initial bouncer config file: ${CSFB_CUSTOMCONFIG}"
-	    install -m 644 "${CSFB_INITIALCONFIG}" "${CSFB_CUSTOMCONFIG}"
-    fi
-    fix_perms
+	fix_perms
+	# Create bouncers dir & permissions if needed
+	if [ ! -d "${CONFIGDIR}/bouncers" ]; then
+		echo "Create initial run directory: ${CONFIGDIR}/bouncers"
+		mkdir -m 0775 -p "${CONFIGDIR}/bouncers"
+		chown sc-crowdsec:sc-crowdsec "${CONFIGDIR}/bouncers" -R
+	fi
+
+	# Create the config file on demand
+	if [ ! -e "${CSFB_CUSTOMCONFIG}" ]; then
+		echo "Create initial bouncer config file: ${CSFB_CUSTOMCONFIG}"
+		install -m 644 "${CSFB_INITIALCONFIG}" "${CSFB_CUSTOMCONFIG}"
+	fi
+	fix_perms
 }
 
 init_config() {
-    fix_perms
-    # Create the config file on demand
-    if [ ! -e "${CSFB_CUSTOMCONFIG}" ]; then
-        echo "Prepare initial config file: ${CSFB_CUSTOMCONFIG}"
-        service_prepare
-    fi
-
-    # Prepare the config file if needed
-    if [ -e "${CSFB_CUSTOMCONFIG}" ]; then
-        echo "Modify initial config file: ${CSFB_CUSTOMCONFIG}"
-        sed -i "s,^\(\s*pid_dir\s*:\s*\).*\$,\1${CROWDSEC_TMPDIR}/run," "${CSFB_CUSTOMCONFIG}"
-        sed -i "s,^\(\s*log_dir\s*:\s*\).*\$,\1${CROWDSEC_TMPDIR}/log," "${CSFB_CUSTOMCONFIG}"
-        sed -i "s,^\(\s*api_url\s*:\s*\).*\$,\1http://${LAPI_URL}:${LAPI_PORT}/," "${CSFB_CUSTOMCONFIG}"
-
-        ## Gen&ConfigApiKey
-        GenConfigApiKey
-    fi
-
-    # Modify the config file on demand
-    if [ -e "${CSFB_CUSTOMCONFIG}" ]; then
-	    ## CheckFirewall
-	    IPTABLES="true"
-	    which iptables > /dev/null
-	    FW_BACKEND=""
-	    if [[ $? != 0 ]]; then
-	      echo "iptables is not present"
-	      IPTABLES="false"
-	    else
-	      FW_BACKEND="iptables"
-	      echo "iptables found"
-	    fi
-
-	    NFTABLES="true"
-	    which nft > /dev/null
-	    if [[ $? != 0 ]]; then
-	      echo "nftables is not present"
-	      NFTABLES="false"
-	    else
-	      FW_BACKEND="nftables"
-	      echo "nftables found"
-	    fi
-
-	    if [ "${NFTABLES}" = "true" -a "${IPTABLES}" = "true" ]; then
-	      echo "Found nftables(default) and iptables…"
-	    fi
-
-	    if [ "${FW_BACKEND}" = "iptables" ]; then
-	      which ipset > /dev/null
-	      if [[ $? != 0 ]]; then
-	        echo "ipset not found, install it!"
-	      fi
-	    fi
-	    BACKEND=${FW_BACKEND}
-
-	    sed -i "s,^\(\s*mode\s*:\s*\).*\$,\1${BACKEND}," "${CSFB_CUSTOMCONFIG}"
-    fi
-    fix_perms
+	fix_perms
+	# Create the config file on demand
+	if [ ! -e "${CSFB_CUSTOMCONFIG}" ]; then
+		echo "Prepare initial config file: ${CSFB_CUSTOMCONFIG}"
+		service_prepare
+	fi
+
+	# Prepare the config file if needed
+	if [ -e "${CSFB_CUSTOMCONFIG}" ]; then
+		echo "Modify initial config file: ${CSFB_CUSTOMCONFIG}"
+		sed -i "s,^\(\s*pid_dir\s*:\s*\).*\$,\1${CROWDSEC_TMPDIR}/run," "${CSFB_CUSTOMCONFIG}"
+		sed -i "s,^\(\s*log_dir\s*:\s*\).*\$,\1${CROWDSEC_TMPDIR}/log," "${CSFB_CUSTOMCONFIG}"
+		sed -i "s,^\(\s*api_url\s*:\s*\).*\$,\1http://${LAPI_URL}:${LAPI_PORT}/," "${CSFB_CUSTOMCONFIG}"
+
+		## Gen&ConfigApiKey
+		GenConfigApiKey
+	fi
+
+	# Modify the config file on demand
+	if [ -e "${CSFB_CUSTOMCONFIG}" ]; then
+		## CheckFirewall
+		IPTABLES="true"
+		which iptables > /dev/null
+		FW_BACKEND=""
+		if [[ $? != 0 ]]; then
+		  echo "iptables is not present"
+		  IPTABLES="false"
+		else
+		  FW_BACKEND="iptables"
+		  echo "iptables found"
+		fi
+
+		NFTABLES="true"
+		which nft > /dev/null
+		if [[ $? != 0 ]]; then
+		  echo "nftables is not present"
+		  NFTABLES="false"
+		else
+		  FW_BACKEND="nftables"
+		  echo "nftables found"
+		fi
+
+		if [ "${NFTABLES}" = "true" -a "${IPTABLES}" = "true" ]; then
+		  echo "Found nftables(default) and iptables…"
+		fi
+
+		if [ "${FW_BACKEND}" = "iptables" ]; then
+		  which ipset > /dev/null
+		  if [[ $? != 0 ]]; then
+			echo "ipset not found, install it!"
+		  fi
+		fi
+		BACKEND=${FW_BACKEND}
+
+		sed -i "s,^\(\s*mode\s*:\s*\).*\$,\1${BACKEND}," "${CSFB_CUSTOMCONFIG}"
+	fi
+	fix_perms
 }
 
 fix_runas_root ()
@@ -202,55 +202,55 @@ fix_runas_root ()
 
 service_postinst ()
 {
-#    if [ "${SYNOPKG_PKG_STATUS}" == "INSTALL" ]; then    # Create data dir & permissions if needed
-        service_prepare
-#    fi
-    fix_runas_root
+#	if [ "${SYNOPKG_PKG_STATUS}" == "INSTALL" ]; then	# Create data dir & permissions if needed
+		service_prepare
+#	fi
+	fix_runas_root
 }
 
 service_postupgrade ()
 {
-    service_prepare
-    fix_runas_root
+	service_prepare
+	fix_runas_root
 }
 
 load_ipset ()
 {
-    unload_ipset
-    echo "INFO: loading ipset kernel modules from ${MODULES_DIR}"
-    /sbin/insmod /lib/modules/nfnetlink.ko
+	unload_ipset
+	echo "INFO: loading ipset kernel modules from ${MODULES_DIR}"
+	/sbin/insmod /lib/modules/nfnetlink.ko
 	/sbin/insmod "${MODULES_DIR}/kernel/net/netfilter/ipset/ip_set.ko"
-    /sbin/insmod "${MODULES_DIR}/kernel/net/netfilter/ipset/ip_set_hash_net.ko"
+	/sbin/insmod "${MODULES_DIR}/kernel/net/netfilter/ipset/ip_set_hash_net.ko"
 	/sbin/insmod "${MODULES_DIR}/kernel/net/netfilter/xt_set.ko"
 	if [[ $(/sbin/lsmod | grep ip_set_hash_net) ]]; then
-        echo "INFO: ipset kernel modules loaded…"
-    else
-        echo "ERROR: loading ipset kernel modules!"
-    fi
+		echo "INFO: ipset kernel modules loaded…"
+	else
+		echo "ERROR: loading ipset kernel modules!"
+	fi
 }
 
 unload_ipset ()
 {
-    echo "INFO: unloading ipset kernel modules…"
-    /sbin/rmmod ip_set_hash_net --syslog
-    /sbin/rmmod xt_set --syslog
-    /sbin/rmmod ip_set --syslog
-    /sbin/rmmod nfnetlink --syslog
+	echo "INFO: unloading ipset kernel modules…"
+	/sbin/rmmod ip_set_hash_net --syslog
+	/sbin/rmmod xt_set --syslog
+	/sbin/rmmod ip_set --syslog
+	/sbin/rmmod nfnetlink --syslog
 	if [[ ! $(/sbin/lsmod | grep ip_set) ]]; then
-        echo "INFO: ipset kernel modules unloaded…"
-    else
-        echo "ERROR: unloading ipset kernel modules!"
-    fi
+		echo "INFO: ipset kernel modules unloaded…"
+	else
+		echo "ERROR: unloading ipset kernel modules!"
+	fi
 }
 
 service_prestart ()
 {
-    init_config
-    load_ipset
+	init_config
+	load_ipset
 }
 
 service_posttstop ()
 {
-    unload_ipset
+	unload_ipset
 }
 
diff --git a/spk/crowdsec/Makefile b/spk/crowdsec/Makefile
@@ -8,7 +8,7 @@
 
 SPK_NAME = crowdsec
 SPK_VERS = 1.3.0
-SPK_REV = 4
+SPK_REV = 5
 SPK_ICON = src/$(SPK_NAME).png
 
 DISPLAY_NAME = CrowdSec
@@ -33,17 +33,17 @@ DEPENDS = cross/$(SPK_NAME)
 include ../../mk/spksrc.common.mk
 
 ifeq ($(call version_ge, ${TCVERSION}, 7.0),1)
-    CONF_DIR = src/conf_7
-    SPK_GROUP = sc-crowdsec
-    SPK_USER = crowdsec
-    SYSTEM_GROUP = system
-    SERVICE_USER = auto
+	CONF_DIR = src/conf_7
+	SPK_GROUP = sc-crowdsec
+	SPK_USER = crowdsec
+	SYSTEM_GROUP = system
+	SERVICE_USER = auto
 else ifeq ($(call version_ge, ${TCVERSION}, 6.0),1)
-    CONF_DIR = src/conf_6
-    SPK_GROUP = sc-crowdsec
-    SPK_USER = crowdsec
-    SYSTEM_GROUP = system
-    SERVICE_USER = root
+	CONF_DIR = src/conf_6
+	SPK_GROUP = sc-crowdsec
+	SPK_USER = crowdsec
+	SYSTEM_GROUP = system
+	SERVICE_USER = root
 endif
 
 SERVICE_SETUP = src/service-setup.sh