mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-25 00:44:15 -05:00
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>
66 lines
1.5 KiB
Go
66 lines
1.5 KiB
Go
// Copyright 2019 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 auth
|
|
|
|
import (
|
|
"net/http"
|
|
|
|
"code.gitea.io/gitea/models"
|
|
"code.gitea.io/gitea/modules/log"
|
|
)
|
|
|
|
// Ensure the struct implements the interface.
|
|
var (
|
|
_ Method = &Session{}
|
|
_ Named = &Session{}
|
|
)
|
|
|
|
// Session checks if there is a user uid stored in the session and returns the user
|
|
// object for that uid.
|
|
type Session struct {
|
|
}
|
|
|
|
// Name represents the name of auth method
|
|
func (s *Session) Name() string {
|
|
return "session"
|
|
}
|
|
|
|
// Verify checks if there is a user uid stored in the session and returns the user
|
|
// object for that uid.
|
|
// Returns nil if there is no user uid stored in the session.
|
|
func (s *Session) Verify(req *http.Request, w http.ResponseWriter, store DataStore, sess SessionStore) *models.User {
|
|
user := SessionUser(sess)
|
|
if user != nil {
|
|
return user
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// SessionUser returns the user object corresponding to the "uid" session variable.
|
|
func SessionUser(sess SessionStore) *models.User {
|
|
// Get user ID
|
|
uid := sess.Get("uid")
|
|
if uid == nil {
|
|
return nil
|
|
}
|
|
log.Trace("Session Authorization: Found user[%d]", uid)
|
|
|
|
id, ok := uid.(int64)
|
|
if !ok {
|
|
return nil
|
|
}
|
|
|
|
// Get user object
|
|
user, err := models.GetUserByID(id)
|
|
if err != nil {
|
|
if !models.IsErrUserNotExist(err) {
|
|
log.Error("GetUserById: %v", err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
log.Trace("Session Authorization: Logged in user %-v", user)
|
|
return user
|
|
}
|