test bouncer registration with tls (#75)

Author: mmetc

go.mod

@@ -5,7 +5,7 @@ go 1.20
 require (
 	github.com/coreos/go-systemd/v22 v22.5.0
 	github.com/crowdsecurity/crowdsec v1.5.2
-	github.com/crowdsecurity/go-cs-bouncer v0.0.5
+	github.com/crowdsecurity/go-cs-bouncer v0.0.6
 	github.com/crowdsecurity/go-cs-lib v0.0.0-20230522124854-671e895fa788
 	github.com/prometheus/client_golang v1.15.1
 	github.com/sirupsen/logrus v1.9.2

go.sum

@@ -15,8 +15,8 @@ github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSV
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/crowdsecurity/crowdsec v1.5.2 h1:2wl5ULsZlD8Du9PGe415x1fYRcOfVx95KI2Si0Qeb98=
 github.com/crowdsecurity/crowdsec v1.5.2/go.mod h1:R1wnz8wqV4r1teYt9Yc5PVTaBb37ug2yqCffIvXEuRw=
-github.com/crowdsecurity/go-cs-bouncer v0.0.5 h1:vZ989qKUDTavycjGLjqm2M6UzXJpmLaq35UoaiF9474=
-github.com/crowdsecurity/go-cs-bouncer v0.0.5/go.mod h1:ShrcSSYmzBTKnpqON9/UFvorDMhhn5mbeQC2HXCv7kE=
+github.com/crowdsecurity/go-cs-bouncer v0.0.6 h1:vzHMPBVcAKH77P/93Q69pTQgYbwBJEMnrg6BxtOaM6c=
+github.com/crowdsecurity/go-cs-bouncer v0.0.6/go.mod h1:ShrcSSYmzBTKnpqON9/UFvorDMhhn5mbeQC2HXCv7kE=
 github.com/crowdsecurity/go-cs-lib v0.0.0-20230522124854-671e895fa788 h1:1tjqkYUmbkbYqa21kZsgSWaPIwGyUW0xE/sbb1zpJHg=
 github.com/crowdsecurity/go-cs-lib v0.0.0-20230522124854-671e895fa788/go.mod h1:9JJLSpGj1ZXnROV3xAcJvS/HTaUvuA8K3gGOpO4tfVc=
 github.com/crowdsecurity/grokky v0.2.1 h1:t4VYnDlAd0RjDM2SlILalbwfCrQxtJSMGdQOR0zwkE4=

test/bouncer/test_custom_bouncer.py

@@ -62,7 +62,7 @@ def test_bad_api_key(crowdsec, bouncer, cb_stream_cfg_factory):
             assert not cb.proc.is_running()
 
 
-def test_good_api_key(crowdsec, bouncer, cb_stream_cfg_factory, api_key_factory):
+def test_good_api_key(crowdsec, bouncer, cb_stream_cfg_factory, api_key_factory, bouncer_under_test):
     api_key = api_key_factory()
     env = {
         'BOUNCER_KEY_custom': api_key,
@@ -89,6 +89,8 @@ def test_good_api_key(crowdsec, bouncer, cb_stream_cfg_factory, api_key_factory)
             bouncers = json.loads(res.output)
             assert len(bouncers) == 1
             assert bouncers[0]['name'] == 'custom'
+            assert bouncers[0]['auth_type'] == 'api-key'
+            assert bouncers[0]['type'] == bouncer_under_test
 
             # check that the bouncer can successfully connect
             # and receive decisions

test/bouncer/test_tls.py

@@ -1,3 +1,4 @@
+import json
 
 def test_tls_server(crowdsec, certs_dir, api_key_factory, bouncer, cb_stream_cfg_factory):
     """TLS with server-only certificate"""
@@ -48,7 +49,7 @@ def test_tls_server(crowdsec, certs_dir, api_key_factory, bouncer, cb_stream_cfg
             ])
 
 
-def test_tls_mutual(crowdsec, certs_dir, api_key_factory, bouncer, cb_stream_cfg_factory):
+def test_tls_mutual(crowdsec, certs_dir, api_key_factory, bouncer, cb_stream_cfg_factory, bouncer_under_test):
     """TLS with two-way bouncer/lapi authentication"""
 
     lapi_env = {
@@ -100,3 +101,12 @@ def test_tls_mutual(crowdsec, certs_dir, api_key_factory, bouncer, cb_stream_cfg
                 "*deleting 0 decisions*",
                 "*adding 0 decisions*",
             ])
+
+            # check that the bouncer is registered
+            res = cs.cont.exec_run('cscli bouncers list -o json')
+            assert res.exit_code == 0
+            bouncers = json.loads(res.output)
+            assert len(bouncers) == 1
+            assert bouncers[0]['name'].startswith('@')
+            assert bouncers[0]['auth_type'] == 'tls'
+            assert bouncers[0]['type'] == bouncer_under_test