Skip to content

feat: accept provisioner keys for provisioner auth #13972

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

Merged
merged 10 commits into from
Jul 25, 2024
Merged

feat: accept provisioner keys for provisioner auth #13972

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
abe253d
feat: accept provisioner keys for provisioner auth
f0ssel Jul 22, 2024
6837b57
fix panic
f0ssel Jul 22, 2024
56a880d
tests
f0ssel Jul 23, 2024
32ff000
limit on api side
f0ssel Jul 23, 2024
c9376a0
revert rbac changes
f0ssel Jul 24, 2024
1e9b79a
move to mw
f0ssel Jul 24, 2024
1214b62
move back to authorize
f0ssel Jul 24, 2024
c7c00e7
fix authorization with pk given
f0ssel Jul 24, 2024
5d470f0
forbid user and pk auth
f0ssel Jul 24, 2024
1a45338
forbid user and pk auth
f0ssel Jul 24, 2024
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
Prev Previous commit
forbid user and pk auth
  • Loading branch information
@f0ssel
f0ssel committed Jul 24, 2024
commit 1a45338396a19c04ee4d7e515b2765ca03667dab
2 changes: 2 additions & 0 deletions enterprise/coderd/provisionerdaemons.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,8 @@ func (p *provisionerDaemonAuth) authorize(r *http.Request, orgID uuid.UUID, tags
return nil, xerrors.New("user unauthorized")
}

// Allow fallback to PSK auth if the user is not allowed to create provisioner daemons.
// This is to preserve backwards compatibility with existing user provisioner daemons.
// If using PSK auth, the daemon is, by definition, scoped to the organization.
tags = provisionersdk.MutateTags(uuid.Nil, tags)
return tags, nil
Expand Down
Loading