Skip to content

feat: Add agent authentication based on instance ID #336

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 7 commits into from
Feb 21, 2022
Merged

feat: Add agent authentication based on instance ID #336

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1b65d08
feat: Add agent authentication based on instance ID
kylecarbs Feb 20, 2022
d16496c
Add test for CLI
kylecarbs Feb 20, 2022
7f4565c
Merge branch 'main' into agent
kylecarbs Feb 20, 2022
50f76b9
Merge branch 'main' into agent
kylecarbs Feb 21, 2022
00d4326
Fix workspace agent request name
kylecarbs Feb 21, 2022
3374212
Fix race with adding to wait group
kylecarbs Feb 21, 2022
648f40a
Fix name of instance identity token
kylecarbs Feb 21, 2022
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
Next Next commit
Fix race with adding to wait group
  • Loading branch information
@kylecarbs
kylecarbs committed Feb 21, 2022
commit 3374212e9daa749b58bda67bb301643060c7305a
5 changes: 3 additions & 2 deletions coderd/provisionerdaemons.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ func (api *api) provisionerDaemons(rw http.ResponseWriter, r *http.Request) {

// Serves the provisioner daemon protobuf API over a WebSocket.
func (api *api) provisionerDaemonsServe(rw http.ResponseWriter, r *http.Request) {
api.websocketWaitGroup.Add(1)
defer api.websocketWaitGroup.Done()

conn, err := websocket.Accept(rw, r, &websocket.AcceptOptions{
// Need to disable compression to avoid a data-race.
CompressionMode: websocket.CompressionDisabled,
Expand All @@ -62,8 +65,6 @@ func (api *api) provisionerDaemonsServe(rw http.ResponseWriter, r *http.Request)
})
return
}
api.websocketWaitGroup.Add(1)
defer api.websocketWaitGroup.Done()

daemon, err := api.Database.InsertProvisionerDaemon(r.Context(), database.InsertProvisionerDaemonParams{
ID: uuid.New(),
Expand Down