Skip to content

wolfsshd: start a Windows session with the user's environment #1380

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.

Sign up for GitHub

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

Open
soulmachine wants to merge 2 commits into
base: master
Choose a base branch
from
Open

wolfsshd: start a Windows session with the user's environment #1380

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
73d9531
wolfsshd: start a Windows session with the user's environment
soulmachine Nov 5, 2026
d31063f
wolfsshd: build the Windows session block on the service's, PATH aside
soulmachine Nov 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions apps/wolfsshd/wolfsshd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,9 @@
#include "auth.h"

#include <signal.h>
#ifdef _WIN32
#include <userenv.h> /* CreateEnvironmentBlock */
#endif

#ifdef NO_INLINE
#include <wolfssh/misc.h>
Expand Down Expand Up @@ -2169,6 +2172,7 @@ static int SHELL_Subsystem(WOLFSSHD_CONNECTION* conn, WOLFSSH* ssh,
size_t conCmdSz = 0;
PROCESS_INFORMATION processInfo;
int processCreated = 0;
LPVOID env = NULL;
size_t sz = 0;
WCHAR h[MAX_PATH];
char* forcedCmd;
Expand Down Expand Up @@ -2326,9 +2330,19 @@ static int SHELL_Subsystem(WOLFSSHD_CONNECTION* conn, WOLFSSH* ssh,
si.dwFlags = STARTF_USESTDHANDLES;
si.lpDesktop = NULL;

/* The user's own variables (USERPROFILE, APPDATA, user PATH), not the
* service account's. The profile is loaded by now, so they resolve. */
if (CreateEnvironmentBlock(&env, wolfSSHD_GetAuthToken(conn->auth),
FALSE) != TRUE) {
wolfSSH_Log(WS_LOG_ERROR,
"[SSHD] Issue building user environment, Windows error %d",
GetLastError());
env = NULL; /* fall back to the service's environment */
}

if (CreateProcessAsUserW(wolfSSHD_GetAuthToken(conn->auth), NULL, conCmdPtr,
NULL, NULL, TRUE, DETACHED_PROCESS, NULL, h,
&si, &processInfo) != TRUE) {
NULL, NULL, TRUE, DETACHED_PROCESS | CREATE_UNICODE_ENVIRONMENT,
env, h, &si, &processInfo) != TRUE) {
wolfSSH_Log(WS_LOG_ERROR,
"[SSHD] Issue creating process, Windows error %d", GetLastError());
ret = WS_FATAL_ERROR;
Expand Down Expand Up @@ -2636,6 +2650,9 @@ static int SHELL_Subsystem(WOLFSSHD_CONNECTION* conn, WOLFSSH* ssh,
}

cleanup:
if (env != NULL) {
DestroyEnvironmentBlock(env);
}
if (conCmdPtr != NULL) {
WFREE(conCmdPtr, NULL, DYNTYPE_SSHD);
}
Expand Down
Loading