fix: include <hostname>.<clustername> principal in SSH host certificates
#60246
Conversation
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
strideynet
approved these changes
Oct 15, 2025
There was a problem hiding this comment.
Thank you for extending the tests to cover this 🚀
tigrato
approved these changes
Oct 15, 2025
public-teleport-github-review-bot
bot
removed the request for review
from tcsc
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
|
@nklaassen See the table below for backport results.
|
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.
Fixes #60245
This PR fixes a bug where SSH host certificates are currently missing the
<hostname>.<clustername>principal, which breaks SSH access via OpenSSH and other third-party SSH clients.This PR makes sure the nodename is correctly sent in
process.firstTimeConnectIdentityRemote. Where it currently passesinstanceIdentity.ID.NodeNameit is always the empty string, identity IDs have no NodeName set when they are read from storage, the fix is to useprocess.Config.Hostnameinstead.lib/service.(*TeleportProcess).reRegisteralready does the same thing (passesprocess.Config.Hostnameinstead of theexisting identity.ID.NodeName).I also updated the logic in
lib/service.(*TeleportProcess).rotateso that existing host certificates on nodes running affected versions will be automatically repaired when the node is upgraded to a version with the fix.Changelog: fixes a bug where SSH host certificates are missing the
<hostname>.<clustername>principal, breaking SSH access via third-party clients