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.

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

wireguard: allow routes to overlap with other routes #66689

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

ryantrinkle
Copy link
Contributor

Previously, ip route replace was tripped-up by non-wireguard routes that overlap the wireguard routes. This commit fixes that by using ip route add separately and also adds a metric of 10000 to avoid competing with local interfaces for traffic

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • N/A macOS
    • N/A other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Previously, `ip route replace` was tripped-up by non-wireguard routes that overlap the wireguard routes.  This commit fixes that by using `ip route add` separately and also adds a metric of 10000 to avoid competing with local interfaces for traffic
@ryantrinkle
Copy link
Contributor Author

cc @grahamc

@grahamc
Copy link
Member

grahamc commented Aug 15, 2019

I am the super wrong person to review this :x cc @flokli @andir

@ryantrinkle
Copy link
Contributor Author

@grahamc No worries! Just saw some large commits from you in this module.

FWIW, I've been using this on my machine for some time, and it seems to work. In particular, my use case is that I am always connected via wireguard to my office and home networks, but I don't want to use wireguard to connect to whatever network I'm actually physically connected to. This seems to achieve that. I'm not sure how to test more thoroughly, though.

@nh2
Copy link
Contributor

nh2 commented Aug 17, 2019

@fpletz Helped me at NixCon to debug route issues also involving add/replace, he may also be useful here.

@andir
Copy link
Member

andir commented Aug 18, 2019

I am not so sure this is a good idea. With 6319054 we started replacing routes instead of adding them. Neither are perfect but we might want to get some insights from @aristidb on this.

@ryantrinkle
Copy link
Contributor Author

@andir I think it makes sense for wireguard to replace routes that it created, but not other routes that exist independently. Perhaps we can make the replace command more specific, or make it so that it specifically deletes any obsolete routes that it might have produced before adding them back?

@srhb
Copy link
Contributor

srhb commented Aug 24, 2019

I am not sure there ever is one-size-fits-all solution to this. I think replace will probably break more configs than add. There's definitely something to be said for Wireguard keeping track of its own routes, but I think the best way to do this is to give it its own routing table, and then doing setup/teardown of the rules to pick table manually. I do something like this:

ip -4 rule add to all lookup 80 pref 40
ip -4 rule add to ${endpoint} lookup main pref 30    # Traffic to wireguard host
ip -4 rule add to 192.168.0.0/16 lookup main pref 30 # local /16
ip -4 rule add to all lookup 80 pref 40

where 80 is the routing table I picked for wireguard to use. This is obviously not perfect, because there's still manual decisions to be made (just for rules instead of routes) -- but on the other hand we completely avoid clobbering the main routing table under any circumstances.

A completely different approach is to have proper network namespacing, but that's a rather large overhaul.

@bennofs
Copy link
Contributor

bennofs commented Jan 24, 2020

Using a different routing table seems to be the way to go here. It's also what wg-quick does, and should allow cleaner removal/adding. However, it is quite a different change than what is proposed in the PR. The question is now, do we merge the change in the PR as an intertim solution or do we leave it as it is until we have a better solution?

@flokli
Copy link
Contributor

flokli commented Jan 31, 2020

I see this a somewhat bigger task, and don't really see a clear consensus yet (how this should be done, and if it should be part of nixpkgs or your network manager)

As soon as we add an "interim solution" option to nixpkgs, people might use it, and then we need to worry about how to these configurations to whatever new solutions, and how it can break in between.

@stale
Copy link

stale bot commented Jul 29, 2020

Hello, I'm a bot and I thank you in the name of the community for your contributions.

Nixpkgs is a busy repository, and unfortunately sometimes PRs get left behind for too long. Nevertheless, we'd like to help committers reach the PRs that are still important. This PR has had no activity for 180 days, and so I marked it as stale, but you can rest assured it will never be closed by a non-human.

If this is still important to you and you'd like to remove the stale label, we ask that you leave a comment. Your comment can be as simple as "still important to me". But there's a bit more you can do:

If you received an approval by an unprivileged maintainer and you are just waiting for a merge, you can @ mention someone with merge permissions and ask them to help. You might be able to find someone relevant by using Git blame on the relevant files, or via GitHub's web interface. You can see if someone's a member of the nixpkgs-committers team, by hovering with the mouse over their username on the web interface, or by searching them directly on the list.

If your PR wasn't reviewed at all, it might help to find someone who's perhaps a user of the package or module you are changing, or alternatively, ask once more for a review by the maintainer of the package/module this is about. If you don't know any, you can use Git blame on the relevant files, or GitHub's web interface to find someone who touched the relevant files in the past.

If your PR has had reviews and nevertheless got stale, make sure you've responded to all of the reviewer's requests / questions. Usually when PR authors show responsibility and dedication, reviewers (privileged or not) show dedication as well. If you've pushed a change, it's possible the reviewer wasn't notified about your push via email, so you can always officially request them for a review, or just @ mention them and say you've addressed their comments.

Lastly, you can always ask for help at our Discourse Forum, or more specifically, at this thread or at #nixos' IRC channel.

@stale stale bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jul 29, 2020
@stale stale bot removed the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Oct 3, 2020
@stale
Copy link

stale bot commented Jun 7, 2021

I marked this as stale due to inactivity. → More info

@stale stale bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jun 7, 2021
@wegank wegank marked this pull request as draft March 20, 2024 15:12
@stale stale bot removed the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Mar 20, 2024
@wegank wegank added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Mar 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants