Skip to content

feat(agent): wire up agentssh server to allow exec into container #16638

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 14 commits into from
Feb 26, 2025
Merged

feat(agent): wire up agentssh server to allow exec into container #16638

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
36707f9
feat(agent): write up reconnectingpty server to container exec
johnstcn Feb 19, 2025
690e91c
refactor: move SystemEnvInfo to usershell
johnstcn Feb 25, 2025
92130fe
Apply suggestions from code review
johnstcn Feb 25, 2025
50f1c7f
hide behind experimental flag
johnstcn Feb 25, 2025
46a6b7d
simply naming of interface methods
johnstcn Feb 25, 2025
1eec238
make usershell tests external again
johnstcn Feb 25, 2025
0aae37f
add experimental note
johnstcn Feb 25, 2025
6fffa6b
mark usershell.HomeDir() as deprecated
johnstcn Feb 25, 2025
3127cba
only log modified command at debug if changed
johnstcn Feb 25, 2025
f4c0eab
clarify the why of ModifyCommand
johnstcn Feb 25, 2025
aafe13f
rm unused runtime iotas
johnstcn Feb 25, 2025
12389d8
reduce diff size
johnstcn Feb 25, 2025
72d3ff1
purge container
johnstcn Feb 25, 2025
40a61fa
add missing parameters for container and container_user
johnstcn Feb 25, 2025
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
add missing parameters for container and container_user
  • Loading branch information
@johnstcn
johnstcn committed Feb 25, 2025
commit 40a61faa047bb429d8ad5f565b2e654556596c11
7 changes: 6 additions & 1 deletion coderd/workspaceapps/proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -653,6 +653,8 @@ func (s *Server) workspaceAgentPTY(rw http.ResponseWriter, r *http.Request) {
reconnect := parser.RequiredNotEmpty("reconnect").UUID(values, uuid.New(), "reconnect")
height := parser.UInt(values, 80, "height")
width := parser.UInt(values, 80, "width")
container := parser.String(values, "", "container")
containerUser := parser.String(values, "", "container_user")
if len(parser.Errors) > 0 {
httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
Message: "Invalid query parameters.",
Expand Down Expand Up @@ -690,7 +692,10 @@ func (s *Server) workspaceAgentPTY(rw http.ResponseWriter, r *http.Request) {
}
defer release()
log.Debug(ctx, "dialed workspace agent")
ptNetConn, err := agentConn.ReconnectingPTY(ctx, reconnect, uint16(height), uint16(width), r.URL.Query().Get("command"))
ptNetConn, err := agentConn.ReconnectingPTY(ctx, reconnect, uint16(height), uint16(width), r.URL.Query().Get("command"), func(arp *workspacesdk.AgentReconnectingPTYInit) {
arp.Container = container
arp.ContainerUser = containerUser
})
if err != nil {
log.Debug(ctx, "dial reconnecting pty server in workspace agent", slog.Error(err))
_ = conn.Close(websocket.StatusInternalError, httpapi.WebsocketCloseSprintf("dial: %s", err))
Expand Down
Loading