Fix user environment block construction #813
Merged
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
Currently, when a user connects, the environment block from the LocalSystem context in which sshd.exe is running is used to create the user session environment. The fix ensures that the user environment block is loaded for users with names without the sshd prefix. Fixes PowerShell/Win32-OpenSSH#2407
o-sdn-o
commented
Oct 30, 2025
Collaborator
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
tgauth
reviewed
Nov 3, 2025
o-sdn-o
commented
Nov 3, 2025
tgauth
reviewed
Nov 3, 2025
There was a problem hiding this comment.
Pull Request Overview
This PR refactors Windows environment handling for SSH sessions to use the Windows CreateEnvironmentBlock API instead of manually setting environment variables from the registry. The key changes simplify environment setup by leveraging Windows native functionality while maintaining session state.
- Introduces
CreateEnvironmentBlockto automatically load user environment blocks with session state inheritance - Refactors registry access code to be more focused and efficient
- Adds username extraction from user tokens to conditionally apply environment blocks
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 6 comments.
| File | Description |
|---|---|
| contrib/win32/win32compat/w32fd.c | Adds get_username_from_token function and updates spawn_child_internal to conditionally create user environment blocks, excluding sshd service accounts |
| contrib/win32/win32compat/w32-doexec.c | Refactors setup_session_user_vars to only set HOMEPATH/HOMEDRIVE and PATH, removes manual registry enumeration of all environment variables, adds get_registry_key_value helper function |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
…block for 'sshd' users)
Collaborator
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Collaborator
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
tgauth
approved these changes
Nov 4, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
PR Summary
Fix construction of user environment block when user connects.
PR Context
Currently, when a user connects, the environment block from the LocalSystem context (in which sshd.exe
is running) is used to create the user session environment.
The fix ensures that the user environment block is loaded for users with names without the
sshdprefix.Fixes PowerShell/Win32-OpenSSH#2407