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.

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

Ignore ~/.tsh/environment file if it does not exist. #1045

Merged
merged 1 commit into from
Jun 5, 2017

Conversation

russjones
Copy link
Contributor

Purpose

At the moment if you specify the --permit-user-env flag it requires the user have a ~/.tsh/environment file. This PR changes this behavior by making this file optional.

Implementation

  • Check ~/.tsh/environment was not found, if it wan't found, return an empty slice.

Related Issues

Fixes #1035

@russjones russjones requested review from kontsevoy and klizhentas June 3, 2017 00:11
@russjones russjones force-pushed the rjones/fix-user-env branch from 9fa7d85 to 9a72243 Compare June 3, 2017 01:02
file, err := os.Open(filename)
if err != nil {
return nil, trace.ConvertSystemError(err)
err = trace.ConvertSystemError(err)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This error, no matter what kind, should be printed into stderror but the login process should not terminate just because environment file is (for whatever reason) not accessible.

@russjones russjones force-pushed the rjones/fix-user-env branch from 9a72243 to 26a565e Compare June 5, 2017 17:22
@kontsevoy
Copy link
Contributor

LGTM

@russjones russjones merged commit 0754e1d into master Jun 5, 2017
@russjones russjones deleted the rjones/fix-user-env branch June 5, 2017 17:30
hatched pushed a commit to hatched/teleport-merge that referenced this pull request Nov 30, 2022
hatched pushed a commit that referenced this pull request Dec 20, 2022
hatched pushed a commit that referenced this pull request Feb 1, 2023
* `SharedDirectoryInfoResponse` (#996)

* `SharedDirectoryListRequest` (#999)

* `SharedDirectoryListResponse` (#1000)

* `SharedDirectoryReadRequest` (#1003)

* `SharedDirectoryReadResponse` (#1005)

* `SharedDirectoryWriteRequest` (#1007)

* `SharedDirectoryWriteResponse` (#1008)

* Tidy up `sharedDirectoryManager` (#1010)

* `SharedDirectoryMoveRequest` (#1045)

* `SharedDirectoryMoveResponse` (#1074)

* `SharedDirectoryCreateRequest` and `SharedDirectoryCreateResponse` (#1090)

* SharedDirectoryDeleteRequest and SharedDirectoryDeleteResponse (#1096)

* Add warning dialog for unsupported browsers for directory sharing (#1110)

* updates yarn.lock
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants