🐛 Add / in regexp for LAPI key (#117)

* Exemples -> Examples

* Exemples -> Examples

* Uppercase

* Uppercase v2

* Uppercase v3

* Uppercases

* Another one

* Add whoami because .gitignore is ignoring conf folder

Makefile

@@ -26,19 +26,19 @@ run_local:
 	docker-compose -f docker-compose.local.yml up -d --remove-orphans
 
 run_behindproxy:
-	docker-compose -f exemples/behind-proxy/docker-compose.cloudflare.yml up -d --remove-orphans
+	docker-compose -f examples/behind-proxy/docker-compose.cloudflare.yml up -d --remove-orphans
 
 run_cacheredis:
-	docker-compose -f exemples/redis-cache/docker-compose.redis.yml up -d --remove-orphans
+	docker-compose -f examples/redis-cache/docker-compose.redis.yml up -d --remove-orphans
 
 run_trustedips:
-	docker-compose -f exemples/trusted-ips/docker-compose.trusted.yml up -d --remove-orphans
+	docker-compose -f examples/trusted-ips/docker-compose.trusted.yml up -d --remove-orphans
 
 run_binaryvm:
-	cd exemples/binary-vm/ && sudo vagrant up
+	cd examples/binary-vm/ && sudo vagrant up
 
 run_tlsauth:
-	docker-compose -f exemples/tls-auth/docker-compose.tls-auth.yml down && docker-compose -f exemples/tls-auth/docker-compose.tls-auth.yml up -d && docker-compose -f exemples/tls-auth/docker-compose.tls-auth.yml restart && docker-compose -f exemples/tls-auth/docker-compose.tls-auth.yml logs -f
+	docker-compose -f examples/tls-auth/docker-compose.tls-auth.yml down && docker-compose -f examples/tls-auth/docker-compose.tls-auth.yml up -d && docker-compose -f examples/tls-auth/docker-compose.tls-auth.yml restart && docker-compose -f examples/tls-auth/docker-compose.tls-auth.yml logs -f
 
 run:
 	docker-compose -f docker-compose.yml up -d --remove-orphans
@@ -53,16 +53,16 @@ restart:
 	docker-compose -f docker-compose.yml restart
 
 restart_behindproxy:
-	docker-compose -f exemples/behind-proxy/docker-compose.cloudflare.yml restart
+	docker-compose -f examples/behind-proxy/docker-compose.cloudflare.yml restart
 
 restart_cacheredis:
-	docker-compose -f exemples/redis-cache/docker-compose.redis.yml restart
+	docker-compose -f examples/redis-cache/docker-compose.redis.yml restart
 
 restart_trustedips:
-	docker-compose -f exemples/trusted-ips/docker-compose.trusted.yml restart
+	docker-compose -f examples/trusted-ips/docker-compose.trusted.yml restart
 
 restart_tlsauth:
-	docker-compose -f exemples/tls-auth/docker-compose.tls-auth.yml
+	docker-compose -f examples/tls-auth/docker-compose.tls-auth.yml
 
 show_logs:
 	docker-compose -f docker-compose.yml restart
@@ -74,15 +74,15 @@ show_dev_logs:
 	docker-compose -f docker-compose.dev.yml logs -f
 
 clean_all_docker:
-	docker-compose -f exemples/behind-proxy/docker-compose.cloudflare.yml down --remove-orphans
+	docker-compose -f examples/behind-proxy/docker-compose.cloudflare.yml down --remove-orphans
-	docker-compose -f exemples/redis-cache/docker-compose.redis.yml down --remove-orphans
+	docker-compose -f examples/redis-cache/docker-compose.redis.yml down --remove-orphans
-	docker-compose -f exemples/trusted-ips/docker-compose.trusted.yml down --remove-orphans
+	docker-compose -f examples/trusted-ips/docker-compose.trusted.yml down --remove-orphans
-	docker-compose -f exemples/tls-auth/docker-compose.tls-auth.yml down --remove-orphans
+	docker-compose -f examples/tls-auth/docker-compose.tls-auth.yml down --remove-orphans
 	docker-compose -f docker-compose.local.yml down --remove-orphans
 	docker-compose -f docker-compose.yml down --remove-orphans
 
 clean_vagrant:
-	cd exemples/binary-vm/ && sudo vagrant destroy -f
+	cd examples/binary-vm/ && sudo vagrant destroy -f
 
 
 show_metrics:

README.md

@@ -272,10 +272,10 @@ docker-compose up -d
 
 #### Use certificates to authenticate with CrowdSec
 
-You can follow the example in `exemples/tls-auth` to view how to authenticate with client certificates with the LAPI.  
+You can follow the example in `examples/tls-auth` to view how to authenticate with client certificates with the LAPI.  
 In that case, communications with the LAPI must go through HTTPS.
 
-A script is available to generate certificates in `exemples/tls-auth/gencerts.sh` and must be in the same directory as the inputs for the PKI creation.
+A script is available to generate certificates in `examples/tls-auth/gencerts.sh` and must be in the same directory as the inputs for the PKI creation.
 
 #### Use HTTPS to communicate with the LAPI
 
@@ -283,7 +283,7 @@ To communicate with the LAPI in HTTPS you need to either accept any certificates
 Set the `crowdsecLapiScheme` to https.
 
 Crowdsec must be listening in HTTPS for this to work.
-Please see the [tls-auth exemple](https://github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin/blob/main/exemples/tls-auth/README.md) or the official documentation: [docs.crowdsec.net/docs/local_api/tls_auth/](https://docs.crowdsec.net/docs/local_api/tls_auth/)
+Please see the [tls-auth example](https://github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin/blob/main/examples/tls-auth/README.md) or the official documentation: [docs.crowdsec.net/docs/local_api/tls_auth/](https://docs.crowdsec.net/docs/local_api/tls_auth/)
 
 #### Manually add an IP to the blocklist (for testing purposes)
 
@@ -293,21 +293,21 @@ docker exec crowdsec cscli decisions add --ip 10.0.0.10 -d 10m # this will be ef
 docker exec crowdsec cscli decisions remove --ip 10.0.0.10
 ```
 
-### Exemples
+### Examples
 
-#### 1. Behind another proxy service (ex: clouflare) [exemples/behind-proxy/README.md](https://github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin/blob/main/exemples/behind-proxy/README.md)
+#### 1. Behind another proxy service (ex: clouflare) [examples/behind-proxy/README.md](https://github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin/blob/main/examples/behind-proxy/README.md)
 
-#### 2. With Redis as an external shared cache [exemples/redis-cache/README.md](https://github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin/blob/main/exemples/redis-cache/README.md)
+#### 2. With Redis as an external shared cache [examples/redis-cache/README.md](https://github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin/blob/main/examples/redis-cache/README.md)
 
-#### 3. Using Trusted IP (ex: LAN OR VPN) that won't get filtered by crowdsec [exemples/trusted-ips/README.md](https://github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin/blob/main/exemples/trusted-ips/README.md)
+#### 3. Using Trusted IP (ex: LAN OR VPN) that won't get filtered by crowdsec [examples/trusted-ips/README.md](https://github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin/blob/main/examples/trusted-ips/README.md)
 
-#### 4. Using Crowdsec and Traefik installed as binary in a single VM [exemples/binary-vm/README.md](https://github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin/blob/main/exemples/binary-vm/README.md)
+#### 4. Using Crowdsec and Traefik installed as binary in a single VM [examples/binary-vm/README.md](https://github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin/blob/main/examples/binary-vm/README.md)
 
-#### 5. Using https communication and tls authentication with Crowdsec [exemples/tls-auth/README.md](https://github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin/blob/main/exemples/tls-auth/README.md)
+#### 5. Using https communication and tls authentication with Crowdsec [examples/tls-auth/README.md](https://github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin/blob/main/examples/tls-auth/README.md)
 
-#### 6. Using Crowdsec and Traefik in Kubernetes [exemples/kubernetes/README.md](https://github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin/blob/main/exemples/kubernetes/README.md)
+#### 6. Using Crowdsec and Traefik in Kubernetes [examples/kubernetes/README.md](https://github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin/blob/main/examples/kubernetes/README.md)
 
-#### 7. Using Traefik in standalone mode without Crowdsec [exemples/standalone-mode/README.md](https://github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin/blob/main/exemples/standalone-mode/README.md)
+#### 7. Using Traefik in standalone mode without Crowdsec [examples/standalone-mode/README.md](https://github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin/blob/main/examples/standalone-mode/README.md)
 
 ### Local Mode
 

docker-compose.local.yml

@@ -2,7 +2,7 @@ version: "3.8"
 
 services:
   traefik:
-    image: "traefik:v2.9.10"
+    image: "traefik:v2.10.4"
     container_name: "traefik"
     restart: unless-stopped
     command:
@@ -36,7 +36,7 @@ services:
       - "traefik.http.routers.router-foo.middlewares=crowdsec-foo@docker" 
       - "traefik.http.services.service-foo.loadbalancer.server.port=80"
       - "traefik.http.middlewares.crowdsec-foo.plugin.bouncer.enabled=true"
-      - "traefik.http.middlewares.crowdsec-foo.plugin.bouncer.crowdseclapikey=40796d93c2958f9e58345514e67740e5"
+      - "traefik.http.middlewares.crowdsec-foo.plugin.bouncer.crowdseclapikey=40796d93c2958f9e58345514e67740e5="
 
   whoami2:
     image: traefik/whoami
@@ -49,17 +49,16 @@ services:
       - "traefik.http.routers.router-bar.middlewares=crowdsec-bar@docker"
       - "traefik.http.services.service-bar.loadbalancer.server.port=80"
       - "traefik.http.middlewares.crowdsec-bar.plugin.bouncer.enabled=true"
-      - "traefik.http.middlewares.crowdsec-bar.plugin.bouncer.crowdseclapikey=44c36dac5c4140af9f06f397508e82c7"
+      - "traefik.http.middlewares.crowdsec-bar.plugin.bouncer.crowdseclapikey=40796d93c2958f9e58345514e67740e5="
 
   crowdsec:
-    image: crowdsecurity/crowdsec:v1.4.6
+    image: crowdsecurity/crowdsec:v1.5.3
     container_name: "crowdsec"
     restart: unless-stopped
     environment:
       COLLECTIONS: crowdsecurity/traefik
       CUSTOM_HOSTNAME: crowdsec
-      BOUNCER_KEY_TRAEFIK_1: 40796d93c2958f9e58345514e67740e5
+      BOUNCER_KEY_TRAEFIK: 40796d93c2958f9e58345514e67740e5=
-      BOUNCER_KEY_TRAEFIK_2: 44c36dac5c4140af9f06f397508e82c7
     volumes:
       - ./acquis.yaml:/etc/crowdsec/acquis.yaml:ro
       - logs-local:/var/log/traefik:ro

docker-compose.yml

@@ -2,7 +2,7 @@ version: "3.8"
 
 services:
   traefik:
-    image: "traefik:v2.9.10"
+    image: "traefik:v2.10.4"
     container_name: "traefik"
     restart: unless-stopped
     command:
@@ -14,7 +14,7 @@ services:
       - "--entrypoints.web.address=:80"
 
       - "--experimental.plugins.bouncer.modulename=github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin"
-      - "--experimental.plugins.bouncer.version=v1.1.11"
+      - "--experimental.plugins.bouncer.version=v1.1.15"
     volumes:
       - "/var/run/docker.sock:/var/run/docker.sock:ro"
       - "logs:/var/log/traefik"
@@ -39,7 +39,7 @@ services:
       # Definition of the middleware
       - "traefik.http.middlewares.crowdsec-foo.plugin.bouncer.enabled=true"
       # crowdseclapikey must be unique to the middleware attached to the service
-      - "traefik.http.middlewares.crowdsec-foo.plugin.bouncer.crowdseclapikey=FIXME-LAPI-KEY-1"
+      - "traefik.http.middlewares.crowdsec-foo.plugin.bouncer.crowdseclapikey=FIXME-LAPI-KEY-1="
       # forwardedheaderstrustedips should be the IP of the proxy that is in front of traefik (if any)
       - "traefik.http.middlewares.crowdsec-foo.plugin.bouncer.forwardedheaderstrustedips=172.21.0.5"
   
@@ -58,20 +58,19 @@ services:
       # Definitin of the middleware
       - "traefik.http.middlewares.crowdsec-bar.plugin.bouncer.enabled=true"
       # crowdseclapikey must be unique to the middleware attached to the service
-      - "traefik.http.middlewares.crowdsec-bar.plugin.bouncer.crowdseclapikey=FIXME-LAPI-KEY-2"
+      - "traefik.http.middlewares.crowdsec-bar.plugin.bouncer.crowdseclapikey=FIXME-LAPI-KEY-1="
       # forwardedheaderstrustedips should be the IP of the proxy that is in front of traefik (if any)
       - "traefik.http.middlewares.crowdsec-bar.plugin.bouncer.forwardedheaderstrustedips=172.21.0.5"
 
   crowdsec:
-    image: crowdsecurity/crowdsec:v1.4.6
+    image: crowdsecurity/crowdsec:v1.5.3
     container_name: "crowdsec"
     restart: unless-stopped
     environment:
       COLLECTIONS: crowdsecurity/traefik
       CUSTOM_HOSTNAME: crowdsec
       # We need to register one api key per service we will use
-      BOUNCER_KEY_TRAEFIK_1: FIXME-LAPI-KEY-1
+      BOUNCER_KEY_TRAEFIK: FIXME-LAPI-KEY-1=
-      BOUNCER_KEY_TRAEFIK_2: FIXME-LAPI-KEY-2
     volumes:
       - ./acquis.yaml:/etc/crowdsec/acquis.yaml:ro
       - logs:/var/log/traefik:ro

examples/behind-proxy/README.md

@@ -1,4 +1,4 @@
-# Exemple
+# Example
 ## Behind another proxy service (ex: clouflare)
 
 You need to configure your Traefik to trust Forwarded headers by your front proxy

examples/behind-proxy/docker-compose.cloudflare.yml

@@ -14,7 +14,7 @@ services:
       - "--providers.file.filename=/cloud.yaml"
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock:ro
-      - ./cloudflare-exemple.yaml:/cloud.yaml:ro
+      - ./cloudflare-example.yaml:/cloud.yaml:ro
       - logs-cloudflare:/var/log/traefik
     ports:
       - 80:80

examples/binary-vm/README.md

@@ -1,4 +1,4 @@
-# Exemple
+# Example
 
 ### Install vagrant
 

examples/kubernetes/README.md

@@ -1,4 +1,4 @@
-### Kubernetes Exemple
+### Kubernetes Example
 
 #### Official docs
 

examples/kubernetes/crowdsec/values.yml

@@ -22,4 +22,4 @@ lapi:
       value: "k8s linux test"
     # If it's a test, we don't want to share signals with CrowdSec so disable the Online API.
     - name: DISABLE_ONLINE_API
-      value: true
+      value: "true"

examples/redis-cache/README.md

@@ -1,4 +1,4 @@
-# Exemple
+# Example
 ## With Redis as an external shared cache
 
 The plugin must be configured to connect to a redis instance

examples/redis-cache/docker-compose.redis.yml

@@ -26,7 +26,7 @@ services:
       - 8080:8080
     depends_on:
       - crowdsec
-      - redis-insecure
+      # - redis-insecure
       - redis-secure
 
 # Either use secure, or insecure but do not mix both

examples/tls-auth/README.md

@@ -1,4 +1,4 @@
-# Exemple
+# Example
 ## Using https communication and tls authentication with Crowdsec
 
 ##### Summary

examples/trusted-ips/README.md

@@ -1,4 +1,4 @@
-# Exemple
+# Example
 ## Using Trusted IP (ex: LAN OR VPN) that won't get filtered by crowdsec
 
 You need to configure your Traefik to trust Forwarded headers by your front proxy

pkg/configuration/configuration.go

@@ -195,7 +195,7 @@ func ValidateParams(config *Config) error {
 // valid ! # $ % & ' * + - . ^ _ ` | ~ DIGIT ALPHA
 // See https://httpwg.github.io/specs/rfc7230.html#rule.token.separators
 func validateParamsAPIKey(lapiKey string) error {
-	reg := regexp.MustCompile("^[a-zA-Z0-9 !#$%&'*+-.^_`|~]*$")
+	reg := regexp.MustCompile("^[a-zA-Z0-9 !#$%&'*+-.^_`|~=/]*$")
 	if !reg.Match([]byte(lapiKey)) {
 		return fmt.Errorf("CrowdsecLapiKey doesn't valid this regexp: '/%s/'", reg.String())
 	}