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

fdpass: send stderr to tbot for error diagnostics #43547

Merged
merged 1 commit into from
Jun 27, 2024

Conversation

espadolini
Copy link
Contributor

This PR updates fdpass and tbot to pass the fdpass stderr file descriptor to tbot so that it can be used by tbot to output error messages. The file descriptor is not required (so fdpass doesn't necessarily have to be updated, and, in fact, this PR doesn't update the behavior of tbot ssh-multiplexer-proxy-command) and a file descriptor sent over the socket will just get discarded (and thus closed) if tbot wasn't updated to receive it.

changelog: improved error diagnostics when using Machine ID's SSH multiplexer

b := make([]byte, 1)
fds := make([]*os.File, 1)

// TODO(espadolini): get rid of [uds.Conn]
Copy link
Contributor

Choose a reason for hiding this comment

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

Does this TODO need addressing ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not in this PR, but there's only drawbacks to having a wrapper around *net.UnixConn, especially if what we're doing with them is io.Copying data around.

@public-teleport-github-review-bot public-teleport-github-review-bot bot removed the request for review from atburke June 26, 2024 23:11
@espadolini espadolini added this pull request to the merge queue Jun 27, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jun 27, 2024
@espadolini espadolini added this pull request to the merge queue Jun 27, 2024
Merged via the queue into master with commit a09ce3b Jun 27, 2024
41 of 42 checks passed
@espadolini espadolini deleted the espadolini/fdpass-stderr branch June 27, 2024 10:53
@public-teleport-github-review-bot

@espadolini See the table below for backport results.

Branch Result
branch/v15 Create PR
branch/v16 Create PR

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

Successfully merging this pull request may close these issues.

None yet

3 participants