Fix for parsing port at log middleware (#4348)

* fix for #4320 Signed-off-by: Srikrishna Paparaju <[email protected]> Signed-off-by: Srikrishna Paparaju <[email protected]> * add unit test Signed-off-by: Srikrishna Paparaju <[email protected]>
thanos-io · Jun 23, 2021 · d8a794b · d8a794b
1 parent 8f50211
commit d8a794b
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 6 deletions.
diff --git a/pkg/logging/http.go b/pkg/logging/http.go
@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"net"
 	"sort"
+	"strings"
 
 	"net/http"
 	"time"
@@ -43,14 +44,24 @@ func (m *HTTPServerMiddleware) HTTPMiddleware(name string, next http.Handler) ht
 		if hostPort == "" {
 			hostPort = r.URL.Host
 		}
-		_, port, err := net.SplitHostPort(hostPort)
-		if err != nil {
-			level.Error(m.logger).Log("msg", "failed to parse host port for http log decision", "err", err)
-			next.ServeHTTP(w, r)
-			return
+
+		var port string
+		var err error
+		// Try to extract port if there is ':' as part of 'hostPort'.
+		if strings.Contains(hostPort, ":") {
+			_, port, err = net.SplitHostPort(hostPort)
+			if err != nil {
+				level.Error(m.logger).Log("msg", "failed to parse host port for http log decision", "err", err)
+				next.ServeHTTP(w, r)
+				return
+			}
 		}
 
-		decision := m.opts.shouldLog(net.JoinHostPort(r.URL.String(), port), nil)
+		deciderURL := r.URL.String()
+		if len(port) > 0 {
+			deciderURL = net.JoinHostPort(deciderURL, port)
+		}
+		decision := m.opts.shouldLog(deciderURL, nil)
 
 		switch decision {
 		case NoLogCall:

diff --git a/pkg/logging/http_test.go b/pkg/logging/http_test.go
@@ -64,4 +64,19 @@ func TestHTTPServerMiddleware(t *testing.T) {
 	testutil.Equals(t, 200, resp.StatusCode)
 	testutil.Equals(t, "Test Works", string(body))
 	testutil.Assert(t, !strings.Contains(b.String(), "err="))
+
+	// URL with no explicit port number in the format- hostname:port
+	req = httptest.NewRequest("GET", "http://example.com/foo", nil)
+	b.Reset()
+
+	w = httptest.NewRecorder()
+	hm(w, req)
+
+	resp = w.Result()
+	body, err = ioutil.ReadAll(resp.Body)
+	testutil.Ok(t, err)
+
+	testutil.Equals(t, 200, resp.StatusCode)
+	testutil.Equals(t, "Test Works", string(body))
+	testutil.Assert(t, !strings.Contains(b.String(), "err="))
 }