mirror of
https://github.com/go-gitea/gitea.git
synced 2026-07-15 20:40:52 +09:00
Giteabot
de4b8277e9
Backport #38406 by @bircni Addresses a batch of privately reported security issues, grouped by area: - **SSRF** - migration PR-patch/asset fetches, OAuth2 avatar & OpenID discovery, pull-mirror URL re-validation, and the outbound proxy path. - **Access-token scope** - prevent scope escalation on token creation; keep public-only tokens confined (feeds, packages, Actions listings, star/watch lists, limited/private owners). - **Access control / disclosure** - go-get default-branch leak, webhook authorization-header leak, watch clearing on private transitions, label/attachment scoping. - **Denial of service** - input bounds for npm dist-tags, Debian control files, Arch file lists, and SSH keys. ### 📌 Attention for site admins Not breaking - existing configs keep working - but two changes are worth a look: - **New SSRF protection** Outbound requests (migrations, OAuth2 avatars, OpenID discovery, pull mirrors, proxy path) are now validated against the allow/block host lists. If your instance legitimately reaches internal hosts, you may need to add them to `[security].ALLOWED_HOST_LIST` (and the relevant `ALLOW_LOCALNETWORKS` settings). - **Deprecation** `[webhook].ALLOWED_HOST_LIST` is deprecated and will be removed in a future release. Use `[security].ALLOWED_HOST_LIST` instead; the old key still works for now. Co-authored-by: bircni <bircni@icloud.com> Co-authored-by: TheFox0x7 <thefox0x7@gmail.com> Co-authored-by: techknowlogick <techknowlogick@gitea.io> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com> Co-authored-by: Zettat123 <zettat123@gmail.com>
91 lines
3.8 KiB
Go
91 lines
3.8 KiB
Go
// Copyright 2021 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package org
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"gitea.dev/models/organization"
|
|
repo_model "gitea.dev/models/repo"
|
|
"gitea.dev/models/unittest"
|
|
user_model "gitea.dev/models/user"
|
|
"gitea.dev/modules/structs"
|
|
"gitea.dev/modules/util"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestMain(m *testing.M) {
|
|
unittest.MainTest(m)
|
|
}
|
|
|
|
func TestOrg(t *testing.T) {
|
|
require.NoError(t, unittest.PrepareTestDatabase())
|
|
|
|
t.Run("UpdateOrgEmailAddress", func(t *testing.T) {
|
|
org := unittest.AssertExistsAndLoadBean(t, &organization.Organization{ID: 3})
|
|
originalEmail := org.Email
|
|
|
|
require.NoError(t, UpdateOrgEmailAddress(t.Context(), org, nil))
|
|
unittest.AssertExistsAndLoadBean(t, &organization.Organization{ID: 3, Email: originalEmail})
|
|
|
|
newEmail := "contact@org3.example.com"
|
|
require.NoError(t, UpdateOrgEmailAddress(t.Context(), org, &newEmail))
|
|
unittest.AssertExistsAndLoadBean(t, &organization.Organization{ID: 3, Email: newEmail})
|
|
|
|
invalidEmail := "invalid email"
|
|
err := UpdateOrgEmailAddress(t.Context(), org, &invalidEmail)
|
|
require.ErrorIs(t, err, util.ErrInvalidArgument)
|
|
unittest.AssertExistsAndLoadBean(t, &organization.Organization{ID: 3, Email: newEmail})
|
|
|
|
require.NoError(t, UpdateOrgEmailAddress(t.Context(), org, new("")))
|
|
org = unittest.AssertExistsAndLoadBean(t, &organization.Organization{ID: 3, Email: ""})
|
|
assert.Empty(t, org.Email)
|
|
})
|
|
|
|
t.Run("DeleteOrganization", func(t *testing.T) {
|
|
org := unittest.AssertExistsAndLoadBean(t, &organization.Organization{ID: 6})
|
|
assert.NoError(t, DeleteOrganization(t.Context(), org, false))
|
|
unittest.AssertNotExistsBean(t, &organization.Organization{ID: 6})
|
|
unittest.AssertNotExistsBean(t, &organization.OrgUser{OrgID: 6})
|
|
unittest.AssertNotExistsBean(t, &organization.Team{OrgID: 6})
|
|
|
|
org = unittest.AssertExistsAndLoadBean(t, &organization.Organization{ID: 3})
|
|
err := DeleteOrganization(t.Context(), org, false)
|
|
assert.Error(t, err)
|
|
assert.True(t, repo_model.IsErrUserOwnRepos(err))
|
|
|
|
user := unittest.AssertExistsAndLoadBean(t, &organization.Organization{ID: 5})
|
|
assert.Error(t, DeleteOrganization(t.Context(), user, false))
|
|
unittest.CheckConsistencyFor(t, &user_model.User{}, &organization.Team{})
|
|
})
|
|
|
|
t.Run("ChangeVisibilityWithUserFork", func(t *testing.T) {
|
|
// org 19 has a repository 27 which has a forked repository 29 by user 20
|
|
org := unittest.AssertExistsAndLoadBean(t, &organization.Organization{ID: 19})
|
|
require.NoError(t, ChangeOrganizationVisibility(t.Context(), org, structs.VisibleTypePrivate))
|
|
unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: org.ID, Visibility: structs.VisibleTypePrivate})
|
|
})
|
|
|
|
t.Run("ChangeVisibilityClearsWatchesAndStars", func(t *testing.T) {
|
|
// org3 is a public organization owning the public repo32
|
|
org := unittest.AssertExistsAndLoadBean(t, &organization.Organization{ID: 3})
|
|
require.Equal(t, structs.VisibleTypePublic, org.Visibility)
|
|
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 32, OwnerID: org.ID})
|
|
|
|
// an outside user watches and stars the repo while the org is still visible
|
|
watcher := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 4})
|
|
require.NoError(t, repo_model.WatchRepo(t.Context(), watcher, repo, true))
|
|
require.NoError(t, repo_model.StarRepo(t.Context(), watcher, repo, true))
|
|
unittest.AssertExistsAndLoadBean(t, &repo_model.Watch{UserID: watcher.ID, RepoID: repo.ID})
|
|
|
|
require.NoError(t, ChangeOrganizationVisibility(t.Context(), org, structs.VisibleTypePrivate))
|
|
|
|
// making the org private must drop watches, not only stars, from users who can no longer see it
|
|
unittest.AssertNotExistsBean(t, &repo_model.Watch{UserID: watcher.ID, RepoID: repo.ID})
|
|
unittest.AssertNotExistsBean(t, &repo_model.Star{UID: watcher.ID, RepoID: repo.ID})
|
|
})
|
|
}
|