Skip to content
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

Update User information in Gitea based on LDAP when login #1743

Closed
wants to merge 8 commits into from
+15 −1
Closed

Update User information in Gitea based on LDAP when login #1743

Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9ed9f6e
Update User information in Gitea based on LDAP when login
DblK May 17, 2017
f15fcbf
Update Admin Flag only if exist in settings
DblK May 18, 2017
879b5f7
Fix affectation
remy-wanteeed Oct 28, 2019
d0f465e
Update models/login_source.go
DblK Oct 28, 2019
18bc2a2
Merge branch 'feature_UpdateUserInfoOnLDAP' of https://github.com/Dbl…
remy-wanteeed Oct 28, 2019
db57637
Better ident
remy-wanteeed Oct 29, 2019
e9d9244
Apply suggestions from code review
DblK Nov 1, 2019
89f0006
Make fmt
remy-wanteeed Nov 3, 2019
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
16 changes: 15 additions & 1 deletion models/login_source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,20 @@ func LoginViaLDAP(user *User, login, password string, source *LoginSource, autoR

var isAttributeSSHPublicKeySet = len(strings.TrimSpace(source.LDAP().AttributeSSHPublicKey)) > 0

// Update User if exist
isExist, err := IsUserExist(0, sr.Username)
if err != nil {
return nil, err
} else if isExist {
user.FullName = composeFullName(sr.Name, sr.Surname, sr.Username)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems it doesn't update the information to database?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See line 418

user.Email = sr.Mail
// Change existing admin flag only if AdminFilter option is set
if len(source.LDAP().AdminFilter) > 0 {
zeripath marked this conversation as resolved.
Show resolved Hide resolved
user.IsAdmin = sr.IsAdmin
}
UpdateUserCols(user, "full_name", "email", "is_admin")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
UpdateUserCols(user, "full_name", "email", "is_admin")
UpdateUserCols(user, "full_name", "email", "is_admin")

Let's see if this change fixes the fmt. Otherwise you'll have to pull the current version to your local server, run make fmt and push your results back.

Copy link
Member

@6543 6543 Nov 2, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@DblK sory my diff didn't take care of fmt "indent" @guillep2k thanks :D

}
DblK marked this conversation as resolved.
Show resolved Hide resolved

DblK marked this conversation as resolved.
Show resolved Hide resolved
if !autoRegister {
if isAttributeSSHPublicKeySet && synchronizeLdapSSHPublicKeys(user, source, sr.SSHPublicKey) {
return user, RewriteAllPublicKeys()
Expand Down Expand Up @@ -436,7 +450,7 @@ func LoginViaLDAP(user *User, login, password string, source *LoginSource, autoR
IsAdmin: sr.IsAdmin,
}

err := CreateUser(user)
err = CreateUser(user)

if err == nil && isAttributeSSHPublicKeySet && addLdapSSHPublicKeys(user, source, sr.SSHPublicKey) {
err = RewriteAllPublicKeys()
Expand Down