5d2e11eedb
`models` does far too much. In particular it handles all `UserSignin`. It shouldn't be responsible for calling LDAP, SMTP or PAM for signing in. Therefore we should move this code out of `models`. This code has to depend on `models` - therefore it belongs in `services`. There is a package in `services` called `auth` and clearly this functionality belongs in there. Plan: - [x] Change `auth.Auth` to `auth.Method` - as they represent methods of authentication. - [x] Move `models.UserSignIn` into `auth` - [x] Move `models.ExternalUserLogin` - [x] Move most of the `LoginVia*` methods to `auth` or subpackages - [x] Move Resynchronize functionality to `auth` - Involved some restructuring of `models/ssh_key.go` to reduce the size of this massive file and simplify its files. - [x] Move the rest of the LDAP functionality in to the ldap subpackage - [x] Re-factor the login sources to express an interfaces `auth.Source`? - I've done this through some smaller interfaces Authenticator and Synchronizable - which would allow us to extend things in future - [x] Now LDAP is out of models - need to think about modules/auth/ldap and I think all of that functionality might just be moveable - [x] Similarly a lot Oauth2 functionality need not be in models too and should be moved to services/auth/source/oauth2 - [x] modules/auth/oauth2/oauth2.go uses xorm... This is naughty - probably need to move this into models. - [x] models/oauth2.go - mostly should be in modules/auth/oauth2 or services/auth/source/oauth2 - [x] More simplifications of login_source.go may need to be done - Allow wiring in of notify registration - *this can now easily be done - but I think we should do it in another PR* - see #16178 - More refactors...? - OpenID should probably become an auth Method but I think that can be left for another PR - Methods should also probably be cleaned up - again another PR I think. - SSPI still needs more refactors.* Rename auth.Auth auth.Method * Restructure ssh_key.go - move functions from models/user.go that relate to ssh_key to ssh_key - split ssh_key.go to try create clearer function domains for allow for future refactors here. Signed-off-by: Andrew Thornton <art27@cantab.net>
93 lines
2.6 KiB
Go
93 lines
2.6 KiB
Go
// Copyright 2021 The Gitea Authors. All rights reserved.
|
|
// Use of this source code is governed by a MIT-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package ldap
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
|
|
"code.gitea.io/gitea/models"
|
|
)
|
|
|
|
// Authenticate queries if login/password is valid against the LDAP directory pool,
|
|
// and create a local user if success when enabled.
|
|
func (source *Source) Authenticate(user *models.User, login, password string) (*models.User, error) {
|
|
sr := source.SearchEntry(login, password, source.loginSource.Type == models.LoginDLDAP)
|
|
if sr == nil {
|
|
// User not in LDAP, do nothing
|
|
return nil, models.ErrUserNotExist{Name: login}
|
|
}
|
|
|
|
isAttributeSSHPublicKeySet := len(strings.TrimSpace(source.AttributeSSHPublicKey)) > 0
|
|
|
|
// Update User admin flag if exist
|
|
if isExist, err := models.IsUserExist(0, sr.Username); err != nil {
|
|
return nil, err
|
|
} else if isExist {
|
|
if user == nil {
|
|
user, err = models.GetUserByName(sr.Username)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
if user != nil && !user.ProhibitLogin {
|
|
cols := make([]string, 0)
|
|
if len(source.AdminFilter) > 0 && user.IsAdmin != sr.IsAdmin {
|
|
// Change existing admin flag only if AdminFilter option is set
|
|
user.IsAdmin = sr.IsAdmin
|
|
cols = append(cols, "is_admin")
|
|
}
|
|
if !user.IsAdmin && len(source.RestrictedFilter) > 0 && user.IsRestricted != sr.IsRestricted {
|
|
// Change existing restricted flag only if RestrictedFilter option is set
|
|
user.IsRestricted = sr.IsRestricted
|
|
cols = append(cols, "is_restricted")
|
|
}
|
|
if len(cols) > 0 {
|
|
err = models.UpdateUserCols(user, cols...)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
if user != nil {
|
|
if isAttributeSSHPublicKeySet && models.SynchronizePublicKeys(user, source.loginSource, sr.SSHPublicKey) {
|
|
return user, models.RewriteAllPublicKeys()
|
|
}
|
|
|
|
return user, nil
|
|
}
|
|
|
|
// Fallback.
|
|
if len(sr.Username) == 0 {
|
|
sr.Username = login
|
|
}
|
|
|
|
if len(sr.Mail) == 0 {
|
|
sr.Mail = fmt.Sprintf("%s@localhost", sr.Username)
|
|
}
|
|
|
|
user = &models.User{
|
|
LowerName: strings.ToLower(sr.Username),
|
|
Name: sr.Username,
|
|
FullName: composeFullName(sr.Name, sr.Surname, sr.Username),
|
|
Email: sr.Mail,
|
|
LoginType: source.loginSource.Type,
|
|
LoginSource: source.loginSource.ID,
|
|
LoginName: login,
|
|
IsActive: true,
|
|
IsAdmin: sr.IsAdmin,
|
|
IsRestricted: sr.IsRestricted,
|
|
}
|
|
|
|
err := models.CreateUser(user)
|
|
|
|
if err == nil && isAttributeSSHPublicKeySet && models.AddPublicKeysBySource(user, source.loginSource, sr.SSHPublicKey) {
|
|
err = models.RewriteAllPublicKeys()
|
|
}
|
|
|
|
return user, err
|
|
}
|