Skip to content

Return friendly errors when sessions are prevented due to a lock#25342

Merged
rosstimothy merged 1 commit intomasterfrom
tross/fix_tsh_lock_eof
May 2, 2023
Merged

Return friendly errors when sessions are prevented due to a lock#25342
rosstimothy merged 1 commit intomasterfrom
tross/fix_tsh_lock_eof

Conversation

@rosstimothy
Copy link
Copy Markdown
Contributor

Session failures resulting from a lock being enforced were returning the EOF that the MFA connection attempt got from the Auth server instead of the friendly error which gets returned from the node via the direct connection attempt.

The direct connection attempt errors now take precendent over the MFA connection errors when an EOF is returned from the MFA connection attempt.

Fixes #25321

Session failures resulting from a lock being enforced were returning
the EOF that the MFA connection attempt got from the Auth server
instead of the friendly error which gets returned from the node via
the direct connection attempt.

The direct connection attempt errors now take precendent over the
MFA connection errors when an EOF is returned from the MFA connection
attempt.

Fixes #25321
@rosstimothy rosstimothy marked this pull request as ready for review April 28, 2023 18:39
@zmb3 zmb3 mentioned this pull request May 1, 2023
@rosstimothy
Copy link
Copy Markdown
Contributor Author

PTAL @fspmarshall @gabrielcorado

@rosstimothy rosstimothy enabled auto-merge May 1, 2023 21:20
@rosstimothy rosstimothy added this pull request to the merge queue May 1, 2023
@public-teleport-github-review-bot public-teleport-github-review-bot Bot removed the request for review from fspmarshall May 1, 2023 23:42
Merged via the queue into master with commit 5d166db May 2, 2023
@rosstimothy rosstimothy deleted the tross/fix_tsh_lock_eof branch May 2, 2023 00:00
@public-teleport-github-review-bot
Copy link
Copy Markdown

@rosstimothy See the table below for backport results.

Branch Result
branch/v11 Create PR
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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

tsh ssh returning EOF when locks are in effect

3 participants