innov
/
nightingale
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

modify node specification

This commit is contained in:
710leo 2020-10-30 13:27:44 +08:00
parent ebbcfa3157
commit 10fef82225
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/models/node.go
View File

@ -183,14 +183,22 @@ func (n *Node) CreateChild(ident, name, note, cate, creator string, leaf, proxy
return nil, fmt.Errorf("tenant node should be root node only")
}
if cate == "project" && (n.Cate != "tenant" && n.Cate != "organization") {
return nil, fmt.Errorf("project node should be under tenant or organization")
}
if ident == "" {
return nil, fmt.Errorf("ident is blank")
}
if !str.IsMatch(ident, "^[a-zA-Z0-9\\-\\_]+$") {
if !str.IsMatch(ident, "^[a-z0-9\\-\\_]+$") {
return nil, fmt.Errorf("ident invalid")
}
if len(ident) >= 32 {
return nil, fmt.Errorf("ident length should be less than 32")
}
if creator != "system" {
// 人为创建的节点，有些保留名字不能使用，是为了给PaaS各个子系统注册资源所用
if (n.Path == "inner" || n.Cate == "project") && slice.ContainsString(protectedNodeIdents, ident) {

8
src/modules/rdb/http/router_node.go
View File

@ -58,8 +58,12 @@ func (f nodeForm) Validate() {
bomb("arg[pid] invalid")
}
if !str.IsMatch(f.Ident, `^[a-zA-Z0-9\-_]+$`) {
bomb("ident legal characters: [a-zA-Z0-9_-]")
if !str.IsMatch(f.Ident, `^[a-z0-9\-_]+$`) {
bomb("ident legal characters: [a-z0-9_-]")
}
if len(f.Ident) >= 32 {
bomb("ident length should be less than 32")
}
if f.Leaf != 0 && f.Leaf != 1 {