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>
278 lines
9.5 KiB
Go
278 lines
9.5 KiB
Go
// Copyright 2017 The Gitea Authors. All rights reserved.
|
|
// Copyright 2024 The Forgejo Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package integration
|
|
|
|
import (
|
|
"net/http"
|
|
"testing"
|
|
|
|
auth_model "forgejo.org/models/auth"
|
|
"forgejo.org/models/db"
|
|
"forgejo.org/models/unittest"
|
|
user_model "forgejo.org/models/user"
|
|
"forgejo.org/modules/setting"
|
|
"forgejo.org/modules/test"
|
|
"forgejo.org/modules/translation"
|
|
"forgejo.org/tests"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestSettingShowUserEmailExplore(t *testing.T) {
|
|
defer tests.PrepareTestEnv(t)()
|
|
|
|
showUserEmail := setting.UI.ShowUserEmail
|
|
setting.UI.ShowUserEmail = true
|
|
|
|
session := loginUser(t, "user2")
|
|
req := NewRequest(t, "GET", "/explore/users?sort=alphabetically")
|
|
resp := session.MakeRequest(t, req, http.StatusOK)
|
|
htmlDoc := NewHTMLParser(t, resp.Body)
|
|
assert.Contains(t,
|
|
htmlDoc.doc.Find(".explore.users").Text(),
|
|
"user34@example.com",
|
|
)
|
|
|
|
setting.UI.ShowUserEmail = false
|
|
|
|
req = NewRequest(t, "GET", "/explore/users?sort=alphabetically")
|
|
resp = session.MakeRequest(t, req, http.StatusOK)
|
|
htmlDoc = NewHTMLParser(t, resp.Body)
|
|
assert.NotContains(t,
|
|
htmlDoc.doc.Find(".explore.users").Text(),
|
|
"user34@example.com",
|
|
)
|
|
|
|
setting.UI.ShowUserEmail = showUserEmail
|
|
}
|
|
|
|
func TestSettingShowUserEmailProfile(t *testing.T) {
|
|
defer tests.PrepareTestEnv(t)()
|
|
|
|
showUserEmail := setting.UI.ShowUserEmail
|
|
|
|
// user1: keep_email_private = false, user2: keep_email_private = true
|
|
|
|
setting.UI.ShowUserEmail = true
|
|
|
|
// user1 can see own visible email
|
|
session := loginUser(t, "user1")
|
|
req := NewRequest(t, "GET", "/user1")
|
|
resp := session.MakeRequest(t, req, http.StatusOK)
|
|
htmlDoc := NewHTMLParser(t, resp.Body)
|
|
assert.Contains(t, htmlDoc.doc.Find(".user.profile").Text(), "user1@example.com")
|
|
|
|
// user1 can not see user2's hidden email
|
|
req = NewRequest(t, "GET", "/user2")
|
|
resp = session.MakeRequest(t, req, http.StatusOK)
|
|
htmlDoc = NewHTMLParser(t, resp.Body)
|
|
// Should only contain if the user visits their own profile page
|
|
assert.NotContains(t, htmlDoc.doc.Find(".user.profile").Text(), "user2@example.com")
|
|
|
|
// user2 can see user1's visible email
|
|
session = loginUser(t, "user2")
|
|
req = NewRequest(t, "GET", "/user1")
|
|
resp = session.MakeRequest(t, req, http.StatusOK)
|
|
htmlDoc = NewHTMLParser(t, resp.Body)
|
|
assert.Contains(t, htmlDoc.doc.Find(".user.profile").Text(), "user1@example.com")
|
|
|
|
// user2 cannot see own hidden email
|
|
session = loginUser(t, "user2")
|
|
req = NewRequest(t, "GET", "/user2")
|
|
resp = session.MakeRequest(t, req, http.StatusOK)
|
|
htmlDoc = NewHTMLParser(t, resp.Body)
|
|
assert.NotContains(t, htmlDoc.doc.Find(".user.profile").Text(), "user2@example.com")
|
|
|
|
setting.UI.ShowUserEmail = false
|
|
|
|
// user1 cannot see own (now hidden) email
|
|
session = loginUser(t, "user1")
|
|
req = NewRequest(t, "GET", "/user1")
|
|
resp = session.MakeRequest(t, req, http.StatusOK)
|
|
htmlDoc = NewHTMLParser(t, resp.Body)
|
|
assert.NotContains(t, htmlDoc.doc.Find(".user.profile").Text(), "user1@example.com")
|
|
|
|
setting.UI.ShowUserEmail = showUserEmail
|
|
}
|
|
|
|
func TestSettingLandingPage(t *testing.T) {
|
|
defer tests.PrepareTestEnv(t)()
|
|
defer test.MockProtect(&setting.LandingPageURL)()
|
|
|
|
setting.LandingPageURL = setting.LandingPageHome
|
|
req := NewRequest(t, "GET", "/")
|
|
MakeRequest(t, req, http.StatusOK)
|
|
|
|
setting.LandingPageURL = setting.LandingPageExplore
|
|
req = NewRequest(t, "GET", "/")
|
|
resp := MakeRequest(t, req, http.StatusSeeOther)
|
|
assert.Equal(t, "/explore", resp.Header().Get("Location"))
|
|
|
|
setting.LandingPageURL = setting.LandingPageOrganizations
|
|
req = NewRequest(t, "GET", "/")
|
|
resp = MakeRequest(t, req, http.StatusSeeOther)
|
|
assert.Equal(t, "/explore/organizations", resp.Header().Get("Location"))
|
|
|
|
setting.LandingPageURL = setting.LandingPageLogin
|
|
req = NewRequest(t, "GET", "/")
|
|
resp = MakeRequest(t, req, http.StatusSeeOther)
|
|
assert.Equal(t, "/user/login", resp.Header().Get("Location"))
|
|
}
|
|
|
|
func TestSettingSecurityAuthSource(t *testing.T) {
|
|
defer tests.PrepareTestEnv(t)()
|
|
|
|
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
|
|
|
|
active := addAuthSource(t, authSourcePayloadGitLabCustom("gitlab-active"))
|
|
activeExternalLoginUser := &user_model.ExternalLoginUser{
|
|
ExternalID: "12345",
|
|
UserID: user.ID,
|
|
LoginSourceID: active.ID,
|
|
}
|
|
err := user_model.LinkExternalToUser(db.DefaultContext, user, activeExternalLoginUser)
|
|
require.NoError(t, err)
|
|
|
|
inactive := addAuthSource(t, authSourcePayloadGitLabCustom("gitlab-inactive"))
|
|
inactiveExternalLoginUser := &user_model.ExternalLoginUser{
|
|
ExternalID: "5678",
|
|
UserID: user.ID,
|
|
LoginSourceID: inactive.ID,
|
|
}
|
|
err = user_model.LinkExternalToUser(db.DefaultContext, user, inactiveExternalLoginUser)
|
|
require.NoError(t, err)
|
|
|
|
// mark the authSource as inactive
|
|
inactive.IsActive = false
|
|
err = auth_model.UpdateSource(db.DefaultContext, inactive)
|
|
require.NoError(t, err)
|
|
|
|
session := loginUser(t, "user1")
|
|
req := NewRequest(t, "GET", "user/settings/security")
|
|
resp := session.MakeRequest(t, req, http.StatusOK)
|
|
assert.Contains(t, resp.Body.String(), `gitlab-active`)
|
|
assert.Contains(t, resp.Body.String(), `gitlab-inactive`)
|
|
}
|
|
|
|
func TestSettingSecurityTwoFactorRequirement(t *testing.T) {
|
|
defer tests.PrepareTestEnv(t)()
|
|
|
|
locale := translation.NewLocale("en-US")
|
|
|
|
runTest := func(t *testing.T, user *user_model.User, forceTOTP, showReroll, showUnroll bool) {
|
|
t.Helper()
|
|
defer unittest.AssertSuccessfulDelete(t, &auth_model.TwoFactor{UID: user.ID})
|
|
|
|
useTOTP := forceTOTP || user.MustHaveTwoFactor()
|
|
session := loginUserMaybeTOTP(t, user, useTOTP)
|
|
|
|
resp := session.MakeRequest(t, NewRequest(t, "GET", "user/settings/security"), http.StatusOK)
|
|
htmlDoc := NewHTMLParser(t, resp.Body)
|
|
htmlDoc.AssertSelection(t, htmlDoc.FindByText("a", locale.TrString("settings.twofa_reenroll")), showReroll)
|
|
htmlDoc.AssertElement(t, "#disable-form", showUnroll)
|
|
htmlDoc.AssertSelection(t, htmlDoc.FindByText("p", locale.TrString("settings.twofa_unroll_unavailable")), showReroll && !showUnroll)
|
|
|
|
req := NewRequestWithValues(t, "POST", "user/settings/security/two_factor/disable", map[string]string{
|
|
"_csrf": htmlDoc.GetCSRF(),
|
|
})
|
|
if user.MustHaveTwoFactor() {
|
|
session.MakeRequest(t, req, http.StatusNotFound)
|
|
} else {
|
|
resp := session.MakeRequest(t, req, http.StatusSeeOther)
|
|
assert.Equal(t, "/user/settings/security", resp.Header().Get("Location"))
|
|
}
|
|
}
|
|
|
|
adminUser := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
|
|
normalUser := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 4})
|
|
restrictedUser := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 29})
|
|
|
|
t.Run("NoneTwoFactorRequirement", func(t *testing.T) {
|
|
t.Run("no 2fa", func(t *testing.T) {
|
|
runTest(t, adminUser, false, false, false)
|
|
runTest(t, normalUser, false, false, false)
|
|
runTest(t, restrictedUser, false, false, false)
|
|
})
|
|
|
|
t.Run("enabled 2fa", func(t *testing.T) {
|
|
runTest(t, adminUser, true, true, true)
|
|
runTest(t, normalUser, true, true, true)
|
|
runTest(t, restrictedUser, true, true, true)
|
|
})
|
|
})
|
|
|
|
t.Run("AllTwoFactorRequirement", func(t *testing.T) {
|
|
defer test.MockVariableValue(&setting.GlobalTwoFactorRequirement, setting.AllTwoFactorRequirement)()
|
|
|
|
runTest(t, adminUser, false, true, false)
|
|
runTest(t, normalUser, false, true, false)
|
|
runTest(t, restrictedUser, false, true, false)
|
|
})
|
|
|
|
t.Run("AdminTwoFactorRequirement", func(t *testing.T) {
|
|
defer test.MockVariableValue(&setting.GlobalTwoFactorRequirement, setting.AdminTwoFactorRequirement)()
|
|
|
|
t.Run("no 2fa", func(t *testing.T) {
|
|
runTest(t, adminUser, false, true, false)
|
|
runTest(t, normalUser, false, false, false)
|
|
runTest(t, restrictedUser, false, false, false)
|
|
})
|
|
|
|
t.Run("enabled 2fa", func(t *testing.T) {
|
|
runTest(t, adminUser, true, true, false)
|
|
runTest(t, normalUser, true, true, true)
|
|
runTest(t, restrictedUser, true, true, true)
|
|
})
|
|
})
|
|
}
|
|
|
|
func TestUserAvatarSizeNotice(t *testing.T) {
|
|
defer tests.PrepareTestEnv(t)()
|
|
|
|
session := loginUser(t, "user1")
|
|
req := NewRequest(t, "GET", "/user/settings")
|
|
resp := session.MakeRequest(t, req, http.StatusOK)
|
|
htmlDoc := NewHTMLParser(t, resp.Body)
|
|
assert.Contains(t,
|
|
htmlDoc.doc.Find("form div:has(input#new-avatar) .help").Text(),
|
|
"Custom avatar may not exceed 1 MiB in size or be larger than 4096x4096 pixels")
|
|
}
|
|
|
|
func TestRepoAvatarSizeNotice(t *testing.T) {
|
|
defer tests.PrepareTestEnv(t)()
|
|
|
|
session := loginUser(t, "user2")
|
|
req := NewRequest(t, "GET", "/user2/repo1/settings")
|
|
resp := session.MakeRequest(t, req, http.StatusOK)
|
|
htmlDoc := NewHTMLParser(t, resp.Body)
|
|
assert.Contains(t,
|
|
htmlDoc.doc.Find("form div:has(input[name=\"avatar\"]) .help").Text(),
|
|
"Custom avatar may not exceed 1 MiB in size or be larger than 4096x4096 pixels")
|
|
}
|
|
|
|
func TestOrgAvatarSizeNotice(t *testing.T) {
|
|
defer tests.PrepareTestEnv(t)()
|
|
|
|
session := loginUser(t, "user2")
|
|
req := NewRequest(t, "GET", "/org/org3/settings")
|
|
resp := session.MakeRequest(t, req, http.StatusOK)
|
|
htmlDoc := NewHTMLParser(t, resp.Body)
|
|
assert.Contains(t,
|
|
htmlDoc.doc.Find("form div:has(input[name=\"avatar\"]) .help").Text(),
|
|
"Custom avatar may not exceed 1 MiB in size or be larger than 4096x4096 pixels")
|
|
}
|
|
|
|
func TestAdminAvatarSizeNotice(t *testing.T) {
|
|
defer tests.PrepareTestEnv(t)()
|
|
|
|
session := loginUser(t, "user1")
|
|
req := NewRequest(t, "GET", "/admin/users/2/edit")
|
|
resp := session.MakeRequest(t, req, http.StatusOK)
|
|
htmlDoc := NewHTMLParser(t, resp.Body)
|
|
assert.Contains(t,
|
|
htmlDoc.doc.Find("form div:has(input[name=\"avatar\"]) .help").Text(),
|
|
"Custom avatar may not exceed 1 MiB in size or be larger than 4096x4096 pixels")
|
|
}
|