Merge pull request #145 from hyperledger-labs/f-144

vault fails to validate keys containing string(utf8.MaxRune) #144
hyperledger-labs · Oct 1, 2021 · 1bd8acc · 1bd8acc
2 parents 7cf9a0f + 51ab039
commit 1bd8acc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/platform/view/services/db/keys/utils.go b/platform/view/services/db/keys/utils.go
@@ -8,13 +8,14 @@ package keys
 
 import (
 	"regexp"
+	"unicode/utf8"
 
 	"github.com/pkg/errors"
 )
 
 var (
 	nsRegexp  = regexp.MustCompile("^[a-zA-Z0-9._-]{1,20}$")
-	keyRegexp = regexp.MustCompile("^[a-zA-Z0-9._\u0000=+/-]{1,200}$")
+	keyRegexp = regexp.MustCompile("^[a-zA-Z0-9._\u0000=" + string(utf8.MaxRune) + "+/-]{1,200}$")
 )
 
 const NamespaceSeparator = "\u0000"

diff --git a/platform/view/services/db/keys/utils_test.go b/platform/view/services/db/keys/utils_test.go
@@ -11,9 +11,10 @@ import (
 	"testing"
 	"unicode/utf8"
 
-	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/db/keys"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/db/keys"
 )
 
 const (
@@ -57,6 +58,7 @@ func TestValidateKey(t *testing.T) {
 	assert.NoError(t, err)
 	assert.NoError(t, keys.ValidateKey(key))
 	assert.EqualError(t, keys.ValidateKey("_key?"), "key '_key?' is invalid")
+	assert.NoError(t, keys.ValidateKey("\x00"+string(utf8.MaxRune)+"initialized"))
 }
 
 func TestValidateNamespace(t *testing.T) {