Skip to content

Commit cee4115

Browse files
nickking-brtkvanzuijlen
authored andcommitted
fix: only lookup user team memberships if using team authz (runatlantis#4903)
Signed-off-by: kvanzuijlen <[email protected]>
1 parent fcdc081 commit cee4115

File tree

1 file changed

+14
-12
lines changed

1 file changed

+14
-12
lines changed

server/events/command_runner.go

+14-12
Original file line numberDiff line numberDiff line change
@@ -156,19 +156,21 @@ func (c *DefaultCommandRunner) RunAutoplanCommand(baseRepo models.Repo, headRepo
156156
defer timer.Stop()
157157

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

165-
ok, err := c.checkUserPermissions(baseRepo, user, "plan")
166-
if err != nil {
167-
c.Logger.Err("Unable to check user permissions: %s", err)
168-
return
169-
}
170-
if !ok {
171-
return
166+
ok, err := c.checkUserPermissions(baseRepo, user, "plan")
167+
if err != nil {
168+
c.Logger.Err("Unable to check user permissions: %s", err)
169+
return
170+
}
171+
if !ok {
172+
return
173+
}
172174
}
173175

174176
ctx := &command.Context{

0 commit comments

Comments
 (0)