@push.rocks/smartnftables 1.9.0 → 2.1.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 +16 -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 +4 -0
- package/dist_ts/classes.managednftables.js +37 -8
- package/package.json +2 -2
- package/readme.md +34 -0
- package/rust/src/egress.router.rs +44 -19
- package/rust/src/egress_tests.rs +68 -0
- package/rust/src/owner_egress_tests.rs +1 -1
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.managednftables.ts +34 -7
package/changelog.md
CHANGED
|
@@ -1,5 +1,21 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 2026-09-15 - 2.1.0
|
|
4
|
+
|
|
5
|
+
### Features
|
|
6
|
+
|
|
7
|
+
- Expose a retained failure signal for unexpected policy process loss, ambiguous operations and unconfirmed cleanup while preserving exact recovery and retention semantics.
|
|
8
|
+
|
|
9
|
+
## 2026-09-14 - 2.0.0
|
|
10
|
+
|
|
11
|
+
### Breaking Changes
|
|
12
|
+
|
|
13
|
+
- Share original-direction connection-state checks while preserving exact grant, tuple, link and generation validation. Router tables compiled by 1.x require fenced recovery and release with the old engine before preparing and applying with version 2; other policy compiler identities are unchanged.
|
|
14
|
+
|
|
15
|
+
### Maintenance
|
|
16
|
+
|
|
17
|
+
- Update Node typings to the current release-age eligible version.
|
|
18
|
+
|
|
3
19
|
## 2026-09-14 - 1.9.0
|
|
4
20
|
|
|
5
21
|
### Features
|
|
Binary file
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"format": "tsrust.build-provenance.v2",
|
|
3
|
-
"binarySha256": "
|
|
3
|
+
"binarySha256": "f87173a416bf8ff6aad2d59dcb8534bbc720325b51a78134ed84c758f1944881",
|
|
4
4
|
"buildInfo": {
|
|
5
5
|
"projectName": "@push.rocks/smartnftables",
|
|
6
|
-
"projectVersion": "1.
|
|
7
|
-
"gitCommit": "
|
|
6
|
+
"projectVersion": "2.1.0",
|
|
7
|
+
"gitCommit": "59f108c731da9cddfc9622cf5bcd7383ba6b0ecd",
|
|
8
8
|
"gitDirty": false,
|
|
9
|
-
"builtAt": "2026-09-
|
|
9
|
+
"builtAt": "2026-09-15T01:41:27.089Z",
|
|
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": "206ed227d6c78079f1240f3a70fd2cf305258e84682b2affd97b92fcf3509b5a",
|
|
4
4
|
"buildInfo": {
|
|
5
5
|
"projectName": "@push.rocks/smartnftables",
|
|
6
|
-
"projectVersion": "1.
|
|
7
|
-
"gitCommit": "
|
|
6
|
+
"projectVersion": "2.1.0",
|
|
7
|
+
"gitCommit": "59f108c731da9cddfc9622cf5bcd7383ba6b0ecd",
|
|
8
8
|
"gitDirty": false,
|
|
9
|
-
"builtAt": "2026-09-
|
|
9
|
+
"builtAt": "2026-09-15T01:41:27.209Z",
|
|
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: '2.1.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=
|
|
@@ -10,6 +10,10 @@ export declare class ManagedNftables<TPolicy extends TManagedNftPolicy = IManage
|
|
|
10
10
|
#private;
|
|
11
11
|
constructor(options: IManagedNftOptions);
|
|
12
12
|
get state(): string;
|
|
13
|
+
/** Retained loss of owner confidence, including idle process death. It never
|
|
14
|
+
* resets or proves withdrawal/deletion; explicit recovery and joined close
|
|
15
|
+
* remain the caller's responsibility. Orderly close does not abort it. */
|
|
16
|
+
get failureSignal(): AbortSignal;
|
|
13
17
|
/** Starts only the compiler/IPC owner. The returned idle status is not enforcement. */
|
|
14
18
|
start(): Promise<IManagedNftStatus<TPolicy>>;
|
|
15
19
|
prepare(policy: TPolicy): Promise<IPreparedManagedNftPolicy<TPolicy>>;
|
|
@@ -67,6 +67,8 @@ export class ManagedNftables {
|
|
|
67
67
|
#retaining = false;
|
|
68
68
|
#detachExpected = null;
|
|
69
69
|
#detach = null;
|
|
70
|
+
#failure = new AbortController();
|
|
71
|
+
#processLost = false;
|
|
70
72
|
constructor(options) {
|
|
71
73
|
this.#options = snapshot(options);
|
|
72
74
|
if (Object.keys(this.#options).some((key) => !['ownerId', 'instanceId', 'tableName', 'binaryPath', 'networkNamespaceFd'].includes(key))
|
|
@@ -81,6 +83,16 @@ export class ManagedNftables {
|
|
|
81
83
|
throw new ManagedNftablesError('INVALID');
|
|
82
84
|
}
|
|
83
85
|
get state() { return this.#state; }
|
|
86
|
+
/** Retained loss of owner confidence, including idle process death. It never
|
|
87
|
+
* resets or proves withdrawal/deletion; explicit recovery and joined close
|
|
88
|
+
* remain the caller's responsibility. Orderly close does not abort it. */
|
|
89
|
+
get failureSignal() { return this.#failure.signal; }
|
|
90
|
+
#fail() {
|
|
91
|
+
if (this.#state !== 'closing')
|
|
92
|
+
this.#state = 'failed-owned';
|
|
93
|
+
if (!this.#failure.signal.aborted)
|
|
94
|
+
this.#failure.abort(new ManagedNftablesError('OWNER_LOST'));
|
|
95
|
+
}
|
|
84
96
|
/** Starts only the compiler/IPC owner. The returned idle status is not enforcement. */
|
|
85
97
|
start() {
|
|
86
98
|
if (this.#state !== 'new' || this.#retaining)
|
|
@@ -100,8 +112,9 @@ export class ManagedNftables {
|
|
|
100
112
|
maxPendingRequestsByMethod: { preparePolicy: 1, openOwner: 1, reconcilePolicy: 1, inspectPolicy: 1, releasePolicy: 1, detachPolicy: 1, closeOwner: 1 },
|
|
101
113
|
});
|
|
102
114
|
this.#bridge.on('exit', () => {
|
|
115
|
+
this.#processLost = true;
|
|
103
116
|
if (!['closing', 'stopped'].includes(this.#state))
|
|
104
|
-
this.#
|
|
117
|
+
this.#fail();
|
|
105
118
|
});
|
|
106
119
|
if (!await this.#bridge.spawn())
|
|
107
120
|
throw new ManagedNftablesError('UNAVAILABLE');
|
|
@@ -112,7 +125,7 @@ export class ManagedNftables {
|
|
|
112
125
|
this.#state = 'ready';
|
|
113
126
|
return status;
|
|
114
127
|
})();
|
|
115
|
-
return this.#track(work);
|
|
128
|
+
return this.#track(work, 'openOwner');
|
|
116
129
|
}
|
|
117
130
|
prepare(policy) {
|
|
118
131
|
return this.#invoke('preparePolicy', policy);
|
|
@@ -151,7 +164,7 @@ export class ManagedNftables {
|
|
|
151
164
|
throw new ManagedNftablesError('PROTOCOL');
|
|
152
165
|
this.#nativeMayOwn = false;
|
|
153
166
|
return result;
|
|
154
|
-
}));
|
|
167
|
+
}), 'detachPolicy');
|
|
155
168
|
const detached = (async () => { const result = await work; await this.close(); return result; })();
|
|
156
169
|
this.#detach = detached;
|
|
157
170
|
void detached.catch(() => { this.#detach = null; });
|
|
@@ -194,6 +207,7 @@ export class ManagedNftables {
|
|
|
194
207
|
})().catch(() => {
|
|
195
208
|
this.#state = 'failed-owned';
|
|
196
209
|
this.#close = null;
|
|
210
|
+
this.#fail();
|
|
197
211
|
throw new ManagedNftablesError('CLEANUP_UNCONFIRMED');
|
|
198
212
|
});
|
|
199
213
|
return this.#close;
|
|
@@ -214,17 +228,32 @@ export class ManagedNftables {
|
|
|
214
228
|
const capturedResult = snapshot(result);
|
|
215
229
|
if (method === 'releasePolicy')
|
|
216
230
|
this.#nativeMayOwn = false;
|
|
217
|
-
if (
|
|
218
|
-
|
|
231
|
+
if (method === 'inspectPolicy') {
|
|
232
|
+
const status = capturedResult;
|
|
233
|
+
if (status.state === 'failed-owned' || status.error !== null)
|
|
234
|
+
this.#fail();
|
|
235
|
+
}
|
|
236
|
+
if (!this.#processLost && this.#state !== 'closing' && (method === 'reconcilePolicy' || method === 'releasePolicy'
|
|
237
|
+
|| method === 'inspectPolicy' && capturedResult.error === null
|
|
238
|
+
&& capturedResult.state !== 'failed-owned'))
|
|
219
239
|
this.#state = 'ready';
|
|
220
240
|
return capturedResult;
|
|
221
|
-
}));
|
|
241
|
+
}), method);
|
|
222
242
|
}
|
|
223
|
-
#track(work) {
|
|
243
|
+
#track(work, method) {
|
|
224
244
|
const owned = work.catch((error) => {
|
|
225
245
|
if (this.#state !== 'closing')
|
|
226
246
|
this.#state = 'failed-owned';
|
|
227
247
|
const code = error instanceof plugins.smartrust.RustBridgeRequestError ? error.responseErrorCode : undefined;
|
|
248
|
+
// Only a native compiler rejection or explicit INVALID response proves
|
|
249
|
+
// effect-free validation. Other native errors can follow lost ownership
|
|
250
|
+
// or admitted kernel work. Recovery stays available; confidence is lost.
|
|
251
|
+
const validation = error instanceof plugins.smartrust.RustBridgeRequestError
|
|
252
|
+
&& error.code === 'ERR_RUST_BRIDGE_REQUEST_RUST_RESPONSE'
|
|
253
|
+
&& (method === 'preparePolicy' || code === 'INVALID');
|
|
254
|
+
if (!validation && (this.#state !== 'closing'
|
|
255
|
+
|| ['reconcilePolicy', 'releasePolicy', 'detachPolicy'].includes(method)))
|
|
256
|
+
this.#fail();
|
|
228
257
|
throw new ManagedNftablesError(typeof code === 'string' && /^[A-Z_]{1,64}$/.test(code) ? code : 'UNAVAILABLE');
|
|
229
258
|
});
|
|
230
259
|
this.#work = owned;
|
|
@@ -232,4 +261,4 @@ export class ManagedNftables {
|
|
|
232
261
|
return owned;
|
|
233
262
|
}
|
|
234
263
|
}
|
|
235
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.managednftables.js","sourceRoot":"","sources":["../ts/classes.managednftables.ts"],"names":[],"mappings":"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"}
|
|
264
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.managednftables.js","sourceRoot":"","sources":["../ts/classes.managednftables.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@push.rocks/smartnftables",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "2.1.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",
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
"@git.zone/tsrun": "^2.0.6",
|
|
15
15
|
"@git.zone/tsrust": "1.13.0",
|
|
16
16
|
"@git.zone/tstest": "6.0.0",
|
|
17
|
-
"@types/node": "26.
|
|
17
|
+
"@types/node": "26.5.0",
|
|
18
18
|
"typescript": "^7.0.2"
|
|
19
19
|
},
|
|
20
20
|
"dependencies": {
|
package/readme.md
CHANGED
|
@@ -109,6 +109,7 @@ grants remain outstanding.
|
|
|
109
109
|
| Method | Behavior |
|
|
110
110
|
| --- | --- |
|
|
111
111
|
| `start()` | Starts one private native process and returns idle status. |
|
|
112
|
+
| `failureSignal` | Stable per-instance AbortSignal for lost owner confidence, including an unexpected idle process exit. It never resets or confirms cleanup. |
|
|
112
113
|
| `prepare(policy)` | Validates, canonicalizes and hashes an inert complete policy without kernel writes. |
|
|
113
114
|
| `reconcile({ previous, target })` | Creates or replaces the entire policy in one kernel transaction. `previous` is null initially, otherwise the full prior applied result. |
|
|
114
115
|
| `inspect()` | Reads the current owned graph and reports `enforced`, pending intent and a bounded error code. |
|
|
@@ -156,6 +157,22 @@ invalidates the old boot receipt; the caller must fence its old link/workload
|
|
|
156
157
|
lifecycle before starting a new owner instance. Cleanup failures and uncertain
|
|
157
158
|
operations must not be reported as successful release or used to transfer authority.
|
|
158
159
|
|
|
160
|
+
Subscribe to `failureSignal` before starting or admitting policy work, and check
|
|
161
|
+
`failureSignal.aborted` when attaching to an existing instance. Unexpected child
|
|
162
|
+
exit, ambiguous operation failures, native inspection reporting failed ownership,
|
|
163
|
+
and unconfirmed cleanup abort the signal once with `ManagedNftablesError` code
|
|
164
|
+
`OWNER_LOST`. Local input rejection, effect-free native compiler validation and
|
|
165
|
+
native `INVALID` responses do not abort it. Other native errors can occur after
|
|
166
|
+
kernel effects or ownership loss and conservatively abort it. Successful orderly
|
|
167
|
+
close, including a cancelled startup, does not signal an unexpected failure;
|
|
168
|
+
ambiguous mutations still signal loss while close is draining them.
|
|
169
|
+
|
|
170
|
+
The caller must fence packet admission on loss. Recovery operations and exact
|
|
171
|
+
retries remain available as documented, but successful recovery never resets the
|
|
172
|
+
signal. It does not monitor foreign kernel changes while idle or prove policy
|
|
173
|
+
withdrawal: PERSIST policy can remain after process death. Still await the chosen
|
|
174
|
+
joined cleanup method and retain unresolved policy/allocation authority.
|
|
175
|
+
|
|
159
176
|
For an orderly restart that must preserve policy, persist the complete applied
|
|
160
177
|
result and call `await owner.detach(applied)` before calling `close()`. The native
|
|
161
178
|
operation validates the exact receipt, graph, interfaces, boot and namespace. It
|
|
@@ -287,6 +304,23 @@ compiled graph still must fit 768 operations and 100,000 bytes; cross-products c
|
|
|
287
304
|
reach that limit before individual input limits. Exhausted source-port ranges
|
|
288
305
|
drop new flows rather than allocate outside the lease.
|
|
289
306
|
|
|
307
|
+
The router compiler shares original-direction connection-state and label checks
|
|
308
|
+
per generation and protocol. Each jump still checks the complete current/original
|
|
309
|
+
tuple, links, zone and direction; replies and source NAT keep their exact checks.
|
|
310
|
+
A combined two-endpoint policy with six private rules, five protected prefixes and
|
|
311
|
+
six workload/router grants fits the existing atomic graph limit.
|
|
312
|
+
|
|
313
|
+
**Upgrading from 1.x:** version 2 changes the compiled identity of schema-v2
|
|
314
|
+
`routerEgress` tables. Retained router tables and their receipts cannot be adopted
|
|
315
|
+
by the new engine, even when the policy digest is unchanged. Fence workload and
|
|
316
|
+
router-local traffic, then use the exact previous engine and retained intent/receipt
|
|
317
|
+
to recover and release each router table. Join that owner before upgrading.
|
|
318
|
+
Prepare and apply the policy with the new engine and persist its complete receipt
|
|
319
|
+
before lifting the traffic fence. Keep lease quarantine and host/pool protection
|
|
320
|
+
throughout; this migration provides no proof of conntrack drainage or safe allocation reuse.
|
|
321
|
+
Do not discard an unresolved retained table or its old engine/receipt. Schema-v1,
|
|
322
|
+
host-transit and allocation-pool-guard compiled identities are unchanged.
|
|
323
|
+
|
|
290
324
|
The caller must coordinate router and host apply order, retain complete intents
|
|
291
325
|
and receipts, authenticate protected authority, prevent reuse of quarantined
|
|
292
326
|
leases, and qualify other packet owners. An ACCEPT in this table cannot override
|
|
@@ -108,13 +108,48 @@ fn raw(program: &mut Program<'_>, scope: &RouterScope) -> Result<()> {
|
|
|
108
108
|
}
|
|
109
109
|
program.end("raw_return", vec![], 0)
|
|
110
110
|
}
|
|
111
|
+
fn original_states(program: &mut Program<'_>, scope: &RouterScope) -> Result<()> {
|
|
112
|
+
for (index, allocation) in scope.generations.iter().enumerate() {
|
|
113
|
+
for protocol in ["tcp", "udp"] {
|
|
114
|
+
if !allocation
|
|
115
|
+
.grants
|
|
116
|
+
.iter()
|
|
117
|
+
.any(|grant| grant.protocol == protocol)
|
|
118
|
+
{
|
|
119
|
+
continue;
|
|
120
|
+
}
|
|
121
|
+
let chain = format!("original_{index}_{protocol}");
|
|
122
|
+
program.chain(&chain, None)?;
|
|
123
|
+
// Only exact tuple/link/zone/direction classifiers jump here. Share
|
|
124
|
+
// state checks instead of repeating those classifiers three times.
|
|
125
|
+
for connection_state in [2, 8] {
|
|
126
|
+
let mut labelled = ct(13, None, label(allocation));
|
|
127
|
+
labelled.extend(state(connection_state));
|
|
128
|
+
if connection_state == 8 && protocol == "tcp" {
|
|
129
|
+
labelled.extend(opening_tcp());
|
|
130
|
+
}
|
|
131
|
+
program.end(&chain, labelled, 1)?;
|
|
132
|
+
}
|
|
133
|
+
let mut fresh = state(8);
|
|
134
|
+
fresh.extend(ct(13, None, vec![0; 16]));
|
|
135
|
+
if protocol == "tcp" {
|
|
136
|
+
fresh.extend(opening_tcp());
|
|
137
|
+
}
|
|
138
|
+
fresh.extend(set_ct(13, label(allocation)));
|
|
139
|
+
program.end(&chain, fresh, 1)?;
|
|
140
|
+
// A failed state/label match returns to the caller's remaining
|
|
141
|
+
// classifiers and terminal denials, exactly as the inlined rules.
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
Ok(())
|
|
145
|
+
}
|
|
111
146
|
fn grants(
|
|
112
147
|
program: &mut Program<'_>,
|
|
113
148
|
scope: &RouterScope,
|
|
114
149
|
chain: &str,
|
|
115
150
|
platform: bool,
|
|
116
151
|
) -> Result<()> {
|
|
117
|
-
for allocation in
|
|
152
|
+
for (index, allocation) in scope.generations.iter().enumerate() {
|
|
118
153
|
for grant in &allocation.grants {
|
|
119
154
|
if matches!(grant.destination, Destination::Platform { .. }) != platform {
|
|
120
155
|
continue;
|
|
@@ -126,24 +161,13 @@ fn grants(
|
|
|
126
161
|
if chain != "input" {
|
|
127
162
|
let mut original = filter(scope, grant, false)?;
|
|
128
163
|
original.extend(generation(allocation, 0, false));
|
|
129
|
-
//
|
|
130
|
-
// label alone never authorizes a changed grant or endpoint.
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
labelled.extend(opening_tcp());
|
|
137
|
-
}
|
|
138
|
-
program.end(chain, labelled, 1)?;
|
|
139
|
-
}
|
|
140
|
-
original.extend(state(8));
|
|
141
|
-
original.extend(ct(13, None, vec![0; 16]));
|
|
142
|
-
if grant.protocol == "tcp" {
|
|
143
|
-
original.extend(opening_tcp());
|
|
144
|
-
}
|
|
145
|
-
original.extend(set_ct(13, label(allocation)));
|
|
146
|
-
program.end(chain, original, 1)?;
|
|
164
|
+
// Current and original tuples remain checked on every packet;
|
|
165
|
+
// a label alone never authorizes a changed grant or endpoint.
|
|
166
|
+
program.jump(
|
|
167
|
+
chain,
|
|
168
|
+
original,
|
|
169
|
+
&format!("original_{index}_{}", grant.protocol),
|
|
170
|
+
)?;
|
|
147
171
|
}
|
|
148
172
|
if chain != "output" {
|
|
149
173
|
let mut reply = filter(scope, grant, true)?;
|
|
@@ -182,6 +206,7 @@ pub(super) fn compile(program: &mut Program<'_>, scope: &RouterScope, revision:
|
|
|
182
206
|
program.rule(&name, expressions)?;
|
|
183
207
|
}
|
|
184
208
|
}
|
|
209
|
+
original_states(program, scope)?;
|
|
185
210
|
raw(program, scope)?;
|
|
186
211
|
protected(program, "protected_out", scope, false)?;
|
|
187
212
|
protected(program, "protected_back", scope, true)?;
|
package/rust/src/egress_tests.rs
CHANGED
|
@@ -297,6 +297,74 @@ fn prepared_v2_compiles_both_scopes_with_bounded_and_identifiable_graphs() {
|
|
|
297
297
|
}
|
|
298
298
|
}
|
|
299
299
|
|
|
300
|
+
/// A combined workload/router policy must fit without discarding private DNS,
|
|
301
|
+
/// either public transport, explicit platform grants, or the protected union.
|
|
302
|
+
pub(crate) fn combined_router_capacity() -> Value {
|
|
303
|
+
let mut value = router();
|
|
304
|
+
value["scope"]["protection"]["prefixes"] = json!([
|
|
305
|
+
"10.0.0.0/8",
|
|
306
|
+
"127.0.0.0/8",
|
|
307
|
+
"169.254.0.0/16",
|
|
308
|
+
"172.16.0.0/12",
|
|
309
|
+
"192.0.2.0/24"
|
|
310
|
+
]);
|
|
311
|
+
value["scope"]["protection"]["platformEndpoints"] = json!([
|
|
312
|
+
{"id":"dns-udp","address":"192.0.2.1","protocol":"udp","port":53},
|
|
313
|
+
{"id":"dns-tcp","address":"192.0.2.1","protocol":"tcp","port":53},
|
|
314
|
+
{"id":"relay","address":"192.0.2.3","protocol":"tcp","port":3000}
|
|
315
|
+
]);
|
|
316
|
+
let rules = value["scope"]["rules"].as_array_mut().unwrap();
|
|
317
|
+
rules[0]["protocol"] = json!("any");
|
|
318
|
+
rules[0]["destinationPort"] = Value::Null;
|
|
319
|
+
let mut reverse = rules[0].clone();
|
|
320
|
+
reverse["sourceEndpoint"] = json!("vpn");
|
|
321
|
+
reverse["destinationEndpoint"] = json!("work");
|
|
322
|
+
reverse["sourcePrefix"] = json!("10.242.0.2/32");
|
|
323
|
+
reverse["destinationPrefix"] = json!("10.241.0.2/32");
|
|
324
|
+
for index in [1, 2] {
|
|
325
|
+
let mut dns = rules[index].clone();
|
|
326
|
+
dns["protocol"] = json!("tcp");
|
|
327
|
+
rules.push(dns);
|
|
328
|
+
}
|
|
329
|
+
rules.push(reverse);
|
|
330
|
+
value["scope"]["generations"][0]["grants"] = json!([
|
|
331
|
+
{"sourceEndpoint":"work","sourcePrefix":"10.241.0.2/32","destination":{"kind":"public","prefix":"0.0.0.0/0"},
|
|
332
|
+
"protocol":"tcp","sourcePort":null,"destinationPort":null,"sourcePortRange":{"first":10000,"last":10999}},
|
|
333
|
+
{"sourceEndpoint":"work","sourcePrefix":"10.241.0.2/32","destination":{"kind":"public","prefix":"0.0.0.0/0"},
|
|
334
|
+
"protocol":"udp","sourcePort":null,"destinationPort":null,"sourcePortRange":{"first":10000,"last":10999}},
|
|
335
|
+
{"sourceEndpoint":"work","sourcePrefix":"10.241.0.2/32","destination":{"kind":"platform","endpointId":"relay"},
|
|
336
|
+
"protocol":"tcp","sourcePort":null,"destinationPort":3000,"sourcePortRange":{"first":10000,"last":10999}},
|
|
337
|
+
{"sourceEndpoint":null,"sourcePrefix":"10.240.0.2/32","destination":{"kind":"platform","endpointId":"dns-tcp"},
|
|
338
|
+
"protocol":"tcp","sourcePort":null,"destinationPort":53,"sourcePortRange":{"first":10000,"last":10999}},
|
|
339
|
+
{"sourceEndpoint":null,"sourcePrefix":"10.240.0.2/32","destination":{"kind":"platform","endpointId":"dns-udp"},
|
|
340
|
+
"protocol":"udp","sourcePort":null,"destinationPort":53,"sourcePortRange":{"first":10000,"last":10999}},
|
|
341
|
+
{"sourceEndpoint":null,"sourcePrefix":"10.240.0.2/32","destination":{"kind":"platform","endpointId":"relay"},
|
|
342
|
+
"protocol":"tcp","sourcePort":null,"destinationPort":3000,"sourcePortRange":{"first":10000,"last":10999}}
|
|
343
|
+
]);
|
|
344
|
+
value
|
|
345
|
+
}
|
|
346
|
+
|
|
347
|
+
#[test]
|
|
348
|
+
fn combined_router_full_transports_and_protection_fit_atomic_reserve() {
|
|
349
|
+
let mut value = combined_router_capacity();
|
|
350
|
+
value["revision"] = json!(9007199254740991_u64);
|
|
351
|
+
let policy = normalized(value).unwrap();
|
|
352
|
+
let prepared = policy.prepare().unwrap();
|
|
353
|
+
let program = prepared
|
|
354
|
+
.program(&format!("snft_{}", "x".repeat(59)))
|
|
355
|
+
.unwrap();
|
|
356
|
+
let bytes: usize = program
|
|
357
|
+
.iter()
|
|
358
|
+
.map(|(_, attributes)| crate::wire::encode_attrs(attributes).len() + 20)
|
|
359
|
+
.sum();
|
|
360
|
+
assert!(program.len() <= 768);
|
|
361
|
+
assert!(bytes <= 100_000);
|
|
362
|
+
println!(
|
|
363
|
+
"COMBINED_ROUTER_GRAPH operations={} bytes={bytes}",
|
|
364
|
+
program.len()
|
|
365
|
+
);
|
|
366
|
+
}
|
|
367
|
+
|
|
300
368
|
#[test]
|
|
301
369
|
fn v2_compiled_graph_limit_rejects_bounded_but_excessive_cross_products() {
|
|
302
370
|
let mut value = router();
|
|
@@ -42,7 +42,7 @@ fn router() -> egress::Policy {
|
|
|
42
42
|
veth("handoff", "10.240.0.2/30");
|
|
43
43
|
ip(&["tuntap", "add", "dev", "vpn", "mode", "tun"]);
|
|
44
44
|
ip(&["address", "add", "10.242.0.1/24", "dev", "vpn"]);
|
|
45
|
-
let mut value = egress::tests::
|
|
45
|
+
let mut value = egress::tests::combined_router_capacity();
|
|
46
46
|
value["scope"]["links"] = json!([
|
|
47
47
|
binding("work", "10.241.0.1", "veth"),
|
|
48
48
|
binding("vpn", "10.242.0.1", "tun")
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -55,6 +55,8 @@ export class ManagedNftables<TPolicy extends TManagedNftPolicy = IManagedNftPoli
|
|
|
55
55
|
#retaining = false;
|
|
56
56
|
#detachExpected: IAppliedManagedNftPolicy<TPolicy> | null = null;
|
|
57
57
|
#detach: Promise<{ detached: true }> | null = null;
|
|
58
|
+
readonly #failure = new AbortController();
|
|
59
|
+
#processLost = false;
|
|
58
60
|
|
|
59
61
|
constructor(options: IManagedNftOptions) {
|
|
60
62
|
this.#options = snapshot(options);
|
|
@@ -71,6 +73,16 @@ export class ManagedNftables<TPolicy extends TManagedNftPolicy = IManagedNftPoli
|
|
|
71
73
|
|
|
72
74
|
public get state(): string { return this.#state; }
|
|
73
75
|
|
|
76
|
+
/** Retained loss of owner confidence, including idle process death. It never
|
|
77
|
+
* resets or proves withdrawal/deletion; explicit recovery and joined close
|
|
78
|
+
* remain the caller's responsibility. Orderly close does not abort it. */
|
|
79
|
+
public get failureSignal(): AbortSignal { return this.#failure.signal; }
|
|
80
|
+
|
|
81
|
+
#fail(): void {
|
|
82
|
+
if (this.#state !== 'closing') this.#state = 'failed-owned';
|
|
83
|
+
if (!this.#failure.signal.aborted) this.#failure.abort(new ManagedNftablesError('OWNER_LOST'));
|
|
84
|
+
}
|
|
85
|
+
|
|
74
86
|
/** Starts only the compiler/IPC owner. The returned idle status is not enforcement. */
|
|
75
87
|
public start(): Promise<IManagedNftStatus<TPolicy>> {
|
|
76
88
|
if (this.#state !== 'new' || this.#retaining) return Promise.reject(new ManagedNftablesError('UNAVAILABLE'));
|
|
@@ -88,7 +100,8 @@ export class ManagedNftables<TPolicy extends TManagedNftPolicy = IManagedNftPoli
|
|
|
88
100
|
maxPendingRequestsByMethod: { preparePolicy: 1, openOwner: 1, reconcilePolicy: 1, inspectPolicy: 1, releasePolicy: 1, detachPolicy: 1, closeOwner: 1 },
|
|
89
101
|
});
|
|
90
102
|
this.#bridge.on('exit', () => {
|
|
91
|
-
|
|
103
|
+
this.#processLost = true;
|
|
104
|
+
if (!['closing', 'stopped'].includes(this.#state)) this.#fail();
|
|
92
105
|
});
|
|
93
106
|
if (!await this.#bridge.spawn()) throw new ManagedNftablesError('UNAVAILABLE');
|
|
94
107
|
const { ownerId, instanceId, tableName } = this.#options;
|
|
@@ -96,7 +109,7 @@ export class ManagedNftables<TPolicy extends TManagedNftPolicy = IManagedNftPoli
|
|
|
96
109
|
if (this.#state !== 'starting') throw new ManagedNftablesError('UNAVAILABLE');
|
|
97
110
|
this.#state = 'ready'; return status;
|
|
98
111
|
})();
|
|
99
|
-
return this.#track(work);
|
|
112
|
+
return this.#track(work, 'openOwner');
|
|
100
113
|
}
|
|
101
114
|
|
|
102
115
|
public prepare(policy: TPolicy): Promise<IPreparedManagedNftPolicy<TPolicy>> {
|
|
@@ -129,7 +142,7 @@ export class ManagedNftables<TPolicy extends TManagedNftPolicy = IManagedNftPoli
|
|
|
129
142
|
if (result?.detached !== true || Object.keys(result).length !== 1) throw new ManagedNftablesError('PROTOCOL');
|
|
130
143
|
this.#nativeMayOwn = false;
|
|
131
144
|
return result;
|
|
132
|
-
}));
|
|
145
|
+
}), 'detachPolicy');
|
|
133
146
|
const detached = (async () => { const result = await work; await this.close(); return result; })();
|
|
134
147
|
this.#detach = detached;
|
|
135
148
|
void detached.catch(() => { this.#detach = null; });
|
|
@@ -168,6 +181,7 @@ export class ManagedNftables<TPolicy extends TManagedNftPolicy = IManagedNftPoli
|
|
|
168
181
|
this.#bridge = null; this.#state = 'stopped';
|
|
169
182
|
})().catch(() => {
|
|
170
183
|
this.#state = 'failed-owned'; this.#close = null;
|
|
184
|
+
this.#fail();
|
|
171
185
|
throw new ManagedNftablesError('CLEANUP_UNCONFIRMED');
|
|
172
186
|
});
|
|
173
187
|
return this.#close;
|
|
@@ -181,15 +195,28 @@ export class ManagedNftables<TPolicy extends TManagedNftPolicy = IManagedNftPoli
|
|
|
181
195
|
return this.#track(this.#bridge.sendCommand(method, captured).then((result) => {
|
|
182
196
|
const capturedResult = snapshot(result);
|
|
183
197
|
if (method === 'releasePolicy') this.#nativeMayOwn = false;
|
|
184
|
-
if (
|
|
185
|
-
|
|
198
|
+
if (method === 'inspectPolicy') {
|
|
199
|
+
const status = capturedResult as IManagedNftStatus<TPolicy>;
|
|
200
|
+
if (status.state === 'failed-owned' || status.error !== null) this.#fail();
|
|
201
|
+
}
|
|
202
|
+
if (!this.#processLost && this.#state !== 'closing' && (method === 'reconcilePolicy' || method === 'releasePolicy'
|
|
203
|
+
|| method === 'inspectPolicy' && (capturedResult as IManagedNftStatus<TPolicy>).error === null
|
|
204
|
+
&& (capturedResult as IManagedNftStatus<TPolicy>).state !== 'failed-owned')) this.#state = 'ready';
|
|
186
205
|
return capturedResult;
|
|
187
|
-
}));
|
|
206
|
+
}), method);
|
|
188
207
|
}
|
|
189
|
-
#track<T>(work: Promise<T>): Promise<T> {
|
|
208
|
+
#track<T>(work: Promise<T>, method: keyof TManagedNftCommands<TPolicy>): Promise<T> {
|
|
190
209
|
const owned = work.catch((error) => {
|
|
191
210
|
if (this.#state !== 'closing') this.#state = 'failed-owned';
|
|
192
211
|
const code = error instanceof plugins.smartrust.RustBridgeRequestError ? error.responseErrorCode : undefined;
|
|
212
|
+
// Only a native compiler rejection or explicit INVALID response proves
|
|
213
|
+
// effect-free validation. Other native errors can follow lost ownership
|
|
214
|
+
// or admitted kernel work. Recovery stays available; confidence is lost.
|
|
215
|
+
const validation = error instanceof plugins.smartrust.RustBridgeRequestError
|
|
216
|
+
&& error.code === 'ERR_RUST_BRIDGE_REQUEST_RUST_RESPONSE'
|
|
217
|
+
&& (method === 'preparePolicy' || code === 'INVALID');
|
|
218
|
+
if (!validation && (this.#state !== 'closing'
|
|
219
|
+
|| ['reconcilePolicy', 'releasePolicy', 'detachPolicy'].includes(method))) this.#fail();
|
|
193
220
|
throw new ManagedNftablesError(typeof code === 'string' && /^[A-Z_]{1,64}$/.test(code) ? code : 'UNAVAILABLE');
|
|
194
221
|
});
|
|
195
222
|
this.#work = owned;
|