From 7210b4cc5207491d3ec5cf64cf923a11d30c705f Mon Sep 17 00:00:00 2001 From: Giteabot Date: Fri, 13 Nov 2026 22:47:38 +0000 Subject: [PATCH] fix: correctly apply team admin permission to doer (#40353) (#40356) Backport #40353 by @wxiaoguang fix #40352 Co-authored-by: wxiaoguang --- models/perm/access/repo_permission.go | 5 ++++- models/perm/access/repo_permission_test.go | 26 ++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/models/perm/access/repo_permission.go b/models/perm/access/repo_permission.go index 7ce3f4f0168..b0d1e3254ba 100644 --- a/models/perm/access/repo_permission.go +++ b/models/perm/access/repo_permission.go @@ -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 { diff --git a/models/perm/access/repo_permission_test.go b/models/perm/access/repo_permission_test.go index 8eef8b010d8..1ad8e2cad0b 100644 --- a/models/perm/access/repo_permission_test.go +++ b/models/perm/access/repo_permission_test.go @@ -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) {