Skip to content

Revert "[WSLC] Add cooperative HTTP/HTTPS proxy support" - #697

Merged
Soham Das (SohamDas2021) merged 1 commit into
mainfrom
revert-652-user/sodas/wslc-enable-http-proxy
Jul 28, 2026
Merged

Revert "[WSLC] Add cooperative HTTP/HTTPS proxy support"#697
Soham Das (SohamDas2021) merged 1 commit into
mainfrom
revert-652-user/sodas/wslc-enable-http-proxy

Conversation

@SohamDas2021

@SohamDas2021 Soham Das (SohamDas2021) commented Jul 28, 2026

Copy link
Copy Markdown
Contributor

Reverts #652

This is conflicting with Darren's new breaking network schema changes- #676
I am reverting this, will be merging after his changes go in.

Microsoft Reviewers: Open in CodeFlow

Copilot AI review requested due to automatic review settings July 28, 2026 20:52
@SohamDas2021
Soham Das (SohamDas2021) requested a review from a team as a code owner July 28, 2026 20:52
@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines:
There may be pipelines that require an authorized user to comment /azp run to run.

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Reverts WSLC cooperative proxy support to unblock the GA network schema migration in PR #676.

Changes:

  • Removes WSLC proxy parsing, environment injection, tests, and documentation.
  • Deletes shared proxy utilities and restores Bubblewrap-local handling.
  • Restores the previous public SDK network documentation.

Reviewed changes

Copilot reviewed 11 out of 11 changed files in this pull request and generated 2 comments.

Show a summary per file
File Description
docs/schema.md Removes WSLC proxy guidance.
docs/wsl/wsl-container-getting-started.md Removes WSLC proxy documentation.
sdk/node/src/types.ts Removes WSLC proxy API notes.
src/backends/bubblewrap/common/src/bwrap_command.rs Restores local proxy environment handling.
src/backends/wslc/common/src/wsl_container_runner.rs Removes WSLC proxy injection.
src/core/wxc_common/src/config_parser.rs Rejects WSLC proxy configurations again.
src/core/wxc_common/src/lib.rs Removes the proxy utility module export.
src/core/wxc_common/src/proxy_env.rs Deletes shared proxy environment utilities.
tests/configs/wslc_network_proxy.json Removes the WSLC proxy fixture.
tests/scripts/run_wslc_all_tests.ps1 Removes proxy testing from the WSLC suite.
tests/scripts/run_wslc_proxy_test.ps1 Deletes the proxy functional test.

Comment on lines +978 to +979
if !request.env.is_empty() {
let env_cstrings: Vec<Vec<u8>> = request
// When the proxy is active, drop any caller-supplied proxy env
// entries so they cannot override the values we set below.
if proxy_address.is_some() && is_managed_proxy_key(key) {
if proxy_address.is_some() && PROXY_ENV_KEYS.contains(&key) {
@SohamDas2021
Soham Das (SohamDas2021) merged commit ea8f405 into main Jul 28, 2026
23 checks passed
@SohamDas2021
Soham Das (SohamDas2021) deleted the revert-652-user/sodas/wslc-enable-http-proxy branch July 28, 2026 21:03
Soham Das (SohamDas2021) added a commit that referenced this pull request Jul 30, 2026
* Reapply "[WSLC] Add cooperative HTTP/HTTPS proxy support" (#697)

This reverts commit ea8f405, restoring
the WSLC cooperative HTTP/HTTPS proxy support originally added in #652.

Resolved a trivial conflict in config_parser.rs (proxy-supported-backends
error message) by keeping the 'wslc' variant.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: cce70ecd-1449-465e-8a87-a9880a0a10c0

* Redact proxy URL credentials in scheme-rejection error

The `network.proxy.url` scheme check interpolated the raw URL into the
`ConfigParse` error, which reaches the diagnostic/log stream. Proxy URLs
commonly embed basic-auth userinfo (`user:password@host`), so a rejected
non-http(s) URL would leak the password into logs. Route it through the
existing `redact_proxy_url` helper (already used on the logging path) so
only `***@host` is shown. Add a regression test asserting the credential
is redacted.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: cce70ecd-1449-465e-8a87-a9880a0a10c0

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: cce70ecd-1449-465e-8a87-a9880a0a10c0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants