Skip to content

Commit

Permalink
Revert part of #23833
Browse files Browse the repository at this point in the history
Because unknown session requests abort sessions instead of getting
rejected "envs@goteleport.com" breaks backwards compatability.
  • Loading branch information
rosstimothy committed Mar 31, 2023
1 parent a1fe2e5 commit a1fd7aa
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 10 deletions.
16 changes: 8 additions & 8 deletions lib/client/session.go
Original file line number Diff line number Diff line change
Expand Up @@ -225,22 +225,22 @@ func (ns *NodeSession) createServerSession(ctx context.Context) (*tracessh.Sessi
return nil, trace.Wrap(err)
}

envs := map[string]string{}

// pass language info into the remote session.
langVars := []string{"LANG", "LANGUAGE"}
for _, env := range langVars {
if value := os.Getenv(env); value != "" {
envs[env] = value
err = sess.Setenv(ctx, env, value)
if err != nil {
log.Warn(err)
}
}
}
// pass environment variables set by client
for key, val := range ns.env {
envs[key] = val
}

if err := sess.SetEnvs(ctx, envs); err != nil {
log.Warn(err)
err = sess.Setenv(ctx, key, val)
if err != nil {
log.Warn(err)
}
}

// if agent forwarding was requested (and we have a agent to forward),
Expand Down
6 changes: 4 additions & 2 deletions lib/srv/term.go
Original file line number Diff line number Diff line change
Expand Up @@ -693,7 +693,9 @@ func (t *remoteTerminal) prepareRemoteSession(ctx context.Context, session *trac
teleport.SSHSessionID: string(scx.SessionID()),
}

if err := session.SetEnvs(ctx, envs); err != nil {
t.log.WithError(err).Debug("Unable to set environment variables")
for k, v := range envs {
if err := session.Setenv(ctx, k, v); err != nil {
t.log.Debugf("Unable to set environment variable: %v: %v", k, v)
}
}
}

0 comments on commit a1fd7aa

Please sign in to comment.