Skip to content

feat: Set SSH env vars: SSH_CLIENT, SSH_CONNECTION and SSH_TTY #3622

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
Aug 23, 2022
Merged

feat: Set SSH env vars: SSH_CLIENT, SSH_CONNECTION and SSH_TTY #3622

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bab3c85
feat: Set SSH env vars: `SSH_CLIENT`, `SSH_CONNECTION` and `SSH_TTY`
mafredri Aug 22, 2022
3823d23
Use hard coded values for SSH env vars
mafredri Aug 23, 2022
22a24db
Move set of env vars to createCommand
mafredri Aug 23, 2022
5fc1d41
Add test for SSH_PTY env var
mafredri Aug 23, 2022
460b762
Add test for SSH env vars
mafredri Aug 23, 2022
f7c91cc
Remove unused func
mafredri Aug 23, 2022
05195f2
Fix test on macOS
mafredri Aug 23, 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
Move set of env vars to createCommand
  • Loading branch information
@mafredri
mafredri committed Aug 23, 2022
commit 22a24db63c2224b01c2ef2d8c924e1e0ce4517da
18 changes: 9 additions & 9 deletions agent/agent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,15 @@ func (a *agent) createCommand(ctx context.Context, rawCommand string, env []stri
unixExecutablePath := strings.ReplaceAll(executablePath, "\\", "/")
cmd.Env = append(cmd.Env, fmt.Sprintf(`GIT_SSH_COMMAND=%s gitssh --`, unixExecutablePath))

// Set SSH connection environment variables (these are also set by OpenSSH
// and thus expected to be present by SSH clients). Since the agent does
// networking in-memory, trying to provide accurate values here would be
// nonsensical. For now, we hard code these values so that they're present.
srcAddr, srcPort := "0.0.0.0", "0"
dstAddr, dstPort := "0.0.0.0", "0"
cmd.Env = append(cmd.Env, fmt.Sprintf("SSH_CLIENT=%s %s %s", srcAddr, srcPort, dstPort))
cmd.Env = append(cmd.Env, fmt.Sprintf("SSH_CONNECTION=%s %s %s %s", srcAddr, srcPort, dstAddr, dstPort))

// Load environment variables passed via the agent.
// These should override all variables we manually specify.
for envKey, value := range metadata.EnvironmentVariables {
Expand All @@ -427,15 +436,6 @@ func (a *agent) handleSSHSession(session ssh.Session) (retErr error) {
if err != nil {
return err
}
// Set SSH connection environment variables, from the clients perspective.
// Set SSH connection environment variables (these are also set by OpenSSH
// and thus expected to be present by SSH clients). Since the agent does
// networking in-memory, trying to provide accurate values here would be
// nonsensical. For now, we hard code these values so that they're present.
srcAddr, srcPort := "0.0.0.0", "0"
dstAddr, dstPort := "0.0.0.0", "0"
cmd.Env = append(cmd.Env, fmt.Sprintf("SSH_CLIENT=%s %s %s", srcAddr, srcPort, dstPort))
cmd.Env = append(cmd.Env, fmt.Sprintf("SSH_CONNECTION=%s %s %s %s", srcAddr, srcPort, dstAddr, dstPort))

if ssh.AgentRequested(session) {
l, err := ssh.NewAgentListener()
Expand Down