mirror of
https://github.com/jmcorgan/fips.git
synced 2026-10-05 19:18:25 +00:00
Johnathan Corgan
9e4b5d6a72
Carries thirteen commits up from maint: the source-comment sweep and its regression gate, and the v1 exposure remediation (key-material clearing, frame-length validation, and post-handshake identity confirmation). Ten paths conflicted. The resolutions: - Cargo.toml: kept both dependency additions, libm and zeroize. - src/control/queries.rs: took the corrected prose from maint but kept this branch's path to the relocated rx_loop module. Neither side was right alone. - src/control/read_handle.rs: took maint's corrected description of what the snapshot dispatch serves, and kept this branch's paragraph on the mutating profiling commands, which maint has never carried. - src/node/handlers/mod.rs: kept this branch's module list, widening handshake to pub(in crate::node) so the tests can name the waiver type. - src/node/dataplane/rx_loop.rs: union of the import blocks. - src/node/handlers/handshake.rs: kept the WireOutcome binding and dropped maint's possible_restart fix-up, which this branch folded away; placed the post-handshake identity confirmation above it, which keeps the confirmation ahead of the reverse-lookup repair as intended. - src/nostr/runtime.rs: took this branch's side. The function maint edits was relocated to traversal_machine.rs here and its copy already carries the same corrected text. - src/mmp/report.rs: deleted. This branch retired the module; maint's only change was removing a stale comment. - src/node/lifecycle.rs and src/peer/connection.rs: deleted, but their key-clearing work was relocated rather than dropped. The erasing guard now wraps both handshake entry points in src/peer/machine.rs and the outbound dial in src/node/lifecycle/mod.rs, since the files maint had changed no longer exist here. Without the relocation the guard type would have arrived with no callers at all. Eight further edits were forced by names that differ on this branch: the wire module path at seven sites, the connection lookup in the waiver classifier, and four test helpers the peer-machine work replaced.
43 lines
2.1 KiB
YAML
43 lines
2.1 KiB
YAML
# Compose override that bumps RUST_LOG to trace level on the modules
|
|
# relevant to NAT-traversal handshake-completion flake evidence
|
|
# collection:
|
|
#
|
|
# - fips::nostr — overlay advert publish/consume
|
|
# (where the cross-init race begins)
|
|
# - fips::transport::udp — UDP socket bind/send/recv
|
|
# (where the punch packets flow)
|
|
# - fips::node::lifecycle — daemon bootstrap, peer state
|
|
# machine, adoption transitions
|
|
# - fips::node::handlers::handshake — Noise handshake msg1/2/3,
|
|
# cross-init tie-breaker
|
|
# ("Ignoring established NAT
|
|
# traversal..." emits here)
|
|
# - fips::node::dataplane::forwarding — transit/local datagram routing
|
|
# (catches drops post-adoption)
|
|
#
|
|
# Other modules stay at info to keep log volume manageable. The base
|
|
# docker-compose.yml's `*fips-common` env block sets RUST_LOG as a
|
|
# list-form env var (`- RUST_LOG=...`); the override below replaces
|
|
# it entirely via the YAML map form, which is the docker-compose
|
|
# override semantics for the environment field.
|
|
#
|
|
# Service-name layout: only the two `lan-*` services are FIPS daemons;
|
|
# the relay and stun services are not (and don't honor RUST_LOG).
|
|
#
|
|
# Include this override via the FIPS_NAT_EXTRA_COMPOSE env var that
|
|
# testing/nat/scripts/nat-test.sh consults:
|
|
# FIPS_NAT_EXTRA_COMPOSE=testing/mesh-lab/compose-trace-nat.yml \
|
|
# bash testing/nat/scripts/nat-test.sh lan
|
|
#
|
|
# The mesh-lab harness sets it automatically when FIPS_MESH_LAB_TRACE
|
|
# is set and the suite is nat-lan.
|
|
|
|
x-trace-rust-log: &trace-rust-log
|
|
RUST_LOG: "info,fips::nostr=trace,fips::transport::udp=trace,fips::node::lifecycle=trace,fips::node::handlers::handshake=trace,fips::node::dataplane::forwarding=trace"
|
|
|
|
services:
|
|
lan-a:
|
|
environment: *trace-rust-log
|
|
lan-b:
|
|
environment: *trace-rust-log
|