Repository navigation
[WSLC] Proxy Pt. 2: Enable session host loopback #1714
There are no files selected for viewing
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
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
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
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
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
Binary file not shown.
Binary file not shown.
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -33,7 +33,7 @@ | |
| //! move that happens *before* any `&raw` is taken), after which callers keep it | ||
| //! as a stationary local. | ||
|
|
||
| use std::ffi::{c_void, CStr}; | ||
| use std::fmt::Write; | ||
| use std::ptr; | ||
| use std::sync::atomic::{AtomicBool, Ordering}; | ||
|
|
@@ -845,15 +845,9 @@ pub unsafe fn create_daemon_session( | |
| } | ||
| apply_session_sizing(sdk, &mut settings, sizing)?; | ||
|
|
||
| let started = Instant::now(); | ||
| let session = create_session(sdk, &mut settings)?; | ||
| let created_in = started.elapsed(); | ||
|
|
||
| let guard = WslcSessionGuard::from_raw( | ||
| session, | ||
|
|
@@ -898,6 +892,45 @@ pub unsafe fn create_daemon_session( | |
| Ok(guard) | ||
| } | ||
|
|
||
| /// Hostname that resolves to the Windows host loopback inside a session. WSL's | ||
| /// own CLI uses the same default. | ||
| pub(crate) const HOST_LOOPBACK_NAME: &CStr = c"host.wslc.internal"; | ||
|
|
||
| /// Create a session with host loopback enabled. A WSL runtime older than 3.0.5 | ||
| /// rejects the setting. | ||
|
Comment on lines
+899
to
+900
Contributor
There was a problem hiding this comment. Isolated-only sessions (every deny-all create-and-run, where Set the hostname only for sessions that can hold a bridged container (pass
Contributor
Author
There was a problem hiding this comment. 3.0.5 is now the minimum version. I will see if I can enforce that. |
||
| /// | ||
| /// # Safety | ||
| /// `sdk` must hold valid function pointers, `settings` must be initialised and | ||
| /// COM must be initialised on this thread. | ||
| pub(crate) unsafe fn create_session( | ||
| sdk: &WslcSdk, | ||
| settings: &mut WslcSessionSettings, | ||
| ) -> Result<WslcSession, ScriptResponse> { | ||
| let hr = sdk.WslcSetSessionSettingsHostLoopback(settings, HOST_LOOPBACK_NAME.as_ptr()); | ||
| if hr != S_OK { | ||
| return Err(sdk_error( | ||
| "WslcSetSessionSettingsHostLoopback failed", | ||
| hr, | ||
| "", | ||
| )); | ||
| } | ||
|
|
||
| let mut session: WslcSession = ptr::null_mut(); | ||
| let mut err_msg = CoTaskMemPWSTR::null(); | ||
| let hr = sdk.WslcCreateSession(settings, &mut session, err_msg.as_mut_ptr()); | ||
| if hr == WSLC_E_RUNTIME_UPDATE_NEEDED { | ||
|
theelliotm marked this conversation as resolved.
Resolved
|
||
| return Err(WslcError::Unavailable(sdk_init::prerequisite_error( | ||
|
Contributor
There was a problem hiding this comment. In the daemon this
Contributor
Author
There was a problem hiding this comment. 3.0.5 is now the minimum version. I will see if I can enforce that. |
||
| WslcComponentFlags::WSLC_COMPONENT_FLAG_WSL_PACKAGE, | ||
| )) | ||
| .into_response()); | ||
| } | ||
| if hr != S_OK { | ||
| let msg = err_msg.to_string_lossy(); | ||
| return Err(sdk_error("WslcCreateSession failed", hr, &msg)); | ||
| } | ||
| Ok(session) | ||
| } | ||
|
|
||
| /// Apply a session's sizing and its boot deadline to `settings`. | ||
| /// | ||
| /// The boot timeout is applied even when the caller asked for no sizing, since | ||
|
|
||
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
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
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The daemon now enables host loopback, but
PROTOCOL_VERSIONstays 9 andready_daemon()reuses any ready v9 daemon, so after an upgrade a still-running pre-PR daemon (alive while it holds sandboxes) keeps creating sessions withouthost.wslc.internal, and a new daemon gives old clients the new access.Shall we bump the protocol version?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will bump.