issues/163: log client address without port

CHANGELOG.md

@@ -5,6 +5,7 @@ Most recent version is listed first.
 
 ## v0.0.22
 - Panic middleware should include correct stack trace: https://github.com/komuw/ong/pull/164
+- Log client address without port: https://github.com/komuw/ong/pull/165
 
 ## v0.0.21
 - Improve performance of calling Csrf middleware multiple times: https://github.com/komuw/ong/pull/161

middleware/log.go

@@ -61,14 +61,19 @@ func Log(wrappedHandler http.HandlerFunc, domain string, l log.Logger) http.Hand
 			ResponseWriter: w,
 		}
 		defer func() {
+			clientAddress := r.RemoteAddr
+			if host, _, err := net.SplitHostPort(r.RemoteAddr); err == nil {
+				clientAddress = host
+			}
+
 			flds := log.F{
-				"requestAddr": r.RemoteAddr,
-				"method":      r.Method,
-				"path":        r.URL.EscapedPath(),
-				"code":        lrw.code,
-				"status":      http.StatusText(lrw.code),
-				"durationMS":  time.Since(start).Milliseconds(),
-				"pid":         os.Getpid(),
+				"clientAddress": clientAddress,
+				"method":        r.Method,
+				"path":          r.URL.Redacted(),
+				"code":          lrw.code,
+				"status":        http.StatusText(lrw.code),
+				"durationMS":    time.Since(start).Milliseconds(),
+				"pid":           os.Getpid(),
 			}
 			if ongError := lrw.Header().Get(ongMiddlewareErrorHeader); ongError != "" {
 				flds["ongError"] = ongError

middleware/log_test.go

@@ -100,7 +100,7 @@ func TestLogMiddleware(t *testing.T) {
 			fmt.Sprint(res.StatusCode),
 			"durationMS",
 			"logID",
-			"requestAddr",
+			"clientAddress",
 			"error",
 		} {
 			attest.Subsequence(t, logOutput.String(), v)

middleware/panic.go

@@ -2,6 +2,7 @@ package middleware
 
 import (
 	"fmt"
+	"net"
 	"net/http"
 	"os"
 
@@ -29,14 +30,19 @@ func Panic(wrappedHandler http.HandlerFunc, l log.Logger) http.HandlerFunc {
 					code,
 				)
 
+				clientAddress := r.RemoteAddr
+				if host, _, err := net.SplitHostPort(r.RemoteAddr); err == nil {
+					clientAddress = host
+				}
+
 				flds := log.F{
-					"err":         fmt.Sprint(errR),
-					"requestAddr": r.RemoteAddr,
-					"method":      r.Method,
-					"path":        r.URL.EscapedPath(),
-					"code":        code,
-					"status":      status,
-					"pid":         os.Getpid(),
+					"err":           fmt.Sprint(errR),
+					"clientAddress": clientAddress,
+					"method":        r.Method,
+					"path":          r.URL.Redacted(),
+					"code":          code,
+					"status":        status,
+					"pid":           os.Getpid(),
 				}
 				if ongError := w.Header().Get(ongMiddlewareErrorHeader); ongError != "" {
 					flds["ongError"] = ongError