Mirrors/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-05-23 15:01:40 +02:00
Code Issues Activity

[models/conds] update some repo conditions to check for access provided via groups

Browse Source
This commit is contained in:
☙◦ The Tablet ❀ GamerGirlandCo ◦❧ 2025-01-09 19:06:48 -05:00
parent c0898cc0e3
commit 1fc3e005fb
No known key found for this signature in database
GPG Key ID: 924A5F6AF051E87C
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
models/repo/repo_list.go
View File

@ -290,9 +290,9 @@ func UserCollaborationRepoCond(idStr string, userID int64) builder.Cond {
) )
} }
// UserOrgTeamRepoCond selects repos that the given user has access to through team membership // UserOrgTeamRepoCond selects repos that the given user has access to through team membership and/or group permissions
func UserOrgTeamRepoCond(idStr string, userID int64) builder.Cond { func UserOrgTeamRepoCond(idStr string, userID int64) builder.Cond {
return builder.In(idStr, userOrgTeamRepoBuilder(userID)) return builder.In(idStr, userOrgTeamRepoBuilder(userID), userOrgTeamRepoGroupBuilder(userID))
} }
// userOrgTeamRepoBuilder returns repo ids where user's teams can access. // userOrgTeamRepoBuilder returns repo ids where user's teams can access.
@ -326,7 +326,9 @@ func userOrgTeamUnitRepoGroupBuilder(userID int64, unitType unit.Type) *builder.
// userOrgTeamUnitRepoCond returns a condition to select repo ids where user's teams can access the special unit. // userOrgTeamUnitRepoCond returns a condition to select repo ids where user's teams can access the special unit.
func userOrgTeamUnitRepoCond(idStr string, userID int64, unitType unit.Type) builder.Cond { func userOrgTeamUnitRepoCond(idStr string, userID int64, unitType unit.Type) builder.Cond {
return builder.In(idStr, userOrgTeamUnitRepoBuilder(userID, unitType)) return builder.Or(builder.In(
idStr, userOrgTeamUnitRepoBuilder(userID, unitType)),
builder.In(idStr, userOrgTeamUnitRepoGroupBuilder(userID, unitType)))
} }
// UserOrgUnitRepoCond selects repos that the given user has access to through org and the special unit // UserOrgUnitRepoCond selects repos that the given user has access to through org and the special unit
@ -334,7 +336,7 @@ func UserOrgUnitRepoCond(idStr string, userID, orgID int64, unitType unit.Type)
return builder.In(idStr, return builder.In(idStr,
userOrgTeamUnitRepoBuilder(userID, unitType). userOrgTeamUnitRepoBuilder(userID, unitType).
And(builder.Eq{"`team_unit`.org_id": orgID}), And(builder.Eq{"`team_unit`.org_id": orgID}),
) userOrgTeamUnitRepoGroupBuilder(userID, unitType).And(builder.Eq{"`team_unit`.org_id": orgID}))
} }
// ReposAccessibleByGroupTeamBuilder returns repositories that are accessible by a team via group permissions // ReposAccessibleByGroupTeamBuilder returns repositories that are accessible by a team via group permissions