Skip to content

internal/outpost/ldap: type switching for uidNumber/gidNumber #24839

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tacerus wants to merge 1 commit into
base: main
Choose a base branch
from
Open

internal/outpost/ldap: type switching for uidNumber/gidNumber #24839

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions internal/outpost/ldap/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,22 @@ import (
api "goauthentik.io/packages/client-go"
)

func getAttributeString(attributes map[string]any, key string) (string, bool) {
val, ok := attributes[key]
if !ok || val == nil {
return "", false
}

switch v := val.(type) {
case string:
return v, true
case float64:
return strconv.FormatFloat(v, 'f', -1, 64), true
default:
return "", false
}
}

func (pi *ProviderInstance) GroupsForUser(user api.User) []string {
groups := make([]string, len(user.Groups))
for i, group := range user.GroupsObj {
Expand Down Expand Up @@ -48,7 +64,7 @@ func (pi *ProviderInstance) GetVirtualGroupDN(group string) string {
}

func (pi *ProviderInstance) GetUserUidNumber(user api.User) string {
uidNumber, ok := user.GetAttributes()["uidNumber"].(string)
uidNumber, ok := getAttributeString(user.GetAttributes(), "uidNumber")

if ok {
return uidNumber
Expand All @@ -58,7 +74,7 @@ func (pi *ProviderInstance) GetUserUidNumber(user api.User) string {
}

func (pi *ProviderInstance) GetUserGidNumber(user api.User) string {
gidNumber, ok := user.GetAttributes()["gidNumber"].(string)
gidNumber, ok := getAttributeString(user.GetAttributes(), "gidNumber")

if ok {
return gidNumber
Expand All @@ -68,7 +84,7 @@ func (pi *ProviderInstance) GetUserGidNumber(user api.User) string {
}

func (pi *ProviderInstance) GetGroupGidNumber(group api.Group) string {
gidNumber, ok := group.GetAttributes()["gidNumber"].(string)
gidNumber, ok := getAttributeString(group.GetAttributes(), "gidNumber")

if ok {
return gidNumber
Expand Down
Loading