Fix client_idle_timeout enforcement for desktop sessions#55693
Merged
Conversation
We had been updating the client activity tracker any time a message was sent from the client (browser or Teleport Connect) to the remote host. This approach was fine for the original RDP implmentation, as all messages sent in this direction were for user input (keypresses, mouse movement, scroll wheel, etc), but it is insufficient with the current RemoteFX implementation as there are some messages sent by the remote Windows hosts which require client acknowledgements. These acknowledgements were mistakenly being counted as client activity. Closes #55691
danielashare
approved these changes
Jun 13, 2025
probakowski
approved these changes
Jun 16, 2025
| // because we don't want a session to be closed due to inactivity during a large | ||
| // file transfer. | ||
| switch msg.(type) { | ||
| case tdp.KeyboardButton, tdp.MouseMove, tdp.MouseButton, tdp.MouseWheel, |
Contributor
There was a problem hiding this comment.
We probably want to include tdp.SyncKeys here as well. And tdp.ClipboardData maybe?
Collaborator
Author
There was a problem hiding this comment.
Clipboard data happens on copy or paste, and this would require keypresses or clicks, so I decided not to include them since they'd happen around the same time as other interactive messages.
Similar story for tdp.SyncKeys it happens in the handleKeyboardEvent, so tdp.KeyboardButton messages will be coming right around the same time.
Contributor
This was referenced Jun 24, 2025
This was referenced Jun 25, 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.
We had been updating the client activity tracker any time a message was sent from the client (browser or Teleport Connect) to the remote host. This approach was fine for the original RDP implementation, as all messages sent in this direction were for user input (keypresses, mouse movement, scroll wheel, etc), but it is insufficient with the current RemoteFX implementation as there are some messages sent by the remote Windows hosts which require client acknowledgements. These acknowledgements were mistakenly being counted as client activity.
Changelog: fixed an issue that could prevent Windows desktop sessions from terminating when the idle timeout was exceeded.
Closes #55691