Skip to content

Fix ldap admin privileges update bug #27051

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

Merged
merged 6 commits into from
Oct 1, 2023
Merged

Fix ldap admin privileges update bug #27051

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
45783b9
fix
CaiCandong Sep 13, 2023
15c4d48
Merge branch 'main' into bugfix/Fix-ldap-admin-update-bug
CaiCandong Sep 20, 2023
4a537e7
Merge branch 'main' into bugfix/Fix-ldap-admin-update-bug
CaiCandong Sep 23, 2023
33f0774
Merge branch 'main' into bugfix/Fix-ldap-admin-update-bug
CaiCandong Sep 30, 2023
dc7ef35
Merge branch 'main' into bugfix/Fix-ldap-admin-update-bug
6543 Oct 1, 2023
948ae08
Merge branch 'main' into bugfix/Fix-ldap-admin-update-bug
GiteaBot Oct 1, 2023
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
17 changes: 7 additions & 10 deletions services/auth/source/ldap/source_authenticate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,13 @@ func (source *Source) Authenticate(ctx context.Context, user *user_model.User, u
// User not in LDAP, do nothing
return nil, user_model.ErrUserNotExist{Name: loginName}
}

// Fallback.
if len(sr.Username) == 0 {
sr.Username = userName
}
if len(sr.Mail) == 0 {
sr.Mail = fmt.Sprintf("%s@localhost.local", sr.Username)
}
isAttributeSSHPublicKeySet := len(strings.TrimSpace(source.AttributeSSHPublicKey)) > 0

// Update User admin flag if exist
Expand Down Expand Up @@ -70,15 +76,6 @@ func (source *Source) Authenticate(ctx context.Context, user *user_model.User, u
}
}
} else {
// Fallback.
if len(sr.Username) == 0 {
sr.Username = userName
}

if len(sr.Mail) == 0 {
sr.Mail = fmt.Sprintf("%s@localhost.local", sr.Username)
}

user = &user_model.User{
LowerName: strings.ToLower(sr.Username),
Name: sr.Username,
Expand Down