Merge d905a35c2108c13ac240ffb4e3b7c5f0c2343b46 into 9914178584e42458ff7d23891463a880f58c9d86

context.go

@@ -978,27 +978,14 @@ func (c *Context) ClientIP() string {
 		}
 	}
 
-	var (
-		trusted  bool
-		remoteIP net.IP
-	)
-	// If gin is listening a unix socket, always trust it.
-	localAddr, ok := c.Request.Context().Value(http.LocalAddrContextKey).(net.Addr)
-	if ok && strings.HasPrefix(localAddr.Network(), "unix") {
-		trusted = true
-	}
-
-	// Fallback
-	if !trusted {
-		// It also checks if the remoteIP is a trusted proxy or not.
-		// In order to perform this validation, it will see if the IP is contained within at least one of the CIDR blocks
-		// defined by Engine.SetTrustedProxies()
-		remoteIP = net.ParseIP(c.RemoteIP())
-		if remoteIP == nil {
-			return ""
-		}
-		trusted = c.engine.isTrustedProxy(remoteIP)
+	// It also checks if the remoteIP is a trusted proxy or not.
+	// In order to perform this validation, it will see if the IP is contained within at least one of the CIDR blocks
+	// defined by Engine.SetTrustedProxies()
+	remoteIP := net.ParseIP(c.RemoteIP())
+	if remoteIP == nil {
+		return ""
 	}
+	trusted := c.engine.isTrustedProxy(remoteIP)
 
 	if trusted && c.engine.ForwardedByClientIP && c.engine.RemoteIPHeaders != nil {
 		for _, headerName := range c.engine.RemoteIPHeaders {

context_test.go

@@ -1915,16 +1915,6 @@ func TestContextClientIP(t *testing.T) {
 	c.engine.trustedCIDRs, _ = c.engine.prepareTrustedCIDRs()
 	resetContextForClientIPTests(c)
 
-	// unix address
-	addr := &net.UnixAddr{Net: "unix", Name: "@"}
-	c.Request = c.Request.WithContext(context.WithValue(c.Request.Context(), http.LocalAddrContextKey, addr))
-	c.Request.RemoteAddr = addr.String()
-	assert.Equal(t, "20.20.20.20", c.ClientIP())
-
-	// reset
-	c.Request = c.Request.WithContext(context.Background())
-	resetContextForClientIPTests(c)
-
 	// Legacy tests (validating that the defaults don't break the
 	// (insecure!) old behaviour)
 	assert.Equal(t, "20.20.20.20", c.ClientIP())

recovery.go

@@ -12,12 +12,12 @@ import (
 	"fmt"
 	"io"
 	"log"
+	"net"
 	"net/http"
 	"net/http/httputil"
 	"os"
 	"runtime"
 	"strings"
-	"syscall"
 	"time"
 
 	"github.com/gin-gonic/gin/internal/bytesconv"
@@ -57,33 +57,40 @@ func CustomRecoveryWithWriter(out io.Writer, handle RecoveryFunc) HandlerFunc {
 	}
 	return func(c *Context) {
 		defer func() {
-			if rec := recover(); rec != nil {
+			if err := recover(); err != nil {
 				// Check for a broken connection, as it is not really a
 				// condition that warrants a panic stack trace.
-				var isBrokenPipe bool
-				err, ok := rec.(error)
-				if ok {
-					isBrokenPipe = errors.Is(err, syscall.EPIPE) ||
-						errors.Is(err, syscall.ECONNRESET) ||
-						errors.Is(err, http.ErrAbortHandler)
-				}
-				if logger != nil {
-					if isBrokenPipe {
-						logger.Printf("%s\n%s%s", rec, secureRequestDump(c.Request), reset)
-					} else if IsDebugging() {
-						logger.Printf("[Recovery] %s panic recovered:\n%s\n%s\n%s%s",
-							timeFormat(time.Now()), secureRequestDump(c.Request), rec, stack(stackSkip), reset)
-					} else {
-						logger.Printf("[Recovery] %s panic recovered:\n%s\n%s%s",
-							timeFormat(time.Now()), rec, stack(stackSkip), reset)
+				var brokenPipe bool
+				if ne, ok := err.(*net.OpError); ok {
+					var se *os.SyscallError
+					if errors.As(ne, &se) {
+						seStr := strings.ToLower(se.Error())
+						if strings.Contains(seStr, "broken pipe") ||
+							strings.Contains(seStr, "connection reset by peer") {
+							brokenPipe = true
+						}
 					}
 				}
-				if isBrokenPipe {
+				if e, ok := err.(error); ok && errors.Is(e, http.ErrAbortHandler) {
+					brokenPipe = true
+				}
+				if logger != nil {
+					if brokenPipe {
+						logger.Printf("%s\n%s%s", err, secureRequestDump(c.Request), reset)
+					} else if IsDebugging() {
+						logger.Printf("[Recovery] %s panic recovered:\n%s\n%s\n%s%s",
+							timeFormat(time.Now()), secureRequestDump(c.Request), err, stack(stackSkip), reset)
+					} else {
+						logger.Printf("[Recovery] %s panic recovered:\n%s\n%s%s",
+							timeFormat(time.Now()), err, stack(stackSkip), reset)
+					}
+				}
+				if brokenPipe {
 					// If the connection is dead, we can't write a status to it.
-					c.Error(err) //nolint: errcheck
+					c.Error(err.(error)) //nolint: errcheck
 					c.Abort()
 				} else {
-					handle(c, rec)
+					handle(c, err)
 				}
 			}
 		}()

recovery_test.go

@@ -98,13 +98,13 @@ func TestFunction(t *testing.T) {
 func TestPanicWithBrokenPipe(t *testing.T) {
 	const expectCode = 204
 
-	expectErrnos := []syscall.Errno{
-		syscall.EPIPE,
-		syscall.ECONNRESET,
+	expectMsgs := map[syscall.Errno]string{
+		syscall.EPIPE:      "broken pipe",
+		syscall.ECONNRESET: "connection reset by peer",
 	}
 
-	for _, errno := range expectErrnos {
-		t.Run("Recovery from "+errno.Error(), func(t *testing.T) {
+	for errno, expectMsg := range expectMsgs {
+		t.Run(expectMsg, func(t *testing.T) {
 			var buf strings.Builder
 
 			router := New()
@@ -122,8 +122,7 @@ func TestPanicWithBrokenPipe(t *testing.T) {
 			w := PerformRequest(router, http.MethodGet, "/recovery")
 			// TEST
 			assert.Equal(t, expectCode, w.Code)
-			assert.Contains(t, strings.ToLower(buf.String()), errno.Error())
-			assert.NotContains(t, strings.ToLower(buf.String()), "[Recovery]")
+			assert.Contains(t, strings.ToLower(buf.String()), expectMsg)
 		})
 	}
 }