Adding IP Addresses in log entries

middleware/logger.go

@@ -2,6 +2,7 @@ package middleware
 
 import (
 	"log"
+	"net"
 	"time"
 
 	"github.com/labstack/echo"
@@ -11,6 +12,15 @@ import (
 func Logger() echo.MiddlewareFunc {
 	return func(h echo.HandlerFunc) echo.HandlerFunc {
 		return func(c *echo.Context) error {
+
+			remoteAddr := c.Request().RemoteAddr
+			if realIP := c.Request().Header.Get("X-Real-IP"); realIP != "" {
+				remoteAddr = realIP
+			}
+			if realIP := c.Request().Header.Get("X-Forwarded-For"); realIP != "" {
+				remoteAddr = realIP
+			}
+
 			start := time.Now()
 			if err := h(c); err != nil {
 				c.Error(err)
@@ -34,7 +44,9 @@ func Logger() echo.MiddlewareFunc {
 				code = color.Cyan(n)
 			}
 
-			log.Printf("%s %s %s %s %d", method, path, code, stop.Sub(start), size)
+			remoteAddr, _, _ = net.SplitHostPort(remoteAddr)
+
+			log.Printf("%s %s %s %s %s %d", remoteAddr, method, path, code, stop.Sub(start), size)
 			return nil
 		}
 	}

middleware/logger_test.go

@@ -2,12 +2,28 @@ package middleware
 
 import (
 	"errors"
-	"github.com/labstack/echo"
 	"net/http"
 	"net/http/httptest"
 	"testing"
+
+	"github.com/labstack/echo"
 )
 
+func TestRealIPHeader(t *testing.T) {
+	e := echo.New()
+	req, _ := http.NewRequest(echo.GET, "/", nil)
+	req.Header.Add("X-Real-IP", "127.0.0.1")
+	req.Header.Add("X-Forwarded-For", "127.0.0.1")
+	rec := httptest.NewRecorder()
+	c := echo.NewContext(req, echo.NewResponse(rec), e)
+
+	// Status 2xx
+	h := func(c *echo.Context) error {
+		return c.String(http.StatusOK, "test")
+	}
+	Logger()(h)(c)
+}
+
 func TestLogger(t *testing.T) {
 	e := echo.New()
 	req, _ := http.NewRequest(echo.GET, "/", nil)