mirror of
https://github.com/go-gitea/gitea
synced 2025-07-22 18:28:37 +00:00
Limit org member view of restricted users (#32211)
currently restricted users can only see the repos of teams in orgs they are part at. they also should only see the users that are also part at the same team. --- *Sponsored by Kithara Software GmbH*
This commit is contained in:
@@ -4,6 +4,7 @@
|
||||
package organization_test
|
||||
|
||||
import (
|
||||
"slices"
|
||||
"sort"
|
||||
"testing"
|
||||
|
||||
@@ -181,6 +182,75 @@ func TestIsPublicMembership(t *testing.T) {
|
||||
test(unittest.NonexistentID, unittest.NonexistentID, false)
|
||||
}
|
||||
|
||||
func TestRestrictedUserOrgMembers(t *testing.T) {
|
||||
assert.NoError(t, unittest.PrepareTestDatabase())
|
||||
|
||||
restrictedUser := unittest.AssertExistsAndLoadBean(t, &user_model.User{
|
||||
ID: 29,
|
||||
IsRestricted: true,
|
||||
})
|
||||
if !assert.True(t, restrictedUser.IsRestricted) {
|
||||
return // ensure fixtures return restricted user
|
||||
}
|
||||
|
||||
testCases := []struct {
|
||||
name string
|
||||
opts *organization.FindOrgMembersOpts
|
||||
expectedUIDs []int64
|
||||
}{
|
||||
{
|
||||
name: "restricted user sees public members and teammates",
|
||||
opts: &organization.FindOrgMembersOpts{
|
||||
OrgID: 17, // org17 where user29 is in team9
|
||||
Doer: restrictedUser,
|
||||
IsDoerMember: true,
|
||||
},
|
||||
expectedUIDs: []int64{2, 15, 20, 29}, // Public members (2) + teammates in team9 (15, 20, 29)
|
||||
},
|
||||
{
|
||||
name: "restricted user sees only public members when not member",
|
||||
opts: &organization.FindOrgMembersOpts{
|
||||
OrgID: 3, // org3 where user29 is not a member
|
||||
Doer: restrictedUser,
|
||||
},
|
||||
expectedUIDs: []int64{2, 28}, // Only public members
|
||||
},
|
||||
{
|
||||
name: "non logged in only shows public members",
|
||||
opts: &organization.FindOrgMembersOpts{
|
||||
OrgID: 3,
|
||||
},
|
||||
expectedUIDs: []int64{2, 28}, // Only public members
|
||||
},
|
||||
{
|
||||
name: "non restricted user sees all members",
|
||||
opts: &organization.FindOrgMembersOpts{
|
||||
OrgID: 17,
|
||||
Doer: unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 15}),
|
||||
IsDoerMember: true,
|
||||
},
|
||||
expectedUIDs: []int64{2, 15, 18, 20, 29}, // All members
|
||||
},
|
||||
}
|
||||
|
||||
for _, tc := range testCases {
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
count, err := organization.CountOrgMembers(db.DefaultContext, tc.opts)
|
||||
assert.NoError(t, err)
|
||||
assert.EqualValues(t, len(tc.expectedUIDs), count)
|
||||
|
||||
members, err := organization.GetOrgUsersByOrgID(db.DefaultContext, tc.opts)
|
||||
assert.NoError(t, err)
|
||||
memberUIDs := make([]int64, 0, len(members))
|
||||
for _, member := range members {
|
||||
memberUIDs = append(memberUIDs, member.UID)
|
||||
}
|
||||
slices.Sort(memberUIDs)
|
||||
assert.EqualValues(t, tc.expectedUIDs, memberUIDs)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestFindOrgs(t *testing.T) {
|
||||
assert.NoError(t, unittest.PrepareTestDatabase())
|
||||
|
||||
|
Reference in New Issue
Block a user