mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2026-07-25 02:48:05 +00:00
1ce675fc1c
**Backport:** https://codeberg.org/forgejo/forgejo/pulls/13304 Regression in #12776 -- `[service].REQUIRE_SIGNIN_VIEW` and `[service.explore].REQUIRE_SIGNIN_VIEW` values were being cached into a constructed middleware during module initialization, before the `settings` object had been initialized by reading settings from the config. As a result, neither setting applied to the middleware. Apparently zero automated tests cover this capability. Fixed by changing the bool into a closure for realtime access to the setting. Added automated tests. Verified that the tests failed when broken. ### Tests for Go changes - I added test coverage for Go changes... - [ ] in their respective `*_test.go` for unit tests. - [x] in the `tests/integration` directory if it involves interactions with a live Forgejo server. - 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. - Prerelease regression. Co-authored-by: Mathieu Fenniak <mathieu@fenniak.net> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/13307 Reviewed-by: Mathieu Fenniak <mfenniak@noreply.codeberg.org>
46 lines
1.2 KiB
Go
46 lines
1.2 KiB
Go
// Copyright 2022 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package common
|
|
|
|
import (
|
|
"forgejo.org/modules/web/middleware"
|
|
auth_service "forgejo.org/services/auth"
|
|
"forgejo.org/services/context"
|
|
)
|
|
|
|
func AuthShared(ctx *context.Base, sessionStore auth_service.SessionStore, authMethod auth_service.Method) auth_service.MethodOutput {
|
|
output := authMethod.Verify(ctx.Req, ctx.Resp, sessionStore)
|
|
|
|
var ar auth_service.AuthenticationResult
|
|
switch v := output.(type) {
|
|
case *auth_service.AuthenticationSuccess:
|
|
ar = v.Result
|
|
case *auth_service.AuthenticationNotAttempted:
|
|
ar = &auth_service.UnauthenticatedResult{}
|
|
}
|
|
if ar != nil {
|
|
doer := ar.User()
|
|
if doer != nil {
|
|
if ctx.Locale.Language() != doer.Language {
|
|
ctx.Locale = middleware.Locale(ctx.Resp, ctx.Req)
|
|
}
|
|
ctx.Data["IsSigned"] = true
|
|
ctx.Data[middleware.ContextDataKeySignedUser] = doer
|
|
ctx.Data["SignedUserID"] = doer.ID
|
|
ctx.Data["IsAdmin"] = doer.IsAdmin
|
|
} else {
|
|
ctx.Data["IsSigned"] = false
|
|
ctx.Data["SignedUserID"] = int64(0)
|
|
}
|
|
}
|
|
return output
|
|
}
|
|
|
|
// VerifyOptions contains required or check options
|
|
type VerifyOptions struct {
|
|
SignInRequired func() bool
|
|
SignOutRequired bool
|
|
AdminRequired bool
|
|
DisableCSRF bool
|
|
}
|