Merge 563f4f606ffef4df8e21461821e2364a73776833 into 77d70e5858278193abfab732164b0c1415d8d4ba

binding/json.go

@@ -13,6 +13,11 @@ import (
 	"github.com/gin-gonic/gin/internal/json"
 )
 
+var (
+	// ErrInvalidJSON invalid json
+	ErrInvalidJSON = errors.New("invalid JSON")
+)
+
 // EnableDecoderUseNumber is used to call the UseNumber method on the JSON
 // Decoder instance. UseNumber causes the Decoder to unmarshal a number into an
 // any as a Number instead of as a float64.
@@ -34,10 +39,19 @@ func (jsonBinding) Bind(req *http.Request, obj any) error {
 	if req == nil || req.Body == nil {
 		return errors.New("invalid request")
 	}
-	return decodeJSON(req.Body, obj)
+	body, _ := io.ReadAll(req.Body)
+	ok := json.Valid(body)
+	if !ok {
+		return ErrInvalidJSON
+	}
+	return decodeJSON(bytes.NewReader(body), obj)
 }
 
 func (jsonBinding) BindBody(body []byte, obj any) error {
+	ok := json.Valid(body)
+	if !ok {
+		return ErrInvalidJSON
+	}
 	return decodeJSON(bytes.NewReader(body), obj)
 }
 

binding/json_test.go

@@ -5,6 +5,8 @@
 package binding
 
 import (
+	"bytes"
+	"net/http"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -18,6 +20,9 @@ func TestJSONBindingBindBody(t *testing.T) {
 	err := jsonBinding{}.BindBody([]byte(`{"foo": "FOO"}`), &s)
 	require.NoError(t, err)
 	assert.Equal(t, "FOO", s.Foo)
+
+	err = jsonBinding{}.BindBody([]byte(`{"foo": "FOO}`), &s)
+	assert.Equal(t, ErrInvalidJSON, err)
 }
 
 func TestJSONBindingBindBodyMap(t *testing.T) {
@@ -27,4 +32,21 @@ func TestJSONBindingBindBodyMap(t *testing.T) {
 	assert.Len(t, s, 2)
 	assert.Equal(t, "FOO", s["foo"])
 	assert.Equal(t, "world", s["hello"])
+
+	err = jsonBinding{}.BindBody([]byte(`{"foo": "FOO","hello":"world}`), &s)
+	assert.Equal(t, ErrInvalidJSON, err)
+}
+
+func TestTestJSONBindingBind(t *testing.T) {
+	var s struct {
+		Foo string `json:"foo"`
+	}
+	req, _ := http.NewRequest(http.MethodPost, "/", bytes.NewBufferString(`{"foo":"FOO"}`))
+	err := jsonBinding{}.Bind(req, &s)
+	require.NoError(t, err)
+	assert.Equal(t, "FOO", s.Foo)
+
+	req, _ = http.NewRequest(http.MethodPost, "/", bytes.NewBufferString(`{"foo":"FOO}`))
+	err = jsonBinding{}.Bind(req, &s)
+	assert.Equal(t, ErrInvalidJSON, err)
 }

internal/json/go_json.go

@@ -6,7 +6,7 @@
 
 package json
 
-import json "github.com/goccy/go-json"
+import "github.com/goccy/go-json"
 
 var (
 	// Marshal is exported by gin/json package.
@@ -19,6 +19,8 @@ var (
 	NewDecoder = json.NewDecoder
 	// NewEncoder is exported by gin/json package.
 	NewEncoder = json.NewEncoder
+	// Valid is exported by gin/json package.
+	Valid = json.Valid
 )
 
 // Package indicates what library is being used for JSON encoding.

internal/json/json.go

@@ -19,6 +19,8 @@ var (
 	NewDecoder = json.NewDecoder
 	// NewEncoder is exported by gin/json package.
 	NewEncoder = json.NewEncoder
+	// Valid is exported by gin/json package.
+	Valid = json.Valid
 )
 
 // Package indicates what library is being used for JSON encoding.

internal/json/jsoniter.go

@@ -20,6 +20,8 @@ var (
 	NewDecoder = json.NewDecoder
 	// NewEncoder is exported by gin/json package.
 	NewEncoder = json.NewEncoder
+	// Valid is exported by gin/json package.
+	Valid = json.Valid
 )
 
 // Package indicates what library is being used for JSON encoding.

internal/json/sonic.go

@@ -20,6 +20,8 @@ var (
 	NewDecoder = json.NewDecoder
 	// NewEncoder is exported by gin/json package.
 	NewEncoder = json.NewEncoder
+	// Valid is exported by gin/json package.
+	Valid = json.Valid
 )
 
 // Package indicates what library is being used for JSON encoding.