Avoid race conditions in getHostUsers#61218
Merged
espadolini merged 3 commits intomasterfrom Nov 11, 2025
Merged
Conversation
codingllama
reviewed
Nov 11, 2025
Contributor
codingllama
left a comment
codingllama
left a comment
There was a problem hiding this comment.
Looks good, just a few Qs.
codingllama
approved these changes
Nov 11, 2025
Contributor
|
Maybe add a changelog? |
Co-authored-by: Alan Parra <alan.parra@goteleport.com>
github-merge-queue
bot
removed this pull request from the merge queue due to no response for status checks
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
Contributor
|
@espadolini See the table below for backport results.
|
This was referenced Nov 12, 2025
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
This PR fixes a race condition in the implementation of
secretsscanner/authorizedkeys.getHostUsersaround the use ofgetpwent. On darwin,getpwentuses thread-local storage but we were not locking the goroutine running thegetpwentloop in a single thread, potentially returning duplicated users if the goroutine changed thread, even with a single copy running. On linux there would be a race if we ever ran two parallel copies ofgetHostUsers, which doesn't affect agents but might affect tests or might be triggered by code changes in the future, so this PR also adds protections around that.changelog: fixed rare error in the
authorized_keyssecret scanner when running the Teleport agent on MacOS