mirror of
https://github.com/go-gitea/gitea.git
synced 2026-08-22 14:53:44 +00:00
Backport #39009 by @bircni Exclude public repositories owned by hidden individual accounts from broad repository listings, while preserving visibility through explicit access and ownership. _Assisted-by: Codex:GPT-5_ Co-authored-by: bircni <bircni@icloud.com>
This commit is contained in:
@@ -658,11 +658,15 @@ func SearchRepositoryIDsByCondition(ctx context.Context, cond builder.Cond) ([]i
|
||||
func userAllPublicRepoCond(cond builder.Cond, orgVisibilityLimit []structs.VisibleType) builder.Cond {
|
||||
return cond.Or(builder.And(
|
||||
builder.Eq{"`repository`.is_private": false},
|
||||
// Aren't in a private organisation or limited organisation if we're not logged in
|
||||
builder.NotIn("`repository`.owner_id", builder.Select("id").From("`user`").Where(
|
||||
builder.And(
|
||||
builder.Eq{"type": user_model.UserTypeOrganization},
|
||||
builder.In("visibility", orgVisibilityLimit)),
|
||||
builder.Or(
|
||||
builder.And(
|
||||
builder.Eq{"type": user_model.UserTypeOrganization},
|
||||
builder.In("visibility", orgVisibilityLimit)),
|
||||
builder.And(
|
||||
builder.Neq{"type": user_model.UserTypeOrganization},
|
||||
builder.Neq{"visibility": structs.VisibleTypePublic}),
|
||||
),
|
||||
))))
|
||||
}
|
||||
|
||||
|
||||
@@ -271,6 +271,23 @@ func testSearchRepositoryRestricted(t *testing.T) {
|
||||
})
|
||||
}
|
||||
|
||||
func TestSearchRepositoryExcludesHiddenIndividualOwners(t *testing.T) {
|
||||
require.NoError(t, unittest.PrepareTestDatabase())
|
||||
|
||||
hiddenOwner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
||||
require.NoError(t, user_model.UpdateUserCols(t.Context(), &user_model.User{
|
||||
ID: hiddenOwner.ID,
|
||||
Visibility: structs.VisibleTypePrivate,
|
||||
}, "visibility"))
|
||||
|
||||
repos, _, err := repo_model.SearchRepositoryByName(t.Context(), repo_model.SearchRepoOptions{
|
||||
ListOptions: db.ListOptions{Page: 1, PageSize: 100},
|
||||
Keyword: "repo1",
|
||||
})
|
||||
require.NoError(t, err)
|
||||
assert.NotContains(t, repoIDs(repos), int64(1))
|
||||
}
|
||||
|
||||
func testSearchRepositoryPrivate(t *testing.T) {
|
||||
// test search private repository on explore page
|
||||
repos, count, err := repo_model.SearchRepositoryByName(t.Context(), repo_model.SearchRepoOptions{
|
||||
|
||||
Reference in New Issue
Block a user