mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2026-05-15 23:40:26 +00:00
#12202 began a refactor of Forgejo's authentication implementations by providing structured data on an authentication success. However, error cases were maintained as-is in that refactor, leaving a complex situation: what does returning an error from an authentication method mean?; does it mean that the authentication failed, or that a server error occurred? Can another authentication still be tried? This PR changes authentication methods so that they can return one of four things: - `AuthenticationSuccess` with an authentication result. - `AuthenticationNotAttempted` which indicates that no credentials relevant for this authentication method were presented. If every method returned `AuthenticationNotAttempted`, then you would have an unauthenticated access. - `AuthenticationAttemptedIncorrectCredential` which indicates that credentials were present and failed validation -- a situation indicating a `401 Unauthorized`. - `AuthenticationError` which indicates that an internal server error occurred and failed authentication -- indicating a `500 Internal Server Error`. This paves the way for one more refactor coming next: `basic.go` and `oauth2.go` perform 3-4 different authentications each (access tokens, oauth JWTs, actions tokens, actions JWTs, and username/password). With the capability to return these more precise responses, these authentication methods can be split up into separate logic that isn't intertwined together. ## Checklist The [contributor guide](https://forgejo.org/docs/next/contributor/) contains information that will be helpful to first time contributors. All work and communication must conform to Forgejo's [AI Agreement](https://codeberg.org/forgejo/governance/src/branch/main/AIAgreement.md). There also are a few [conditions for merging Pull Requests in Forgejo repositories](https://codeberg.org/forgejo/governance/src/branch/main/PullRequestsAgreement.md). You are also welcome to join the [Forgejo development chatroom](https://matrix.to/#/#forgejo-development:matrix.org). ### Tests for Go changes - I added test coverage for Go changes... - [ ] in their respective `*_test.go` for unit tests. - [ ] in the `tests/integration` directory if it involves interactions with a live Forgejo server. - Relying on existing test suite, with changes for any compile errors -- the next refactor will simplify the auth methods so that they can be unit tested easily. - I ran... - [x] `make pr-go` before pushing ### Documentation - [ ] I created a pull request [to the documentation](https://codeberg.org/forgejo/docs) to explain to Forgejo users how to use this change. - [x] I did not document these changes and I do not expect someone else to do it. ### Release notes - [ ] This change will be noticed by a Forgejo user or admin (feature, bug fix, performance, etc.). I suggest to include a release note for this change. - [x] This change is not visible to a Forgejo user or admin (refactor, dependency upgrade, etc.). I think there is no need to add a release note for this change. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/12231 Reviewed-by: Gusted <gusted@noreply.codeberg.org>
71 lines
2.1 KiB
Go
71 lines
2.1 KiB
Go
// Copyright 2022 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package container
|
|
|
|
import (
|
|
"fmt"
|
|
"net/http"
|
|
|
|
auth_model "forgejo.org/models/auth"
|
|
user_model "forgejo.org/models/user"
|
|
"forgejo.org/modules/log"
|
|
"forgejo.org/modules/optional"
|
|
"forgejo.org/services/auth"
|
|
"forgejo.org/services/packages"
|
|
)
|
|
|
|
var (
|
|
_ auth.Method = &Auth{}
|
|
_ auth.AuthenticationResult = &containerAuthenticationResult{}
|
|
)
|
|
|
|
type containerAuthenticationResult struct {
|
|
*auth.BaseAuthenticationResult
|
|
user *user_model.User
|
|
scope optional.Option[auth_model.AccessTokenScope]
|
|
}
|
|
|
|
func (r *containerAuthenticationResult) Scope() optional.Option[auth_model.AccessTokenScope] {
|
|
return r.scope
|
|
}
|
|
|
|
func (r *containerAuthenticationResult) User() *user_model.User {
|
|
return r.user
|
|
}
|
|
|
|
type Auth struct{}
|
|
|
|
func (a *Auth) Name() string {
|
|
return "container"
|
|
}
|
|
|
|
// Verify extracts the user from the Bearer token
|
|
// If it's an anonymous session a ghost user is returned
|
|
func (a *Auth) Verify(req *http.Request, w http.ResponseWriter, sess auth.SessionStore) auth.MethodOutput {
|
|
uid, scope, err := packages.ParseAuthorizationToken(req)
|
|
if err != nil {
|
|
log.Trace("ParseAuthorizationToken: %v", err)
|
|
// Errors from ParseAuthorizationToken are almost all from malformed incoming input, which we'll consider an
|
|
// auth failure:
|
|
// - `Authorization` header was present for all cases, so it's not `AuthenticationNotAttempted`
|
|
// - it's not `AuthenticationError` because malformed headers would cause errors, and this is intended for
|
|
// server errors which should cause 500s
|
|
return &auth.AuthenticationAttemptedIncorrectCredential{Error: err}
|
|
} else if uid == 0 {
|
|
return &auth.AuthenticationNotAttempted{}
|
|
}
|
|
|
|
// Propagate scope of the authorization token.
|
|
authScope := optional.None[auth_model.AccessTokenScope]()
|
|
if scope != "" {
|
|
authScope = optional.Some(scope)
|
|
}
|
|
|
|
u, err := user_model.GetPossibleUserByID(req.Context(), uid)
|
|
if err != nil {
|
|
return &auth.AuthenticationError{Error: fmt.Errorf("container auth GetPossibleUserByID: %w", err)}
|
|
}
|
|
|
|
return &auth.AuthenticationSuccess{Result: &containerAuthenticationResult{user: u, scope: authScope}}
|
|
}
|