main: do not require authentication if no users are configured

When TLS is enabled, basic authentication is required, whether there are users configured or not. If no users are defined, allow unauthenticated access even with TLS. Fix typo in config file comment. Signed-off-by: Robin Jarry <[email protected]>
openstack-k8s-operators · Jan 8, 2025 · bec0185 · bec0185
1 parent c4a0667
commit bec0185
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/etc/dataplane-node-exporter.yaml b/etc/dataplane-node-exporter.yaml
@@ -40,8 +40,8 @@
 #
 #tls-key:
 
-# Space separated list of valid users and passwords. Leave empty to disable
-# authentication. Authentication will only be enforced when TLS is enabled.
+# List of valid users and passwords. Leave empty to disable authentication.
+# Authentication will only be enforced when TLS is enabled.
 #
 # Example:
 #

diff --git a/main.go b/main.go
@@ -74,7 +74,9 @@ func main() {
 
 	if config.TlsCert() != "" && config.TlsKey() != "" {
 		log.Noticef("listening on https://%s%s", config.HttpListen(), config.HttpPath())
-		server.Handler = basicAuthHandler(mux)
+		if len(config.AuthUsers()) > 0 {
+			server.Handler = basicAuthHandler(mux)
+		}
 		err = server.ListenAndServeTLS(config.TlsCert(), config.TlsKey())
 	} else {
 		log.Noticef("listening on http://%s%s", config.HttpListen(), config.HttpPath())