fix(cli/cliui): avoid nil pointer deref when agent disconnects (#9892)

mafredri · web-flow · commit 0878381d0bf5 · 2023-09-27T19:10:15.000+03:00
Fixes #9884
diff --git a/cli/cliui/agent.go b/cli/cliui/agent.go
@@ -237,12 +237,14 @@ func Agent(ctx context.Context, writer io.Writer, agentID uuid.UUID, opts AgentO
 			sw.Start(stage)
 			sw.Log(time.Now(), codersdk.LogLevelWarn, "Wait for it to reconnect or restart your workspace.")
 			sw.Log(time.Now(), codersdk.LogLevelWarn, troubleshootingMessage(agent, "https://coder.com/docs/v2/latest/templates#agent-connection-issues"))
+
+			disconnectedAt := *agent.DisconnectedAt
 			for agent.Status == codersdk.WorkspaceAgentDisconnected {
 				if agent, err = fetch(); err != nil {
 					return xerrors.Errorf("fetch: %w", err)
 				}
 			}
-			sw.Complete(stage, agent.LastConnectedAt.Sub(*agent.DisconnectedAt))
+			sw.Complete(stage, agent.LastConnectedAt.Sub(disconnectedAt))
 		}
 	}
 }
diff --git a/cli/cliui/agent_test.go b/cli/cliui/agent_test.go
@@ -133,6 +133,7 @@ func TestAgent(t *testing.T) {
 				},
 				func(_ context.Context, agent *codersdk.WorkspaceAgent, _ chan []codersdk.WorkspaceAgentLog) error {
 					agent.Status = codersdk.WorkspaceAgentConnected
+					agent.DisconnectedAt = nil
 					agent.LastConnectedAt = ptr.Ref(time.Now())
 					return nil
 				},

Original file line number	Diff line number	Diff line change
`@@ -237,12 +237,14 @@ func Agent(ctx context.Context, writer io.Writer, agentID uuid.UUID, opts AgentO`
`237`	`237`	`sw.Start(stage)`
`238`	`238`	`sw.Log(time.Now(), codersdk.LogLevelWarn, "Wait for it to reconnect or restart your workspace.")`
`239`	`239`	`sw.Log(time.Now(), codersdk.LogLevelWarn, troubleshootingMessage(agent, "https://coder.com/docs/v2/latest/templates#agent-connection-issues"))`
	`240`	`+`
	`241`	`+ disconnectedAt := *agent.DisconnectedAt`
`240`	`242`	`for agent.Status == codersdk.WorkspaceAgentDisconnected {`
`241`	`243`	`if agent, err = fetch(); err != nil {`
`242`	`244`	`return xerrors.Errorf("fetch: %w", err)`
`243`	`245`	`}`
`244`	`246`	`}`
`245`		`- sw.Complete(stage, agent.LastConnectedAt.Sub(*agent.DisconnectedAt))`
	`247`	`+ sw.Complete(stage, agent.LastConnectedAt.Sub(disconnectedAt))`
`246`	`248`	`}`
`247`	`249`	`}`
`248`	`250`	`}`