LocalKeyAgent only loads keys for a user logged into a proxy. #1618
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
8bc240b to
19982e6
Compare
klizhentas
reviewed
Jan 19, 2018
| func (fs *FSLocalKeyStore) DeleteKeys() error { | ||
| dirPath := filepath.Join(fs.KeyDir, sessionKeyDir) | ||
|
|
||
| err := os.RemoveAll(dirPath) |
There was a problem hiding this comment.
what if you logout twice this will be an error? probably should handle not found error on the upper level
There was a problem hiding this comment.
Doesn't return an error if called twice: https://golang.org/pkg/os/#RemoveAll
RemoveAll removes path and any children it contains. It removes everything
it can but returns the first error it encounters. If the path does not
exist, RemoveAll returns nil (no error).
klizhentas
reviewed
Jan 19, 2018
tool/tsh/tsh.go
Outdated
| fmt.Printf("Logged out %v from %v.\n", cf.Username, proxyHost) | ||
| // remove all keys | ||
| case proxyHost == "" && cf.Username == "": | ||
| err = flka.DeleteKeys() |
There was a problem hiding this comment.
check NotFound condition here - tsh logout called twice should not result in error
There was a problem hiding this comment.
DeleteKeys does not return an error. However, I cleaned up the error message when logging out a specific user a few lines up.
klizhentas
reviewed
Jan 19, 2018
kontsevoy
approved these changes
Jan 20, 2018
19982e6 to
07e90d0
Compare
klizhentas
approved these changes
Jan 20, 2018
Closed
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
#1541 and #1611 cover two problems
tshhas. The first is that Teleport will use the incorrect key when trying to connect to a cluster if you use the same username across different proxies. The second issue is that Teleport does not log a user out correctly.Implementation
GetKeyshas been removed fromLocalKeyAgentas it now only operates on a single user and proxy at a time. This was done to simplify the logic forLocalKeyAgentotherwise to fix tsh logout #1541LocalKeyAgentwould have to be updated to know about multiple proxies.DeleteKeysto remove all keys toFSLocalKeyStoreto remove all keys for all users connected to all proxies.tsh logoutwithout any parameters will callDeleteKeysand remove all keys for all users connected to all proxies.tsh --proxy=one.example.com --user=rjoneswill log outrjonesfromone.example.com.Related Issues
Fixes #1541
Fixes #1611