Skip to content

Update DNS handling for Qubes 4.2+ using nftables #23

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.

Sign up for GitHub

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

Open
PromptPunksFauxCough wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update DNS handling for Qubes 4.2+ using nftables #23

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions pkg/pickle/helpers/bitmask-root
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -727,18 +727,16 @@ def firewall_start(args):
# route all ipv4 DNS over VPN
# (note: NAT does not work with ipv6 until kernel 3.7)
enable_ip_forwarding()
if QUBES_PROXY and QUBES_VER >= 3:
# rewrite DNS packets for VPN DNS; Qubes preconfigures masquerade
ip4tables("-t", "nat", "--flush", "PR-QBS")
if QUBES_PROXY and QUBES_VER >= 4:
# Qubes 4.2+ uses nftables, rewrite DNS via nft
run("nft", "flush", "chain", "ip", "qubes", "dnat-dns")
for gateway in gateways:
ip4tables("-t", "nat", "--append", "PR-QBS", "--destination", gateway,
"--jump", "RETURN")
ip4tables("-t", "nat", "--append", "PR-QBS", "-p", "udp",
"--dport", "53", "--jump", "DNAT", "--to",
NAMESERVER + ":53")
ip4tables("-t", "nat", "--append", "PR-QBS", "-p", "tcp",
"--dport", "53", "--jump", "DNAT", "--to",
NAMESERVER + ":53")
run("nft", "add", "rule", "ip", "qubes", "dnat-dns",
"ip", "daddr", gateway, "return")
run("nft", "add", "rule", "ip", "qubes", "dnat-dns",
"udp", "dport", "53", "dnat", "to", NAMESERVER)
run("nft", "add", "rule", "ip", "qubes", "dnat-dns",
"tcp", "dport", "53", "dnat", "to", NAMESERVER)
else:
# As we may have OpenVPN running on port 53, we don't want to redirect that
for gateway in gateways:
Expand Down