dashboard/app: stricter check on namespace names

Check that namespaces don't contain bad chars.
google · Apr 10, 2019 · 31e097a · 31e097a
1 parent e39dbde
commit 31e097a
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/dashboard/app/config.go b/dashboard/app/config.go
@@ -135,8 +135,9 @@ type KernelRepo struct {
 }
 
 var (
-	clientNameRe = regexp.MustCompile("^[a-zA-Z0-9-_]{4,100}$")
-	clientKeyRe  = regexp.MustCompile("^[a-zA-Z0-9]{16,128}$")
+	namespaceNameRe = regexp.MustCompile("^[a-zA-Z0-9-_.]{4,32}$")
+	clientNameRe    = regexp.MustCompile("^[a-zA-Z0-9-_.]{4,100}$")
+	clientKeyRe     = regexp.MustCompile("^[a-zA-Z0-9]{16,128}$")
 )
 
 type (
@@ -202,8 +203,8 @@ func checkConfig(cfg *GlobalConfig) {
 }
 
 func checkNamespace(ns string, cfg *Config, namespaces, clientNames map[string]bool) {
-	if ns == "" {
-		panic("empty namespace name")
+	if !namespaceNameRe.MatchString(ns) {
+		panic(fmt.Sprintf("bad namespace name: %q", ns))
 	}
 	if namespaces[ns] {
 		panic(fmt.Sprintf("duplicate namespace %q", ns))