@push.rocks/smartnftables 1.6.0 → 1.8.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/changelog.md +12 -0
- package/dist_rust/smartnftables_linux_amd64_musl +0 -0
- package/dist_rust/smartnftables_linux_amd64_musl.tsrust-build.json +4 -4
- package/dist_rust/smartnftables_linux_arm64_musl +0 -0
- package/dist_rust/smartnftables_linux_arm64_musl.tsrust-build.json +4 -4
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/classes.managednftables.d.ts +8 -1
- package/dist_ts/classes.managednftables.js +42 -6
- package/dist_ts/managed.egress.types.d.ts +9 -1
- package/dist_ts/managed.types.d.ts +7 -1
- package/package.json +1 -1
- package/readme.md +59 -2
- package/rust/src/egress.compile.rs +3 -0
- package/rust/src/egress.poolguard.rs +30 -0
- package/rust/src/egress.rs +27 -0
- package/rust/src/egress_tests.rs +85 -0
- package/rust/src/main.rs +4 -0
- package/rust/src/managed.rs +4 -0
- package/rust/src/owner.detach.rs +73 -0
- package/rust/src/owner.rs +20 -1
- package/rust/src/owner_detach_tests.rs +252 -0
- package/rust/src/owner_egress_tests.rs +1 -1
- package/rust/src/owner_egress_traffic_tests.rs +21 -10
- package/rust/src/owner_host_traffic_tests.rs +4 -10
- package/rust/src/owner_namespace_tests.rs +4 -4
- package/rust/src/owner_poolguard_tests.rs +268 -0
- package/rust/src/owner_tests.rs +6 -0
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.managednftables.ts +35 -5
- package/ts/managed.egress.types.ts +10 -1
- package/ts/managed.types.ts +2 -1
package/changelog.md
CHANGED
|
@@ -1,5 +1,17 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 2026-09-14 - 1.8.0
|
|
4
|
+
|
|
5
|
+
### Features
|
|
6
|
+
|
|
7
|
+
- Add terminal policy detachment with exact PERSIST verification, retained-intent recovery and failure-safe native process cleanup.
|
|
8
|
+
|
|
9
|
+
## 2026-09-14 - 1.7.0
|
|
10
|
+
|
|
11
|
+
### Features
|
|
12
|
+
|
|
13
|
+
- Add a host-wide allocation-pool guard with direction-aware IPv4 denial, bounded atomic updates, and native packet and recovery qualification.
|
|
14
|
+
|
|
3
15
|
## 2026-09-13 - 1.6.0
|
|
4
16
|
|
|
5
17
|
### Features
|
|
Binary file
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"format": "tsrust.build-provenance.v2",
|
|
3
|
-
"binarySha256": "
|
|
3
|
+
"binarySha256": "e7f3f755b5f9579969e94d70442710a8b2ebde0aa8dda4c0b312094b8771caf6",
|
|
4
4
|
"buildInfo": {
|
|
5
5
|
"projectName": "@push.rocks/smartnftables",
|
|
6
|
-
"projectVersion": "1.
|
|
7
|
-
"gitCommit": "
|
|
6
|
+
"projectVersion": "1.8.0",
|
|
7
|
+
"gitCommit": "63a819de3661273bd4df2cea457f9fb3c4131cc9",
|
|
8
8
|
"gitDirty": false,
|
|
9
|
-
"builtAt": "2026-09-
|
|
9
|
+
"builtAt": "2026-09-14T03:26:32.636Z",
|
|
10
10
|
"tsrustVersion": "1.13.0",
|
|
11
11
|
"binary": "smartnftables",
|
|
12
12
|
"target": "linux_amd64_musl"
|
|
Binary file
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"format": "tsrust.build-provenance.v2",
|
|
3
|
-
"binarySha256": "
|
|
3
|
+
"binarySha256": "f80787be41352d19daf0b3916cb285fe29aa3e88f637180109a07ab8ec609b14",
|
|
4
4
|
"buildInfo": {
|
|
5
5
|
"projectName": "@push.rocks/smartnftables",
|
|
6
|
-
"projectVersion": "1.
|
|
7
|
-
"gitCommit": "
|
|
6
|
+
"projectVersion": "1.8.0",
|
|
7
|
+
"gitCommit": "63a819de3661273bd4df2cea457f9fb3c4131cc9",
|
|
8
8
|
"gitDirty": false,
|
|
9
|
-
"builtAt": "2026-09-
|
|
9
|
+
"builtAt": "2026-09-14T03:26:32.863Z",
|
|
10
10
|
"tsrustVersion": "1.13.0",
|
|
11
11
|
"binary": "smartnftables",
|
|
12
12
|
"target": "linux_arm64_musl"
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@push.rocks/smartnftables',
|
|
6
|
-
version: '1.
|
|
6
|
+
version: '1.8.0',
|
|
7
7
|
description: 'A TypeScript module for managing nftables rules including NAT, firewall, and rate limiting with a high-level API.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSwyQkFBMkI7SUFDakMsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLG1IQUFtSDtDQUNqSSxDQUFBIn0=
|
|
@@ -18,6 +18,13 @@ export declare class ManagedNftables<TPolicy extends TManagedNftPolicy = IManage
|
|
|
18
18
|
release(expected: IAppliedManagedNftPolicy<TPolicy>): Promise<{
|
|
19
19
|
released: true;
|
|
20
20
|
}>;
|
|
21
|
-
/**
|
|
21
|
+
/** Permanently selects retention cleanup, verifies exact PERSIST retention, and
|
|
22
|
+
* joins the native process. Retain the full applied value before this call.
|
|
23
|
+
* After any failure close() only terminates; it never deletes the table. */
|
|
24
|
+
detach(expected: IAppliedManagedNftPolicy<TPolicy>): Promise<{
|
|
25
|
+
detached: true;
|
|
26
|
+
}>;
|
|
27
|
+
/** Join policy operations, then delete and terminate unless detach selected retention.
|
|
28
|
+
* Packet/allocation fencing belongs to the caller; already-admitted close cannot be undone. */
|
|
22
29
|
close(): Promise<void>;
|
|
23
30
|
}
|
|
@@ -62,6 +62,9 @@ export class ManagedNftables {
|
|
|
62
62
|
#work = null;
|
|
63
63
|
#close = null;
|
|
64
64
|
#nativeMayOwn = false;
|
|
65
|
+
#retaining = false;
|
|
66
|
+
#detachExpected = null;
|
|
67
|
+
#detach = null;
|
|
65
68
|
constructor(options) {
|
|
66
69
|
this.#options = snapshot(options);
|
|
67
70
|
if (Object.keys(this.#options).some((key) => !['ownerId', 'instanceId', 'tableName', 'binaryPath', 'networkNamespaceFd'].includes(key))
|
|
@@ -78,7 +81,7 @@ export class ManagedNftables {
|
|
|
78
81
|
get state() { return this.#state; }
|
|
79
82
|
/** Starts only the compiler/IPC owner. The returned idle status is not enforcement. */
|
|
80
83
|
start() {
|
|
81
|
-
if (this.#state !== 'new')
|
|
84
|
+
if (this.#state !== 'new' || this.#retaining)
|
|
82
85
|
return Promise.reject(new ManagedNftablesError('UNAVAILABLE'));
|
|
83
86
|
this.#state = 'starting';
|
|
84
87
|
const work = (async () => {
|
|
@@ -92,7 +95,7 @@ export class ManagedNftables {
|
|
|
92
95
|
cliArgs: ['--management', ...(this.#options.networkNamespaceFd === undefined ? [] : ['--network-namespace-fd', '3'])],
|
|
93
96
|
inheritedFileDescriptors: this.#options.networkNamespaceFd === undefined ? undefined : [this.#options.networkNamespaceFd],
|
|
94
97
|
readyTimeoutMs: 3000, requestTimeoutMs: 30_000, maxPayloadSize: 262_144,
|
|
95
|
-
maxPendingRequestsByMethod: { preparePolicy: 1, openOwner: 1, reconcilePolicy: 1, inspectPolicy: 1, releasePolicy: 1, closeOwner: 1 },
|
|
98
|
+
maxPendingRequestsByMethod: { preparePolicy: 1, openOwner: 1, reconcilePolicy: 1, inspectPolicy: 1, releasePolicy: 1, detachPolicy: 1, closeOwner: 1 },
|
|
96
99
|
});
|
|
97
100
|
this.#bridge.on('exit', () => {
|
|
98
101
|
if (!['closing', 'stopped'].includes(this.#state))
|
|
@@ -119,17 +122,50 @@ export class ManagedNftables {
|
|
|
119
122
|
release(expected) {
|
|
120
123
|
return this.#invoke('releasePolicy', expected);
|
|
121
124
|
}
|
|
122
|
-
/**
|
|
125
|
+
/** Permanently selects retention cleanup, verifies exact PERSIST retention, and
|
|
126
|
+
* joins the native process. Retain the full applied value before this call.
|
|
127
|
+
* After any failure close() only terminates; it never deletes the table. */
|
|
128
|
+
detach(expected) {
|
|
129
|
+
this.#retaining = true;
|
|
130
|
+
let captured;
|
|
131
|
+
try {
|
|
132
|
+
captured = snapshot(expected);
|
|
133
|
+
if (this.#detachExpected && !plugins.util.isDeepStrictEqual(this.#detachExpected, captured))
|
|
134
|
+
throw new ManagedNftablesError('CONFLICT');
|
|
135
|
+
if (this.#detach)
|
|
136
|
+
return this.#detach;
|
|
137
|
+
if (!['ready', 'failed-owned'].includes(this.#state) || !this.#bridge || this.#work || this.#close)
|
|
138
|
+
throw new ManagedNftablesError('UNAVAILABLE');
|
|
139
|
+
this.#detachExpected = captured;
|
|
140
|
+
}
|
|
141
|
+
catch (error) {
|
|
142
|
+
return Promise.reject(error instanceof ManagedNftablesError ? error : new ManagedNftablesError('INVALID'));
|
|
143
|
+
}
|
|
144
|
+
const work = this.#track(this.#bridge.sendCommand('detachPolicy', captured).then((value) => {
|
|
145
|
+
const result = snapshot(value);
|
|
146
|
+
if (result?.detached !== true || Object.keys(result).length !== 1)
|
|
147
|
+
throw new ManagedNftablesError('PROTOCOL');
|
|
148
|
+
this.#nativeMayOwn = false;
|
|
149
|
+
return result;
|
|
150
|
+
}));
|
|
151
|
+
const detached = (async () => { const result = await work; await this.close(); return result; })();
|
|
152
|
+
this.#detach = detached;
|
|
153
|
+
void detached.catch(() => { this.#detach = null; });
|
|
154
|
+
return detached;
|
|
155
|
+
}
|
|
156
|
+
/** Join policy operations, then delete and terminate unless detach selected retention.
|
|
157
|
+
* Packet/allocation fencing belongs to the caller; already-admitted close cannot be undone. */
|
|
123
158
|
close() {
|
|
124
159
|
if (this.#close)
|
|
125
160
|
return this.#close;
|
|
126
161
|
if (this.#state === 'stopped')
|
|
127
162
|
return Promise.resolve();
|
|
163
|
+
const retaining = this.#retaining;
|
|
128
164
|
this.#state = 'closing';
|
|
129
165
|
this.#close = (async () => {
|
|
130
166
|
await this.#work?.catch(() => undefined);
|
|
131
167
|
if (this.#bridge) {
|
|
132
|
-
if (this.#nativeMayOwn) {
|
|
168
|
+
if (this.#nativeMayOwn && !retaining) {
|
|
133
169
|
const result = await this.#bridge.sendCommand('closeOwner', {});
|
|
134
170
|
if (result.released !== true)
|
|
135
171
|
throw new ManagedNftablesError('PROTOCOL');
|
|
@@ -146,7 +182,7 @@ export class ManagedNftables {
|
|
|
146
182
|
return this.#close;
|
|
147
183
|
}
|
|
148
184
|
#invoke(method, params) {
|
|
149
|
-
if (!['ready', 'failed-owned'].includes(this.#state) || !this.#bridge || this.#work)
|
|
185
|
+
if (this.#retaining || !['ready', 'failed-owned'].includes(this.#state) || !this.#bridge || this.#work)
|
|
150
186
|
return Promise.reject(new ManagedNftablesError('UNAVAILABLE'));
|
|
151
187
|
let captured;
|
|
152
188
|
try {
|
|
@@ -179,4 +215,4 @@ export class ManagedNftables {
|
|
|
179
215
|
return owned;
|
|
180
216
|
}
|
|
181
217
|
}
|
|
182
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.managednftables.js","sourceRoot":"","sources":["../ts/classes.managednftables.ts"],"names":[],"mappings":"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"}
|
|
218
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.managednftables.js","sourceRoot":"","sources":["../ts/classes.managednftables.ts"],"names":[],"mappings":"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"}
|
|
@@ -84,8 +84,16 @@ export interface IManagedNftHostTransitScopeV2 {
|
|
|
84
84
|
/** Exact current address present on uplink. No masquerade or default-route inference. */
|
|
85
85
|
snatAddress: string;
|
|
86
86
|
}
|
|
87
|
+
/** Host-wide IPv4 destination denial for caller-authenticated private allocation pools.
|
|
88
|
+
* This has no link dependency or allow grants. It is not allocation-release or boot-order proof. */
|
|
89
|
+
export interface IManagedNftAllocationPoolGuardScopeV2 {
|
|
90
|
+
kind: 'allocationPoolGuard';
|
|
91
|
+
authorityDigest: string;
|
|
92
|
+
/** Complete current pool list: 1–64 canonical, disjoint RFC1918 prefixes. */
|
|
93
|
+
prefixes: string[];
|
|
94
|
+
}
|
|
87
95
|
export interface IManagedNftPolicyV2 {
|
|
88
96
|
schemaVersion: 2;
|
|
89
97
|
revision: number;
|
|
90
|
-
scope: IManagedNftRouterEgressScopeV2 | IManagedNftHostTransitScopeV2;
|
|
98
|
+
scope: IManagedNftRouterEgressScopeV2 | IManagedNftHostTransitScopeV2 | IManagedNftAllocationPoolGuardScopeV2;
|
|
91
99
|
}
|
|
@@ -53,7 +53,7 @@ export interface IManagedNftTransition<TPolicy extends TManagedNftPolicy = IMana
|
|
|
53
53
|
}
|
|
54
54
|
export interface IManagedNftStatus<TPolicy extends TManagedNftPolicy = IManagedNftPolicy> {
|
|
55
55
|
identity: IManagedNftIdentity;
|
|
56
|
-
state: 'idle' | 'applied' | 'failed-owned' | 'released';
|
|
56
|
+
state: 'idle' | 'applied' | 'failed-owned' | 'released' | 'retained';
|
|
57
57
|
enforced: boolean;
|
|
58
58
|
applied: IAppliedManagedNftPolicy<TPolicy> | null;
|
|
59
59
|
pending: IManagedNftTransition<TPolicy> | null;
|
|
@@ -96,6 +96,12 @@ export type TManagedNftCommands<TPolicy extends TManagedNftPolicy = IManagedNftP
|
|
|
96
96
|
released: true;
|
|
97
97
|
};
|
|
98
98
|
};
|
|
99
|
+
detachPolicy: {
|
|
100
|
+
params: IAppliedManagedNftPolicy<TPolicy>;
|
|
101
|
+
result: {
|
|
102
|
+
detached: true;
|
|
103
|
+
};
|
|
104
|
+
};
|
|
99
105
|
closeOwner: {
|
|
100
106
|
params: Record<string, never>;
|
|
101
107
|
result: {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@push.rocks/smartnftables",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.8.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "A TypeScript module for managing nftables rules including NAT, firewall, and rate limiting with a high-level API.",
|
|
6
6
|
"main": "dist_ts/index.js",
|
package/readme.md
CHANGED
|
@@ -113,7 +113,8 @@ grants remain outstanding.
|
|
|
113
113
|
| `reconcile({ previous, target })` | Creates or replaces the entire policy in one kernel transaction. `previous` is null initially, otherwise the full prior applied result. |
|
|
114
114
|
| `inspect()` | Reads the current owned graph and reports `enforced`, pending intent and a bounded error code. |
|
|
115
115
|
| `release(applied)` | Verifies the exact retained graph and confirms deletion; repeats are idempotent. |
|
|
116
|
-
| `
|
|
116
|
+
| `detach(applied)` | Selects terminal retention, verifies the same graph with PERSIST-only flags after dropping socket ownership, then joins the native process. Returns `{ detached: true }`; retain the full applied result. |
|
|
117
|
+
| `close()` | Stops command admission, joins admitted policy operations, confirms owned-table deletion unless `detach()` selected retention, then joins the native process. Failure retains the owner for explicit recovery. |
|
|
117
118
|
|
|
118
119
|
Schema-v1 policies are directed. Return traffic requires its own grant; there is no broad
|
|
119
120
|
connection-tracking bypass. A null endpoint denotes the actual local host, with an
|
|
@@ -154,6 +155,33 @@ invalidates the old boot receipt; the caller must fence its old link/workload
|
|
|
154
155
|
lifecycle before starting a new owner instance. Cleanup failures and uncertain
|
|
155
156
|
operations must not be reported as successful release or used to transfer authority.
|
|
156
157
|
|
|
158
|
+
For an orderly restart that must preserve policy, persist the complete applied
|
|
159
|
+
result and call `await owner.detach(applied)` before calling `close()`. The native
|
|
160
|
+
operation validates the exact receipt, graph, interfaces, boot and namespace. It
|
|
161
|
+
accepts this socket's OWNER/PERSIST table or an exact orphan; it never adopts a
|
|
162
|
+
foreign owner. After closing the owner socket it reads the graph again and requires
|
|
163
|
+
the same handle and compiled body with PERSIST-only flags. Native inspection then
|
|
164
|
+
reports `state: 'retained'`. The facade returns success only after child termination.
|
|
165
|
+
|
|
166
|
+
Calling `detach()` irreversibly selects retention cleanup, including invalid input,
|
|
167
|
+
transport failure, timeout, native rejection or malformed acknowledgement. Subsequent
|
|
168
|
+
`close()` only joins and terminates; it never sends a table-deletion command. It
|
|
169
|
+
cannot undo a `close()` already admitted earlier. Other policy operations reject.
|
|
170
|
+
Resolve any pending policy transition by exact replay before requesting detachment.
|
|
171
|
+
If a detach ACK is lost while the process remains available, only the same captured
|
|
172
|
+
body may be retried. After process loss, start a fresh owner with identical options
|
|
173
|
+
and retry `detach(applied)` against the exact orphan. Absent graphs, foreign active
|
|
174
|
+
owners, changed interfaces, handles, bodies or boot/namespace identities reject.
|
|
175
|
+
Native release/reconcile/close commands reject after a valid detach intent, even
|
|
176
|
+
when post-drop verification fails; explicit recovery requires the retained body.
|
|
177
|
+
|
|
178
|
+
Detachment confirms retention at observation time. A completed facade retry returns
|
|
179
|
+
its existing acknowledgement; it is not a fresh kernel inspection. Retention does
|
|
180
|
+
not guarantee future enforcement, namespace survival or reboot ordering, and does
|
|
181
|
+
not withdraw external authority, drain packets, clear conntrack or release leases.
|
|
182
|
+
A separately created owner can later recover the full policy and perform an
|
|
183
|
+
explicit release after the caller has fenced that authority and packet lifecycle.
|
|
184
|
+
|
|
157
185
|
Apply and release receipts describe this owner's table and policy operations.
|
|
158
186
|
They do not certify that packets admitted under an earlier graph have drained:
|
|
159
187
|
foreign NFQUEUE or other deferred packet owners may still hold such packets.
|
|
@@ -168,12 +196,41 @@ conntrack/NAT state. This restriction also applies to private veth/TUN forwardin
|
|
|
168
196
|
The prepared/applied/transition/status interfaces accept the same policy type
|
|
169
197
|
parameter; existing callers default to the unchanged schema-v1 contract. V1
|
|
170
198
|
canonical digests and compiled bytes are preserved. V2 uses its own hash domain.
|
|
171
|
-
An owner cannot transition between v1 private, v2 router,
|
|
199
|
+
An owner cannot transition between v1 private, v2 router, v2 host transit, and v2
|
|
200
|
+
allocation-pool guard policy kinds.
|
|
172
201
|
|
|
173
202
|
| V2 scope | Required authority and behavior |
|
|
174
203
|
| --- | --- |
|
|
175
204
|
| `routerEgress` | Private `endpoints` and `rules`, one exact `links` binding per endpoint, a separate veth `handoff`, `protection`, and active `generations`. Private veth/TUN/local DNS and egress share one table so terminal private denial cannot override a separate egress table. |
|
|
176
205
|
| `hostTransit` | Exact handoff `link`/`allocations` pairs, complete `protection`, an explicit veth or Ethernet `uplink`, and its current `snatAddress`. It checks each handoff's leased source address and protocol/port range, default conntrack zone, direction, uplink, and protected destinations before outer SNAT. |
|
|
206
|
+
| `allocationPoolGuard` | An authenticated `authorityDigest` and complete current allocation-pool `prefixes`. Installs host-wide IPv4 destination denial before any handoff exists, without link, uplink or SNAT dependencies. |
|
|
207
|
+
|
|
208
|
+
`allocationPoolGuard` accepts 1–64 canonical, disjoint RFC1918 prefixes. Supply
|
|
209
|
+
the actual allocation pools, not the broader protected union containing management
|
|
210
|
+
LANs, resolvers and platform endpoints. It applies to IPv4 INPUT, FORWARD and OUTPUT
|
|
211
|
+
at filter priority 0, after normal destination NAT. It drops an original conntrack
|
|
212
|
+
destination in a pool. Reply-direction packets additionally check their current
|
|
213
|
+
source, then return; all remaining packets check their current destination. This
|
|
214
|
+
denies DNAT into or away from a pool and untracked current-destination traffic,
|
|
215
|
+
while permitting reverse-SNAT replies to authorized transit sources. It grants no
|
|
216
|
+
egress permissions; exact `hostTransit` and router policies remain separate owners.
|
|
217
|
+
Unrelated host traffic and IPv6 retain their existing behavior.
|
|
218
|
+
|
|
219
|
+
For example, a guard policy is `{ schemaVersion: 2, revision: 1, scope: {
|
|
220
|
+
kind: 'allocationPoolGuard', authorityDigest, prefixes: ['10.240.0.0/16',
|
|
221
|
+
'10.241.0.0/16'] } }`. Hashing binds the supplied body, but does not authenticate
|
|
222
|
+
the authority or prove its completeness. An empty `hostTransit.handoffs` array
|
|
223
|
+
provides no host-wide denial and is not a substitute for this scope.
|
|
224
|
+
|
|
225
|
+
The caller must retain the authenticated authority, complete transition and applied
|
|
226
|
+
receipt, verify `inspect().enforced`, and qualify the complete packet path. This
|
|
227
|
+
guard alone proves neither early-boot/late-shutdown ordering nor protection after
|
|
228
|
+
kernel reboot. It does not fence foreign packet queues, later packet rewrites,
|
|
229
|
+
offloads or proxies, and supplies no quarantine release, conntrack drainage or
|
|
230
|
+
allocation-reuse evidence. Historical leases remain the caller's durable ownership
|
|
231
|
+
responsibility. PERSIST retains this table only while its network namespace exists;
|
|
232
|
+
`release()` and ordinary `close()` delete it, so revoke any external protection
|
|
233
|
+
claim before release, or use the verified retention operation described above.
|
|
177
234
|
|
|
178
235
|
Local bindings include name, index, kind, MAC (null for L3 TUN), interface-link
|
|
179
236
|
index, and required IPv4 addresses. RTM_GETLINK/RTM_GETADDR verify those local
|
|
@@ -4,6 +4,8 @@ use crate::wire::{self, Attr};
|
|
|
4
4
|
|
|
5
5
|
#[path = "egress.host.rs"]
|
|
6
6
|
mod host;
|
|
7
|
+
#[path = "egress.poolguard.rs"]
|
|
8
|
+
mod poolguard;
|
|
7
9
|
#[path = "egress.router.rs"]
|
|
8
10
|
mod router;
|
|
9
11
|
|
|
@@ -283,6 +285,7 @@ pub(super) fn compile(prepared: &Prepared, table: &str) -> Result<Vec<(u16, Vec<
|
|
|
283
285
|
router::compile(&mut program, scope, prepared.policy.revision)?
|
|
284
286
|
}
|
|
285
287
|
Scope::HostTransit(scope) => host::compile(&mut program, scope)?,
|
|
288
|
+
Scope::AllocationPoolGuard(scope) => poolguard::compile(&mut program, scope)?,
|
|
286
289
|
}
|
|
287
290
|
Ok(program.operations)
|
|
288
291
|
}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
use super::*;
|
|
2
|
+
|
|
3
|
+
pub(super) fn compile(program: &mut Program<'_>, scope: &AllocationPoolGuardScope) -> Result<()> {
|
|
4
|
+
for (name, hook) in [("input", 1), ("forward", 2), ("output", 3)] {
|
|
5
|
+
program.chain(name, Some((hook, 0, "filter")))?;
|
|
6
|
+
}
|
|
7
|
+
for name in ["pool_guard", "pool_reply"] {
|
|
8
|
+
program.chain(name, None)?;
|
|
9
|
+
}
|
|
10
|
+
for name in ["input", "forward", "output"] {
|
|
11
|
+
program.jump(name, ipv4(), "pool_guard")?;
|
|
12
|
+
}
|
|
13
|
+
// An earlier owner's DNAT must not conceal the original protected target.
|
|
14
|
+
for prefix in &scope.prefixes {
|
|
15
|
+
program.end("pool_guard", original_address(prefix, false)?, 0)?;
|
|
16
|
+
}
|
|
17
|
+
// GOTO, not JUMP: RETURN from pool_reply must return to the base chain,
|
|
18
|
+
// skipping current-destination denial for legitimate reverse-SNAT replies.
|
|
19
|
+
let mut reply = ct(1, None, vec![1]);
|
|
20
|
+
reply.push(verdict(-4, Some("pool_reply")));
|
|
21
|
+
program.rule("pool_guard", reply)?;
|
|
22
|
+
// A missing conntrack tuple/direction breaks only its rule. Untracked or
|
|
23
|
+
// invalid packets still reach this unconditional current-destination guard.
|
|
24
|
+
for prefix in &scope.prefixes {
|
|
25
|
+
program.end("pool_guard", current_address(prefix, false)?, 0)?;
|
|
26
|
+
program.end("pool_reply", current_address(prefix, true)?, 0)?;
|
|
27
|
+
}
|
|
28
|
+
program.end("pool_guard", vec![], -5)?;
|
|
29
|
+
program.end("pool_reply", vec![], -5)
|
|
30
|
+
}
|
package/rust/src/egress.rs
CHANGED
|
@@ -119,10 +119,17 @@ pub struct HostScope {
|
|
|
119
119
|
pub snat_address: String,
|
|
120
120
|
}
|
|
121
121
|
#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq)]
|
|
122
|
+
#[serde(rename_all = "camelCase", deny_unknown_fields)]
|
|
123
|
+
pub struct AllocationPoolGuardScope {
|
|
124
|
+
pub authority_digest: String,
|
|
125
|
+
pub prefixes: Vec<String>,
|
|
126
|
+
}
|
|
127
|
+
#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq)]
|
|
122
128
|
#[serde(tag = "kind", rename_all = "camelCase", deny_unknown_fields)]
|
|
123
129
|
pub enum Scope {
|
|
124
130
|
RouterEgress(RouterScope),
|
|
125
131
|
HostTransit(HostScope),
|
|
132
|
+
AllocationPoolGuard(AllocationPoolGuardScope),
|
|
126
133
|
}
|
|
127
134
|
#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq)]
|
|
128
135
|
#[serde(rename_all = "camelCase", deny_unknown_fields)]
|
|
@@ -532,6 +539,23 @@ fn normalize_router(value: &mut RouterScope, revision: u64) -> Result<()> {
|
|
|
532
539
|
)
|
|
533
540
|
}))
|
|
534
541
|
}
|
|
542
|
+
fn normalize_pool_guard(value: &mut AllocationPoolGuardScope) -> Result<()> {
|
|
543
|
+
require(
|
|
544
|
+
digest(&value.authority_digest) && !value.prefixes.is_empty() && value.prefixes.len() <= 64,
|
|
545
|
+
)?;
|
|
546
|
+
value.prefixes.sort();
|
|
547
|
+
for (index, item) in value.prefixes.iter().enumerate() {
|
|
548
|
+
require(
|
|
549
|
+
covers("10.0.0.0/8", item)?
|
|
550
|
+
|| covers("172.16.0.0/12", item)?
|
|
551
|
+
|| covers("192.168.0.0/16", item)?,
|
|
552
|
+
)?;
|
|
553
|
+
for previous in &value.prefixes[..index] {
|
|
554
|
+
require(!overlaps(item, previous)?)?;
|
|
555
|
+
}
|
|
556
|
+
}
|
|
557
|
+
Ok(())
|
|
558
|
+
}
|
|
535
559
|
fn normalize_host(value: &mut HostScope) -> Result<()> {
|
|
536
560
|
normalize_protection(&mut value.protection)?;
|
|
537
561
|
normalize_link(&mut value.uplink)?;
|
|
@@ -642,6 +666,7 @@ impl Policy {
|
|
|
642
666
|
match &mut self.scope {
|
|
643
667
|
Scope::RouterEgress(scope) => normalize_router(scope, self.revision)?,
|
|
644
668
|
Scope::HostTransit(scope) => normalize_host(scope)?,
|
|
669
|
+
Scope::AllocationPoolGuard(scope) => normalize_pool_guard(scope)?,
|
|
645
670
|
}
|
|
646
671
|
Ok(self)
|
|
647
672
|
}
|
|
@@ -667,6 +692,8 @@ impl Prepared {
|
|
|
667
692
|
.map(|item| &item.link)
|
|
668
693
|
.chain(std::iter::once(&scope.uplink))
|
|
669
694
|
.collect(),
|
|
695
|
+
// No link/route dependency: this policy must apply before allocation.
|
|
696
|
+
Scope::AllocationPoolGuard(_) => return Ok(()),
|
|
670
697
|
};
|
|
671
698
|
crate::wire::verify_bound_interfaces(links.into_iter().map(|link| {
|
|
672
699
|
crate::wire::BoundInterface {
|
package/rust/src/egress_tests.rs
CHANGED
|
@@ -45,6 +45,11 @@ pub(crate) fn host() -> Value {
|
|
|
45
45
|
"handoffs":[{"link":link(4,"handoff","veth","10.240.0.1"),"allocations":[allocation()]}],
|
|
46
46
|
"uplink":link(2,"ens18","ethernet","192.0.2.2"),"snatAddress":"192.0.2.2"}})
|
|
47
47
|
}
|
|
48
|
+
pub(crate) fn pool_guard() -> Value {
|
|
49
|
+
json!({"schemaVersion":2,"revision":1,"scope":{"kind":"allocationPoolGuard",
|
|
50
|
+
"authorityDigest":format!("sha256:{}", "b".repeat(64)),
|
|
51
|
+
"prefixes":["10.241.0.0/16", "10.240.0.0/16"]}})
|
|
52
|
+
}
|
|
48
53
|
fn normalized(value: Value) -> super::Result<Policy> {
|
|
49
54
|
serde_json::from_value::<Policy>(value)
|
|
50
55
|
.map_err(|_| crate::Error::Invalid)?
|
|
@@ -330,3 +335,83 @@ fn managed_union_keeps_strict_duplicate_and_unknown_field_rejection() {
|
|
|
330
335
|
)
|
|
331
336
|
.is_err());
|
|
332
337
|
}
|
|
338
|
+
|
|
339
|
+
#[test]
|
|
340
|
+
fn allocation_pool_guard_is_canonical_authority_bound_and_private_only() {
|
|
341
|
+
let prepared = normalized(pool_guard()).unwrap().prepare().unwrap();
|
|
342
|
+
let mut reordered = pool_guard();
|
|
343
|
+
reordered["scope"]["prefixes"]
|
|
344
|
+
.as_array_mut()
|
|
345
|
+
.unwrap()
|
|
346
|
+
.reverse();
|
|
347
|
+
assert_eq!(normalized(reordered).unwrap().prepare().unwrap(), prepared);
|
|
348
|
+
let mut changed_authority = pool_guard();
|
|
349
|
+
changed_authority["scope"]["authorityDigest"] = json!(format!("sha256:{}", "c".repeat(64)));
|
|
350
|
+
assert_ne!(
|
|
351
|
+
normalized(changed_authority)
|
|
352
|
+
.unwrap()
|
|
353
|
+
.prepare()
|
|
354
|
+
.unwrap()
|
|
355
|
+
.digest,
|
|
356
|
+
prepared.digest
|
|
357
|
+
);
|
|
358
|
+
for prefixes in [
|
|
359
|
+
json!([]),
|
|
360
|
+
json!(["10.0.0.1/8"]),
|
|
361
|
+
json!(["10.0.0.0/8", "10.1.0.0/16"]),
|
|
362
|
+
json!(["10.0.0.0/8", "10.0.0.0/8"]),
|
|
363
|
+
json!(["0.0.0.0/0"]),
|
|
364
|
+
json!(["192.0.2.0/24"]),
|
|
365
|
+
json!(["127.0.0.0/8"]),
|
|
366
|
+
json!(["172.0.0.0/8"]),
|
|
367
|
+
json!(["192.168.0.0/15"]),
|
|
368
|
+
json!(["10.0.0.0/08"]),
|
|
369
|
+
json!(["::/0"]),
|
|
370
|
+
] {
|
|
371
|
+
assert!(normalized(changed(pool_guard(), "/scope/prefixes", prefixes)).is_err());
|
|
372
|
+
}
|
|
373
|
+
let mut extra = pool_guard();
|
|
374
|
+
extra["scope"]["handoffs"] = json!([]);
|
|
375
|
+
assert!(normalized(extra).is_err());
|
|
376
|
+
assert!(normalized(changed(
|
|
377
|
+
pool_guard(),
|
|
378
|
+
"/scope/authorityDigest",
|
|
379
|
+
json!("sha256:bad")
|
|
380
|
+
))
|
|
381
|
+
.is_err());
|
|
382
|
+
assert!(normalized(changed(
|
|
383
|
+
pool_guard(),
|
|
384
|
+
"/scope/prefixes",
|
|
385
|
+
json!(["10.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16"])
|
|
386
|
+
))
|
|
387
|
+
.is_ok());
|
|
388
|
+
let duplicate = serde_json::to_string(&pool_guard())
|
|
389
|
+
.unwrap()
|
|
390
|
+
.replace("\"prefixes\":", "\"prefixes\":[],\"prefixes\":");
|
|
391
|
+
assert!(serde_json::from_str::<crate::managed::Policy>(&duplicate).is_err());
|
|
392
|
+
}
|
|
393
|
+
|
|
394
|
+
#[test]
|
|
395
|
+
fn allocation_pool_guard_maximum_fits_the_atomic_graph_without_link_bindings() {
|
|
396
|
+
let prefixes: Vec<_> = (0..64).map(|part| format!("10.{part}.0.0/16")).collect();
|
|
397
|
+
let prepared = normalized(changed(pool_guard(), "/scope/prefixes", json!(prefixes)))
|
|
398
|
+
.unwrap()
|
|
399
|
+
.prepare()
|
|
400
|
+
.unwrap();
|
|
401
|
+
prepared.validate().unwrap();
|
|
402
|
+
prepared.validate_interfaces().unwrap();
|
|
403
|
+
let program = prepared
|
|
404
|
+
.program(&format!("snft_{}", "x".repeat(59)))
|
|
405
|
+
.unwrap();
|
|
406
|
+
let bytes: usize = program
|
|
407
|
+
.iter()
|
|
408
|
+
.map(|(_, attrs)| crate::wire::encode_attrs(attrs).len() + 20)
|
|
409
|
+
.sum();
|
|
410
|
+
assert!(program.len() <= 768 && bytes <= 100_000);
|
|
411
|
+
println!(
|
|
412
|
+
"POOL_GUARD_MAX prefixes=64 operations={} bytes={bytes}",
|
|
413
|
+
program.len()
|
|
414
|
+
);
|
|
415
|
+
let excessive: Vec<_> = (0..65).map(|part| format!("10.{part}.0.0/16")).collect();
|
|
416
|
+
assert!(normalized(changed(pool_guard(), "/scope/prefixes", json!(excessive))).is_err());
|
|
417
|
+
}
|
package/rust/src/main.rs
CHANGED
|
@@ -91,6 +91,10 @@ fn dispatch(owner: &mut Option<owner::Owner>, request: Request) -> Result<serde_
|
|
|
91
91
|
.release(decode(request.params)?)?;
|
|
92
92
|
Ok(serde_json::json!({"released":true}))
|
|
93
93
|
}
|
|
94
|
+
"detachPolicy" => {
|
|
95
|
+
owner.as_mut().ok_or(Error::Conflict)?.detach(decode(request.params)?)?;
|
|
96
|
+
Ok(serde_json::json!({"detached":true}))
|
|
97
|
+
}
|
|
94
98
|
"closeOwner" => {
|
|
95
99
|
if decode::<serde_json::Value>(request.params)? != serde_json::json!({}) {
|
|
96
100
|
return Err(Error::Invalid);
|
package/rust/src/managed.rs
CHANGED
|
@@ -34,6 +34,10 @@ impl Policy {
|
|
|
34
34
|
scope: egress::Scope::HostTransit(_),
|
|
35
35
|
..
|
|
36
36
|
}) => "hostTransitV2",
|
|
37
|
+
Self::Egress(egress::Policy {
|
|
38
|
+
scope: egress::Scope::AllocationPoolGuard(_),
|
|
39
|
+
..
|
|
40
|
+
}) => "allocationPoolGuardV2",
|
|
37
41
|
}
|
|
38
42
|
}
|
|
39
43
|
pub fn prepare(self) -> Result<Prepared> {
|