llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-05-23 10:45:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: check group name cannot be same as organization name (#2090)

Browse Source
This commit is contained in:
Yaodong Yu 2023-07-19 11:37:28 +08:00 committed by GitHub
parent 6c647818ca
commit 0639564d27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
object/group.go
View File

@ -107,6 +107,11 @@ func UpdateGroup(id string, group *Group) (bool, error) {
return false, err return false, err
} }
err = checkGroupName(group.Name)
if err != nil {
return false, err
}
if name != group.Name { if name != group.Name {
err := GroupChangeTrigger(name, group.Name) err := GroupChangeTrigger(name, group.Name)
if err != nil { if err != nil {
@ -123,6 +128,11 @@ func UpdateGroup(id string, group *Group) (bool, error) {
} }
func AddGroup(group *Group) (bool, error) { func AddGroup(group *Group) (bool, error) {
err := checkGroupName(group.Name)
if err != nil {
return false, err
}
affected, err := adapter.Engine.Insert(group) affected, err := adapter.Engine.Insert(group)
if err != nil { if err != nil {
return false, err return false, err
@ -168,6 +178,17 @@ func DeleteGroup(group *Group) (bool, error) {
return affected != 0, nil return affected != 0, nil
} }
func checkGroupName(name string) error {
exist, err := adapter.Engine.Exist(&Organization{Owner: "admin", Name: name})
if err != nil {
return err
}
if exist {
return errors.New("group name can't be same as the organization name")
}
return nil
}
func (group *Group) GetId() string { func (group *Group) GetId() string {
return fmt.Sprintf("%s/%s", group.Owner, group.Name) return fmt.Sprintf("%s/%s", group.Owner, group.Name)
} }