diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2022-12-29 13:50:09 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-29 13:50:09 +0800 |
| commit | 900e1580648e153d40f9da005eb745705410ac73 (patch) | |
| tree | 80b0bbf9535c64cfc5e2c049511139683115560e /services/packages | |
| parent | e9bc2c77c35d078c5ba5e6107c3551f31410c936 (diff) | |
| download | gitea-900e1580648e153d40f9da005eb745705410ac73.tar.gz gitea-900e1580648e153d40f9da005eb745705410ac73.zip | |
refactor auth interface to return error when verify failure (#22119) (#22259)
backport #22119
This PR changed the Auth interface signature from `Verify(http
*http.Request, w http.ResponseWriter, store DataStore, sess
SessionStore) *user_model.User`
to
`Verify(http *http.Request, w http.ResponseWriter, store DataStore, sess
SessionStore) (*user_model.User, error)`.
There is a new return argument `error` which means the verification
condition matched but verify process failed, we should stop the auth
process.
Before this PR, when return a `nil` user, we don't know the reason why
it returned `nil`. If the match condition is not satisfied or it
verified failure? For these two different results, we should have
different handler. If the match condition is not satisfied, we should
try next auth method and if there is no more auth method, it's an
anonymous user. If the condition matched but verify failed, the auth
process should be stop and return immediately.
This will fix #20563
Co-authored-by: KN4CK3R <admin@oldschoolhack.me>
Co-authored-by: Jason Song <i@wolfogre.com>
Diffstat (limited to 'services/packages')
| -rw-r--r-- | services/packages/auth.go | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/services/packages/auth.go b/services/packages/auth.go index 50212fccfd..49ff6c0a3d 100644 --- a/services/packages/auth.go +++ b/services/packages/auth.go @@ -11,6 +11,7 @@ import ( "time" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" "github.com/golang-jwt/jwt/v4" @@ -42,9 +43,15 @@ func CreateAuthorizationToken(u *user_model.User) (string, error) { } func ParseAuthorizationToken(req *http.Request) (int64, error) { - parts := strings.SplitN(req.Header.Get("Authorization"), " ", 2) + h := req.Header.Get("Authorization") + if h == "" { + return 0, nil + } + + parts := strings.SplitN(h, " ", 2) if len(parts) != 2 { - return 0, fmt.Errorf("no token") + log.Error("split token failed: %s", h) + return 0, fmt.Errorf("split token failed") } token, err := jwt.ParseWithClaims(parts[1], &packageClaims{}, func(t *jwt.Token) (interface{}, error) { |