From b27e637894c3710daba573d023046603548f23f9 Mon Sep 17 00:00:00 2001
From: Quentin McGaw <quentin.mcgaw@gmail.com>
Date: Sat, 17 Oct 2020 22:21:20 +0000
Subject: [PATCH] HTTP_CONTROL_SERVER_LOG variable, fixes #249

---
 README.md                   | 1 +
 cmd/gluetun/main.go         | 3 ++-
 internal/params/params.go   | 1 +
 internal/params/server.go   | 4 ++++
 internal/server/server.go   | 6 ++++--
 internal/settings/server.go | 6 ++++++
 6 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 4d15d46c..af71a656 100644
--- a/README.md
+++ b/README.md
@@ -260,6 +260,7 @@ That one is important if you want to connect to the container from your LAN for
 | Variable | Default | Choices | Description |
 | --- | --- | --- | --- |
 | `HTTP_CONTROL_SERVER_PORT` | `8000` | `1` to `65535` | Listening port for the HTTP control server |
+| `HTTP_CONTROL_SERVER_LOG` | `on` | `on` or `off` | Enable logging of HTTP requests |
 
 ### Other
 
diff --git a/cmd/gluetun/main.go b/cmd/gluetun/main.go
index 882efad1..cdb6d696 100644
--- a/cmd/gluetun/main.go
+++ b/cmd/gluetun/main.go
@@ -237,7 +237,8 @@ func _main(background context.Context, args []string) int { //nolint:gocognit,go
 		allSettings.VersionInformation, allSettings.OpenVPN.Provider.PortForwarding.Enabled, openvpnLooper.PortForward,
 	)
 	controlServerAddress := fmt.Sprintf("0.0.0.0:%d", allSettings.ControlServer.Port)
-	httpServer := server.New(controlServerAddress, logger, openvpnLooper, unboundLooper, updaterLooper)
+	controlServerLogging := allSettings.ControlServer.Log
+	httpServer := server.New(controlServerAddress, controlServerLogging, logger, openvpnLooper, unboundLooper, updaterLooper)
 	wg.Add(1)
 	go httpServer.Run(ctx, wg)
 
diff --git a/internal/params/params.go b/internal/params/params.go
index 2a091110..beb13ccb 100644
--- a/internal/params/params.go
+++ b/internal/params/params.go
@@ -112,6 +112,7 @@ type Reader interface {
 
 	// Control server
 	GetControlServerPort() (port uint16, err error)
+	GetControlServerLog() (enabled bool, err error)
 
 	GetVersionInformation() (enabled bool, err error)
 
diff --git a/internal/params/server.go b/internal/params/server.go
index 60f2c026..9df90676 100644
--- a/internal/params/server.go
+++ b/internal/params/server.go
@@ -11,3 +11,7 @@ func (r *reader) GetControlServerPort() (port uint16, err error) {
 	}
 	return uint16(n), nil
 }
+
+func (r *reader) GetControlServerLog() (enabled bool, err error) {
+	return r.envParams.GetOnOff("HTTP_CONTROL_SERVER_LOG", libparams.Default("on"))
+}
diff --git a/internal/server/server.go b/internal/server/server.go
index d2894fdc..f3a52c03 100644
--- a/internal/server/server.go
+++ b/internal/server/server.go
@@ -20,6 +20,7 @@ type Server interface {
 
 type server struct {
 	address       string
+	logging       bool
 	logger        logging.Logger
 	openvpnLooper openvpn.Looper
 	unboundLooper dns.Looper
@@ -27,9 +28,10 @@ type server struct {
 	lookupIP      func(host string) ([]net.IP, error)
 }
 
-func New(address string, logger logging.Logger, openvpnLooper openvpn.Looper, unboundLooper dns.Looper, updaterLooper updater.Looper) Server {
+func New(address string, logging bool, logger logging.Logger, openvpnLooper openvpn.Looper, unboundLooper dns.Looper, updaterLooper updater.Looper) Server {
 	return &server{
 		address:       address,
+		logging:       logging,
 		logger:        logger.WithPrefix("http server: "),
 		openvpnLooper: openvpnLooper,
 		unboundLooper: unboundLooper,
@@ -60,7 +62,7 @@ func (s *server) Run(ctx context.Context, wg *sync.WaitGroup) {
 
 func (s *server) makeHandler() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		if r.Method != http.MethodGet || r.RequestURI != "/health" {
+		if s.logging && (r.Method != http.MethodGet || r.RequestURI != "/health") {
 			s.logger.Info("HTTP %s %s", r.Method, r.RequestURI)
 		}
 		switch r.Method {
diff --git a/internal/settings/server.go b/internal/settings/server.go
index 589a22c7..5c6520b8 100644
--- a/internal/settings/server.go
+++ b/internal/settings/server.go
@@ -10,12 +10,14 @@ import (
 // ControlServer contains settings to customize the control server operation
 type ControlServer struct {
 	Port uint16
+	Log  bool
 }
 
 func (c *ControlServer) String() string {
 	settingsList := []string{
 		"HTTP Control server:",
 		fmt.Sprintf("Listening port: %d", c.Port),
+		fmt.Sprintf("Logging: %t", c.Log),
 	}
 	return strings.Join(settingsList, "\n |--")
 }
@@ -26,5 +28,9 @@ func GetControlServerSettings(paramsReader params.Reader) (settings ControlServe
 	if err != nil {
 		return settings, err
 	}
+	settings.Log, err = paramsReader.GetControlServerLog()
+	if err != nil {
+		return settings, err
+	}
 	return settings, nil
 }