add : to valid map key names

Signed-off-by: Doug Davis <duglin@gmail.com>

Author: duglin

README.md

@@ -148,4 +148,3 @@ TODOs:
 - allow any model change, verify entities
 - make sure that maxversions=0 when we only support 1 means sitcky must be false
 - add "relaxednames" to attr aspects
-- add ":" to map key names

registry/model.go

@@ -16,7 +16,7 @@ import (
 
 var RegexpModelName = regexp.MustCompile("^[a-z_][a-z_0-9]{0,57}$")
 var RegexpPropName = regexp.MustCompile("^[a-z_][a-z_0-9]{0,62}$")
-var RegexpMapKey = regexp.MustCompile("^[a-z0-9][a-z0-9_.\\-]{0,62}$")
+var RegexpMapKey = regexp.MustCompile("^[a-z0-9][a-z0-9_.:\\-]{0,62}$")
 var RegexpID = regexp.MustCompile("^[a-zA-Z0-9_][a-zA-Z0-9_.\\-~@]{0,127}$")
 
 type ModelSerializer func(*Model, string) ([]byte, error)

registry/model_test.go

@@ -739,6 +739,7 @@ func TestValidChars(t *testing.T) {
 		{"a*", `Invalid map key name "a*", must match: ` + match},
 		{"a!", `Invalid map key name "a!", must match: ` + match},
 		{"a~", `Invalid map key name "a~", must match: ` + match},
+		{":a", `Invalid map key name ":a", must match: ` + match},
 		{a64, `Invalid map key name "` + a64 + `", must match: ` + match},
 
 		{"a", ``},
@@ -752,6 +753,7 @@ func TestValidChars(t *testing.T) {
 		{"m-z", ``},
 		{"m.9", ``},
 		{"m_9", ``},
+		{"m:9", ``},
 		{a63, ``},
 	} {
 		err := IsValidMapKey(test.input)

tests/set_test.go

@@ -626,15 +626,18 @@ func TestSetNameUser(t *testing.T) {
 }
 `)
 
+	xHTTP(t, reg, "PUT", "/", `{"mymap":{":bar":"bar"}}`, 400,
+		`Invalid map key name ":bar", must match: ^[a-z0-9][a-z0-9_.:\-]{0,62}$
+`)
 	xHTTP(t, reg, "PUT", "/", `{"mymap":{"@bar":"bar"}}`, 400,
-		`Invalid map key name "@bar", must match: ^[a-z0-9][a-z0-9_.\-]{0,62}$
+		`Invalid map key name "@bar", must match: ^[a-z0-9][a-z0-9_.:\-]{0,62}$
 `)
 	// This is ok because "mymap" is under "ext" which is defined as "*"
 	// and that allows ANYTHING as long as it's valid json
 	xHTTP(t, reg, "PUT", "/", `{"ext":{"mymap":{"@bar":"bar"}}}`, 200, `*`)
 
 	xHTTP(t, reg, "PUT", "/dirs/d1", `{"mymap":{"@bar":"bar"}}`, 400,
-		`Invalid map key name "@bar", must match: ^[a-z0-9][a-z0-9_.\-]{0,62}$
+		`Invalid map key name "@bar", must match: ^[a-z0-9][a-z0-9_.:\-]{0,62}$
 `)
 	// This is ok because "mymap" is under "ext" which is defined as "*"
 	// and that allows ANYTHING as long as it's valid json
@@ -643,7 +646,7 @@ func TestSetNameUser(t *testing.T) {
 
 	xHTTP(t, reg, "PUT", "/dirs/d1/files/f1$details",
 		`{"mymap":{"@bar":"bar"}}`, 400,
-		`Invalid map key name "@bar", must match: ^[a-z0-9][a-z0-9_.\-]{0,62}$
+		`Invalid map key name "@bar", must match: ^[a-z0-9][a-z0-9_.:\-]{0,62}$
 `)
 	// This is ok because "mymap" is under "ext" which is defined as "*"
 	// and that allows ANYTHING as long as it's valid json