UnmarshalJSON: removing hex decode

jackc · Sep 10, 2022 · f59ff94 · f59ff94
1 parent fd427c0
commit f59ff94
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 20 deletions.
diff --git a/json_test.go b/json_test.go
@@ -489,10 +489,10 @@ func TestJSONUnmarshalQuery(t *testing.T) {
 }
 
 func TestJSONUnmarshalSASLInitialResponse(t *testing.T) {
-	data := []byte(`{"Type":"SASLInitialResponse", "AuthMechanism":"SCRAM-SHA-256", "Data": "6D"}`)
+	data := []byte(`{"Type":"SASLInitialResponse", "AuthMechanism":"SCRAM-SHA-256", "Data": "abc"}`)
 	want := SASLInitialResponse{
 		AuthMechanism: "SCRAM-SHA-256",
-		Data:          []byte{109},
+		Data:          []byte("abc"),
 	}
 
 	var got SASLInitialResponse
@@ -505,8 +505,10 @@ func TestJSONUnmarshalSASLInitialResponse(t *testing.T) {
 }
 
 func TestJSONUnmarshalSASLResponse(t *testing.T) {
-	data := []byte(`{"Type":"SASLResponse","Message":"abc"}`)
-	want := SASLResponse{}
+	data := []byte(`{"Type":"SASLResponse","Data":"abc"}`)
+	want := SASLResponse{
+		Data: []byte("abc"),
+	}
 
 	var got SASLResponse
 	if err := json.Unmarshal(data, &got); err != nil {

diff --git a/sasl_initial_response.go b/sasl_initial_response.go
@@ -2,7 +2,6 @@ package pgproto3
 
 import (
 	"bytes"
-	"encoding/hex"
 	"encoding/json"
 	"errors"
 
@@ -83,12 +82,6 @@ func (dst *SASLInitialResponse) UnmarshalJSON(data []byte) error {
 		return err
 	}
 	dst.AuthMechanism = msg.AuthMechanism
-	if msg.Data != "" {
-		decoded, err := hex.DecodeString(msg.Data)
-		if err != nil {
-			return err
-		}
-		dst.Data = decoded
-	}
+	dst.Data = []byte(msg.Data)
 	return nil
 }
diff --git a/sasl_response.go b/sasl_response.go
@@ -1,7 +1,6 @@
 package pgproto3
 
 import (
-	"encoding/hex"
 	"encoding/json"
 
 	"github.com/jackc/pgio"
@@ -50,12 +49,6 @@ func (dst *SASLResponse) UnmarshalJSON(data []byte) error {
 	if err := json.Unmarshal(data, &msg); err != nil {
 		return err
 	}
-	if msg.Data != "" {
-		decoded, err := hex.DecodeString(msg.Data)
-		if err != nil {
-			return err
-		}
-		dst.Data = decoded
-	}
+	dst.Data = []byte(msg.Data)
 	return nil
 }