mirror of
https://github.com/jmcorgan/fips.git
synced 2026-10-05 11:08:25 +00:00
Three ways an address for a peer we already hold a session with used to reach the dialler — a beacon on a new transport, `update_peers` or `fipsctl connect`, a configured address whose transport came up later — and each was a second handshake, which the far side read as a rekey and this side resolved as a cross-connection, the two not composing. Two phones hearing the same Wi-Fi return at the same moment both dialled at once; one side swapped to its outbound session and freed the index it had just handed out in the rekey reply, the other kept its inbound session and the pre-rekey index, every frame between them was dropped, and the link-dead reap tore the peer down. About a minute dark on every Wi-Fi return. A peer that holds a session is never dialled now. An address on a transport it has no path over becomes a path candidate under that session; one on a transport whose path is not eligible re-points that path (the active path included: it is not answering, that is why we are here); one on a transport whose path is carrying acknowledged traffic changes nothing. The heartbeat tick probes the candidate under the existing session — one authenticated, replay-checked round trip — and the mandatory switch takes it if the current path stops answering. Nothing is lost against the dial: a session that is truly gone answers no probe either, is reaped by the link-dead timeout, and is dialled then; a peer that restarted dials us with a new epoch and wins promotion outright, as before. Applies to the control API's connect, to update_peers, to configured addresses (checked once a tick) and to transport discovery alike. The counterpart: a handshake creates no path state. A dial that does reach a peer with a session — a startup that lists two addresses dials both, a caller that still dials by hand, an older node dialling us — is classified and resolved exactly as before this work: rekey, duplicate or restart on the responder, whichever transport the msg1 arrived on; the cross-connection tie-break on the initiator. The address it ran to is left as a candidate for the probe exchange. Two reasons. Both ends must resolve a handshake on the same information, and "is this a new transport to a live peer" was a fact only one end could see. And the IK responder commits at msg1, which carries no freshness beyond the startup epoch: a captured msg1 replayed from any address would otherwise have planted a path, probed full-size for the life of the peering and counting as a transport the peer is on for the decrypt-failure gate. So that gate now counts garbage only on the active path or one the peer has acknowledged. On a connection-oriented transport the connection a dial opened is kept as the candidate's socket rather than closed as the losing leg: the probe rides it, and closing it would only have the first probe dial again — or, at the responder, find an ephemeral port that cannot be dialled at all. `api_disconnect` closes every path's connection, the standby's included; loopback records the closes it is asked for so a test can say so. Path heartbeats are gated and bounded. A peer with one live path is not path-heartbeated: selection has nothing to move to, the link heartbeat keeps liveness, and five probes a second on every single-path link was cost without a decision behind it. A standby the peer never acknowledges is given up after eight discovery probes, Dead and pruned after the grace; the active path is never given up. The active path's first probe is small, the handshake having proved it and seeded its MTU. And a Dead path is probed again when its transport returns: nothing on our side ever re-probed one, so after a NIC replug traffic stayed on the standby until the grace pruned the path and a beacon found it with no history. The presence edge now revives every Dead path on the transport as Probing, RTT window and ETX kept. Smaller: `add_path_candidate` re-points a known transport's path at a moved address (`refresh_path_addr`), for a Wi-Fi Aware data path that re-forms with a new link-local; `api_disconnect` closes every path's connection, not the active one alone; `path_show` is built from the `show_peers` path projection plus the three now-relative fields; `PathState` and `TransportRole` render through `as_str()`; `node.path.switch_margin` is validated finite and at least 1.0; `PathPolicy::PERMISSIVE` had no users; four doc comments an inserted function had split are put back on the function they describe. The dual-udp-flap scenario is config-driven: the dial owner lists udp/main and udp/<veth>, both dial at startup, and the second is proven as a path under the first's session by the probe exchange.
271 lines
9.9 KiB
Python
271 lines
9.9 KiB
Python
"""FIPS node config generation from template + topology."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import os
|
|
from copy import deepcopy
|
|
|
|
import yaml
|
|
|
|
from .topology import UDP_VETH, SimTopology
|
|
|
|
|
|
def _deep_merge(base: dict, override: dict) -> dict:
|
|
"""Recursively merge override into base (override wins on conflicts)."""
|
|
result = deepcopy(base)
|
|
for key, value in override.items():
|
|
if key in result and isinstance(result[key], dict) and isinstance(value, dict):
|
|
result[key] = _deep_merge(result[key], value)
|
|
else:
|
|
result[key] = deepcopy(value)
|
|
return result
|
|
|
|
# Path to the shared node config template
|
|
_TEMPLATE_PATH = os.path.join(
|
|
os.path.dirname(__file__), "..", "configs", "node.template.yaml"
|
|
)
|
|
|
|
|
|
def _load_template() -> str:
|
|
with open(_TEMPLATE_PATH) as f:
|
|
return f.read()
|
|
|
|
|
|
_TRANSPORT_PORTS = {
|
|
"udp": 2121,
|
|
"udp-veth": 2122,
|
|
"tcp": 443,
|
|
}
|
|
|
|
|
|
def generate_peers_block(
|
|
topology: SimTopology, node_id: str, outbound_peers: list[str]
|
|
) -> str:
|
|
"""Generate the YAML peers block for a node.
|
|
|
|
Only includes peers that this node is responsible for connecting to
|
|
(outbound direction). The link is still bidirectional once established.
|
|
Transport type and port are determined per-edge from the topology.
|
|
"""
|
|
if not outbound_peers:
|
|
return " []"
|
|
|
|
# With interface-bound UDP instances the UDP transport is named, and a
|
|
# bare ``udp`` address would resolve to the lowest instance id, which
|
|
# may be the one bound to a veth: qualify the bridge half.
|
|
bridge = "udp/main" if topology.udp_veth_links(node_id) else "udp"
|
|
lines = []
|
|
for peer_id in sorted(outbound_peers):
|
|
peer = topology.nodes[peer_id]
|
|
transport = topology.transport_for_edge(node_id, peer_id)
|
|
dual = topology.is_dual_udp_edge(node_id, peer_id)
|
|
# (transport, addr, priority) per address. A dual edge's Ethernet
|
|
# half is found by beacon, so only its bridge half is listed; a dual
|
|
# udp-veth edge lists both halves, bridge first, and the daemon takes
|
|
# the second completed handshake as a path under the first's session.
|
|
addresses = []
|
|
if transport == UDP_VETH:
|
|
link = next(l for l in topology.udp_veth_links(node_id) if l.peer_id == peer_id)
|
|
if dual:
|
|
addresses.append((bridge, f"{peer.docker_ip}:{_TRANSPORT_PORTS['udp']}", 1))
|
|
addresses.append((f"udp/{link.instance}", link.peer_addr, 10 if dual else 1))
|
|
else:
|
|
if dual:
|
|
transport = "udp"
|
|
addr = f"{peer.docker_ip}:{_TRANSPORT_PORTS.get(transport, 2121)}"
|
|
if transport == "udp":
|
|
transport = bridge
|
|
addresses.append((transport, addr, 1))
|
|
lines.append(f' - npub: "{peer.npub}"')
|
|
lines.append(f' alias: "{peer_id}"')
|
|
lines.append(f" addresses:")
|
|
for transport, addr, priority in addresses:
|
|
lines.append(f" - transport: {transport}")
|
|
lines.append(f' addr: "{addr}"')
|
|
lines.append(f" priority: {priority}")
|
|
lines.append(f" connect_policy: auto_connect")
|
|
return "\n".join(lines)
|
|
|
|
|
|
def _build_ethernet_config(iface: str) -> dict:
|
|
"""Build an Ethernet transport config dict for a single interface.
|
|
|
|
``optional: True`` because in this harness a neighbour's interface
|
|
disappearing is the scenario, not a fault. ``node_churn`` stops a
|
|
container, which destroys its netns and with it both ends of every veth
|
|
pair it held (see ``nodes.py``: the veths are recreated on restart), so a
|
|
surviving node watches a *required* interface vanish for the 30-90s the
|
|
neighbour is down -- once per churn event, on every neighbour. The daemon
|
|
reports a required interface absent past its bring-up window at ERROR,
|
|
which is correct for a deployment and wrong for a harness that tears the
|
|
interface down on purpose; the mesh-wide zero-ERROR ceiling would fail on
|
|
injected chaos rather than on a defect.
|
|
|
|
Absence behaviour itself is asserted in ``testing/iface-binding/``, which
|
|
exists for it and drives both policies deliberately.
|
|
"""
|
|
return {
|
|
"interface": iface,
|
|
"listen": True,
|
|
"announce": True,
|
|
"auto_connect": True,
|
|
"accept_connections": True,
|
|
"beacon_interval_secs": 10,
|
|
"optional": True,
|
|
}
|
|
|
|
|
|
def _inject_ethernet_transports(parsed: dict, eth_ifaces: list[str]):
|
|
"""Inject Ethernet transport config into a parsed FIPS config.
|
|
|
|
For a single interface, uses the single-instance format.
|
|
For multiple interfaces, uses the named-instances format.
|
|
Pure-Ethernet nodes (no UDP peers) have their UDP transport removed.
|
|
"""
|
|
if not eth_ifaces:
|
|
return
|
|
|
|
transports = parsed.setdefault("transports", {})
|
|
if len(eth_ifaces) == 1:
|
|
transports["ethernet"] = _build_ethernet_config(eth_ifaces[0])
|
|
else:
|
|
transports["ethernet"] = {
|
|
iface: _build_ethernet_config(iface) for iface in eth_ifaces
|
|
}
|
|
|
|
|
|
def _inject_udp_instances(parsed: dict, topology: SimTopology, node_id: str, has_udp: bool):
|
|
"""Turn the template's single UDP transport into named instances: ``main``
|
|
(the bridge, kept only if the node has bridge-UDP peers) plus one
|
|
interface-bound instance per ``udp-veth`` edge, named after its veth.
|
|
"""
|
|
links = topology.udp_veth_links(node_id)
|
|
if not links:
|
|
return
|
|
transports = parsed.setdefault("transports", {})
|
|
main = transports.pop("udp", None) or {"bind_addr": "0.0.0.0:2121"}
|
|
instances = {}
|
|
if has_udp:
|
|
instances["main"] = main
|
|
for link in links:
|
|
instances[link.instance] = {
|
|
"bind_addr": f"0.0.0.0:{_TRANSPORT_PORTS['udp-veth']}",
|
|
"interface": link.iface,
|
|
"mtu": main.get("mtu", 1472),
|
|
}
|
|
transports["udp"] = instances
|
|
|
|
|
|
def _inject_tcp_transport(parsed: dict):
|
|
"""Inject TCP transport config into a parsed FIPS config."""
|
|
transports = parsed.setdefault("transports", {})
|
|
transports["tcp"] = {
|
|
"bind_addr": "0.0.0.0:443",
|
|
}
|
|
|
|
|
|
def generate_node_config(
|
|
topology: SimTopology,
|
|
node_id: str,
|
|
outbound_peers: list[str],
|
|
fips_overrides: dict | None = None,
|
|
ephemeral: bool = False,
|
|
) -> str:
|
|
"""Generate a complete FIPS config YAML for one node.
|
|
|
|
If ephemeral is True, the nsec is omitted from the config so the
|
|
daemon generates a fresh keypair on each restart.
|
|
"""
|
|
template = _load_template()
|
|
node = topology.nodes[node_id]
|
|
peers_yaml = generate_peers_block(topology, node_id, outbound_peers)
|
|
|
|
config = template
|
|
config = config.replace("{{NODE_NAME}}", node_id.upper())
|
|
config = config.replace("{{TOPOLOGY}}", "sim")
|
|
config = config.replace("{{NPUB}}", node.npub)
|
|
config = config.replace("{{NSEC}}", node.nsec)
|
|
config = config.replace("{{PEERS}}", peers_yaml)
|
|
|
|
# Ephemeral nodes: remove nsec so daemon generates fresh keys on restart
|
|
if ephemeral:
|
|
parsed = yaml.safe_load(config)
|
|
identity = parsed.get("node", {}).get("identity", {})
|
|
identity.pop("nsec", None)
|
|
config = yaml.dump(parsed, default_flow_style=False, sort_keys=False)
|
|
|
|
# Determine which transports this node participates in
|
|
eth_ifaces = topology.ethernet_interfaces(node_id)
|
|
has_tcp = bool(topology.tcp_peers(node_id))
|
|
has_udp = _has_transport_peers(topology, node_id, "udp")
|
|
has_udp_veth = bool(topology.udp_veth_links(node_id))
|
|
|
|
# Inject non-UDP transport configs and handle pure-transport nodes
|
|
needs_yaml_rewrite = (
|
|
eth_ifaces or has_tcp or has_udp_veth or not has_udp or fips_overrides
|
|
)
|
|
|
|
if needs_yaml_rewrite:
|
|
parsed = yaml.safe_load(config)
|
|
if fips_overrides:
|
|
parsed = _deep_merge(parsed, fips_overrides)
|
|
if eth_ifaces:
|
|
_inject_ethernet_transports(parsed, eth_ifaces)
|
|
if has_tcp:
|
|
_inject_tcp_transport(parsed)
|
|
if has_udp_veth:
|
|
_inject_udp_instances(parsed, topology, node_id, has_udp)
|
|
elif not has_udp:
|
|
# No UDP edges: remove UDP transport
|
|
transports = parsed.get("transports", {})
|
|
transports.pop("udp", None)
|
|
config = yaml.dump(parsed, default_flow_style=False, sort_keys=False)
|
|
|
|
return config
|
|
|
|
|
|
def _has_transport_peers(topology: SimTopology, node_id: str, transport: str) -> bool:
|
|
"""Check if a node has any edges (inbound or outbound) using the given transport."""
|
|
for peer_id in topology.nodes[node_id].peers:
|
|
edge = (min(node_id, peer_id), max(node_id, peer_id))
|
|
if topology.edge_transport.get(edge, "udp") == transport:
|
|
return True
|
|
if transport == "udp" and edge in topology.dual_udp_edges:
|
|
return True
|
|
return False
|
|
|
|
|
|
def generate_npubs_env(topology: SimTopology) -> str:
|
|
"""Generate npubs.env content mapping NPUB_<ID>=<npub> for all nodes."""
|
|
lines = []
|
|
for node_id in sorted(topology.nodes):
|
|
node = topology.nodes[node_id]
|
|
env_name = f"NPUB_{node_id.upper()}"
|
|
lines.append(f"{env_name}={node.npub}")
|
|
return "\n".join(lines) + "\n"
|
|
|
|
|
|
def write_configs(
|
|
topology: SimTopology,
|
|
output_dir: str,
|
|
fips_overrides: dict | None = None,
|
|
ephemeral_nodes: set[str] | None = None,
|
|
):
|
|
"""Write all node configs and npubs.env to the output directory."""
|
|
os.makedirs(output_dir, exist_ok=True)
|
|
ephemeral_nodes = ephemeral_nodes or set()
|
|
|
|
outbound = topology.directed_outbound()
|
|
for node_id in topology.nodes:
|
|
config = generate_node_config(
|
|
topology, node_id, outbound[node_id], fips_overrides,
|
|
ephemeral=(node_id in ephemeral_nodes),
|
|
)
|
|
path = os.path.join(output_dir, f"{node_id}.yaml")
|
|
with open(path, "w") as f:
|
|
f.write(config)
|
|
|
|
env_path = os.path.join(output_dir, "npubs.env")
|
|
with open(env_path, "w") as f:
|
|
f.write(generate_npubs_env(topology))
|