add basic-auth-enable settings on prom logger (#251)

* add basic-auth-enable settings on prom logger * update README.md
dmachard · Mar 28, 2023 · d2ab6b3 · d2ab6b3
1 parent 567befa
commit d2ab6b3
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@
 
 *NOTE: The code before version 1.x is considered beta quality and is subject to breaking changes.*
 
-`DNS-collector` acts as a passive high speed **aggregator, analyzer, transporter and logging** for your DNS messages, written in **Golang**. The DNS traffic can be collected and aggregated from simultaneously [sources](doc/collectors.md) like DNStap streams, network interface or log files and relays it to multiple other [listeners](doc/loggers.md) with some [transformations](doc/transformers.md) on it ([traffic filtering](doc/transformers.md#dns-filtering), [user privacy](doc/transformers.md#user-privacy), ...) and DNS protocol conversions (to [plain text](doc/configuration.md#custom-text-format), [json](doc/dnsjson.md), and more... ).
+`DNS-collector` acts as a passive high speed **ingestor, aggregator and analyzer** for your DNS traffic, written in **Golang**. The DNS traffic can be collected and aggregated from simultaneously [sources](doc/collectors.md) like DNStap streams, network interface or log files and relays it to multiple other [listeners](doc/loggers.md) with some [transformations](doc/transformers.md) on it ([traffic filtering](doc/transformers.md#dns-filtering), [user privacy](doc/transformers.md#user-privacy), ...) and DNS protocol conversions (to [plain text](doc/configuration.md#custom-text-format), [json](doc/dnsjson.md), and more... ).
 
 Additionally, DNS-collector also support 
 - [Extension Mechanisms for DNS (EDNS)](doc/dnsparser.md) decoding

diff --git a/config.yml b/config.yml
@@ -72,7 +72,7 @@ multiplexer:
     - name: console
       stdout:
         mode: text
-        
+
   routes:
     - from: [ tap ]
       to: [ console ]
@@ -202,6 +202,8 @@ multiplexer:
 #   listen-ip: 0.0.0.0
 #   # listening port
 #   listen-port: 8080
+#   # enable basic authentication
+#   basic-auth-enable: true
 #   # default login
 #   basic-auth-login: admin
 #   # default password

diff --git a/dnsutils/config.go b/dnsutils/config.go
@@ -217,18 +217,19 @@ type Config struct {
 			TextFormat string `yaml:"text-format"`
 		} `yaml:"stdout"`
 		Prometheus struct {
-			Enable         bool   `yaml:"enable"`
-			ListenIP       string `yaml:"listen-ip"`
-			ListenPort     int    `yaml:"listen-port"`
-			TlsSupport     bool   `yaml:"tls-support"`
-			TlsMutual      bool   `yaml:"tls-mutual"`
-			TlsMinVersion  string `yaml:"tls-min-version"`
-			CertFile       string `yaml:"cert-file"`
-			KeyFile        string `yaml:"key-file"`
-			PromPrefix     string `yaml:"prometheus-prefix"`
-			TopN           int    `yaml:"top-n"`
-			BasicAuthLogin string `yaml:"basic-auth-login"`
-			BasicAuthPwd   string `yaml:"basic-auth-pwd"`
+			Enable           bool   `yaml:"enable"`
+			ListenIP         string `yaml:"listen-ip"`
+			ListenPort       int    `yaml:"listen-port"`
+			TlsSupport       bool   `yaml:"tls-support"`
+			TlsMutual        bool   `yaml:"tls-mutual"`
+			TlsMinVersion    string `yaml:"tls-min-version"`
+			CertFile         string `yaml:"cert-file"`
+			KeyFile          string `yaml:"key-file"`
+			PromPrefix       string `yaml:"prometheus-prefix"`
+			TopN             int    `yaml:"top-n"`
+			BasicAuthLogin   string `yaml:"basic-auth-login"`
+			BasicAuthPwd     string `yaml:"basic-auth-pwd"`
+			BasicAuthEnabled bool   `yaml:"basic-auth-enable"`
 		} `yaml:"prometheus"`
 		RestAPI struct {
 			Enable         bool   `yaml:"enable"`
@@ -470,6 +471,7 @@ func (c *Config) SetDefault() {
 	c.Loggers.Prometheus.TopN = 10
 	c.Loggers.Prometheus.BasicAuthLogin = "admin"
 	c.Loggers.Prometheus.BasicAuthPwd = "changeme"
+	c.Loggers.Prometheus.BasicAuthEnabled = true
 
 	c.Loggers.RestAPI.Enable = false
 	c.Loggers.RestAPI.ListenIP = LOCALHOST_IP

diff --git a/doc/loggers.md b/doc/loggers.md
@@ -93,6 +93,7 @@ See the [swagger](https://generator.swagger.io/?url=https://raw.githubuserconten
 Options:
 - `listen-ip`: (string) listening IP
 - `listen-port`: (integer) listening port
+- `basic-auth-enable`: (boolean) enable or disable basic authentication
 - `basic-auth-login`: (string) default login for basic auth
 - `basic-auth-pwd`: (string) default password for basic auth
 - `tls-support`: (boolean) tls support
@@ -107,6 +108,7 @@ Default values:
 restapi:
   listen-ip: 0.0.0.0
   listen-port: 8080
+  basic-auth-enable: true
   basic-auth-login: admin
   basic-auth-pwd: changeme
   tls-support: true

diff --git a/loggers/prometheus.go b/loggers/prometheus.go
@@ -180,11 +180,20 @@ func NewPrometheus(config *dnsutils.Config, logger *logger.Logger, version strin
 
 	handler := authMiddleware(mux)
 
-	o.httpServer = &http.Server{
-		Handler:  handler,
-		ErrorLog: o.logger.ErrorLogger(),
+	o.httpServer = &http.Server{}
+	if o.config.Loggers.Prometheus.BasicAuthEnabled {
+		o.httpServer.Handler = handler
+	} else {
+		o.httpServer.Handler = mux
 	}
 
+	o.httpServer.ErrorLog = o.logger.ErrorLogger()
+
+	// o.httpServer = &http.Server{
+	// 	Handler:  handler,
+	// 	ErrorLog: o.logger.ErrorLogger(),
+	// }
+
 	return o
 }