DecryptMarshal: json UseNumber (#20)

ovh · Aug 27, 2019 · 95035df · 95035df
1 parent 0d66d1a
commit 95035df
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/symmecrypt_test.go b/symmecrypt_test.go
@@ -3,6 +3,7 @@ package symmecrypt_test
 import (
 	"bytes"
 	"encoding/json"
+	"fmt"
 	"io"
 	"os"
 	"reflect"
@@ -102,8 +103,9 @@ func TestEncryptDecrypt(t *testing.T) {
 }
 
 type testObfuscate struct {
-	Name   string
-	Amount int
+	Name            string
+	Amount          int
+	InterfaceNumber interface{}
 }
 
 func TestEncryptDecryptMarshal(t *testing.T) {
@@ -114,8 +116,9 @@ func TestEncryptDecryptMarshal(t *testing.T) {
 	}
 
 	origin := &testObfuscate{
-		Name:   "test",
-		Amount: 10,
+		Name:            "test",
+		Amount:          10,
+		InterfaceNumber: 2345678954,
 	}
 
 	extra := []byte("aa")
@@ -149,11 +152,11 @@ func TestEncryptDecryptMarshal(t *testing.T) {
 		t.Fatal("succerssfully decrypted cipher without using extra data -> ERROR")
 	}
 
-	if target.Name != origin.Name || target.Amount != origin.Amount {
-		t.Errorf("Not same deobfuscated result %s, %d", target.Name, target.Amount)
+	if target.Name != origin.Name || target.Amount != origin.Amount || fmt.Sprint(origin.InterfaceNumber) != fmt.Sprint(target.InterfaceNumber) {
+		t.Errorf("Not same deobfuscated result %s, %d, %v", target.Name, target.Amount, target.InterfaceNumber)
 	}
-	if targetExtra.Name != origin.Name || targetExtra.Amount != origin.Amount {
-		t.Errorf("Not same deobfuscated result %s, %d", targetExtra.Name, targetExtra.Amount)
+	if targetExtra.Name != origin.Name || targetExtra.Amount != origin.Amount || fmt.Sprint(origin.InterfaceNumber) != fmt.Sprint(targetExtra.InterfaceNumber) {
+		t.Errorf("Not same deobfuscated result %s, %d, %v", targetExtra.Name, targetExtra.Amount, targetExtra.InterfaceNumber)
 	}
 }
 

diff --git a/symutils/symutils.go b/symutils/symutils.go
@@ -1,6 +1,7 @@
 package symutils
 
 import (
+	"bytes"
 	"crypto/cipher"
 	"crypto/rand"
 	"encoding/base64"
@@ -202,7 +203,9 @@ func (b KeyAEAD) DecryptMarshal(s string, target interface{}, extra ...[]byte) e
 	if err != nil {
 		return err
 	}
-	return json.Unmarshal(unciphered, target)
+	dec := json.NewDecoder(bytes.NewReader(unciphered))
+	dec.UseNumber()
+	return dec.Decode(target)
 }
 
 // Wait is a noop for regular implementations: the key is always ready