Skip to content

Ensure SSH_SESSION_WEBPROXY_ADDR is set for all sessions#27842

Merged
rosstimothy merged 1 commit intomasterfrom
tross/fix_webproxy_add_env
Jun 14, 2023
Merged

Ensure SSH_SESSION_WEBPROXY_ADDR is set for all sessions#27842
rosstimothy merged 1 commit intomasterfrom
tross/fix_webproxy_add_env

Conversation

@rosstimothy
Copy link
Copy Markdown
Contributor

Fixes a discrepancy in overwriting the environment value with the address observed for the Web UI for sessions not originating from the Web UI. All sessions will now use tc.WebProxyAddr as the default value and only update if an override is provided.

TestIntegrations/EnvironmentVars was updated to ensure that the expected environment variables are present in both interactive and non-interactive sessions.

Fixes a discrepancy in overwriting the environment value with the
address observed for the Web UI for sessions not originating from
the Web UI. All sessions will now use `tc.WebProxyAddr` as the
default value and *only* update if an override is provided.

`TestIntegrations/EnvironmentVars` was updated to ensure that the
expected environment variables are present in both interactive and
non-interactive sessions.
@rosstimothy rosstimothy linked an issue Jun 14, 2023 that may be closed by this pull request
@rosstimothy rosstimothy marked this pull request as ready for review June 14, 2023 16:22
@rosstimothy rosstimothy requested a review from Joerger June 14, 2023 16:22
@github-actions github-actions Bot requested review from tigrato and zmb3 June 14, 2023 16:23
@github-actions github-actions Bot added size/sm tsh tsh - Teleport's command line tool for logging into nodes running Teleport. labels Jun 14, 2023
@public-teleport-github-review-bot public-teleport-github-review-bot Bot removed the request for review from tigrato June 14, 2023 18:25
@rosstimothy rosstimothy added this pull request to the merge queue Jun 14, 2023
Merged via the queue into master with commit c78743c Jun 14, 2023
@rosstimothy rosstimothy deleted the tross/fix_webproxy_add_env branch June 14, 2023 20:05
@public-teleport-github-review-bot
Copy link
Copy Markdown

@rosstimothy See the table below for backport results.

Branch Result
branch/v11 Failed
branch/v12 Create PR
branch/v13 Create PR

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size/sm tsh tsh - Teleport's command line tool for logging into nodes running Teleport.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

SSH_SESSION_WEBPROXY_ADDR is not properly set with tsh ssh

3 participants