Bump v1.0.9 (#69)

* update the lua lib to v1.0.7
* ensure proper initialization
* bump v1.0.9
* revert formatting change

Author: sabban

Dockerfile

@@ -4,7 +4,7 @@ RUN luarocks install lua-resty-http
 
 FROM with_deps as git
 ARG BUILD_ENV=git
-ARG LUA_LIB_VERSION=v1.0.0
+ARG LUA_LIB_VERSION=v1.0.9
 RUN if [ "$BUILD_ENV" == "git" ]; then apk add --no-cache git; fi
 RUN if [ "$BUILD_ENV" == "git" ]; then git clone -b "${LUA_LIB_VERSION}" https://github.com/crowdsecurity/lua-cs-bouncer.git ; fi
 

Dockerfile.lua-bouncer-plugin

@@ -2,7 +2,7 @@ ARG BUILD_ENV=git
 
 FROM docker.io/alpine:latest as git
 ARG BUILD_ENV=git
-ARG LUA_LIB_VERSION=v1.0.1
+ARG LUA_LIB_VERSION=v1.0.9
 RUN if [ "$BUILD_ENV" == "git" ]; then apk add --no-cache git; fi
 RUN if [ "$BUILD_ENV" == "git" ]; then git clone -b "${LUA_LIB_VERSION}" https://github.com/crowdsecurity/lua-cs-bouncer.git ; fi
 

Makefile

@@ -4,7 +4,7 @@ LUA_DIR="${OUTDIR}lua"
 CONFIG_DIR="${OUTDIR}config"
 TEMPLATE_DIR="${OUTDIR}templates"
 OUT_ARCHIVE="crowdsec-openresty-bouncer.tgz"
-LUA_BOUNCER_BRANCH?=v1.0.1
+LUA_BOUNCER_BRANCH?=v1.0.9
 default: release
 release:
 	git clone -b "${LUA_BOUNCER_BRANCH}" https://github.com/crowdsecurity/lua-cs-bouncer.git

debian/rules

@@ -2,7 +2,7 @@
 
 export DEB_VERSION=$(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
 export BUILD_VERSION=v${DEB_VERSION}-debian-pragmatic
-export LUA_BOUNCER_BRANCH?=v1.0.1
+export LUA_BOUNCER_BRANCH?=v1.0.9
 
 %:
 	dh $@

ingress-nginx/main.lua

@@ -2,13 +2,30 @@ local cs = require "plugins.crowdsec.crowdsec"
 local ngx = ngx
 
 local _M = {}
-local ok, err = cs.init("/etc/nginx/lua/plugins/crowdsec/crowdsec-bouncer.conf", "crowdsec-openresty-bouncer/v1.0.4")
+local ok, err = cs.init("/etc/nginx/lua/plugins/crowdsec/crowdsec-bouncer.conf", "crowdsec-openresty-bouncer/v1.1.0")
 if ok == nil then
     ngx.log(ngx.ERR, "[Crowdsec] " .. err)
     error()
 end
 ngx.log(ngx.ALERT, "[Crowdsec] Initialisation done")
 
+function _M.init_worker()
+    -- This function is called once per worker
+    -- It can be used to initialize the worker
+    -- For example, to load the configuration file
+    local mode = cs.get_mode()
+    if string.lower(mode) == "stream" then
+        ngx.log(ngx.INFO, "Initializing stream mode for worker " .. tostring(ngx.worker.id()))
+        cs.SetupStream()
+    end
+
+    if ngx.worker.id() == 0 then
+        cs.SetupMetrics()
+    end
+    ngx.log(ngx.INFO, "Crowdsec bouncer initialized in " .. mode .. " mode for worker " .. tostring(ngx.worker.id()))
+end
+
+
 function _M.rewrite()
 	cs.Allow(ngx.var.remote_addr)
 end

openresty/crowdsec_openresty.conf

@@ -4,7 +4,7 @@ lua_ssl_trusted_certificate ${SSL_CERTS_PATH};
 
 init_by_lua_block {
 	cs = require "crowdsec"
-	local ok, err = cs.init("/etc/crowdsec/bouncers/crowdsec-openresty-bouncer.conf", "crowdsec-openresty-bouncer/v1.0.4")
+	local ok, err = cs.init("/etc/crowdsec/bouncers/crowdsec-openresty-bouncer.conf", "crowdsec-openresty-bouncer/v1.1.0")
 	if ok == nil then
 		ngx.log(ngx.ERR, "[Crowdsec] " .. err)
 		error()
@@ -29,3 +29,18 @@ access_by_lua_block {
 		cs.Allow(ngx.var.remote_addr)
 	end
 }
+
+
+init_worker_by_lua_block {
+        cs = require "crowdsec"
+        local mode = cs.get_mode()
+        if string.lower(mode) == "stream" then
+           ngx.log(ngx.INFO, "Initializing stream mode for worker " .. tostring(ngx.worker.id()))
+           cs.SetupStream()
+        end
+
+        if ngx.worker.id() == 0 then
+           ngx.log(ngx.INFO, "Initializing metrics for worker " .. tostring(ngx.worker.id()))
+           cs.SetupMetrics()
+        end
+}

rpm/SPECS/crowdsec-openresty-bouncer.spec

@@ -33,7 +33,7 @@ mkdir -p %{buildroot}/usr/local/openresty/nginx/conf/conf.d/
 mkdir -p %{buildroot}/usr/local/openresty/lualib/plugins/crowdsec/
 mkdir -p %{buildroot}/var/lib/crowdsec/lua/templates/
 mkdir -p %{buildroot}/etc/crowdsec/bouncers/
-git clone -b v1.0.1 https://github.com/crowdsecurity/lua-cs-bouncer.git
+git clone -b v1.0.9 https://github.com/crowdsecurity/lua-cs-bouncer.git
 install -m 600 -D lua-cs-bouncer/config_example.conf %{buildroot}/etc/crowdsec/bouncers/%{name}.conf
 install -m 644 -D lua-cs-bouncer/lib/crowdsec.lua %{buildroot}/usr/local/openresty/lualib/
 install -m 644 -D lua-cs-bouncer/lib/plugins/crowdsec/* %{buildroot}/usr/local/openresty/lualib/plugins/crowdsec/