mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-10-31 21:28:11 +09: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>
		
			
				
	
	
		
			126 lines
		
	
	
		
			3.3 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			126 lines
		
	
	
		
			3.3 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 models
 | |
| 
 | |
| import (
 | |
| 	"errors"
 | |
| 	"fmt"
 | |
| 	"strings"
 | |
| 
 | |
| 	"code.gitea.io/gitea/modules/setting"
 | |
| )
 | |
| 
 | |
| // __________       .__              .__             .__
 | |
| // \______   _______|__| ____   ____ |_____________  |  |   ______
 | |
| //  |     ___\_  __ |  |/    \_/ ___\|  \____ \__  \ |  |  /  ___/
 | |
| //  |    |    |  | \|  |   |  \  \___|  |  |_> / __ \|  |__\___ \
 | |
| //  |____|    |__|  |__|___|  /\___  |__|   __(____  |____/____  >
 | |
| //                          \/     \/   |__|       \/          \/
 | |
| //
 | |
| // This file contains functions related to principals
 | |
| 
 | |
| // AddPrincipalKey adds new principal to database and authorized_principals file.
 | |
| func AddPrincipalKey(ownerID int64, content string, loginSourceID int64) (*PublicKey, error) {
 | |
| 	sess := x.NewSession()
 | |
| 	defer sess.Close()
 | |
| 	if err := sess.Begin(); err != nil {
 | |
| 		return nil, err
 | |
| 	}
 | |
| 
 | |
| 	// Principals cannot be duplicated.
 | |
| 	has, err := sess.
 | |
| 		Where("content = ? AND type = ?", content, KeyTypePrincipal).
 | |
| 		Get(new(PublicKey))
 | |
| 	if err != nil {
 | |
| 		return nil, err
 | |
| 	} else if has {
 | |
| 		return nil, ErrKeyAlreadyExist{0, "", content}
 | |
| 	}
 | |
| 
 | |
| 	key := &PublicKey{
 | |
| 		OwnerID:       ownerID,
 | |
| 		Name:          content,
 | |
| 		Content:       content,
 | |
| 		Mode:          AccessModeWrite,
 | |
| 		Type:          KeyTypePrincipal,
 | |
| 		LoginSourceID: loginSourceID,
 | |
| 	}
 | |
| 	if err = addPrincipalKey(sess, key); err != nil {
 | |
| 		return nil, fmt.Errorf("addKey: %v", err)
 | |
| 	}
 | |
| 
 | |
| 	if err = sess.Commit(); err != nil {
 | |
| 		return nil, err
 | |
| 	}
 | |
| 
 | |
| 	sess.Close()
 | |
| 
 | |
| 	return key, RewriteAllPrincipalKeys()
 | |
| }
 | |
| 
 | |
| func addPrincipalKey(e Engine, key *PublicKey) (err error) {
 | |
| 	// Save Key representing a principal.
 | |
| 	if _, err = e.Insert(key); err != nil {
 | |
| 		return err
 | |
| 	}
 | |
| 
 | |
| 	return nil
 | |
| }
 | |
| 
 | |
| // CheckPrincipalKeyString strips spaces and returns an error if the given principal contains newlines
 | |
| func CheckPrincipalKeyString(user *User, content string) (_ string, err error) {
 | |
| 	if setting.SSH.Disabled {
 | |
| 		return "", ErrSSHDisabled{}
 | |
| 	}
 | |
| 
 | |
| 	content = strings.TrimSpace(content)
 | |
| 	if strings.ContainsAny(content, "\r\n") {
 | |
| 		return "", errors.New("only a single line with a single principal please")
 | |
| 	}
 | |
| 
 | |
| 	// check all the allowed principals, email, username or anything
 | |
| 	// if any matches, return ok
 | |
| 	for _, v := range setting.SSH.AuthorizedPrincipalsAllow {
 | |
| 		switch v {
 | |
| 		case "anything":
 | |
| 			return content, nil
 | |
| 		case "email":
 | |
| 			emails, err := GetEmailAddresses(user.ID)
 | |
| 			if err != nil {
 | |
| 				return "", err
 | |
| 			}
 | |
| 			for _, email := range emails {
 | |
| 				if !email.IsActivated {
 | |
| 					continue
 | |
| 				}
 | |
| 				if content == email.Email {
 | |
| 					return content, nil
 | |
| 				}
 | |
| 			}
 | |
| 
 | |
| 		case "username":
 | |
| 			if content == user.Name {
 | |
| 				return content, nil
 | |
| 			}
 | |
| 		}
 | |
| 	}
 | |
| 
 | |
| 	return "", fmt.Errorf("didn't match allowed principals: %s", setting.SSH.AuthorizedPrincipalsAllow)
 | |
| }
 | |
| 
 | |
| // ListPrincipalKeys returns a list of principals belongs to given user.
 | |
| func ListPrincipalKeys(uid int64, listOptions ListOptions) ([]*PublicKey, error) {
 | |
| 	sess := x.Where("owner_id = ? AND type = ?", uid, KeyTypePrincipal)
 | |
| 	if listOptions.Page != 0 {
 | |
| 		sess = listOptions.setSessionPagination(sess)
 | |
| 
 | |
| 		keys := make([]*PublicKey, 0, listOptions.PageSize)
 | |
| 		return keys, sess.Find(&keys)
 | |
| 	}
 | |
| 
 | |
| 	keys := make([]*PublicKey, 0, 5)
 | |
| 	return keys, sess.Find(&keys)
 | |
| }
 |