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>
95 lines
3.0 KiB
Go
95 lines
3.0 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 oauth2
|
|
|
|
import (
|
|
"fmt"
|
|
"time"
|
|
|
|
"code.gitea.io/gitea/modules/timeutil"
|
|
"github.com/dgrijalva/jwt-go"
|
|
)
|
|
|
|
// ___________ __
|
|
// \__ ___/___ | | __ ____ ____
|
|
// | | / _ \| |/ // __ \ / \
|
|
// | |( <_> ) <\ ___/| | \
|
|
// |____| \____/|__|_ \\___ >___| /
|
|
// \/ \/ \/
|
|
|
|
// Token represents an Oauth grant
|
|
|
|
// TokenType represents the type of token for an oauth application
|
|
type TokenType int
|
|
|
|
const (
|
|
// TypeAccessToken is a token with short lifetime to access the api
|
|
TypeAccessToken TokenType = 0
|
|
// TypeRefreshToken is token with long lifetime to refresh access tokens obtained by the client
|
|
TypeRefreshToken = iota
|
|
)
|
|
|
|
// Token represents a JWT token used to authenticate a client
|
|
type Token struct {
|
|
GrantID int64 `json:"gnt"`
|
|
Type TokenType `json:"tt"`
|
|
Counter int64 `json:"cnt,omitempty"`
|
|
jwt.StandardClaims
|
|
}
|
|
|
|
// ParseToken parses a signed jwt string
|
|
func ParseToken(jwtToken string) (*Token, error) {
|
|
parsedToken, err := jwt.ParseWithClaims(jwtToken, &Token{}, func(token *jwt.Token) (interface{}, error) {
|
|
if token.Method == nil || token.Method.Alg() != DefaultSigningKey.SigningMethod().Alg() {
|
|
return nil, fmt.Errorf("unexpected signing algo: %v", token.Header["alg"])
|
|
}
|
|
return DefaultSigningKey.VerifyKey(), nil
|
|
})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
var token *Token
|
|
var ok bool
|
|
if token, ok = parsedToken.Claims.(*Token); !ok || !parsedToken.Valid {
|
|
return nil, fmt.Errorf("invalid token")
|
|
}
|
|
return token, nil
|
|
}
|
|
|
|
// SignToken signs the token with the JWT secret
|
|
func (token *Token) SignToken() (string, error) {
|
|
token.IssuedAt = time.Now().Unix()
|
|
jwtToken := jwt.NewWithClaims(DefaultSigningKey.SigningMethod(), token)
|
|
DefaultSigningKey.PreProcessToken(jwtToken)
|
|
return jwtToken.SignedString(DefaultSigningKey.SignKey())
|
|
}
|
|
|
|
// OIDCToken represents an OpenID Connect id_token
|
|
type OIDCToken struct {
|
|
jwt.StandardClaims
|
|
Nonce string `json:"nonce,omitempty"`
|
|
|
|
// Scope profile
|
|
Name string `json:"name,omitempty"`
|
|
PreferredUsername string `json:"preferred_username,omitempty"`
|
|
Profile string `json:"profile,omitempty"`
|
|
Picture string `json:"picture,omitempty"`
|
|
Website string `json:"website,omitempty"`
|
|
Locale string `json:"locale,omitempty"`
|
|
UpdatedAt timeutil.TimeStamp `json:"updated_at,omitempty"`
|
|
|
|
// Scope email
|
|
Email string `json:"email,omitempty"`
|
|
EmailVerified bool `json:"email_verified,omitempty"`
|
|
}
|
|
|
|
// SignToken signs an id_token with the (symmetric) client secret key
|
|
func (token *OIDCToken) SignToken(signingKey JWTSigningKey) (string, error) {
|
|
token.IssuedAt = time.Now().Unix()
|
|
jwtToken := jwt.NewWithClaims(signingKey.SigningMethod(), token)
|
|
signingKey.PreProcessToken(jwtToken)
|
|
return jwtToken.SignedString(signingKey.SignKey())
|
|
}
|