DC-153: provider.syncAccess enforcement wiring (tailscale ACL push + wireguard nftables apply) + contract tests
This commit is contained in:
6 files changed
+820
-32
No files matched your search
@@ -39,6 +39,13 @@ const path = require('path');
|
||||
const crypto = require('crypto');
|
||||
const { execFile } = require('child_process');
|
||||
const { ProviderError } = require('../errors');
|
||||
const {
|
||||
compileRuleset,
|
||||
createWgFirewallApplier,
|
||||
FirewallCheckError,
|
||||
FirewallApplyError,
|
||||
FirewallVerifyError,
|
||||
} = require('../wg-firewall');
|
||||
|
||||
const INTERFACE_NAME = 'dcnet0';
|
||||
const HUB_ADDRESS = '10.53.0.1/16';
|
||||
@@ -128,6 +135,10 @@ function bareAddress(addr) {
|
||||
* @param {number} [deps.listenPort] - UDP listen port (default 51820)
|
||||
* @param {Function} [deps.getuid] - uid probe (root/CAP_NET_ADMIN check)
|
||||
* @param {Function} [deps.now] - epoch-ms clock (invite TTL tests)
|
||||
* @param {object} [deps.firewall] - the nftables enforcement engine
|
||||
* (src/network/wg-firewall.js applier surface: apply/rollback). Default:
|
||||
* createWgFirewallApplier() built from this provider's execFileImpl, so
|
||||
* injected exec mocks exercise the REAL wiring end to end.
|
||||
*/
|
||||
function createWireGuardProvider({
|
||||
execFileImpl,
|
||||
@@ -138,9 +149,16 @@ function createWireGuardProvider({
|
||||
listenPort = DEFAULT_LISTEN_PORT,
|
||||
getuid,
|
||||
now,
|
||||
firewall = null,
|
||||
} = {}) {
|
||||
const execFn = execFileImpl || execFileDefault;
|
||||
const fs = fsImpl || require('fs'); // eslint-disable-line no-shadow
|
||||
const firewallApplier =
|
||||
firewall ||
|
||||
createWgFirewallApplier({
|
||||
execFileImpl: execFn,
|
||||
fsImpl: fsImpl || undefined,
|
||||
});
|
||||
const dataDirResolved =
|
||||
dataDir !== undefined ? dataDir : require('../../../platform-paths').dataDir;
|
||||
const peersPath = path.join(dataDirResolved, 'network-wg-peers.json');
|
||||
@@ -772,15 +790,100 @@ function createWireGuardProvider({
|
||||
},
|
||||
|
||||
/**
|
||||
* nftables firewall compiler lands with DC-151 — not a silent no-op.
|
||||
* Compile + transactionally apply the dcnet nftables ruleset (DC-153;
|
||||
* engines from DC-151). Sequence:
|
||||
* 1. compileRuleset — the admin-lockout throw (admin ports with zero
|
||||
* active admin peer IPs) → ProviderError 'lockout_guard'
|
||||
* 2. firewallApplier.apply — check (`nft -c -f`) → rollback-file →
|
||||
* apply (`nft -f`) → verify; the applier NEVER partially applies
|
||||
* (a check failure applies nothing; an apply failure restores the
|
||||
* prior rollback file). Firewall*Error classes map to
|
||||
* 'firewall_check_failed' / 'firewall_apply_failed' /
|
||||
* 'firewall_verify_failed' with .detail preserving stderr +
|
||||
* rolledBack info.
|
||||
*
|
||||
* @param {object} [input]
|
||||
* @param {object} input.accessMap - { grants: [...] } (DC-145 store)
|
||||
* @param {Array} input.people - DC-141 person records
|
||||
* @param {Object<string,{ip:string,port:number}>} input.resources
|
||||
* @param {Object<string,string>} [input.peerAddresses] - `pid/did` → ip
|
||||
* @param {string[]} [input.adminPeers] - person IDs allowed admin ports
|
||||
* (defaults to active 'Admin'-group people)
|
||||
* @returns {Promise<{applied:true, resourcesAffected:number}>}
|
||||
*/
|
||||
async syncAccess() {
|
||||
await Promise.reject(
|
||||
new ProviderError('syncAccess lands with the nftables firewall compiler (DC-151)', {
|
||||
code: 'not_implemented',
|
||||
retryable: false,
|
||||
})
|
||||
);
|
||||
async syncAccess(input = {}) {
|
||||
const {
|
||||
accessMap,
|
||||
people,
|
||||
resources,
|
||||
peerAddresses = {},
|
||||
adminPeers,
|
||||
} = input;
|
||||
// Default admin set: active members of the 'Admin' group (DC-141
|
||||
// bootstrap-admin convention).
|
||||
const admins = Array.isArray(adminPeers)
|
||||
? adminPeers
|
||||
: (people || [])
|
||||
.filter(
|
||||
(p) =>
|
||||
p &&
|
||||
p.status === 'active' &&
|
||||
Array.isArray(p.groups) &&
|
||||
p.groups.includes('Admin')
|
||||
)
|
||||
.map((p) => p.id);
|
||||
|
||||
let ruleset;
|
||||
try {
|
||||
ruleset = compileRuleset({
|
||||
accessMap,
|
||||
people,
|
||||
peerAddresses,
|
||||
resources,
|
||||
adminPeers: admins,
|
||||
});
|
||||
} catch (err) {
|
||||
if (err && /lockout guard/.test(err.message)) {
|
||||
throw new ProviderError('wireguard: ' + err.message, {
|
||||
code: 'lockout_guard',
|
||||
retryable: false,
|
||||
cause: err,
|
||||
});
|
||||
}
|
||||
throw toProviderError(err);
|
||||
}
|
||||
|
||||
try {
|
||||
await firewallApplier.apply(ruleset);
|
||||
} catch (err) {
|
||||
const detailByClass = new Map([
|
||||
[FirewallCheckError, { stderr: err.stderr, applied: false }],
|
||||
[FirewallApplyError, { stderr: err.stderr, applied: false, rolledBack: false }],
|
||||
[FirewallVerifyError, { stderr: err.stderr, applied: true, rolledBack: err.rolledBack }],
|
||||
]);
|
||||
const codeByClass = new Map([
|
||||
[FirewallCheckError, 'firewall_check_failed'],
|
||||
[FirewallApplyError, 'firewall_apply_failed'],
|
||||
[FirewallVerifyError, 'firewall_verify_failed'],
|
||||
]);
|
||||
for (const [cls, code] of codeByClass) {
|
||||
if (err instanceof cls) {
|
||||
const pe = new ProviderError('wireguard: ' + err.message, {
|
||||
code,
|
||||
retryable: false,
|
||||
cause: err,
|
||||
});
|
||||
pe.detail = detailByClass.get(cls);
|
||||
throw pe;
|
||||
}
|
||||
}
|
||||
throw toProviderError(err);
|
||||
}
|
||||
|
||||
return {
|
||||
applied: true,
|
||||
resourcesAffected: Object.keys(resources || {}).length,
|
||||
};
|
||||
},
|
||||
|
||||
/**
|
||||
|
||||
Reference in new issue
Block a user