Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HTTP unmarshal a number into an interface{} as json.Number instead of float64 #1407

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

HTTP unmarshal a number into an interface{} as json.Number instead of float64 #1407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions internal/server/httpws/redisCmdAdapter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,17 +86,15 @@ func ParseHTTPRequest(r *http.Request) (*cmd.DiceDBCmd, error) {
}
// Step 1: Handle JSON body if present
if r.Body != nil {
body, err := io.ReadAll(r.Body)
if err != nil {
return nil, err
}
decoder := json.NewDecoder(r.Body)
decoder.UseNumber() // avoids converting numbers to float64

if len(body) > 0 {
var jsonBody map[string]interface{}
if err := json.Unmarshal(body, &jsonBody); err != nil {
var jsonBody map[string]interface{}
if err := decoder.Decode(&jsonBody); err != nil {
if err != io.EOF { // ignore EOF error
return nil, err
}

} else {
if len(jsonBody) == 0 && command != ABORT {
return nil, fmt.Errorf("empty JSON object")
}
Expand Down
59 changes: 59 additions & 0 deletions internal/server/httpws/redisCmdAdapter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package httpws

import (
"io"
"net/http/httptest"
"strings"
"testing"
Expand Down Expand Up @@ -82,6 +83,14 @@ func TestParseHTTPRequest(t *testing.T) {
expectedCmd: "SET",
expectedArgs: []string{"k1", `[{"subKey1":"value1"},{"subKey2":"value2"}]`, "nx"},
},
{
name: "Test SET command with int64",
method: "POST",
url: "/set",
body: `{"key": "k1", "value": -9223372036854775808}`,
expectedCmd: "SET",
expectedArgs: []string{"k1", "-9223372036854775808"},
},
{
name: "Test GET command",
method: "POST",
Expand Down Expand Up @@ -226,6 +235,14 @@ func TestParseHTTPRequest(t *testing.T) {
expectedCmd: "JSON.ARRPOP",
expectedArgs: []string{"k1", "$", "1"},
},
{
name: "Test ABORT command",
method: "POST",
url: "/abort",
body: `{}`,
expectedCmd: "ABORT",
expectedArgs: []string{},
},
}

for _, tc := range commands {
Expand All @@ -251,6 +268,48 @@ func TestParseHTTPRequest(t *testing.T) {
}
}

func TestParseHTTPRequestError(t *testing.T) {
commands := []struct {
name string
method string
url string
body string
expectedErr string
}{
{
name: "Unexpected EOF",
method: "POST",
url: "/set",
body: `{"key": "malformed json}"`,
expectedErr: io.ErrUnexpectedEOF.Error(),
},
{
name: "Empty body",
method: "POST",
url: "/set",
body: `{}`,
expectedErr: "empty JSON object",
},
{
name: "Syntax error",
method: "POST",
url: "/set",
body: `{'key': "k1"}`,
expectedErr: "invalid character '\\'' looking for beginning of object key string",
},
}
for _, tc := range commands {
t.Run(tc.name, func(t *testing.T) {
req := httptest.NewRequest(tc.method, tc.url, strings.NewReader(tc.body))
req.Header.Set("Content-Type", "application/json")

_, err := ParseHTTPRequest(req)
assert.Error(t, err)
assert.EqualError(t, err, tc.expectedErr)
})
}
}

func TestParseWebsocketMessage(t *testing.T) {
commands := []struct {
name string
Expand Down