@push.rocks/smartnftables 2.4.0 → 2.5.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 +5 -5
- package/dist_rust/smartnftables_linux_arm64_musl +0 -0
- package/dist_rust/smartnftables_linux_arm64_musl.tsrust-build.json +5 -5
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/classes.manageddockerforwarding.js +3 -3
- package/dist_ts/classes.managednftables.d.ts +5 -0
- package/dist_ts/classes.managednftables.js +13 -6
- package/dist_ts/managed.egress.types.d.ts +31 -1
- package/package.json +7 -7
- package/readme.md +91 -3
- package/rust/src/egress.compile.rs +49 -1
- package/rust/src/egress.host.rs +22 -0
- package/rust/src/egress.hostgrant.rs +187 -0
- package/rust/src/egress.poolguard.rs +7 -0
- package/rust/src/egress.router.rs +45 -4
- package/rust/src/egress.rs +150 -1
- package/rust/src/egress_hostgrant_tests.rs +948 -0
- package/rust/src/main.rs +6 -2
- package/rust/src/owner.rs +116 -4
- package/rust/src/owner_egress_tests.rs +1 -1
- package/rust/src/owner_hostgrant_traffic_tests.rs +280 -0
- package/rust/src/owner_identity_tests.rs +80 -1
- package/rust/src/owner_poolguard_tests.rs +69 -0
- package/rust/src/owner_router_traffic_tests.rs +1 -1
- package/rust/src/owner_tests.rs +3 -0
- package/rust/src/policy.rs +1 -1
- package/rust/src/wire.rs +15 -1
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.manageddockerforwarding.ts +2 -2
- package/ts/classes.managednftables.ts +13 -5
- package/ts/managed.egress.types.ts +32 -1
package/changelog.md
CHANGED
|
@@ -1,5 +1,17 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 2026-09-24 - 2.5.0
|
|
4
|
+
|
|
5
|
+
### Features
|
|
6
|
+
|
|
7
|
+
- Add optional exact host grants to the schema-v2 `allocationPoolGuard`, `hostTransit` and `routerEgress` scopes: the host's own address on a handoff may dial one exact workload address, protocol and port, and receive its replies, in the default conntrack zone. Up to 1024 grants per scope live in a CONSTANT named set behind a constant number of rules; each lookup key carries the exact interface, both protocols, and the live and originally tracked tuple, so translated flows never match. The router classifies granted arrivals ahead of its handoff barrier through a second exact set. Prefixes, wildcards, port ranges and unbound addresses reject; absent and empty grants keep the previous canonical policy, digest and compiled bytes, and withdrawal is an ordinary atomic replacement.
|
|
8
|
+
- Verify, replace and adopt named sets and every set element as part of the owned graph; a replacement batch now deletes the previous sets by handle, and batches may reach 320,000 bytes.
|
|
9
|
+
- Raise the private facade IPC bound to 1,048,576 bytes per line (1,000,000 bytes and 65,536 values per captured value), so a status with an applied policy and a pending transition at the host-grant maximum fits.
|
|
10
|
+
|
|
11
|
+
### Maintenance
|
|
12
|
+
|
|
13
|
+
- Update release tooling: `packageManager` `pnpm@12.4.0` -> `pnpm@12.4.2`, `@git.zone/cli` 6.14.0 -> 7.2.2, `@git.zone/tsbuild` `^4.4.3` -> `^5.0.0`, `@git.zone/tsrun` `^2.0.6` -> `^3.0.0`, `@git.zone/tsrust` 1.13.0 -> 1.13.2, `@git.zone/tstest` 6.1.1 -> 6.2.0 and `@types/node` 26.5.0 -> 26.6.1. The majors need no project changes here: there is no folder `tsconfig.json` or `tspublish.json`, no tsrun script, and no `packageSource` release key.
|
|
14
|
+
|
|
3
15
|
## 2026-09-16 - 2.4.0
|
|
4
16
|
|
|
5
17
|
### Features
|
|
Binary file
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"format": "tsrust.build-provenance.v2",
|
|
3
|
-
"binarySha256": "
|
|
3
|
+
"binarySha256": "65bf4c0e1cd00c97f8d6bb6b62a01ca17e53427cf9eed5a5a9dc9ebfa30a6dce",
|
|
4
4
|
"buildInfo": {
|
|
5
5
|
"projectName": "@push.rocks/smartnftables",
|
|
6
|
-
"projectVersion": "2.
|
|
7
|
-
"gitCommit": "
|
|
6
|
+
"projectVersion": "2.5.0",
|
|
7
|
+
"gitCommit": "cbe1cf64bee14a7e06ad634f9251fb7a989e2776",
|
|
8
8
|
"gitDirty": false,
|
|
9
|
-
"builtAt": "2026-09-
|
|
10
|
-
"tsrustVersion": "1.13.
|
|
9
|
+
"builtAt": "2026-09-24T20:06:09.426Z",
|
|
10
|
+
"tsrustVersion": "1.13.2",
|
|
11
11
|
"binary": "smartnftables",
|
|
12
12
|
"target": "linux_amd64_musl"
|
|
13
13
|
}
|
|
Binary file
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"format": "tsrust.build-provenance.v2",
|
|
3
|
-
"binarySha256": "
|
|
3
|
+
"binarySha256": "7ab374c54305be2c86e19ae67e1a0ce172ae2a61ae6dc020b7de8a8561abd1a0",
|
|
4
4
|
"buildInfo": {
|
|
5
5
|
"projectName": "@push.rocks/smartnftables",
|
|
6
|
-
"projectVersion": "2.
|
|
7
|
-
"gitCommit": "
|
|
6
|
+
"projectVersion": "2.5.0",
|
|
7
|
+
"gitCommit": "cbe1cf64bee14a7e06ad634f9251fb7a989e2776",
|
|
8
8
|
"gitDirty": false,
|
|
9
|
-
"builtAt": "2026-09-
|
|
10
|
-
"tsrustVersion": "1.13.
|
|
9
|
+
"builtAt": "2026-09-24T20:06:18.821Z",
|
|
10
|
+
"tsrustVersion": "1.13.2",
|
|
11
11
|
"binary": "smartnftables",
|
|
12
12
|
"target": "linux_arm64_musl"
|
|
13
13
|
}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@push.rocks/smartnftables',
|
|
6
|
-
version: '2.
|
|
6
|
+
version: '2.5.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=
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import * as plugins from './plugins.js';
|
|
2
|
-
import { snapshot, ManagedNftablesError } from './classes.managednftables.js';
|
|
2
|
+
import { snapshot, managedIpcBytes, ManagedNftablesError } from './classes.managednftables.js';
|
|
3
3
|
/** One node-level Docker DOCKER-USER contribution. Caller owns durable intents and handoff lifetimes. */
|
|
4
4
|
export class ManagedDockerForwarding {
|
|
5
5
|
#options;
|
|
@@ -37,7 +37,7 @@ export class ManagedDockerForwarding {
|
|
|
37
37
|
localPaths: [], searchSystemPath: false,
|
|
38
38
|
cliArgs: ['--docker-forwarding', ...(this.#options.networkNamespaceFd === undefined ? [] : ['--network-namespace-fd', '3'])],
|
|
39
39
|
inheritedFileDescriptors: this.#options.networkNamespaceFd === undefined ? undefined : [this.#options.networkNamespaceFd],
|
|
40
|
-
readyTimeoutMs: 3000, requestTimeoutMs: 30_000, maxPayloadSize:
|
|
40
|
+
readyTimeoutMs: 3000, requestTimeoutMs: 30_000, maxPayloadSize: managedIpcBytes,
|
|
41
41
|
maxPendingRequestsByMethod: { prepareDockerForwarding: 1, openDockerForwarding: 1, reconcileDockerForwarding: 1, inspectDockerForwarding: 1, releaseDockerForwarding: 1, closeDockerForwarding: 1 },
|
|
42
42
|
});
|
|
43
43
|
this.#bridge.on('exit', () => {
|
|
@@ -125,4 +125,4 @@ export class ManagedDockerForwarding {
|
|
|
125
125
|
return owned;
|
|
126
126
|
}
|
|
127
127
|
}
|
|
128
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
128
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.manageddockerforwarding.js","sourceRoot":"","sources":["../ts/classes.manageddockerforwarding.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,11 @@ export declare class ManagedNftablesError extends Error {
|
|
|
3
3
|
readonly code: string;
|
|
4
4
|
constructor(code: string);
|
|
5
5
|
}
|
|
6
|
+
/** Bounds of the private native IPC. A status carries up to three complete policies (applied,
|
|
7
|
+
* pending previous and pending target); a policy with the maximum 1024 host grants serializes to
|
|
8
|
+
* about 111 KB and 5,300 values, so these bounds hold three of them with room for the rest of a
|
|
9
|
+
* large scope. */
|
|
10
|
+
export declare const managedIpcBytes = 1048576;
|
|
6
11
|
/** Capture inert input without evaluating getters, proxies, coercions or toJSON. */
|
|
7
12
|
export declare function snapshot<T>(input: T): T;
|
|
8
13
|
/** One private native/netlink owner. Persistence and workload link lifetimes belong to its caller. */
|
|
@@ -5,17 +5,24 @@ export class ManagedNftablesError extends Error {
|
|
|
5
5
|
this.code = code;
|
|
6
6
|
}
|
|
7
7
|
}
|
|
8
|
+
/** Bounds of the private native IPC. A status carries up to three complete policies (applied,
|
|
9
|
+
* pending previous and pending target); a policy with the maximum 1024 host grants serializes to
|
|
10
|
+
* about 111 KB and 5,300 values, so these bounds hold three of them with room for the rest of a
|
|
11
|
+
* large scope. */
|
|
12
|
+
export const managedIpcBytes = 1_048_576;
|
|
13
|
+
const snapshotBytes = 1_000_000;
|
|
14
|
+
const snapshotValues = 65_536;
|
|
8
15
|
/** Capture inert input without evaluating getters, proxies, coercions or toJSON. */
|
|
9
16
|
export function snapshot(input) {
|
|
10
17
|
let count = 0;
|
|
11
18
|
let stringBytes = 0;
|
|
12
19
|
const string = (value) => {
|
|
13
|
-
if (value.length >
|
|
20
|
+
if (value.length > snapshotBytes || (stringBytes += Buffer.byteLength(value)) > snapshotBytes)
|
|
14
21
|
throw new ManagedNftablesError('INVALID');
|
|
15
22
|
return value;
|
|
16
23
|
};
|
|
17
24
|
const copy = (value, depth) => {
|
|
18
|
-
if (++count >
|
|
25
|
+
if (++count > snapshotValues || depth > 20)
|
|
19
26
|
throw new ManagedNftablesError('INVALID');
|
|
20
27
|
if (typeof value === 'string')
|
|
21
28
|
return string(value);
|
|
@@ -29,7 +36,7 @@ export function snapshot(input) {
|
|
|
29
36
|
if (Object.getPrototypeOf(value) !== (array ? Array.prototype : Object.prototype))
|
|
30
37
|
throw new ManagedNftablesError('INVALID');
|
|
31
38
|
const keys = Reflect.ownKeys(value);
|
|
32
|
-
if (keys.length >
|
|
39
|
+
if (keys.length > snapshotValues - count)
|
|
33
40
|
throw new ManagedNftablesError('INVALID');
|
|
34
41
|
for (const key of keys)
|
|
35
42
|
if (typeof key === 'string')
|
|
@@ -50,7 +57,7 @@ export function snapshot(input) {
|
|
|
50
57
|
return result;
|
|
51
58
|
};
|
|
52
59
|
const result = copy(input, 0);
|
|
53
|
-
if (Buffer.byteLength(JSON.stringify(result)) >
|
|
60
|
+
if (Buffer.byteLength(JSON.stringify(result)) > snapshotBytes)
|
|
54
61
|
throw new ManagedNftablesError('INVALID');
|
|
55
62
|
return result;
|
|
56
63
|
}
|
|
@@ -109,7 +116,7 @@ export class ManagedNftables {
|
|
|
109
116
|
localPaths: [], searchSystemPath: false,
|
|
110
117
|
cliArgs: ['--management', ...(this.#options.networkNamespaceFd === undefined ? [] : ['--network-namespace-fd', '3'])],
|
|
111
118
|
inheritedFileDescriptors: this.#options.networkNamespaceFd === undefined ? undefined : [this.#options.networkNamespaceFd],
|
|
112
|
-
readyTimeoutMs: 3000, requestTimeoutMs: 30_000, maxPayloadSize:
|
|
119
|
+
readyTimeoutMs: 3000, requestTimeoutMs: 30_000, maxPayloadSize: managedIpcBytes,
|
|
113
120
|
maxPendingRequestsByMethod: { preparePolicy: 1, openOwner: 1, reconcilePolicy: 1, inspectPolicy: 1, releasePolicy: 1, releasePolicyTransition: 1, detachPolicy: 1, closeOwner: 1 },
|
|
114
121
|
});
|
|
115
122
|
this.#bridge.on('exit', () => {
|
|
@@ -285,4 +292,4 @@ export class ManagedNftables {
|
|
|
285
292
|
return owned;
|
|
286
293
|
}
|
|
287
294
|
}
|
|
288
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.managednftables.js","sourceRoot":"","sources":["../ts/classes.managednftables.ts"],"names":[],"mappings":"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"}
|
|
295
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.managednftables.js","sourceRoot":"","sources":["../ts/classes.managednftables.ts"],"names":[],"mappings":"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"}
|
|
@@ -76,6 +76,21 @@ export interface IManagedNftRouterPublishedPortV2 {
|
|
|
76
76
|
* `handoff`. No wildcard, secondary-address or route inference. */
|
|
77
77
|
transitSourceAddress: string;
|
|
78
78
|
}
|
|
79
|
+
/** One exact host-origin flow: the node's own host network namespace dials one port of one local
|
|
80
|
+
* workload at its lease address, from the transit host address of the current handoff. Compile the
|
|
81
|
+
* same grant into every scope the flow crosses (`allocationPoolGuard` and `hostTransit` on the host,
|
|
82
|
+
* `routerEgress` in the router namespace); each scope binds it to the authority it proves. It admits
|
|
83
|
+
* that tuple and its replies in the default conntrack zone and nothing else: no loopback, no
|
|
84
|
+
* translation, no source-port selection and no workload-origin flow. */
|
|
85
|
+
export interface IManagedNftHostGrant {
|
|
86
|
+
protocol: 'tcp' | 'udp';
|
|
87
|
+
/** Exact unicast address, never a prefix: the host's own address on the handoff. */
|
|
88
|
+
sourceAddress: string;
|
|
89
|
+
/** Exact unicast workload lease address, never a prefix. */
|
|
90
|
+
destinationAddress: string;
|
|
91
|
+
/** The workload's exact listening port, 1–65535; never a range. */
|
|
92
|
+
destinationPort: number;
|
|
93
|
+
}
|
|
79
94
|
/** One combined private/TUN/local/egress table; never compose a second ACCEPT over v1 terminal drops. */
|
|
80
95
|
export interface IManagedNftRouterEgressScopeV2 {
|
|
81
96
|
kind: 'routerEgress';
|
|
@@ -93,6 +108,12 @@ export interface IManagedNftRouterEgressScopeV2 {
|
|
|
93
108
|
* forward and reply admission in this generation, so a failed apply, a target
|
|
94
109
|
* without it, or release removes it with the generation. */
|
|
95
110
|
publishedPorts?: IManagedNftRouterPublishedPortV2[];
|
|
111
|
+
/** Optional host-origin grants forwarded from the handoff to a workload endpoint. Each
|
|
112
|
+
* `destinationAddress` is an exact current veth endpoint address of this scope; each
|
|
113
|
+
* `sourceAddress` is protected space that is neither router-local, a platform endpoint nor a
|
|
114
|
+
* workload. Absent and empty are the same canonical policy, digest and compiled graph; at most 1024,
|
|
115
|
+
* held in a named set behind a constant number of rules. */
|
|
116
|
+
hostGrants?: IManagedNftHostGrant[];
|
|
96
117
|
}
|
|
97
118
|
/** One inbound uplink publication, compiled inside the same host-transit generation. */
|
|
98
119
|
export interface IManagedNftPublishedPortV2 {
|
|
@@ -121,14 +142,23 @@ export interface IManagedNftHostTransitScopeV2 {
|
|
|
121
142
|
* exact forward and reply admission in this generation, so a failed apply, a target
|
|
122
143
|
* without it, or release removes it with the generation. */
|
|
123
144
|
publishedPorts?: IManagedNftPublishedPortV2[];
|
|
145
|
+
/** Optional host-origin grants leaving through a handoff. Each `sourceAddress` is an exact current
|
|
146
|
+
* address of exactly one handoff link; each `destinationAddress` is protected space that is neither
|
|
147
|
+
* host-local, a platform endpoint nor a leased transit source address. Absent and empty are the
|
|
148
|
+
* same canonical policy; at most 1024, held in a named set behind a constant number of rules. */
|
|
149
|
+
hostGrants?: IManagedNftHostGrant[];
|
|
124
150
|
}
|
|
125
151
|
/** Host-wide IPv4 destination denial for caller-authenticated private allocation pools.
|
|
126
|
-
*
|
|
152
|
+
* It has no link dependency; exact host grants are its only exceptions. It is not allocation-release or boot-order proof. */
|
|
127
153
|
export interface IManagedNftAllocationPoolGuardScopeV2 {
|
|
128
154
|
kind: 'allocationPoolGuard';
|
|
129
155
|
authorityDigest: string;
|
|
130
156
|
/** Complete current pool list: 1–64 canonical, disjoint RFC1918 prefixes. */
|
|
131
157
|
prefixes: string[];
|
|
158
|
+
/** The only exceptions to the guard: exact host-origin flows whose `destinationAddress` lies in a
|
|
159
|
+
* listed pool, and their replies. Absent and empty are the same canonical policy; at most 1024,
|
|
160
|
+
* held in a named set behind a constant number of rules. */
|
|
161
|
+
hostGrants?: IManagedNftHostGrant[];
|
|
132
162
|
}
|
|
133
163
|
export interface IManagedNftPolicyV2 {
|
|
134
164
|
schemaVersion: 2;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@push.rocks/smartnftables",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.5.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",
|
|
@@ -9,12 +9,12 @@
|
|
|
9
9
|
"author": "Task Venture Capital GmbH",
|
|
10
10
|
"license": "MIT",
|
|
11
11
|
"devDependencies": {
|
|
12
|
-
"@git.zone/cli": "
|
|
13
|
-
"@git.zone/tsbuild": "^
|
|
14
|
-
"@git.zone/tsrun": "^
|
|
15
|
-
"@git.zone/tsrust": "1.13.
|
|
16
|
-
"@git.zone/tstest": "6.
|
|
17
|
-
"@types/node": "26.
|
|
12
|
+
"@git.zone/cli": "7.2.2",
|
|
13
|
+
"@git.zone/tsbuild": "^5.0.0",
|
|
14
|
+
"@git.zone/tsrun": "^3.0.0",
|
|
15
|
+
"@git.zone/tsrust": "1.13.2",
|
|
16
|
+
"@git.zone/tstest": "6.2.0",
|
|
17
|
+
"@types/node": "26.6.1",
|
|
18
18
|
"typescript": "^7.0.2"
|
|
19
19
|
},
|
|
20
20
|
"dependencies": {
|
package/readme.md
CHANGED
|
@@ -264,9 +264,9 @@ allocation-pool guard policy kinds.
|
|
|
264
264
|
|
|
265
265
|
| V2 scope | Required authority and behavior |
|
|
266
266
|
| --- | --- |
|
|
267
|
-
| `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. Optional `publishedPorts` add the inbound second hop from the handoff to a workload endpoint; both directions are classified into the default conntrack zone ahead of every leased classifier, so a published endpoint port is dedicated to its publication and never becomes leased egress. |
|
|
268
|
-
| `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. Optional `publishedPorts` add inbound uplink destination NAT inside the same generation. |
|
|
269
|
-
| `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. |
|
|
267
|
+
| `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. Optional `publishedPorts` add the inbound second hop from the handoff to a workload endpoint; both directions are classified into the default conntrack zone ahead of every leased classifier, so a published endpoint port is dedicated to its publication and never becomes leased egress. Optional `hostGrants` forward exact host-origin flows from the handoff to a workload endpoint. |
|
|
268
|
+
| `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. Optional `publishedPorts` add inbound uplink destination NAT inside the same generation. Optional `hostGrants` let the host's own address on a handoff dial exact workload ports. |
|
|
269
|
+
| `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. Optional `hostGrants` are its only exceptions. |
|
|
270
270
|
|
|
271
271
|
`allocationPoolGuard` accepts 1–64 canonical, disjoint RFC1918 prefixes. Supply
|
|
272
272
|
the actual allocation pools, not the broader protected union containing management
|
|
@@ -412,6 +412,81 @@ matching `hostTransit` publication, the route to the workload through this route
|
|
|
412
412
|
the workload listener and every other packet owner. A publication grants no egress;
|
|
413
413
|
outbound flows still need their leased grants.
|
|
414
414
|
|
|
415
|
+
#### Host grants
|
|
416
|
+
|
|
417
|
+
A host grant lets the node's own host network namespace dial one exact port of
|
|
418
|
+
one local workload at the workload's address, from the host's own address on the
|
|
419
|
+
current handoff (the transit host address). It is how a controller that runs on
|
|
420
|
+
the node, such as a reverse proxy, reaches a workload without loopback
|
|
421
|
+
publication, `route_localnet`, loopback DNAT or loosened martian filtering. Each
|
|
422
|
+
entry is `{ protocol, sourceAddress, destinationAddress, destinationPort }`:
|
|
423
|
+
`tcp` or `udp`, two exact unicast IPv4 addresses and one port 1–65535. Prefixes,
|
|
424
|
+
wildcards, ranges, lists, loopback, broadcast, IPv6 and duplicate tuples reject.
|
|
425
|
+
There is no source-port selection and no translation.
|
|
426
|
+
|
|
427
|
+
The flow crosses three tables, so the caller compiles the same grants into each
|
|
428
|
+
scope, and each scope binds them to the authority it proves:
|
|
429
|
+
|
|
430
|
+
- `allocationPoolGuard.hostGrants`: `destinationAddress` lies in a guarded pool.
|
|
431
|
+
The admissions sit in OUTPUT (original direction) and INPUT (reply) ahead of the
|
|
432
|
+
guard. Everything else still meets the unconditional guard, including forwarded
|
|
433
|
+
traffic and a translated flow that merely arrives at a granted tuple.
|
|
434
|
+
- `hostTransit.hostGrants`: `sourceAddress` is an exact current address of exactly
|
|
435
|
+
one handoff link and not an uplink address; `destinationAddress` is protected
|
|
436
|
+
space that is neither host-local, a platform endpoint nor a leased transit source
|
|
437
|
+
address. The admissions bind the exact handoff that holds the source address and
|
|
438
|
+
precede its terminal OUTPUT and INPUT denials; forwarding and the uplink are
|
|
439
|
+
unchanged.
|
|
440
|
+
- `routerEgress.hostGrants`: `destinationAddress` is an exact current veth workload
|
|
441
|
+
endpoint address of this scope, and `sourceAddress` is protected space that is
|
|
442
|
+
neither router-local, a platform endpoint nor any workload's address. One raw
|
|
443
|
+
handoff ingress classification precedes the barrier's protected-source denial,
|
|
444
|
+
sets no generation zone and leaves the flow in the default conntrack zone; the
|
|
445
|
+
forward admissions bind the handoff and the exact workload link, follow the
|
|
446
|
+
private anti-spoof guards, and sit beside the publications ahead of the capture
|
|
447
|
+
barrier. The workload's replies need no classifier: their destination is
|
|
448
|
+
protected, so they return to the default zone ahead of every leased classifier,
|
|
449
|
+
even when the host's source port equals a leased grant's destination port.
|
|
450
|
+
|
|
451
|
+
The grants of a scope live in one CONSTANT named set, `host_grant`, and the rule
|
|
452
|
+
graph does not grow with them: four admissions per scope — ESTABLISHED original
|
|
453
|
+
direction, a NEW UDP opening, a NEW TCP opening restricted to SYN with FIN/RST/ACK
|
|
454
|
+
clear, and the ESTABLISHED reply — each check the default conntrack zone and the
|
|
455
|
+
direction, then look up one concatenated key. The key carries every remaining
|
|
456
|
+
operand: the variable interface's index and name (the handoff in host transit, the
|
|
457
|
+
workload link in the router; the guard has none), the packet protocol and the
|
|
458
|
+
conntrack protocol, the live source, destination and workload port, and the
|
|
459
|
+
originally tracked source, destination and port. An element is one grant whose
|
|
460
|
+
live tuple equals its original tuple, so a translated flow never matches and
|
|
461
|
+
foreign NAT cannot borrow an admission for another flow. The router's raw
|
|
462
|
+
classification looks up the exact arriving protocol, addresses and port in a
|
|
463
|
+
second set, `host_grant_arrival`. Owner verification reads every set back with all
|
|
464
|
+
of its elements, so apply, inspection, adoption and recovery reject a changed or
|
|
465
|
+
foreign set exactly as they reject a changed rule; a bound CONSTANT set also
|
|
466
|
+
refuses element changes from any other socket.
|
|
467
|
+
|
|
468
|
+
Absent and empty are the same canonical policy, so a scope without grants keeps its
|
|
469
|
+
exact previous digest and compiled bytes and has no set. Withdrawing a grant is an
|
|
470
|
+
ordinary atomic replacement: the batch deletes the previous rules, chains and sets
|
|
471
|
+
by handle and creates the complete target, so a target without the entry, a failed
|
|
472
|
+
batch or release removes it, and an established flow stops with it. Apply grants
|
|
473
|
+
hop by hop from the workload side (router, host transit, guard) and withdraw them
|
|
474
|
+
in the reverse order; each table is atomic on its own, and a partially applied
|
|
475
|
+
grant only stays dark.
|
|
476
|
+
|
|
477
|
+
Input bounds are 1024 grants per scope, the maximum a network projection carries.
|
|
478
|
+
Elements have their own 100,000-byte budget beside the 100,000-byte rule graph, and
|
|
479
|
+
are sent 256 to a message. At 1024 grants the reference router needs about 94 KB
|
|
480
|
+
of elements (two sets), host transit about 66 KB and the guard about 45 KB. A
|
|
481
|
+
replacement batch — handle-only deletion of a previous maximum graph, a maximum
|
|
482
|
+
rule graph and maximum elements — stays below 320,000 bytes, which the kernel
|
|
483
|
+
accepts with any `net.core.wmem_max` of at least 160,016 (the Linux default is
|
|
484
|
+
212,992). The private facade IPC carries up to three complete policies in one
|
|
485
|
+
status and is bounded at 1,048,576 bytes per line; the facade captures at most
|
|
486
|
+
1,000,000 JSON bytes and 65,536 values per request or result. The caller owns the host route
|
|
487
|
+
to the workload through the handoff, selecting the transit host address as the
|
|
488
|
+
socket's source, the workload listener and every other packet owner.
|
|
489
|
+
|
|
415
490
|
Active overlapping classifiers, duplicate zones/labels and conflicting handoff
|
|
416
491
|
allocations reject. Empty router generations retain private routing while denying
|
|
417
492
|
egress. Input bounds include 32 private endpoints, 128 private rules, 32 active
|
|
@@ -544,6 +619,19 @@ A client whose source port equals a leased grant's destination port on that gran
|
|
|
544
619
|
public address completes the published TCP handshake and receives its UDP reply
|
|
545
620
|
from the published address, so the leased classifiers of the same generation cannot
|
|
546
621
|
capture the workload's published packets.
|
|
622
|
+
Host grants are qualified across all three tables in the same four-namespace
|
|
623
|
+
topology with leased public egress on every port of both protocols and 1024 grants
|
|
624
|
+
in every scope: a member far from the probed tuples passes, the tuple just outside
|
|
625
|
+
the set stays dark, and against
|
|
626
|
+
pre-policy positive controls, the host stays dark without grants and with router and
|
|
627
|
+
transit grants alone (the guard still denies), the exact TCP and UDP tuples reach the
|
|
628
|
+
workload from the transit host address once the guard exception is applied, another
|
|
629
|
+
port, protocol, host source address and the workload-origin direction stay denied,
|
|
630
|
+
withdrawing only the router grant closes the path and re-granting reopens it, and
|
|
631
|
+
withdrawal in every scope stops new flows and the established one. A full guard
|
|
632
|
+
set persists across owner loss, is re-verified element by element before adoption,
|
|
633
|
+
survives lost-ACK replay and is replaced and released like the rest of the graph,
|
|
634
|
+
and another socket cannot add or delete one of its elements.
|
|
547
635
|
The arm64 binary is cross-built; native packet qualification is currently x86_64.
|
|
548
636
|
Kernel 6.8 is unsupported. No production activation is implied by these tests.
|
|
549
637
|
|
|
@@ -4,27 +4,74 @@ use crate::wire::{self, Attr};
|
|
|
4
4
|
|
|
5
5
|
#[path = "egress.host.rs"]
|
|
6
6
|
mod host;
|
|
7
|
+
#[path = "egress.hostgrant.rs"]
|
|
8
|
+
mod hostgrant;
|
|
7
9
|
#[path = "egress.poolguard.rs"]
|
|
8
10
|
mod poolguard;
|
|
9
11
|
#[path = "egress.router.rs"]
|
|
10
12
|
mod router;
|
|
11
13
|
|
|
14
|
+
/// Set elements of one target. Together with the 100,000-byte rule graph and the
|
|
15
|
+
/// handle-only deletion of a previous maximum graph this bounds one replacement
|
|
16
|
+
/// batch below `wire::BATCH_BYTES`.
|
|
17
|
+
pub(super) const ELEMENT_BYTES: usize = 100_000;
|
|
18
|
+
|
|
12
19
|
pub(super) struct Program<'a> {
|
|
13
20
|
table: &'a str,
|
|
14
21
|
stamp: String,
|
|
15
22
|
ordinal: usize,
|
|
16
23
|
bytes: usize,
|
|
24
|
+
element_bytes: usize,
|
|
17
25
|
operations: Vec<(u16, Vec<Attr>)>,
|
|
18
26
|
}
|
|
19
27
|
impl<'a> Program<'a> {
|
|
20
28
|
fn push(&mut self, operation: u16, attributes: Vec<Attr>) -> Result<()> {
|
|
21
29
|
self.bytes += wire::encode_attrs(&attributes).len() + 20;
|
|
22
30
|
// Same atomic replacement reserve as v1: a previous bounded graph must
|
|
23
|
-
// fit its handle-only deletions beside the complete target
|
|
31
|
+
// fit its handle-only deletions beside the complete target, and the
|
|
32
|
+
// target's set elements, in one `wire::BATCH_BYTES` batch.
|
|
24
33
|
require(self.bytes <= 100_000 && self.operations.len() < 768)?;
|
|
25
34
|
self.operations.push((operation, attributes));
|
|
26
35
|
Ok(())
|
|
27
36
|
}
|
|
37
|
+
/// One named exact-match set. CONSTANT: its elements cannot change once a
|
|
38
|
+
/// rule binds it, so replacement always creates a complete new set.
|
|
39
|
+
fn set(&mut self, name: &str, id: u32, key_length: usize) -> Result<()> {
|
|
40
|
+
self.push(
|
|
41
|
+
9,
|
|
42
|
+
vec![
|
|
43
|
+
Attr::string(1, self.table),
|
|
44
|
+
Attr::string(2, name),
|
|
45
|
+
Attr::u32(3, 2),
|
|
46
|
+
Attr::u32(4, 0),
|
|
47
|
+
Attr::u32(5, key_length as u32),
|
|
48
|
+
Attr::u32(10, id),
|
|
49
|
+
],
|
|
50
|
+
)
|
|
51
|
+
}
|
|
52
|
+
/// The elements of one set, 256 to a message so every nested attribute
|
|
53
|
+
/// stays far below netlink's 16-bit attribute length. Elements have their
|
|
54
|
+
/// own budget: a replacement deletes the previous set, and so its elements,
|
|
55
|
+
/// by one handle.
|
|
56
|
+
fn elements(&mut self, name: &str, keys: Vec<Vec<u8>>) -> Result<()> {
|
|
57
|
+
for chunk in keys.chunks(256) {
|
|
58
|
+
let elements = chunk
|
|
59
|
+
.iter()
|
|
60
|
+
.map(|key| {
|
|
61
|
+
Attr::nested(1, vec![Attr::nested(1, vec![Attr::bytes(1, key.clone())])])
|
|
62
|
+
})
|
|
63
|
+
.collect();
|
|
64
|
+
let attributes = vec![
|
|
65
|
+
Attr::string(1, self.table),
|
|
66
|
+
Attr::string(2, name),
|
|
67
|
+
Attr::nested(3, elements),
|
|
68
|
+
];
|
|
69
|
+
self.element_bytes += wire::encode_attrs(&attributes).len() + 20;
|
|
70
|
+
require(self.element_bytes <= ELEMENT_BYTES && self.operations.len() < 768)?;
|
|
71
|
+
self.operations.push((12, attributes));
|
|
72
|
+
}
|
|
73
|
+
Ok(())
|
|
74
|
+
}
|
|
28
75
|
fn chain(&mut self, name: &str, base: Option<(u32, i32, &str)>) -> Result<()> {
|
|
29
76
|
let mut data = vec![Attr::string(1, self.table), Attr::string(3, name)];
|
|
30
77
|
if let Some((hook, priority, kind)) = base {
|
|
@@ -298,6 +345,7 @@ pub(super) fn compile(prepared: &Prepared, table: &str) -> Result<Vec<(u16, Vec<
|
|
|
298
345
|
stamp: format!("snft2:{}:{}", prepared.policy.revision, prepared.digest),
|
|
299
346
|
ordinal: 0,
|
|
300
347
|
bytes: 0,
|
|
348
|
+
element_bytes: 0,
|
|
301
349
|
operations: Vec::new(),
|
|
302
350
|
};
|
|
303
351
|
match &prepared.policy.scope {
|
package/rust/src/egress.host.rs
CHANGED
|
@@ -135,12 +135,34 @@ pub(super) fn compile(program: &mut Program<'_>, scope: &HostScope) -> Result<()
|
|
|
135
135
|
for name in ["protected_out", "protected_back"] {
|
|
136
136
|
program.chain(name, None)?;
|
|
137
137
|
}
|
|
138
|
+
if !scope.host_grants.is_empty() {
|
|
139
|
+
// Validation admits only an address of exactly one handoff link.
|
|
140
|
+
hostgrant::tuple_set(program, &scope.host_grants, |grant| {
|
|
141
|
+
scope
|
|
142
|
+
.handoffs
|
|
143
|
+
.iter()
|
|
144
|
+
.find(|handoff| {
|
|
145
|
+
handoff
|
|
146
|
+
.link
|
|
147
|
+
.required_ipv4_addresses
|
|
148
|
+
.contains(&grant.source_address)
|
|
149
|
+
})
|
|
150
|
+
.map(|handoff| Some(&handoff.link))
|
|
151
|
+
.ok_or(crate::Error::Invalid)
|
|
152
|
+
})?;
|
|
153
|
+
}
|
|
138
154
|
protection(program, scope, false)?;
|
|
139
155
|
protection(program, scope, true)?;
|
|
140
156
|
// Published admission precedes the capture barrier: the barrier denies every
|
|
141
157
|
// protected original destination, which includes this uplink address, and an
|
|
142
158
|
// exact inbound publication is the explicit authority for that exception.
|
|
143
159
|
published(program, scope)?;
|
|
160
|
+
// Host-origin grants leave through the exact handoff that holds their source
|
|
161
|
+
// address, which is part of every set key, and precede the terminal output
|
|
162
|
+
// and input denials. Nothing else of the host's own traffic crosses a handoff.
|
|
163
|
+
if !scope.host_grants.is_empty() {
|
|
164
|
+
hostgrant::admissions(program, ["output", "input"], true, |_| vec![])?;
|
|
165
|
+
}
|
|
144
166
|
for handoff in &scope.handoffs {
|
|
145
167
|
program.jump("forward", link(&handoff.link, true), "protected_out")?;
|
|
146
168
|
program.jump("forward", link(&handoff.link, false), "protected_back")?;
|