temp!

Signed-off-by: Alexandros Filios <alexandros.filios@ibm.com>

Author: alexandrosfilios

platform/view/services/db/driver/sql/common/vault.go

@@ -13,6 +13,7 @@ import (
 	"fmt"
 	"runtime/debug"
 	"strings"
+	"unicode/utf8"
 
 	"github.com/hyperledger-labs/fabric-smart-client/pkg/utils/errors"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/common/driver"
@@ -277,25 +278,27 @@ func (db *VaultPersistence) UpdateStatusesValid(txIDs []driver.TxID, offset int)
 	return query, params
 }
 
+const minUnicodeRuneValue = string(0)
+const maxUnicodeRuneValue = string(utf8.MaxRune)
 const forbiddenRune = "\x00"
-const forbiddenRuneReplacement = "??"
+
+var replacements = map[string]string{
+	minUnicodeRuneValue: "?0?",
+	maxUnicodeRuneValue: "?1?",
+	forbiddenRune:       "?2?",
+}
 
 // TODO: Better sanitization of inputs
 func escape(s string) (string, error) {
-	if strings.HasPrefix(s, forbiddenRune) {
-		logger.Infof("Escaping [%s]", s)
-		s = forbiddenRuneReplacement + strings.TrimPrefix(s, forbiddenRune)
-	}
-	if strings.Contains(s, forbiddenRune) {
-		return "", errors.Errorf("invalid character in [%s]", s)
+	for forbidden, replacement := range replacements {
+		s = strings.ReplaceAll(s, forbidden, replacement)
 	}
 	return s, nil
 }
 
 func unescape(s string) string {
-	if strings.HasPrefix(s, forbiddenRuneReplacement) {
-		logger.Infof("Reverting escaped [%s]", s)
-		return forbiddenRune + strings.TrimPrefix(s, forbiddenRuneReplacement)
+	for forbidden, replacement := range replacements {
+		s = strings.ReplaceAll(s, replacement, forbidden)
 	}
 	return s
 }