Read user environment when creating child session #1020
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
klizhentas
reviewed
May 26, 2017
lib/srv/exec.go
Outdated
| // readEnvironmentFile will read environment variables from a passed in location. | ||
| // Lines that start with "#" or empty lines are ignored. Assignments are in the | ||
| // form name=value and no variable expansion occurs. | ||
| func readEnvironmentFile(filename string) ([]string, error) { |
There was a problem hiding this comment.
I would move this to utils
klizhentas
reviewed
May 26, 2017
lib/srv/exec.go
Outdated
| func readEnvironmentFile(filename string) ([]string, error) { | ||
| file, err := os.Open(filename) | ||
| if err != nil { | ||
| return nil, trace.Wrap(err) |
There was a problem hiding this comment.
trace.ConvertSystemError
klizhentas
reviewed
May 26, 2017
lib/srv/exec.go
Outdated
| // follow the lead of OpenSSH and don't allow more than 1,000 environment variables | ||
| // https://github.com/openssh/openssh-portable/blob/master/session.c#L873-L874 | ||
| lineno = lineno + 1 | ||
| if lineno > 1000 { |
klizhentas
reviewed
May 26, 2017
| @@ -81,6 +81,9 @@ type CommandLineFlags struct { | |||
| GopsAddr string | |||
| // DiagnosticAddr is listen address for diagnostic endpoint | |||
| DiagnosticAddr string | |||
| // PermitUserEnvironment enables reading of ~/.tsh/environment | |||
| // when creating a new session. | |||
| PermitUserEnvironment bool | |||
There was a problem hiding this comment.
I would not make this a boolean flag, rather than a list with files to read with default to .tsh/environment so folks can actually set to something else if they want, e.g. will close the issue #1011
klizhentas
reviewed
May 26, 2017
| @@ -105,6 +105,8 @@ func Run(cmdlineArgs []string, testRun bool) (executedCommand string, conf *serv | |||
| "Specify gops addr to listen on").Hidden().StringVar(&ccf.GopsAddr) | |||
| start.Flag("diag-addr", | |||
| "Start diangonstic endpoint on this address").Hidden().StringVar(&ccf.DiagnosticAddr) | |||
| start.Flag("permit-user-env", | |||
There was a problem hiding this comment.
I would make this a flag that accepts values with paths to read, defaulting to ~/.tsh/environment
russjones
force-pushed
the
rjones/tsh-environment
branch
from
ad0b82e
to
397fbcd
Compare
klizhentas
reviewed
May 27, 2017
lib/srv/exec.go
Outdated
| // if the server allows reading in of ~/.tsh/environment read it in | ||
| // and pass environment variables along to new session | ||
| if ctx.srv.PermitUserEnvironment() { | ||
| filename := osUser.HomeDir + "/.tsh/environment" |
There was a problem hiding this comment.
filepath.Join() instead of +
russjones
force-pushed
the
rjones/tsh-environment
branch
from
397fbcd
to
e0ee27b
Compare
creating a new child session from ~/.tsh/environment.
russjones
force-pushed
the
rjones/tsh-environment
branch
from
e0ee27b
to
78ee5d0
Compare
klizhentas
approved these changes
May 27, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Purpose
As covered in #1014, at the moment a new Teleport session only gives you a limited number of environment variables. This PR adds support for reading in of a
~./tsh/environmentthat contains environment variables that will be loaded before the shell is executed.Implementation
--permit-user-envCLI flag forteleport.permit_user_envfield underssh_servicefor Teleport file configuration.~/.tsh/environmentis read when creating a new child session. Variables in this file are not expanded and lines that start with#or are empty are ignored.Related Issue
Fixes #1014