mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-05-07 03:50:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make permission and role ids unique (#5051)

Browse Source 
* make permission ids unique

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>

* deduplicate roleids after listing permissions

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
This commit is contained in:
Jörn Friedrich Dreyer
2022-11-15 16:51:49 +01:00
committed by GitHub
parent 4971330477
commit 7443a9a225
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/settings/pkg/service/v0/service.go
+7 -2
View File
@@ -563,9 +563,14 @@ func (g Service) hasStaticPermission(ctx context.Context, permissionID string) b
return false
}
roleIDs = make([]string, 0, len(assignments))
// deduplicate roleids
uniqueRoleIds := make(map[string]struct{})
for _, a := range assignments {
roleIDs = append(roleIDs, a.GetRoleId())
uniqueRoleIds[a.GetRoleId()] = struct{}{}
}
roleIDs = make([]string, 0, len(uniqueRoleIds))
for a := range uniqueRoleIds {
roleIDs = append(roleIDs, a)
}
}
p, err := g.manager.ReadPermissionByID(permissionID, roleIDs)
services/settings/pkg/service/v0/settings.go
+1 -1
View File
@@ -24,7 +24,7 @@ const (
RoleManagementPermissionName string = "role-management"
// SettingsManagementPermissionID is the hardcoded setting UUID for the settings management permission
SettingsManagementPermissionID string = "79e13b30-3e22-11eb-bc51-0b9f0bad9a58"
SettingsManagementPermissionID string = "3d58f441-4a05-42f8-9411-ef5874528ae1"
// SettingsManagementPermissionName is the hardcoded setting name for the settings management permission
SettingsManagementPermissionName string = "settings-management"
services/settings/pkg/store/defaults/defaults.go
+1 -1
View File
@@ -24,7 +24,7 @@ const (
RoleManagementPermissionName string = "role-management"
// SettingsManagementPermissionID is the hardcoded setting UUID for the settings management permission
SettingsManagementPermissionID string = "79e13b30-3e22-11eb-bc51-0b9f0bad9a58"
SettingsManagementPermissionID string = "3d58f441-4a05-42f8-9411-ef5874528ae1"
// SettingsManagementPermissionName is the hardcoded setting name for the settings management permission
SettingsManagementPermissionName string = "settings-management"