🐛 Fix bug preventing non-utf8 characters being saved in some databases

gofiber · Apr 11, 2021 · 5d232d2 · 5d232d2
1 parent 7cfce7a
commit 5d232d2
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 13 deletions.
diff --git a/arangodb/arangodb_test.go b/arangodb/arangodb_test.go
@@ -118,6 +118,17 @@ func Test_ARANGODB_Reset(t *testing.T) {
 	utils.AssertEqual(t, true, len(result) == 0)
 }
 
+func Test_ARANGODB_Non_UTF8(t *testing.T) {
+	val := []byte("0xF5")
+
+	err := testStore.Set("0xF6", val, 0)
+	utils.AssertEqual(t, nil, err)
+
+	result, err := testStore.Get("0xF6")
+	utils.AssertEqual(t, nil, err)
+	utils.AssertEqual(t, val, result)
+}
+
 func Test_ARANGODB_Close(t *testing.T) {
 	utils.AssertEqual(t, nil, testStore.Close())
 }
diff --git a/mysql/mysql.go b/mysql/mysql.go
@@ -6,7 +6,6 @@ import (
 	"time"
 
 	_ "github.com/go-sql-driver/mysql"
-	"github.com/gofiber/utils"
 )
 
 // Storage interface that is implemented by storage providers
@@ -27,7 +26,7 @@ var (
 	initQuery = []string{
 		`CREATE TABLE IF NOT EXISTS %s ( 
 			k  VARCHAR(64) NOT NULL DEFAULT '', 
-			v  TEXT NOT NULL, 
+			v  BLOB NOT NULL, 
 			e  BIGINT NOT NULL DEFAULT '0', 
 			PRIMARY KEY (k)
 		) ENGINE=InnoDB DEFAULT CHARSET=utf8;`,
@@ -133,8 +132,7 @@ func (s *Storage) Set(key string, val []byte, exp time.Duration) error {
 	if exp != 0 {
 		expSeconds = time.Now().Add(exp).Unix()
 	}
-	valStr := utils.UnsafeString(val)
-	_, err := s.db.Exec(s.sqlInsert, key, valStr, expSeconds, valStr, expSeconds)
+	_, err := s.db.Exec(s.sqlInsert, key, val, expSeconds, val, expSeconds)
 	return err
 }
 

diff --git a/mysql/mysql_test.go b/mysql/mysql_test.go
@@ -148,6 +148,17 @@ func Test_MYSQL_GC(t *testing.T) {
 
 }
 
+func Test_MYSQL_Non_UTF8(t *testing.T) {
+	val := []byte("0xF5")
+
+	err := testStore.Set("0xF6", val, 0)
+	utils.AssertEqual(t, nil, err)
+
+	result, err := testStore.Get("0xF6")
+	utils.AssertEqual(t, nil, err)
+	utils.AssertEqual(t, val, result)
+}
+
 func Test_MYSQL_Close(t *testing.T) {
 	utils.AssertEqual(t, nil, testStore.Close())
 }
diff --git a/postgres/postgres.go b/postgres/postgres.go
@@ -7,7 +7,6 @@ import (
 	"net/url"
 	"time"
 
-	"github.com/gofiber/utils"
 	_ "github.com/lib/pq"
 )
 
@@ -29,7 +28,7 @@ var (
 	initQuery = []string{
 		`CREATE TABLE IF NOT EXISTS %s (
 			k  VARCHAR(64) PRIMARY KEY NOT NULL DEFAULT '',
-			v  TEXT NOT NULL,
+			v  BYTEA NOT NULL,
 			e  BIGINT NOT NULL DEFAULT '0'
 		);`,
 		`CREATE INDEX IF NOT EXISTS e ON %s (e);`,
@@ -137,7 +136,6 @@ func (s *Storage) Get(key string) ([]byte, error) {
 	return data, nil
 }
 
-// Set key with value
 // Set key with value
 func (s *Storage) Set(key string, val []byte, exp time.Duration) error {
 	// Ain't Nobody Got Time For That
@@ -148,8 +146,7 @@ func (s *Storage) Set(key string, val []byte, exp time.Duration) error {
 	if exp != 0 {
 		expSeconds = time.Now().Add(exp).Unix()
 	}
-	valStr := utils.UnsafeString(val)
-	_, err := s.db.Exec(s.sqlInsert, key, valStr, expSeconds, valStr, expSeconds)
+	_, err := s.db.Exec(s.sqlInsert, key, val, expSeconds, val, expSeconds)
 	return err
 }
 

diff --git a/postgres/postgres_test.go b/postgres/postgres_test.go
@@ -148,6 +148,17 @@ func Test_Postgres_GC(t *testing.T) {
 
 }
 
+func Test_Postgres_Non_UTF8(t *testing.T) {
+	val := []byte("0xF5")
+
+	err := testStore.Set("0xF6", val, 0)
+	utils.AssertEqual(t, nil, err)
+
+	result, err := testStore.Get("0xF6")
+	utils.AssertEqual(t, nil, err)
+	utils.AssertEqual(t, val, result)
+}
+
 func Test_Postgres_Close(t *testing.T) {
 	utils.AssertEqual(t, nil, testStore.Close())
 }
diff --git a/sqlite3/sqlite3.go b/sqlite3/sqlite3.go
@@ -5,8 +5,6 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/gofiber/utils"
-
 	_ "github.com/mattn/go-sqlite3"
 )
 
@@ -28,7 +26,7 @@ var (
 	initQuery = []string{
 		`CREATE TABLE IF NOT EXISTS %s (
 			k  VARCHAR(64) PRIMARY KEY NOT NULL DEFAULT '',
-			v TEXT NOT NULL,
+			v  BLOB NOT NULL,
 			e  BIGINT NOT NULL DEFAULT '0'
 		);`,
 		`CREATE INDEX IF NOT EXISTS e ON %s (e);`,
@@ -126,7 +124,7 @@ func (s *Storage) Set(key string, val []byte, exp time.Duration) error {
 	if exp != 0 {
 		expSeconds = time.Now().Add(exp).Unix()
 	}
-	_, err := s.db.Exec(s.sqlInsert, key, utils.UnsafeString(val), expSeconds)
+	_, err := s.db.Exec(s.sqlInsert, key, val, expSeconds)
 	return err
 }
 

diff --git a/sqlite3/sqlite3_test.go b/sqlite3/sqlite3_test.go
@@ -145,6 +145,17 @@ func Test_SQLite3_GC(t *testing.T) {
 
 }
 
+func Test_SQLite3_Non_UTF8(t *testing.T) {
+	val := []byte("0xF5")
+
+	err := testStore.Set("0xF6", val, 0)
+	utils.AssertEqual(t, nil, err)
+
+	result, err := testStore.Get("0xF6")
+	utils.AssertEqual(t, nil, err)
+	utils.AssertEqual(t, val, result)
+}
+
 func Test_SQLite3_Close(t *testing.T) {
 	utils.AssertEqual(t, nil, testStore.Close())
 }