fix(m3-hermes): firewall — interface match instead of IPv4 CIDR in ip46tables
The mesh-only accept rules used 'ip46tables ... -s 100.x/16'. ip46tables runs every rule through iptables AND ip6tables; ip6tables cannot parse an IPv4 CIDR and aborts with 'host/network not found', failing the whole firewall.service (status 2). Consequence beyond the unit failure: the firewall-start script aborted at the first such rule, so the trailing default-reject rules were never applied — the input filter was effectively OPEN (only SSH/established rules had been added). This also explains why the mesh services were reachable although the previous 100.64.0.0/16 source rule never matched any peer. Fix: match on the NetBird interface (-i wt0) instead of a source range — family-agnostic, survives NetBird range changes, and matches the idiom the generated script already uses for NetBird service ports. Applied to ai-memory, hermes-dashboard and t3code rules (add + stop-commands). After deploying: firewall.service completes, default-reject applies, and 49374/9119/8642/3773 become reachable from the mesh ONLY (previously open to everyone). Anything that silently relied on the open filter will start failing — that is the intended posture.
This commit is contained in:
1 parent
4e6a193d00
commit
d8239fcd32
3 files changed
+14
-17
No files matched your search
@@ -3,10 +3,8 @@
|
|||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
# Netbird mesh VPN range — the server is only reachable from mesh peers.
|
# Mesh-only via interface match on wt0 (NetBird) — an IPv4 CIDR in -s
|
||||||
# m3-atlas Traefik proxies memory.m3ta.dev to this port over Netbird.
|
# would abort the ip6tables run of ip46tables and fail the unit.
|
||||||
# (Fleet mesh address block is 100.81.0.0/16 — kernel route on wt0.)
|
|
||||||
netbirdRange = "100.81.0.0/16";
|
|
||||||
port = config.m3ta.ports.get "ai-memory";
|
port = config.m3ta.ports.get "ai-memory";
|
||||||
in {
|
in {
|
||||||
# ── ai-memory server ──────────────────────────────────────────────────
|
# ── ai-memory server ──────────────────────────────────────────────────
|
||||||
@@ -47,11 +45,11 @@ in {
|
|||||||
networking.firewall = {
|
networking.firewall = {
|
||||||
extraCommands = ''
|
extraCommands = ''
|
||||||
# Allow ai-memory only from Netbird mesh VPN
|
# Allow ai-memory only from Netbird mesh VPN
|
||||||
ip46tables -A nixos-fw -p tcp --dport ${toString port} -s ${netbirdRange} -j nixos-fw-accept
|
ip46tables -A nixos-fw -p tcp --dport ${toString port} -i wt0 -j nixos-fw-accept
|
||||||
'';
|
'';
|
||||||
|
|
||||||
extraStopCommands = ''
|
extraStopCommands = ''
|
||||||
ip46tables -D nixos-fw -p tcp --dport ${toString port} -s ${netbirdRange} -j nixos-fw-accept 2>/dev/null || true
|
ip46tables -D nixos-fw -p tcp --dport ${toString port} -i wt0 -j nixos-fw-accept 2>/dev/null || true
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -4,9 +4,8 @@
|
|||||||
inputs,
|
inputs,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
# Netbird mesh VPN range — dashboard only accessible from mesh peers.
|
# Mesh-only via interface match on wt0 (NetBird) — works for ip46tables
|
||||||
# m3-atlas Traefik proxies to this port over Netbird.
|
# where an IPv4 CIDR in -s would abort the ip6tables run.
|
||||||
netbirdRange = "100.81.0.0/16";
|
|
||||||
apiPort = config.m3ta.ports.get "hermes-api";
|
apiPort = config.m3ta.ports.get "hermes-api";
|
||||||
dashboardPort = config.m3ta.ports.get "hermes-dashboard";
|
dashboardPort = config.m3ta.ports.get "hermes-dashboard";
|
||||||
|
|
||||||
@@ -57,13 +56,13 @@ in {
|
|||||||
networking.firewall = {
|
networking.firewall = {
|
||||||
extraCommands = ''
|
extraCommands = ''
|
||||||
# Allow Hermes Dashboard and OpenAI-compatible API only from Netbird mesh VPN
|
# Allow Hermes Dashboard and OpenAI-compatible API only from Netbird mesh VPN
|
||||||
ip46tables -A nixos-fw -p tcp --dport ${toString dashboardPort} -s ${netbirdRange} -j nixos-fw-accept
|
ip46tables -A nixos-fw -p tcp --dport ${toString dashboardPort} -i wt0 -j nixos-fw-accept
|
||||||
ip46tables -A nixos-fw -p tcp --dport ${toString apiPort} -s ${netbirdRange} -j nixos-fw-accept
|
ip46tables -A nixos-fw -p tcp --dport ${toString apiPort} -i wt0 -j nixos-fw-accept
|
||||||
'';
|
'';
|
||||||
|
|
||||||
extraStopCommands = ''
|
extraStopCommands = ''
|
||||||
ip46tables -D nixos-fw -p tcp --dport ${toString dashboardPort} -s ${netbirdRange} -j nixos-fw-accept 2>/dev/null || true
|
ip46tables -D nixos-fw -p tcp --dport ${toString dashboardPort} -i wt0 -j nixos-fw-accept 2>/dev/null || true
|
||||||
ip46tables -D nixos-fw -p tcp --dport ${toString apiPort} -s ${netbirdRange} -j nixos-fw-accept 2>/dev/null || true
|
ip46tables -D nixos-fw -p tcp --dport ${toString apiPort} -i wt0 -j nixos-fw-accept 2>/dev/null || true
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -25,8 +25,8 @@
|
|||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
# NetBird mesh range of this fleet (kernel route: 100.81.0.0/16 dev wt0).
|
# Mesh-only via interface match on wt0 (NetBird) — an IPv4 CIDR in -s
|
||||||
netbirdRange = "100.81.0.0/16";
|
# would abort the ip6tables run of ip46tables and fail the unit.
|
||||||
port = config.m3ta.ports.get "t3code";
|
port = config.m3ta.ports.get "t3code";
|
||||||
in {
|
in {
|
||||||
# CLI on the system for interactive admin (t3 pair, t3 service status)
|
# CLI on the system for interactive admin (t3 pair, t3 service status)
|
||||||
@@ -67,11 +67,11 @@ in {
|
|||||||
networking.firewall = {
|
networking.firewall = {
|
||||||
extraCommands = ''
|
extraCommands = ''
|
||||||
# Allow t3code only from Netbird mesh VPN
|
# Allow t3code only from Netbird mesh VPN
|
||||||
ip46tables -A nixos-fw -p tcp --dport ${toString port} -s ${netbirdRange} -j nixos-fw-accept
|
ip46tables -A nixos-fw -p tcp --dport ${toString port} -i wt0 -j nixos-fw-accept
|
||||||
'';
|
'';
|
||||||
|
|
||||||
extraStopCommands = ''
|
extraStopCommands = ''
|
||||||
ip46tables -D nixos-fw -p tcp --dport ${toString port} -s ${netbirdRange} -j nixos-fw-accept 2>/dev/null || true
|
ip46tables -D nixos-fw -p tcp --dport ${toString port} -i wt0 -j nixos-fw-accept 2>/dev/null || true
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user