mirror of
https://github.com/go-gitea/gitea.git
synced 2026-11-16 13:51:02 +00:00
Backport #40353 by @wxiaoguang fix #40352 Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
1 parent
87c509a405
commit
7210b4cc52
2 files changed
+30
-1
No files matched your search
@@ -506,13 +506,16 @@ func GetIndividualUserRepoPermission(ctx context.Context, repo *repo_model.Repos
|
||||
}
|
||||
}
|
||||
|
||||
// if user in an owner team
|
||||
// Apply repository-level access from teams.
|
||||
for _, team := range perm.orgRepoTeams {
|
||||
if team.IsOwnerTeam() || team.AccessMode == perm_model.AccessModeOwner {
|
||||
perm.AccessMode = perm_model.AccessModeOwner
|
||||
perm.unitsMode = nil
|
||||
return perm, nil
|
||||
}
|
||||
if team.AccessMode == perm_model.AccessModeAdmin {
|
||||
perm.AccessMode = max(perm.AccessMode, perm_model.AccessModeAdmin)
|
||||
}
|
||||
}
|
||||
|
||||
for _, u := range repo.Units {
|
||||
|
||||
@@ -236,6 +236,32 @@ func testGetIndividualUserRepoPermission(t *testing.T) {
|
||||
require.Empty(t, users)
|
||||
})
|
||||
|
||||
t.Run("DoerWithAdminTeamWithoutAccessRow", func(t *testing.T) {
|
||||
_, err := db.GetEngine(ctx).ID(team.ID).Cols("authorize").Update(&organization.Team{AccessMode: perm_model.AccessModeAdmin})
|
||||
require.NoError(t, err)
|
||||
defer func() {
|
||||
_, err := db.GetEngine(ctx).ID(team.ID).Cols("authorize").Update(&organization.Team{AccessMode: perm_model.AccessModeNone})
|
||||
require.NoError(t, err)
|
||||
}()
|
||||
|
||||
for _, repo := range []*repo_model.Repository{repo3, repo32} {
|
||||
perm, err := GetIndividualUserRepoPermission(ctx, repo, user)
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, perm_model.AccessModeAdmin, perm.AccessMode)
|
||||
assert.True(t, perm.IsAdmin())
|
||||
assert.False(t, perm.IsOwner())
|
||||
for _, repoUnit := range repo.Units {
|
||||
assert.Equal(t, perm_model.AccessModeAdmin, perm.UnitAccessMode(repoUnit.Type))
|
||||
}
|
||||
}
|
||||
|
||||
unrelatedRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 5})
|
||||
require.Equal(t, org.ID, unrelatedRepo.OwnerID)
|
||||
perm, err := GetIndividualUserRepoPermission(ctx, unrelatedRepo, user)
|
||||
require.NoError(t, err)
|
||||
assert.False(t, perm.IsAdmin())
|
||||
})
|
||||
|
||||
require.NoError(t, db.Insert(ctx, repo_model.Collaboration{RepoID: repo3.ID, UserID: user.ID, Mode: perm_model.AccessModeWrite}))
|
||||
require.NoError(t, db.Insert(ctx, Access{RepoID: repo3.ID, UserID: user.ID, Mode: perm_model.AccessModeWrite}))
|
||||
t.Run("DoerWithReadIssueTeamAndWriteCollaboratorOnPrivateRepo", func(t *testing.T) {
|
||||
|
||||
Reference in new issue
Block a user