fi/nix-infra
1
1
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Use snat rule instead if masquerade for wireguard nat

Browse source
This commit is contained in:
fi 2023-09-19 15:58:42 +02:00
parent 0d820c58af
commit 215065aa6c
Signed by: fi
SSH key fingerprint: SHA256:d+6fQoDPMbSFK95zRVflRKZLRKF4cPSQb7VIxYkhFsA
3 changed files with 7 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/hosts/valkyrie/configuration.nix
View file

@ -8,7 +8,7 @@
firewall = { firewall = {
enable = true; enable = true;
allowedTCPPorts = [ 80 443 ]; allowedTCPPorts = [ 80 443 ];
allowedUDPPorts = [ 51820 51821 51822 51827 51828 ]; allowedUDPPorts = [ 51820 51821 51822 51824 51827 51828 51829 51830 ];
}; };
wireguard = { wireguard = {
enable = true; enable = true;

1
config/hosts/valkyrie/services.nix
View file

@ -3,6 +3,7 @@ let
wireguard-nat-nftables = import ../../../pkgs/wireguard-nat-nftables pkgs; wireguard-nat-nftables = import ../../../pkgs/wireguard-nat-nftables pkgs;
config = pkgs.writeText "wireguard-nat-nftables-config" (builtins.toJSON { config = pkgs.writeText "wireguard-nat-nftables-config" (builtins.toJSON {
interface = "ens3"; interface = "ens3";
interface_address = "172.16.4.180";
wg_interface = "wg0"; wg_interface = "wg0";
pubkey_port_mapping = { pubkey_port_mapping = {
"SJ8xCRb4hWm5EnXoV4FnwgbiaxmY2wI+xzfk+3HXERg=" = [ 51827 51829 ]; "SJ8xCRb4hWm5EnXoV4FnwgbiaxmY2wI+xzfk+3HXERg=" = [ 51827 51829 ];

20
pkgs/wireguard-nat-nftables/src/wireguard-nat-nftables.py
View file

@ -12,6 +12,7 @@ def main():
f.close() f.close()
interface = config["interface"] interface = config["interface"]
interface_address = config["interface_address"]
wg_interface = config["wg_interface"] wg_interface = config["wg_interface"]
pubkey_port_mapping = config["pubkey_port_mapping"] pubkey_port_mapping = config["pubkey_port_mapping"]
@ -19,30 +20,19 @@ def main():
nft.set_json_output(True) nft.set_json_output(True)
nft.set_handle_output(True) nft.set_handle_output(True)
# add nat table rules for dnat and snat masquerade # add nat table rules for dnat and snat
nft.cmd("add table wireguard-nat") nft.cmd("add table wireguard-nat")
nft.cmd("flush table wireguard-nat")
nft.cmd("add chain wireguard-nat prerouting { type nat hook prerouting priority -100; }") nft.cmd("add chain wireguard-nat prerouting { type nat hook prerouting priority -100; }")
nft.cmd("add chain wireguard-nat postrouting { type nat hook postrouting priority 100; }") nft.cmd("add chain wireguard-nat postrouting { type nat hook postrouting priority 100; }")
nft.cmd("add rule wireguard-nat postrouting oifname {} snat to {}".format(interface, interface_address))
# load current nftables rules # load current nftables rules
rc, output, error = nft.cmd("list ruleset") rc, output, error = nft.cmd("list ruleset")
if error: if error:
print(error, file=sys.stderr) print(error, file=sys.stderr)
nftables_output = json.loads(output) nftables_output = json.loads(output)
add_masquerade = True
for item in nftables_output["nftables"]:
if ("rule" in item
and item["rule"]["family"] == "ip"
and item["rule"]["table"] == "wireguard-nat"
and item["rule"]["chain"] == "postrouting"
and "masquerade" in item["rule"]["expr"][0]
):
add_masquerade = False
break
if add_masquerade:
nft.cmd("add rule wireguard-nat postrouting masquerade")
while True: while True:
# list WireGuard peer endpoint addresses of WireGuard VPN connection # list WireGuard peer endpoint addresses of WireGuard VPN connection
process = subprocess.Popen(["wg", "show", wg_interface, "endpoints"], stdout=subprocess.PIPE, stderr=subprocess.PIPE) process = subprocess.Popen(["wg", "show", wg_interface, "endpoints"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)