mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2025-08-19 08:51:10 +00:00
resolves #8549 This PR add a config to enforce 2FA for the whole Forgejo instance. It can be configured to `none`, `admin` or `all`. A user who is required to enable 2FA is like a disabled user. He can only see the `/user/settings/security`-Page to enable 2FA, this should be similar to a user which needs to change his password. Also api and git-commands are not allowed. ## Checklist The [contributor guide](https://forgejo.org/docs/next/contributor/) contains information that will be helpful to first time contributors. 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 - I added test coverage for Go changes... - [x] in their respective `*_test.go` for unit tests. - [x] in the `tests/integration` directory if it involves interactions with a live Forgejo server. - I added test coverage for JavaScript changes... - [ ] in `web_src/js/*.test.js` if it can be unit tested. - [ ] in `tests/e2e/*.test.e2e.js` if it requires interactions with a live Forgejo server (see also the [developer guide for JavaScript testing](https://codeberg.org/forgejo/forgejo/src/branch/forgejo/tests/e2e/README.md#end-to-end-tests)). ### Documentation - [ ] I created a pull request [to the documentation](https://codeberg.org/forgejo/docs) to explain to Forgejo users how to use this change. - [ ] I did not document these changes and I do not expect someone else to do it. I will do it, if the general idea of this PR is a good feature. ### Release notes - [ ] I do not want this change to show in the release notes. - [x] I want the title to show in the release notes with a link to this pull request. - [ ] I want the content of the `release-notes/<pull request number>.md` to be be used for the release notes instead of the title. <!--start release-notes-assistant--> ## Release notes <!--URL:https://codeberg.org/forgejo/forgejo--> - Security features - [PR](https://codeberg.org/forgejo/forgejo/pulls/8753): <!--number 8753 --><!--line 0 --><!--description R2xvYmFsIDJGQSBlbmZvcmNlbWVudA==-->Global 2FA enforcement<!--description--> <!--end release-notes-assistant--> Co-authored-by: 0ko <0ko@noreply.codeberg.org> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/8753 Reviewed-by: 0ko <0ko@noreply.codeberg.org> Reviewed-by: Ellen Εμιλία Άννα Zscheile <fogti@noreply.codeberg.org> Reviewed-by: Gusted <gusted@noreply.codeberg.org> Co-authored-by: zokki <zokki.softwareschmiede@gmail.com> Co-committed-by: zokki <zokki.softwareschmiede@gmail.com>
61 lines
1.9 KiB
Go
61 lines
1.9 KiB
Go
// Copyright 2025 The Forgejo Authors. All rights reserved.
|
|
// SPDX-License-Identifier: GPL-3.0-or-later
|
|
|
|
package integration
|
|
|
|
import (
|
|
"net/http"
|
|
"testing"
|
|
|
|
"forgejo.org/modules/setting"
|
|
"forgejo.org/modules/test"
|
|
"forgejo.org/routers"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
// `/devtest/error/{errcode}` provides a convenient way of testing various
|
|
// error pages sometimes which can be hard to reach otherwise.
|
|
// This file is a test of various attributes on those pages.
|
|
|
|
func enableDevtest() func() {
|
|
resetIsProd := test.MockVariableValue(&setting.IsProd, false)
|
|
resetRoutes := test.MockVariableValue(&testWebRoutes, routers.NormalRoutes())
|
|
return func() {
|
|
resetIsProd()
|
|
resetRoutes()
|
|
}
|
|
}
|
|
|
|
func TestDevtestErrorpages(t *testing.T) {
|
|
defer enableDevtest()()
|
|
|
|
t.Run("Server error", func(t *testing.T) {
|
|
// `/devtest/error/x` returns 500 for any x by default.
|
|
// `/500` is simply for good look here
|
|
req := NewRequest(t, "GET", "/devtest/error/500")
|
|
resp := MakeRequest(t, req, http.StatusInternalServerError)
|
|
doc := NewHTMLParser(t, resp.Body)
|
|
assert.Equal(t, "500", doc.Find(".error-code").Text())
|
|
assert.Contains(t, doc.Find("head title").Text(), "Internal server error")
|
|
})
|
|
|
|
t.Run("Page not found",
|
|
func(t *testing.T) {
|
|
req := NewRequest(t, "GET", "/devtest/error/404").
|
|
// Without this header `notFoundInternal` returns plaintext error message
|
|
SetHeader("Accept", "text/html")
|
|
resp := MakeRequest(t, req, http.StatusNotFound)
|
|
doc := NewHTMLParser(t, resp.Body)
|
|
assert.Equal(t, "404", doc.Find(".error-code").Text())
|
|
assert.Contains(t, doc.Find("head title").Text(), "Page not found")
|
|
})
|
|
|
|
t.Run("Quota exhaustion",
|
|
func(t *testing.T) {
|
|
req := NewRequest(t, "GET", "/devtest/error/413")
|
|
resp := MakeRequest(t, req, http.StatusRequestEntityTooLarge)
|
|
doc := NewHTMLParser(t, resp.Body)
|
|
assert.Equal(t, "413", doc.Find(".error-code").Text())
|
|
})
|
|
}
|