fix: add socket to avoid network issue - #34
Merged
Conversation
Signed-off-by: kerthcet <kerthcet@gmail.com>
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates the SandD daemon’s tunnel-mode networking so that, when running Tailscale in --tun=userspace-networking, the daemon can reliably reach the controller by dialing the WebSocket through tailscaled’s localhost SOCKS5 proxy (including “remote DNS” semantics for MagicDNS names). It also adds dedicated tunnel-mode E2E coverage and CI execution for that path.
Changes:
- Route tunnel-mode WebSocket connections through tailscaled’s SOCKS5 proxy and share a single serve loop across direct vs tunnel transports.
- Add a tunnel-mode E2E test stack (headscale + controller + unprivileged daemon) plus a new pytest marker and Makefile target to run it.
- Add a CI job to run the tunnel-mode E2E test suite.
Reviewed changes
Copilot reviewed 7 out of 8 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
sandd/src/main.rs |
Adds SOCKS5-based dialing for tunnel mode and refactors to a shared serve() implementation. |
sandd/Cargo.toml |
Adds tokio-socks dependency required for SOCKS5 tunneling. |
python/tests/test_e2e_tunnel.py |
New E2E regression test that forces the MagicDNS + userspace-networking + SOCKS5 path. |
pyproject.toml |
Registers the new tunnel pytest marker. |
Makefile |
Adds test-e2e-tunnel target and updates E2E test selection logic. |
hack/docker/docker-compose.tunnel-e2e.yml |
New compose stack to run headscale + controller + unprivileged daemon for tunnel E2E. |
Cargo.lock |
Locks tokio-socks and transitive dependencies. |
.github/workflows/rust-ci.yaml |
Adds a CI job to run tunnel-mode E2E tests. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Member
Author
|
/lgtm |
InftyAI-Agent
approved these changes
Aug 3, 2026
InftyAI-Agent
left a comment
Member
There was a problem hiding this comment.
Approved: PR has both lgtm and approved labels
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What this PR does / why we need it
Which issue(s) this PR fixes
Fixes #
Special notes for your reviewer
Does this PR introduce a user-facing change?