ClusterCockpit/cc-backend
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-backend synced 2025-09-12 19:53:00 +02:00
Code Issues Packages Releases Activity

Merge branch 'dev' into metricstore

Browse Source
This commit is contained in:
Jan Eitzinger
2025-09-10 09:14:50 +02:00
committed by GitHub
parent 79605c8a9e ffa9919019
commit df0e8eb228
26 changed files with 2836 additions and 945 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
internal/auth/auth.go
View File

@@ -402,7 +402,7 @@ func (auth *Authentication) AuthUserApi(
return
}
case len(user.Roles) >= 2:
if user.HasRole(schema.RoleApi) && user.HasAnyRole([]schema.Role{schema.RoleUser, schema.RoleManager, schema.RoleAdmin}) {
if user.HasRole(schema.RoleApi) && user.HasAnyRole([]schema.Role{schema.RoleUser, schema.RoleManager, schema.RoleSupport, schema.RoleAdmin}) {
ctx := context.WithValue(r.Context(), repository.ContextUserKey, user)
onsuccess.ServeHTTP(rw, r.WithContext(ctx))
return
@@ -530,6 +530,7 @@ func securedCheck(user *schema.User, r *http.Request) error {
IPAddress = r.RemoteAddr
}
// FIXME: IPV6 not handled
if strings.Contains(IPAddress, ":") {
IPAddress = strings.Split(IPAddress, ":")[0]
}