CalvinBackup/ctrld
1
0
Fork 0
mirror of https://github.com/Control-D-Inc/ctrld.git synced 2026-09-04 13:36:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

all: apply the organization's allowed destination IPs in Firewall Mode

Browse Source 
Firewall Mode only permits what ctrld resolved, so an approved service addressed
by literal IP - with no DNS lookup to observe - is unreachable, and the only
workaround was turning the mode off. The API now sends the effective per-org list
in destination_ips of every resolver-config response.

Apply it as a set rather than as additions: each refresh replaces the previous
snapshot, so an entry added upstream takes effect and one removed upstream stops
bypassing enforcement. This happens inside the refresh handler before its early
returns, so scheduled and forced refreshes both carry it, and without a ctrld
reload. Entries carry no TTL and survive the allowlist flushes that follow a
profile or network change.

Track what the API asked for separately from what pf/WFP accepted, because
mirroring can fail and the next refresh - carrying an identical list - would
compute no delta to retry. The applied snapshot advances only on success, and the
difference is retried by the next refresh and by a reconcile every 5 minutes,
reported meanwhile as allowed_destinations_pending. Enforcement coming up
replaces the whole set rather than adding to it: the macOS table is a persist
table that can still hold what a previous run put there. Enforcement is versioned
by a generation advanced under the same lock the mirror is called with, so a
maintenance worker outliving its run cannot reinstall permits into enforcement
that is gone.

macOS keeps the set in a second pf table, <ctrld_allowed_dst>; Windows in
per-entry WFP permit filters in their own map - apart from the DNS-resolved
entries so a flush of those leaves them installed. Linux is unchanged, the mode
already fails open there, and devices with Firewall Mode off are unaffected.

Lookups binary search sorted per-family address ranges, so the per-connection hot
path stays flat at ~40ns rather than growing with the list. Addresses are logged
at debug level only: the list is organization network topology, and Info-level
logs are persisted and travel in support bundles.

Indirect the refresh's fetch and split its handler out of the fetch loop so both
refresh paths are driven end to end in tests without an API server.
This commit is contained in:
Cuong Manh Le
2026-08-28 14:01:23 +07:00
parent f0b60f3efa
commit 4113064680
15 changed files with 2434 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/cli/control_server.go
+10
View File
@@ -247,6 +247,16 @@ func (p *prog) registerControlServerHandler() {
} else {
cdDeactivationPin.Store(defaultDeactivationPin)
}
// Every resolver-config response carries the organization's allowed
// destinations, including this one, so apply them rather than discarding
// a fresher list until the next scheduled refresh converges.
//
// Only the destinations: p.rc is deliberately left alone. The scheduled
// refresh decides whether to reload ctrld by comparing the response
// against p.rc, so storing this one here would let an exclude-list change
// be compared away and never reloaded. The destination set needs no
// reload - it is enforced directly and applying it is idempotent.
p.applyAllowedDestinations(p.firewallAllowList(), rc.DestinationIPs)
} else {
p.Warn().Err(err).Msg("Could not re-fetch deactivation pin code")
}