mirror of
				https://gitee.com/gitea/gitea
				synced 2025-11-04 16:40:24 +08:00 
			
		
		
		
	`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>
		
			
				
	
	
		
			72 lines
		
	
	
		
			1.9 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			72 lines
		
	
	
		
			1.9 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 smtp
 | 
						|
 | 
						|
import (
 | 
						|
	"errors"
 | 
						|
	"net/smtp"
 | 
						|
	"net/textproto"
 | 
						|
	"strings"
 | 
						|
 | 
						|
	"code.gitea.io/gitea/models"
 | 
						|
	"code.gitea.io/gitea/modules/util"
 | 
						|
)
 | 
						|
 | 
						|
// Authenticate queries if the provided login/password is authenticates against the SMTP server
 | 
						|
// Users will be autoregistered as required
 | 
						|
func (source *Source) Authenticate(user *models.User, login, password string) (*models.User, error) {
 | 
						|
	// Verify allowed domains.
 | 
						|
	if len(source.AllowedDomains) > 0 {
 | 
						|
		idx := strings.Index(login, "@")
 | 
						|
		if idx == -1 {
 | 
						|
			return nil, models.ErrUserNotExist{Name: login}
 | 
						|
		} else if !util.IsStringInSlice(login[idx+1:], strings.Split(source.AllowedDomains, ","), true) {
 | 
						|
			return nil, models.ErrUserNotExist{Name: login}
 | 
						|
		}
 | 
						|
	}
 | 
						|
 | 
						|
	var auth smtp.Auth
 | 
						|
	if source.Auth == PlainAuthentication {
 | 
						|
		auth = smtp.PlainAuth("", login, password, source.Host)
 | 
						|
	} else if source.Auth == LoginAuthentication {
 | 
						|
		auth = &loginAuthenticator{login, password}
 | 
						|
	} else {
 | 
						|
		return nil, errors.New("Unsupported SMTP auth type")
 | 
						|
	}
 | 
						|
 | 
						|
	if err := Authenticate(auth, source); err != nil {
 | 
						|
		// Check standard error format first,
 | 
						|
		// then fallback to worse case.
 | 
						|
		tperr, ok := err.(*textproto.Error)
 | 
						|
		if (ok && tperr.Code == 535) ||
 | 
						|
			strings.Contains(err.Error(), "Username and Password not accepted") {
 | 
						|
			return nil, models.ErrUserNotExist{Name: login}
 | 
						|
		}
 | 
						|
		return nil, err
 | 
						|
	}
 | 
						|
 | 
						|
	if user != nil {
 | 
						|
		return user, nil
 | 
						|
	}
 | 
						|
 | 
						|
	username := login
 | 
						|
	idx := strings.Index(login, "@")
 | 
						|
	if idx > -1 {
 | 
						|
		username = login[:idx]
 | 
						|
	}
 | 
						|
 | 
						|
	user = &models.User{
 | 
						|
		LowerName:   strings.ToLower(username),
 | 
						|
		Name:        strings.ToLower(username),
 | 
						|
		Email:       login,
 | 
						|
		Passwd:      password,
 | 
						|
		LoginType:   models.LoginSMTP,
 | 
						|
		LoginSource: source.loginSource.ID,
 | 
						|
		LoginName:   login,
 | 
						|
		IsActive:    true,
 | 
						|
	}
 | 
						|
	return user, models.CreateUser(user)
 | 
						|
}
 |