mirror of
				https://codeberg.org/forgejo/forgejo.git
				synced 2025-10-30 22:11:07 +00:00 
			
		
		
		
	Refactor: Move login out of models (#16199)
`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>
This commit is contained in:
		
					parent
					
						
							
								f135a818f5
							
						
					
				
			
			
				commit
				
					
						5d2e11eedb
					
				
			
		
					 77 changed files with 3803 additions and 2951 deletions
				
			
		
							
								
								
									
										111
									
								
								models/migrations/v189.go
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										111
									
								
								models/migrations/v189.go
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,111 @@ | |||
| // 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 migrations | ||||
| 
 | ||||
| import ( | ||||
| 	"encoding/binary" | ||||
| 	"fmt" | ||||
| 
 | ||||
| 	jsoniter "github.com/json-iterator/go" | ||||
| 	"xorm.io/xorm" | ||||
| ) | ||||
| 
 | ||||
| func unwrapLDAPSourceCfg(x *xorm.Engine) error { | ||||
| 	jsonUnmarshalHandleDoubleEncode := func(bs []byte, v interface{}) error { | ||||
| 		json := jsoniter.ConfigCompatibleWithStandardLibrary | ||||
| 		err := json.Unmarshal(bs, v) | ||||
| 		if err != nil { | ||||
| 			ok := true | ||||
| 			rs := []byte{} | ||||
| 			temp := make([]byte, 2) | ||||
| 			for _, rn := range string(bs) { | ||||
| 				if rn > 0xffff { | ||||
| 					ok = false | ||||
| 					break | ||||
| 				} | ||||
| 				binary.LittleEndian.PutUint16(temp, uint16(rn)) | ||||
| 				rs = append(rs, temp...) | ||||
| 			} | ||||
| 			if ok { | ||||
| 				if rs[0] == 0xff && rs[1] == 0xfe { | ||||
| 					rs = rs[2:] | ||||
| 				} | ||||
| 				err = json.Unmarshal(rs, v) | ||||
| 			} | ||||
| 		} | ||||
| 		if err != nil && len(bs) > 2 && bs[0] == 0xff && bs[1] == 0xfe { | ||||
| 			err = json.Unmarshal(bs[2:], v) | ||||
| 		} | ||||
| 		return err | ||||
| 	} | ||||
| 
 | ||||
| 	// LoginSource represents an external way for authorizing users. | ||||
| 	type LoginSource struct { | ||||
| 		ID        int64 `xorm:"pk autoincr"` | ||||
| 		Type      int | ||||
| 		IsActived bool   `xorm:"INDEX NOT NULL DEFAULT false"` | ||||
| 		IsActive  bool   `xorm:"INDEX NOT NULL DEFAULT false"` | ||||
| 		Cfg       string `xorm:"TEXT"` | ||||
| 	} | ||||
| 
 | ||||
| 	const ldapType = 2 | ||||
| 	const dldapType = 5 | ||||
| 
 | ||||
| 	type WrappedSource struct { | ||||
| 		Source map[string]interface{} | ||||
| 	} | ||||
| 
 | ||||
| 	// change lower_email as unique | ||||
| 	if err := x.Sync2(new(LoginSource)); err != nil { | ||||
| 		return err | ||||
| 	} | ||||
| 
 | ||||
| 	sess := x.NewSession() | ||||
| 	defer sess.Close() | ||||
| 
 | ||||
| 	const batchSize = 100 | ||||
| 	for start := 0; ; start += batchSize { | ||||
| 		sources := make([]*LoginSource, 0, batchSize) | ||||
| 		if err := sess.Limit(batchSize, start).Where("`type` = ? OR `type` = ?", ldapType, dldapType).Find(&sources); err != nil { | ||||
| 			return err | ||||
| 		} | ||||
| 		if len(sources) == 0 { | ||||
| 			break | ||||
| 		} | ||||
| 
 | ||||
| 		for _, source := range sources { | ||||
| 			wrapped := &WrappedSource{ | ||||
| 				Source: map[string]interface{}{}, | ||||
| 			} | ||||
| 			err := jsonUnmarshalHandleDoubleEncode([]byte(source.Cfg), &wrapped) | ||||
| 			if err != nil { | ||||
| 				return fmt.Errorf("failed to unmarshal %s: %w", string(source.Cfg), err) | ||||
| 			} | ||||
| 			if wrapped.Source != nil && len(wrapped.Source) > 0 { | ||||
| 				bs, err := jsoniter.Marshal(wrapped.Source) | ||||
| 				if err != nil { | ||||
| 					return err | ||||
| 				} | ||||
| 				source.Cfg = string(bs) | ||||
| 				if _, err := sess.ID(source.ID).Cols("cfg").Update(source); err != nil { | ||||
| 					return err | ||||
| 				} | ||||
| 			} | ||||
| 		} | ||||
| 	} | ||||
| 
 | ||||
| 	if _, err := x.SetExpr("is_active", "is_actived").Update(&LoginSource{}); err != nil { | ||||
| 		return fmt.Errorf("SetExpr Update failed:  %w", err) | ||||
| 	} | ||||
| 
 | ||||
| 	if err := sess.Begin(); err != nil { | ||||
| 		return err | ||||
| 	} | ||||
| 	if err := dropTableColumns(sess, "login_source", "is_actived"); err != nil { | ||||
| 		return err | ||||
| 	} | ||||
| 
 | ||||
| 	return sess.Commit() | ||||
| } | ||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue