mirror of
https://github.com/coder/coder.git
synced 2026-06-03 21:18:24 +00:00
56f95a3e6d
## Problem When the git askpass flow triggered diff status refreshes, it updated **every chat** connected to the workspace. This was wasteful and could cause confusing status updates on unrelated chats. ## Solution Thread the chat ID through the entire git askpass flow so only the chat that initiated the git operation gets updated: 1. **`coderd/chatd/chattool/execute.go`** — Sets `CODER_CHAT_ID` env var on spawned processes (alongside the existing `CODER_CHAT_AGENT`) 2. **`cli/gitaskpass.go`** — Reads `CODER_CHAT_ID` from the environment and sends it as a `chat_id` query parameter in the `ExternalAuthRequest` 3. **`codersdk/agentsdk/agentsdk.go`** — Adds `ChatID` field to `ExternalAuthRequest` and encodes it as a query param 4. **`coderd/workspaceagents.go`** — Parses `chat_id` query param and passes it through to `storeChatGitRef` and `triggerWorkspaceChatDiffStatusRefresh` 5. **`coderd/chats.go`** — `storeChatGitRef` and `refreshWorkspaceChatDiffStatuses` now scope updates to just the initiating chat when a chat ID is provided, falling back to all-workspace-chats behavior for backwards compatibility (non-chat git operations)
141 lines
4.0 KiB
Go
141 lines
4.0 KiB
Go
package cli
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"net/http"
|
|
"os"
|
|
"os/exec"
|
|
"strings"
|
|
"time"
|
|
|
|
"golang.org/x/xerrors"
|
|
|
|
"github.com/coder/coder/v2/cli/cliui"
|
|
"github.com/coder/coder/v2/cli/gitauth"
|
|
"github.com/coder/coder/v2/codersdk"
|
|
"github.com/coder/coder/v2/codersdk/agentsdk"
|
|
"github.com/coder/retry"
|
|
"github.com/coder/serpent"
|
|
)
|
|
|
|
// detectGitRef attempts to resolve the current git branch and remote
|
|
// origin URL from the given working directory. These are sent to the
|
|
// control plane so it can look up PR/diff status via the GitHub API
|
|
// without SSHing into the workspace. Failures are silently ignored
|
|
// since this is best-effort.
|
|
func detectGitRef(workingDirectory string) (branch string, remoteOrigin string) {
|
|
run := func(args ...string) string {
|
|
//nolint:gosec
|
|
cmd := exec.Command(args[0], args[1:]...)
|
|
if workingDirectory != "" {
|
|
cmd.Dir = workingDirectory
|
|
}
|
|
out, err := cmd.Output()
|
|
if err != nil {
|
|
return ""
|
|
}
|
|
return strings.TrimSpace(string(out))
|
|
}
|
|
branch = run("git", "rev-parse", "--abbrev-ref", "HEAD")
|
|
remoteOrigin = run("git", "config", "--get", "remote.origin.url")
|
|
return branch, remoteOrigin
|
|
}
|
|
|
|
// gitAskpass is used by the Coder agent to automatically authenticate
|
|
// with Git providers based on a hostname.
|
|
func gitAskpass(agentAuth *AgentAuth) *serpent.Command {
|
|
cmd := &serpent.Command{
|
|
Use: "gitaskpass",
|
|
Hidden: true,
|
|
Handler: func(inv *serpent.Invocation) error {
|
|
ctx := inv.Context()
|
|
|
|
ctx, stop := inv.SignalNotifyContext(ctx, StopSignals...)
|
|
defer stop()
|
|
|
|
user, host, err := gitauth.ParseAskpass(inv.Args[0])
|
|
if err != nil {
|
|
return xerrors.Errorf("parse host: %w", err)
|
|
}
|
|
|
|
client, err := agentAuth.CreateClient()
|
|
if err != nil {
|
|
return xerrors.Errorf("create agent client: %w", err)
|
|
}
|
|
|
|
workingDirectory, err := os.Getwd()
|
|
if err != nil {
|
|
workingDirectory = ""
|
|
}
|
|
|
|
// Detect the current git branch and remote origin so
|
|
// the control plane can resolve diffs without needing
|
|
// to SSH back into the workspace.
|
|
gitBranch, gitRemoteOrigin := detectGitRef(workingDirectory)
|
|
|
|
token, err := client.ExternalAuth(ctx, agentsdk.ExternalAuthRequest{
|
|
Match: host,
|
|
GitBranch: gitBranch,
|
|
GitRemoteOrigin: gitRemoteOrigin,
|
|
ChatID: inv.Environ.Get("CODER_CHAT_ID"),
|
|
})
|
|
if err != nil {
|
|
var apiError *codersdk.Error
|
|
if errors.As(err, &apiError) && apiError.StatusCode() == http.StatusNotFound {
|
|
// This prevents the "Run 'coder --help' for usage"
|
|
// message from occurring.
|
|
lines := []string{apiError.Message}
|
|
if apiError.Detail != "" {
|
|
lines = append(lines, apiError.Detail)
|
|
}
|
|
cliui.Warn(inv.Stderr, "Coder was unable to handle this git request. The default git behavior will be used instead.",
|
|
lines...,
|
|
)
|
|
return cliui.ErrCanceled
|
|
}
|
|
return xerrors.Errorf("get git token: %w", err)
|
|
}
|
|
if token.URL != "" {
|
|
// This is to help the agent authenticate with Git.
|
|
if inv.Environ.Get("CODER_CHAT_AGENT") == "true" {
|
|
_, _ = fmt.Fprintf(inv.Stderr, `You must notify the user to authenticate with Git.\n\nThe URL is: %s\n`, token.URL)
|
|
return cliui.ErrCanceled
|
|
}
|
|
|
|
if err := openURL(inv, token.URL); err == nil {
|
|
cliui.Infof(inv.Stderr, "Your browser has been opened to authenticate with Git:\n%s", token.URL)
|
|
} else {
|
|
cliui.Infof(inv.Stderr, "Open the following URL to authenticate with Git:\n%s", token.URL)
|
|
}
|
|
|
|
for r := retry.New(250*time.Millisecond, 10*time.Second); r.Wait(ctx); {
|
|
token, err = client.ExternalAuth(ctx, agentsdk.ExternalAuthRequest{
|
|
Match: host,
|
|
Listen: true,
|
|
})
|
|
if err != nil {
|
|
continue
|
|
}
|
|
cliui.Infof(inv.Stderr, "You've been authenticated with Git!")
|
|
break
|
|
}
|
|
}
|
|
|
|
if token.Password != "" {
|
|
if user == "" {
|
|
_, _ = fmt.Fprintln(inv.Stdout, token.Username)
|
|
} else {
|
|
_, _ = fmt.Fprintln(inv.Stdout, token.Password)
|
|
}
|
|
} else {
|
|
_, _ = fmt.Fprintln(inv.Stdout, token.Username)
|
|
}
|
|
|
|
return nil
|
|
},
|
|
}
|
|
agentAuth.AttachOptions(cmd, false)
|
|
return cmd
|
|
}
|