tproxy: Apply DNS rules first #900
Merged
+24
−24
Conversation
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
Member
|
The tests need updating... :-) |
Contributor
Author
Oh, I didn't expect them to fail, I'll get to it |
Having --dst-type LOCAL rules before DNS ones forces the usage of a dnsmasq-like program to retrigger DNS requests directed locally because they are fast-tracked through the firewall and ignored by sshuttle. As dns options documentation state that they capture the requests no matter the server, and other methods and older versions behave consistently, change the iptables rules to apply DNS ones first.
Contributor
Author
Done, tests running locally |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Commit msg:
After a much required upgrade (from 0.78.5 to 1.1.1), I found that my setup was no longer working. I traced it to the DNS requests being ignored.
In order to solve the issue, I had to change from
sshuttle \ --method=tproxy \ --listen 0.0.0.0:0 \ --remote $REMOTE \ --ns-hosts $(get_ip_local) \ --disable-ipv6 \ --exclude $(get_ip_local)/24 \ $REMOTE_NETWORKSto
dnsmasq --no-resolv --server=1.1.1.1 sshuttle \ --method=tproxy \ --listen 0.0.0.0:0 \ --remote $REMOTE \ --ns-hosts 1.1.1.1 \ --disable-ipv6 \ --exclude $(get_ip_local)/24 \ $REMOTE_NETWORKSMy setup involves configuring the sshuttle box as the DNS for the remote search domains and the default gateway for the different clients.
I'm not sure this PR is worth it, seeing that it can be solved by adding a dnsmasq. But since it's a behaviour change (both in versions and methods (-nat works ok)), and the doc does not mention it, I figured I'd try a PR