Skip to content
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

Jump to bottom

Add WT_SESSION to WSLENV so it propagates into WSL #4157

Merged
2 commits merged into from
Jan 9, 2020
Merged

Add WT_SESSION to WSLENV so it propagates into WSL #4157

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ad2b7c
Add WT_SESSION to WSLENV so it propagates into WSL
DHowett Jan 9, 2020
c236cfa
Update src/cascadia/TerminalConnection/ConptyConnection.cpp
DHowett Jan 9, 2020
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
31 changes: 19 additions & 12 deletions src/cascadia/TerminalConnection/ConptyConnection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,18 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
std::wstring cmdline{ wil::ExpandEnvironmentStringsW<std::wstring>(_commandline.c_str()) }; // mutable copy -- required for CreateProcessW

Utils::EnvironmentVariableMapW environment;
auto zeroEnvMap = wil::scope_exit([&] {
// Can't zero the keys, but at least we can zero the values.
for (auto& [name, value] : environment)
{
::SecureZeroMemory(value.data(), value.size() * sizeof(decltype(value.begin())::value_type));
}

environment.clear();
});

// Populate the environment map with the current environment.
RETURN_IF_FAILED(Utils::UpdateEnvironmentMapW(environment));

{
// Convert connection Guid to string and ignore the enclosing '{}'.
Expand All @@ -97,7 +109,13 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
const auto guidSubStr = std::wstring_view{ wsGuid }.substr(1);

// Ensure every connection has the unique identifier in the environment.
environment.emplace(L"WT_SESSION", guidSubStr.data());
environment.insert_or_assign(L"WT_SESSION", guidSubStr.data());

auto wslEnv = environment[L"WSLENV"]; // We always want to load something, even if it's blank.
// WSLENV is a colon-delimited list of environment variables (+flags) that should appear inside WSL
// https://devblogs.microsoft.com/commandline/share-environment-vars-between-wsl-and-windows/
wslEnv = L"WT_SESSION:" + wslEnv; // prepend WT_SESSION to make sure it's visible inside WSL.
DHowett-MSFT marked this conversation as resolved.
Show resolved Hide resolved
environment.insert_or_assign(L"WSLENV", wslEnv);
}

std::vector<wchar_t> newEnvVars;
Expand All @@ -106,17 +124,6 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
newEnvVars.size() * sizeof(decltype(newEnvVars.begin())::value_type));
});

auto zeroEnvMap = wil::scope_exit([&] {
// Can't zero the keys, but at least we can zero the values.
for (auto& [name, value] : environment)
{
::SecureZeroMemory(value.data(), value.size() * sizeof(decltype(value.begin())::value_type));
}

environment.clear();
});

RETURN_IF_FAILED(Utils::UpdateEnvironmentMapW(environment));
RETURN_IF_FAILED(Utils::EnvironmentMapToEnvironmentStringsW(environment, newEnvVars));

LPWCH lpEnvironment = newEnvVars.empty() ? nullptr : newEnvVars.data();
Expand Down