Merge branch 'main' into keyauth-use-extractors

Author: sixcolors

ctx.go

@@ -337,14 +337,66 @@ func (c *DefaultCtx) IsMiddleware() bool {
 	return c.indexHandler+1 < len(c.route.Handlers)
 }
 
-// HasBody returns true if the request has a body or a Content-Length header greater than zero.
+// HasBody returns true if the request declares a body via Content-Length, Transfer-Encoding, or already buffered payload data.
 func (c *DefaultCtx) HasBody() bool {
-	if c.fasthttp.Request.Header.ContentLength() > 0 {
+	hdr := &c.fasthttp.Request.Header
+
+	switch cl := hdr.ContentLength(); {
+	case cl > 0:
+		return true
+	case cl == -1:
+		// fasthttp reports -1 for Transfer-Encoding: chunked bodies.
 		return true
+	case cl == 0:
+		if hasTransferEncodingBody(hdr) {
+			return true
+		}
 	}
+
 	return len(c.fasthttp.Request.Body()) > 0
 }
 
+func hasTransferEncodingBody(hdr *fasthttp.RequestHeader) bool {
+	teBytes := hdr.Peek(HeaderTransferEncoding)
+	var te string
+
+	if len(teBytes) > 0 {
+		te = utils.UnsafeString(teBytes)
+	} else {
+		for key, value := range hdr.All() {
+			if !strings.EqualFold(utils.UnsafeString(key), HeaderTransferEncoding) {
+				continue
+			}
+			te = utils.UnsafeString(value)
+			break
+		}
+	}
+
+	if te == "" {
+		return false
+	}
+
+	hasEncoding := false
+	for raw := range strings.SplitSeq(te, ",") {
+		token := strings.TrimSpace(raw)
+		if len(token) == 0 {
+			continue
+		}
+		if idx := strings.IndexByte(token, ';'); idx >= 0 {
+			token = strings.TrimSpace(token[:idx])
+		}
+		if token == "" {
+			continue
+		}
+		if strings.EqualFold(token, "identity") {
+			continue
+		}
+		hasEncoding = true
+	}
+
+	return hasEncoding
+}
+
 // IsWebSocket returns true if the request includes a WebSocket upgrade handshake.
 func (c *DefaultCtx) IsWebSocket() bool {
 	conn := c.fasthttp.Request.Header.Peek(HeaderConnection)

ctx_interface_gen.go

@@ -5113,22 +5113,95 @@ func Test_Ctx_HasBody(t *testing.T) {
 	t.Parallel()
 	app := New()
 
-	ctxWithBody := app.AcquireCtx(&fasthttp.RequestCtx{})
-	require.NotNil(t, ctxWithBody)
-	t.Cleanup(func() { app.ReleaseCtx(ctxWithBody) })
-	ctxWithBody.Request().SetBody([]byte("test"))
-	require.True(t, ctxWithBody.HasBody())
-
-	ctxWithHeader := app.AcquireCtx(&fasthttp.RequestCtx{})
-	require.NotNil(t, ctxWithHeader)
-	t.Cleanup(func() { app.ReleaseCtx(ctxWithHeader) })
-	ctxWithHeader.Request().Header.SetContentLength(4)
-	require.True(t, ctxWithHeader.HasBody())
-
-	ctxWithoutBody := app.AcquireCtx(&fasthttp.RequestCtx{})
-	require.NotNil(t, ctxWithoutBody)
-	t.Cleanup(func() { app.ReleaseCtx(ctxWithoutBody) })
-	require.False(t, ctxWithoutBody.HasBody())
+	acquire := func(t *testing.T) CustomCtx {
+		t.Helper()
+		ctx := app.AcquireCtx(&fasthttp.RequestCtx{})
+		require.NotNil(t, ctx)
+		t.Cleanup(func() { app.ReleaseCtx(ctx) })
+		return ctx
+	}
+
+	setTransferEncoding := func(t *testing.T, ctx Ctx, value string) {
+		t.Helper()
+		hdr := &ctx.Request().Header
+		hdr.DisableSpecialHeader()
+		hdr.Set(HeaderTransferEncoding, value)
+		hdr.Set(HeaderContentLength, "0")
+		hdr.EnableSpecialHeader()
+		require.Zero(t, hdr.ContentLength())
+		require.Empty(t, ctx.Request().Body())
+	}
+
+	t.Run("body bytes", func(t *testing.T) {
+		t.Parallel()
+		ctx := acquire(t)
+		ctx.Request().SetBody([]byte("test"))
+		require.True(t, ctx.HasBody())
+	})
+
+	t.Run("content length header", func(t *testing.T) {
+		t.Parallel()
+		ctx := acquire(t)
+		ctx.Request().Header.SetContentLength(4)
+		require.True(t, ctx.HasBody())
+	})
+
+	t.Run("chunked sentinel", func(t *testing.T) {
+		t.Parallel()
+		ctx := acquire(t)
+		ctx.Request().Header.SetContentLength(-1)
+		require.Equal(t, -1, ctx.Request().Header.ContentLength())
+		require.Empty(t, ctx.Request().Body())
+		require.True(t, ctx.HasBody())
+	})
+
+	t.Run("transfer encoding chunked", func(t *testing.T) {
+		t.Parallel()
+		ctx := acquire(t)
+		setTransferEncoding(t, ctx, "chunked")
+		require.True(t, ctx.HasBody())
+	})
+
+	t.Run("transfer encoding whitespace", func(t *testing.T) {
+		t.Parallel()
+		ctx := acquire(t)
+		setTransferEncoding(t, ctx, "  ChUnKeD  ")
+		require.True(t, ctx.HasBody())
+	})
+
+	t.Run("transfer encoding parameters", func(t *testing.T) {
+		t.Parallel()
+		ctx := acquire(t)
+		setTransferEncoding(t, ctx, "chunked; q=1")
+		require.True(t, ctx.HasBody())
+	})
+
+	t.Run("transfer encoding multiple values", func(t *testing.T) {
+		t.Parallel()
+		ctx := acquire(t)
+		setTransferEncoding(t, ctx, "gzip, chunked")
+		require.True(t, ctx.HasBody())
+	})
+
+	t.Run("transfer encoding identity", func(t *testing.T) {
+		t.Parallel()
+		ctx := acquire(t)
+		setTransferEncoding(t, ctx, "identity")
+		require.False(t, ctx.HasBody())
+	})
+
+	t.Run("transfer encoding identity then chunked", func(t *testing.T) {
+		t.Parallel()
+		ctx := acquire(t)
+		setTransferEncoding(t, ctx, "identity, chunked")
+		require.True(t, ctx.HasBody())
+	})
+
+	t.Run("no body", func(t *testing.T) {
+		t.Parallel()
+		ctx := acquire(t)
+		require.False(t, ctx.HasBody())
+	})
 }
 
 func Test_Ctx_IsWebSocket(t *testing.T) {