Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: only lookup user team memberships if using team authz #4903

Merged
merged 1 commit into from
Sep 6, 2024
Merged

fix: only lookup user team memberships if using team authz #4903

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions server/events/command_runner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,19 +156,21 @@ func (c *DefaultCommandRunner) RunAutoplanCommand(baseRepo models.Repo, headRepo
defer timer.Stop()

// Check if the user who triggered the autoplan has permissions to run 'plan'.
err = c.fetchUserTeams(baseRepo, &user)
if err != nil {
c.Logger.Err("Unable to fetch user teams: %s", err)
return
}
if c.TeamAllowlistChecker != nil && c.TeamAllowlistChecker.HasRules() {
err := c.fetchUserTeams(baseRepo, &user)
if err != nil {
c.Logger.Err("Unable to fetch user teams: %s", err)
return
}

ok, err := c.checkUserPermissions(baseRepo, user, "plan")
if err != nil {
c.Logger.Err("Unable to check user permissions: %s", err)
return
}
if !ok {
return
ok, err := c.checkUserPermissions(baseRepo, user, "plan")
if err != nil {
c.Logger.Err("Unable to check user permissions: %s", err)
return
}
if !ok {
return
}
}

ctx := &command.Context{
Expand Down
Loading