Merge branch 'main' into metrics

crowdsecurity · Dec 13, 2024 · e7e1252 · e7e1252
2 parents 81002cc + 175231e
commit e7e1252
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 7 deletions.
diff --git a/t/01lua_config.t b/t/01lua_config.t
@@ -10,10 +10,15 @@ __DATA__
 load_module /usr/share/nginx/modules/ndk_http_module.so;
 load_module /usr/share/nginx/modules/ngx_http_lua_module.so;
 
---- http
+--- http_config
+lua_package_path "./lib/?.lua;;";
+lua_shared_dict crowdsec_cache 50m;
+
+#  luacov -r lcov
+#  genhtml luacov.report.out -o destination_directory/
 init_by_lua_block {
         cs = require "crowdsec"
-        local ok, err = cs.init("/etc/crowdsec/bouncers/crowdsec-nginx-bouncer.conf", "crowdsec-nginx-bouncer/v1.0.8")
+        local ok, err = cs.init("t/conf_t/01_conf_crowdsec_nginx_bouncer.conf", "crowdsec-nginx-bouncer/v1.0.8")
         if ok == nil then
                 ngx.log(ngx.ERR, "[Crowdsec] " .. err)
                 error()

diff --git a/t/02live.t b/t/02live.t
@@ -31,11 +31,6 @@ init_by_lua_block
 access_by_lua_block {
         local cs = require "crowdsec"
         cs.Allow(ngx.var.remote_addr)
-                if ngx.var.unix == "1" then
-                ngx.log(ngx.DEBUG, "[Crowdsec] Unix socket request ignoring...")
-        else
-                cs.Allow(ngx.var.remote_addr)
-        end
 }
 
 server {

diff --git a/t/conf_t/01_conf_crowdsec_nginx_bouncer.conf b/t/conf_t/01_conf_crowdsec_nginx_bouncer.conf
@@ -0,0 +1,29 @@
+APPSEC_URL=http://127.0.0.1:7422
+ENABLED=true
+API_URL=http://127.0.0.1:8081
+API_KEY=LFrdL+aiecMTSxpGE9vLkx5sGMwdIpgVovpVMfXp3J0
+CACHE_EXPIRATION=1
+# bounce for all type of remediation that the bouncer can receive from the local API
+BOUNCING_ON_TYPE=all
+FALLBACK_REMEDIATION=ban
+REQUEST_TIMEOUT=3000
+UPDATE_FREQUENCY=10
+# live or stream
+MODE=live
+# exclude the bouncing on those location
+EXCLUDE_LOCATION=/v1/decisions
+#those apply for "ban" action
+# /!\ REDIRECT_LOCATION and RET_CODE can't be used together. REDIRECT_LOCATION take priority over RET_CODE
+BAN_TEMPLATE_PATH=./ban
+REDIRECT_LOCATION=
+RET_CODE=
+#those apply for "captcha" action
+#valid providers are recaptcha, hcaptcha, turnstile
+CAPTCHA_PROVIDER=
+# Captcha Secret Key
+SECRET_KEY=
+# Captcha Site key
+SITE_KEY=
+CAPTCHA_TEMPLATE_PATH=/var/lib/crowdsec/lua/templates/captcha.html
+CAPTCHA_EXPIRATION=3600
+#METRICS_PERIOD=60