Skip to content
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

fix(cli): proxy provider credential forwarding #1065

Merged
merged 1 commit into from
May 14, 2024
Merged

fix(cli): proxy provider credential forwarding #1065

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 5 additions & 8 deletions cmd/ssh.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,12 +446,11 @@ func (cmd *SSHCmd) startProxyServices(
ideName string,
log log.Logger,
) {
if cmd.User == "" {
gitCredentials := devPodConfig.ContextOption(config.ContextOptionSSHInjectGitCredentials) == "true"
if !gitCredentials || cmd.User == "" || cmd.GitUsername == "" || cmd.GitToken == "" {
return
}

gitCredentials := devPodConfig.ContextOption(config.ContextOptionSSHInjectGitCredentials) == "true"

stdoutReader, stdoutWriter, err := os.Pipe()
if err != nil {
log.Debugf("Error creating stdout pipe: %v", err)
Expand Down Expand Up @@ -485,11 +484,9 @@ func (cmd *SSHCmd) startProxyServices(
errChan <- devssh.Run(cancelCtx, containerClient, command, stdinReader, stdoutWriter, writer)
}()

opts := []tunnelserver.Option{}
if cmd.GitUsername != "" && cmd.GitToken != "" {
opts = append(opts, tunnelserver.WithGitCredentialsOverride(cmd.GitUsername, cmd.GitToken))
}
err = tunnelserver.RunServicesServer(ctx, stdoutReader, stdinWriter, true, true, nil, log, opts...)
err = tunnelserver.RunServicesServer(ctx, stdoutReader, stdinWriter, true, true, nil, log,
[]tunnelserver.Option{tunnelserver.WithGitCredentialsOverride(cmd.GitUsername, cmd.GitToken)}...,
)
if err != nil {
log.Debugf("Error running proxy server: %v", err)
return
Expand Down
Loading