@push.rocks/smartnftables 1.3.1 → 1.4.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 +10 -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.js +9 -3
- package/dist_ts/managed.types.d.ts +5 -1
- package/package.json +4 -4
- package/readme.md +23 -0
- package/rust/src/main.rs +20 -2
- package/rust/src/namespace.rs +51 -0
- package/rust/src/owner_namespace_tests.rs +242 -0
- package/rust/src/owner_tests.rs +3 -0
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.managednftables.ts +7 -2
- package/ts/managed.types.ts +5 -1
package/changelog.md
CHANGED
|
@@ -1,5 +1,15 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 2026-09-13 - 1.4.0
|
|
4
|
+
|
|
5
|
+
### Maintenance
|
|
6
|
+
|
|
7
|
+
- Update release, build and test tooling with explicit development build-script policy.
|
|
8
|
+
|
|
9
|
+
### Features
|
|
10
|
+
|
|
11
|
+
- Add Linux namespace descriptor entry before native policy ownership, with isolated persistence and recovery qualification.
|
|
12
|
+
|
|
3
13
|
## 2026-09-09 - 1.3.1
|
|
4
14
|
|
|
5
15
|
### Fixes
|
|
Binary file
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"format": "tsrust.build-provenance.v2",
|
|
3
|
-
"binarySha256": "
|
|
3
|
+
"binarySha256": "a97fc50e1f566505de1a412ee316f66996fd2f8450d07f6919c242dfd1746f0a",
|
|
4
4
|
"buildInfo": {
|
|
5
5
|
"projectName": "@push.rocks/smartnftables",
|
|
6
|
-
"projectVersion": "1.
|
|
7
|
-
"gitCommit": "
|
|
6
|
+
"projectVersion": "1.4.0",
|
|
7
|
+
"gitCommit": "4cd43db6efa140559ba87b90b4cdddf758239e42",
|
|
8
8
|
"gitDirty": false,
|
|
9
|
-
"builtAt": "2026-09-
|
|
9
|
+
"builtAt": "2026-09-13T12:15:55.817Z",
|
|
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": "029d5e31ef6656bfb45588179dc75cd211a6d66254b7104da62c9fd9c687e61c",
|
|
4
4
|
"buildInfo": {
|
|
5
5
|
"projectName": "@push.rocks/smartnftables",
|
|
6
|
-
"projectVersion": "1.
|
|
7
|
-
"gitCommit": "
|
|
6
|
+
"projectVersion": "1.4.0",
|
|
7
|
+
"gitCommit": "4cd43db6efa140559ba87b90b4cdddf758239e42",
|
|
8
8
|
"gitDirty": false,
|
|
9
|
-
"builtAt": "2026-09-
|
|
9
|
+
"builtAt": "2026-09-13T12:15:56.577Z",
|
|
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.4.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=
|
|
@@ -64,12 +64,16 @@ export class ManagedNftables {
|
|
|
64
64
|
#nativeMayOwn = false;
|
|
65
65
|
constructor(options) {
|
|
66
66
|
this.#options = snapshot(options);
|
|
67
|
-
if (Object.keys(this.#options).some((key) => !['ownerId', 'instanceId', 'tableName', 'binaryPath'].includes(key))
|
|
67
|
+
if (Object.keys(this.#options).some((key) => !['ownerId', 'instanceId', 'tableName', 'binaryPath', 'networkNamespaceFd'].includes(key))
|
|
68
68
|
|| ![this.#options.ownerId, this.#options.instanceId, this.#options.tableName].every((value) => typeof value === 'string' && /^[A-Za-z0-9_-]{1,64}$/.test(value))
|
|
69
69
|
|| this.#options.instanceId.length < 16 || !this.#options.tableName.startsWith('snft_')
|
|
70
70
|
|| this.#options.binaryPath !== undefined && (!plugins.path.isAbsolute(this.#options.binaryPath) || this.#options.binaryPath.includes('\0'))) {
|
|
71
71
|
throw new ManagedNftablesError('INVALID');
|
|
72
72
|
}
|
|
73
|
+
if (this.#options.networkNamespaceFd !== undefined && (process.platform !== 'linux'
|
|
74
|
+
|| !Number.isInteger(this.#options.networkNamespaceFd) || this.#options.networkNamespaceFd < 0
|
|
75
|
+
|| this.#options.networkNamespaceFd > 0x7fff_ffff))
|
|
76
|
+
throw new ManagedNftablesError('INVALID');
|
|
73
77
|
}
|
|
74
78
|
get state() { return this.#state; }
|
|
75
79
|
/** Starts only the compiler/IPC owner. The returned idle status is not enforcement. */
|
|
@@ -84,7 +88,9 @@ export class ManagedNftables {
|
|
|
84
88
|
this.#bridge = new plugins.smartrust.RustBridge({
|
|
85
89
|
binaryName: 'smartnftables', binaryPath: this.#options.binaryPath
|
|
86
90
|
?? plugins.path.join(root, 'dist_rust', `smartnftables_linux_${process.arch === 'x64' ? 'amd64' : 'arm64'}_musl`),
|
|
87
|
-
localPaths: [], searchSystemPath: false,
|
|
91
|
+
localPaths: [], searchSystemPath: false,
|
|
92
|
+
cliArgs: ['--management', ...(this.#options.networkNamespaceFd === undefined ? [] : ['--network-namespace-fd', '3'])],
|
|
93
|
+
inheritedFileDescriptors: this.#options.networkNamespaceFd === undefined ? undefined : [this.#options.networkNamespaceFd],
|
|
88
94
|
readyTimeoutMs: 3000, requestTimeoutMs: 30_000, maxPayloadSize: 262_144,
|
|
89
95
|
maxPendingRequestsByMethod: { preparePolicy: 1, openOwner: 1, reconcilePolicy: 1, inspectPolicy: 1, releasePolicy: 1, closeOwner: 1 },
|
|
90
96
|
});
|
|
@@ -173,4 +179,4 @@ export class ManagedNftables {
|
|
|
173
179
|
return owned;
|
|
174
180
|
}
|
|
175
181
|
}
|
|
176
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.managednftables.js","sourceRoot":"","sources":["../ts/classes.managednftables.ts"],"names":[],"mappings":"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"}
|
|
182
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.managednftables.js","sourceRoot":"","sources":["../ts/classes.managednftables.ts"],"names":[],"mappings":"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"}
|
|
@@ -66,6 +66,10 @@ export interface IManagedNftOptions {
|
|
|
66
66
|
tableName: string;
|
|
67
67
|
/** Explicit executable selection for qualified distributions and isolated tests. */
|
|
68
68
|
binaryPath?: string;
|
|
69
|
+
/** Linux network namespace descriptor, owned by the caller and valid through start().
|
|
70
|
+
* The native process enters before readiness or netlink activity. Keep a namespace
|
|
71
|
+
* owner alive for policy lifetime and recovery; this process option is not durable authority. */
|
|
72
|
+
networkNamespaceFd?: number;
|
|
69
73
|
}
|
|
70
74
|
export type TManagedNftCommands = {
|
|
71
75
|
preparePolicy: {
|
|
@@ -73,7 +77,7 @@ export type TManagedNftCommands = {
|
|
|
73
77
|
result: IPreparedManagedNftPolicy;
|
|
74
78
|
};
|
|
75
79
|
openOwner: {
|
|
76
|
-
params:
|
|
80
|
+
params: Pick<IManagedNftOptions, 'ownerId' | 'instanceId' | 'tableName'>;
|
|
77
81
|
result: IManagedNftStatus;
|
|
78
82
|
};
|
|
79
83
|
reconcilePolicy: {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@push.rocks/smartnftables",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.4.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,11 +9,11 @@
|
|
|
9
9
|
"author": "Lossless GmbH",
|
|
10
10
|
"license": "MIT",
|
|
11
11
|
"devDependencies": {
|
|
12
|
-
"@git.zone/cli": "6.
|
|
13
|
-
"@git.zone/tsbuild": "^4.4.
|
|
12
|
+
"@git.zone/cli": "6.13.2",
|
|
13
|
+
"@git.zone/tsbuild": "^4.4.3",
|
|
14
14
|
"@git.zone/tsrun": "^2.0.6",
|
|
15
15
|
"@git.zone/tsrust": "1.13.0",
|
|
16
|
-
"@git.zone/tstest": "
|
|
16
|
+
"@git.zone/tstest": "6.0.0",
|
|
17
17
|
"@types/node": "26.4.1",
|
|
18
18
|
"typescript": "^7.0.2"
|
|
19
19
|
},
|
package/readme.md
CHANGED
|
@@ -26,6 +26,29 @@ namespace, and working nftables OWNER/PERSIST support. The published native matr
|
|
|
26
26
|
is Linux x86_64 and arm64, statically linked with musl. Actual kernel support is
|
|
27
27
|
checked when applying policy; starting the compiler does not establish enforcement.
|
|
28
28
|
|
|
29
|
+
An optional caller-owned `networkNamespaceFd` selects an already-created Linux
|
|
30
|
+
network namespace. Keep that descriptor valid through `start()`. The native
|
|
31
|
+
process validates and enters its inherited copy before readiness, owner identity
|
|
32
|
+
capture or netlink activity, then closes the copy. Invalid descriptors and denied
|
|
33
|
+
entry fail before readiness. The option is process configuration and never enters
|
|
34
|
+
`openOwner`, policy commands or durable receipts. Native callers use
|
|
35
|
+
`--management --network-namespace-fd 3` with an inherited descriptor at FD 3.
|
|
36
|
+
|
|
37
|
+
The caller owns the namespace lifetime, links and routes. Retain a namespace
|
|
38
|
+
owner across process loss and recovery: PERSIST retains policy only while its
|
|
39
|
+
namespace exists. An entered process keeps its namespace membership if the source
|
|
40
|
+
descriptor is closed, but a replacement process requires a valid descriptor.
|
|
41
|
+
Receipts bind the actual target namespace device and inode; recovery in another
|
|
42
|
+
namespace rejects. Await complete policy and process cleanup before releasing
|
|
43
|
+
the caller's final namespace owner. Namespace entry does not create uplink
|
|
44
|
+
authority, drain conntrack flows or authorize address and port reuse.
|
|
45
|
+
|
|
46
|
+
The Linux x86_64 musl candidate passed nine isolated Linux 6.18.35 kernel tests,
|
|
47
|
+
including inherited namespace entry, retained policy after process loss, recovery
|
|
48
|
+
in the original namespace, rejection in another namespace, and denied entry
|
|
49
|
+
before readiness. ARM binaries are built; privileged ARM and complete Pallet
|
|
50
|
+
workload integration remain separate qualification requirements.
|
|
51
|
+
|
|
29
52
|
The caller owns workload links and durable state. Keep links disabled until their
|
|
30
53
|
policy is confirmed, serialize link changes with policy operations, and disable
|
|
31
54
|
them before cleanup. Persist the full prepared transition before calling
|
package/rust/src/main.rs
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
mod namespace;
|
|
1
2
|
mod owner;
|
|
2
3
|
mod policy;
|
|
3
4
|
#[cfg(test)]
|
|
@@ -97,9 +98,26 @@ fn dispatch(owner: &mut Option<owner::Owner>, request: Request) -> Result<serde_
|
|
|
97
98
|
}
|
|
98
99
|
|
|
99
100
|
fn main() {
|
|
100
|
-
|
|
101
|
-
|
|
101
|
+
let arguments = std::env::args().skip(1).collect::<Vec<_>>();
|
|
102
|
+
let descriptor = match arguments.as_slice() {
|
|
103
|
+
[management] if management == "--management" => None,
|
|
104
|
+
[management, option, fd]
|
|
105
|
+
if management == "--management" && option == "--network-namespace-fd" =>
|
|
106
|
+
{
|
|
107
|
+
match fd.parse::<i32>() {
|
|
108
|
+
Ok(value) => Some(value),
|
|
109
|
+
Err(_) => std::process::exit(2),
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
_ => std::process::exit(2),
|
|
113
|
+
};
|
|
114
|
+
if let Some(fd) = descriptor {
|
|
115
|
+
if let Err(error) = namespace::enter(fd) {
|
|
116
|
+
eprintln!("Network namespace startup failed: {error}");
|
|
117
|
+
std::process::exit(1);
|
|
118
|
+
}
|
|
102
119
|
}
|
|
120
|
+
// The single native owner must enter before readiness, context capture or sockets.
|
|
103
121
|
let mut output = std::io::stdout().lock();
|
|
104
122
|
writeln!(output, "{{\"event\":\"ready\",\"data\":{{}}}}").unwrap();
|
|
105
123
|
output.flush().unwrap();
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
//! Startup-only entry. No thread, runtime, socket or ready event may precede it.
|
|
2
|
+
use std::io;
|
|
3
|
+
|
|
4
|
+
#[cfg(target_os = "linux")]
|
|
5
|
+
pub fn enter(fd: i32) -> io::Result<()> {
|
|
6
|
+
use std::os::fd::{AsRawFd, FromRawFd, OwnedFd};
|
|
7
|
+
|
|
8
|
+
// Only an explicitly inherited extra descriptor is accepted. Never consume IPC.
|
|
9
|
+
if fd < 3 {
|
|
10
|
+
return Err(io::Error::new(
|
|
11
|
+
io::ErrorKind::InvalidInput,
|
|
12
|
+
"network namespace descriptor must be at least 3",
|
|
13
|
+
));
|
|
14
|
+
}
|
|
15
|
+
if unsafe { libc::fcntl(fd, libc::F_GETFD) } < 0 {
|
|
16
|
+
return Err(io::Error::new(
|
|
17
|
+
io::ErrorKind::InvalidInput,
|
|
18
|
+
"network namespace descriptor is not open",
|
|
19
|
+
));
|
|
20
|
+
}
|
|
21
|
+
// Startup is single-threaded; this is the child's owned copy, not the parent's.
|
|
22
|
+
let descriptor = unsafe { OwnedFd::from_raw_fd(fd) };
|
|
23
|
+
let namespace_type = unsafe { libc::ioctl(descriptor.as_raw_fd(), libc::NS_GET_NSTYPE) };
|
|
24
|
+
if namespace_type != libc::CLONE_NEWNET {
|
|
25
|
+
return Err(io::Error::new(
|
|
26
|
+
io::ErrorKind::InvalidInput,
|
|
27
|
+
"descriptor is not a Linux network namespace",
|
|
28
|
+
));
|
|
29
|
+
}
|
|
30
|
+
if unsafe { libc::setns(descriptor.as_raw_fd(), libc::CLONE_NEWNET) } != 0 {
|
|
31
|
+
return Err(io::Error::new(
|
|
32
|
+
io::ErrorKind::PermissionDenied,
|
|
33
|
+
format!(
|
|
34
|
+
"network namespace entry failed: {}",
|
|
35
|
+
io::Error::last_os_error()
|
|
36
|
+
),
|
|
37
|
+
));
|
|
38
|
+
}
|
|
39
|
+
// Close the inherited capability before creating threads. Namespace membership
|
|
40
|
+
// itself keeps the namespace alive until the complete process has exited.
|
|
41
|
+
drop(descriptor);
|
|
42
|
+
Ok(())
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
#[cfg(not(target_os = "linux"))]
|
|
46
|
+
pub fn enter(_fd: i32) -> io::Result<()> {
|
|
47
|
+
Err(io::Error::new(
|
|
48
|
+
io::ErrorKind::Unsupported,
|
|
49
|
+
"network namespace entry requires Linux",
|
|
50
|
+
))
|
|
51
|
+
}
|
|
@@ -0,0 +1,242 @@
|
|
|
1
|
+
use super::{empty, in_namespace, ip, isolated, options};
|
|
2
|
+
use crate::owner::{Applied, Owner, Transition};
|
|
3
|
+
use serde_json::{json, Value};
|
|
4
|
+
use std::fs::{self, File};
|
|
5
|
+
use std::io::{BufRead, BufReader, Read, Write};
|
|
6
|
+
use std::os::fd::AsRawFd;
|
|
7
|
+
use std::os::unix::fs::MetadataExt;
|
|
8
|
+
use std::os::unix::process::CommandExt;
|
|
9
|
+
use std::process::{Child, Command, Stdio};
|
|
10
|
+
use std::sync::mpsc::{self, Receiver};
|
|
11
|
+
use std::thread::{self, JoinHandle};
|
|
12
|
+
use std::time::{Duration, Instant};
|
|
13
|
+
|
|
14
|
+
fn command(namespace: &File) -> Command {
|
|
15
|
+
let fd = namespace.as_raw_fd();
|
|
16
|
+
let mut command = Command::new("/bin/managed");
|
|
17
|
+
command
|
|
18
|
+
.args(["--management", "--network-namespace-fd", "3"])
|
|
19
|
+
.stdin(Stdio::piped())
|
|
20
|
+
.stdout(Stdio::piped())
|
|
21
|
+
.stderr(Stdio::inherit());
|
|
22
|
+
unsafe {
|
|
23
|
+
command.pre_exec(move || {
|
|
24
|
+
if libc::dup2(fd, 3) < 0 || libc::fcntl(3, libc::F_SETFD, 0) < 0 {
|
|
25
|
+
return Err(std::io::Error::last_os_error());
|
|
26
|
+
}
|
|
27
|
+
Ok(())
|
|
28
|
+
});
|
|
29
|
+
}
|
|
30
|
+
command
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
struct NativeOwner {
|
|
34
|
+
child: Child,
|
|
35
|
+
messages: Receiver<Value>,
|
|
36
|
+
reader: Option<JoinHandle<()>>,
|
|
37
|
+
}
|
|
38
|
+
impl NativeOwner {
|
|
39
|
+
fn start(namespace: &File) -> Self {
|
|
40
|
+
let mut child = command(namespace).spawn().unwrap();
|
|
41
|
+
let output = child.stdout.take().unwrap();
|
|
42
|
+
let (send, messages) = mpsc::channel();
|
|
43
|
+
let reader = thread::spawn(move || {
|
|
44
|
+
for line in BufReader::new(output.take(1024 * 1024)).lines() {
|
|
45
|
+
let Ok(line) = line else { break };
|
|
46
|
+
if line.len() > 262_144 {
|
|
47
|
+
break;
|
|
48
|
+
}
|
|
49
|
+
let Ok(value) = serde_json::from_str(&line) else {
|
|
50
|
+
break;
|
|
51
|
+
};
|
|
52
|
+
if send.send(value).is_err() {
|
|
53
|
+
break;
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
});
|
|
57
|
+
let owner = Self {
|
|
58
|
+
child,
|
|
59
|
+
messages,
|
|
60
|
+
reader: Some(reader),
|
|
61
|
+
};
|
|
62
|
+
assert_eq!(
|
|
63
|
+
owner.messages.recv_timeout(Duration::from_secs(5)).unwrap()["event"],
|
|
64
|
+
"ready"
|
|
65
|
+
);
|
|
66
|
+
owner
|
|
67
|
+
}
|
|
68
|
+
fn response(&mut self, method: &str, params: Value) -> Value {
|
|
69
|
+
writeln!(
|
|
70
|
+
self.child.stdin.as_mut().unwrap(),
|
|
71
|
+
"{}",
|
|
72
|
+
json!({"id":method,"method":method,"params":params})
|
|
73
|
+
)
|
|
74
|
+
.unwrap();
|
|
75
|
+
let response = self.messages.recv_timeout(Duration::from_secs(5)).unwrap();
|
|
76
|
+
assert_eq!(response["id"], method);
|
|
77
|
+
response
|
|
78
|
+
}
|
|
79
|
+
fn call(&mut self, method: &str, params: Value) -> Value {
|
|
80
|
+
let response = self.response(method, params);
|
|
81
|
+
assert_eq!(response["success"], true, "{response}");
|
|
82
|
+
response["result"].clone()
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
impl Drop for NativeOwner {
|
|
86
|
+
fn drop(&mut self) {
|
|
87
|
+
let _ = self.child.kill();
|
|
88
|
+
let _ = self.child.wait();
|
|
89
|
+
if let Some(reader) = self.reader.take() {
|
|
90
|
+
let _ = reader.join();
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
#[test]
|
|
96
|
+
#[ignore = "requires the explicitly isolated QEMU qualification guest"]
|
|
97
|
+
fn inherited_namespace_binds_policy_and_persistent_recovery() {
|
|
98
|
+
isolated();
|
|
99
|
+
ip(&["netns", "add", "fdtarget"]);
|
|
100
|
+
let namespace = File::open("/run/netns/fdtarget").unwrap();
|
|
101
|
+
let metadata = namespace.metadata().unwrap();
|
|
102
|
+
let initial = fs::metadata("/proc/thread-self/ns/net").unwrap();
|
|
103
|
+
assert_ne!(metadata.ino(), initial.ino());
|
|
104
|
+
let mut child = NativeOwner::start(&namespace);
|
|
105
|
+
let pid = child.child.id();
|
|
106
|
+
let status = child.call("openOwner", serde_json::to_value(options("nsfd")).unwrap());
|
|
107
|
+
assert_eq!(
|
|
108
|
+
status["identity"]["namespaceDevice"],
|
|
109
|
+
metadata.dev().to_string()
|
|
110
|
+
);
|
|
111
|
+
assert_eq!(
|
|
112
|
+
status["identity"]["namespaceInode"],
|
|
113
|
+
metadata.ino().to_string()
|
|
114
|
+
);
|
|
115
|
+
assert_eq!(
|
|
116
|
+
fs::read_dir(format!("/proc/{pid}/task")).unwrap().count(),
|
|
117
|
+
1
|
|
118
|
+
);
|
|
119
|
+
let target_link = fs::read_link(format!("/proc/{pid}/ns/net")).unwrap();
|
|
120
|
+
for fd in fs::read_dir(format!("/proc/{pid}/fd")).unwrap() {
|
|
121
|
+
if let Ok(target) = fs::read_link(fd.unwrap().path()) {
|
|
122
|
+
assert_ne!(
|
|
123
|
+
target, target_link,
|
|
124
|
+
"child namespace descriptor must be closed"
|
|
125
|
+
);
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
let first = child.call(
|
|
129
|
+
"reconcilePolicy",
|
|
130
|
+
serde_json::to_value(Transition {
|
|
131
|
+
previous: None,
|
|
132
|
+
target: empty(1),
|
|
133
|
+
})
|
|
134
|
+
.unwrap(),
|
|
135
|
+
);
|
|
136
|
+
assert!(Owner::new(options("nsfd"))
|
|
137
|
+
.unwrap()
|
|
138
|
+
.graph()
|
|
139
|
+
.unwrap()
|
|
140
|
+
.is_none());
|
|
141
|
+
assert!(in_namespace("fdtarget", || Owner::new(options("nsfd"))
|
|
142
|
+
.unwrap()
|
|
143
|
+
.graph()
|
|
144
|
+
.unwrap()
|
|
145
|
+
.is_some()));
|
|
146
|
+
assert_eq!(
|
|
147
|
+
unsafe { libc::ioctl(namespace.as_raw_fd(), libc::NS_GET_NSTYPE) },
|
|
148
|
+
libc::CLONE_NEWNET
|
|
149
|
+
);
|
|
150
|
+
drop(child); // PERSIST must retain the target graph after native process loss.
|
|
151
|
+
assert!(!std::path::Path::new(&format!("/proc/{pid}")).exists());
|
|
152
|
+
assert!(in_namespace("fdtarget", || Owner::new(options("nsfd"))
|
|
153
|
+
.unwrap()
|
|
154
|
+
.graph()
|
|
155
|
+
.unwrap()
|
|
156
|
+
.is_some()));
|
|
157
|
+
|
|
158
|
+
let previous: Applied = serde_json::from_value(first).unwrap();
|
|
159
|
+
let transition = serde_json::to_value(Transition {
|
|
160
|
+
previous: Some(previous),
|
|
161
|
+
target: empty(2),
|
|
162
|
+
})
|
|
163
|
+
.unwrap();
|
|
164
|
+
let wrong_namespace = File::open("/proc/thread-self/ns/net").unwrap();
|
|
165
|
+
let mut wrong = NativeOwner::start(&wrong_namespace);
|
|
166
|
+
wrong.call("openOwner", serde_json::to_value(options("nsfd")).unwrap());
|
|
167
|
+
let denied = wrong.response("reconcilePolicy", transition.clone());
|
|
168
|
+
assert_eq!(denied["success"], false);
|
|
169
|
+
assert_eq!(denied["errorCode"], "CONFLICT");
|
|
170
|
+
assert!(Owner::new(options("nsfd"))
|
|
171
|
+
.unwrap()
|
|
172
|
+
.graph()
|
|
173
|
+
.unwrap()
|
|
174
|
+
.is_none());
|
|
175
|
+
drop(wrong);
|
|
176
|
+
assert!(in_namespace("fdtarget", || Owner::new(options("nsfd"))
|
|
177
|
+
.unwrap()
|
|
178
|
+
.graph()
|
|
179
|
+
.unwrap()
|
|
180
|
+
.is_some()));
|
|
181
|
+
|
|
182
|
+
let mut recovered = NativeOwner::start(&namespace);
|
|
183
|
+
recovered.call("openOwner", serde_json::to_value(options("nsfd")).unwrap());
|
|
184
|
+
drop(namespace); // The entered child keeps membership; caller capability is not consumed by it.
|
|
185
|
+
let applied = recovered.call("reconcilePolicy", transition);
|
|
186
|
+
assert_eq!(applied["receipt"]["revision"], 2);
|
|
187
|
+
assert_eq!(
|
|
188
|
+
applied["receipt"]["identity"]["namespaceInode"],
|
|
189
|
+
metadata.ino().to_string()
|
|
190
|
+
);
|
|
191
|
+
assert_eq!(recovered.call("inspectPolicy", json!({}))["enforced"], true);
|
|
192
|
+
assert_eq!(recovered.call("closeOwner", json!({}))["released"], true);
|
|
193
|
+
drop(recovered);
|
|
194
|
+
assert!(in_namespace("fdtarget", || Owner::new(options("nsfd"))
|
|
195
|
+
.unwrap()
|
|
196
|
+
.graph()
|
|
197
|
+
.unwrap()
|
|
198
|
+
.is_none()));
|
|
199
|
+
assert!(Owner::new(options("nsfd"))
|
|
200
|
+
.unwrap()
|
|
201
|
+
.graph()
|
|
202
|
+
.unwrap()
|
|
203
|
+
.is_none());
|
|
204
|
+
assert_eq!(
|
|
205
|
+
fs::metadata("/proc/thread-self/ns/net").unwrap().ino(),
|
|
206
|
+
initial.ino()
|
|
207
|
+
);
|
|
208
|
+
ip(&["netns", "delete", "fdtarget"]);
|
|
209
|
+
}
|
|
210
|
+
|
|
211
|
+
#[test]
|
|
212
|
+
#[ignore = "requires the explicitly isolated QEMU qualification guest"]
|
|
213
|
+
fn valid_descriptor_without_entry_permission_never_becomes_ready() {
|
|
214
|
+
isolated();
|
|
215
|
+
let namespace = File::open("/proc/thread-self/ns/net").unwrap();
|
|
216
|
+
let mut child = command(&namespace)
|
|
217
|
+
.uid(65534)
|
|
218
|
+
.gid(65534)
|
|
219
|
+
.stdin(Stdio::null())
|
|
220
|
+
.stderr(Stdio::piped())
|
|
221
|
+
.spawn()
|
|
222
|
+
.unwrap();
|
|
223
|
+
let deadline = Instant::now() + Duration::from_secs(5);
|
|
224
|
+
while child.try_wait().unwrap().is_none() {
|
|
225
|
+
if Instant::now() >= deadline {
|
|
226
|
+
let _ = child.kill();
|
|
227
|
+
let _ = child.wait();
|
|
228
|
+
panic!("denied namespace entry did not exit");
|
|
229
|
+
}
|
|
230
|
+
thread::sleep(Duration::from_millis(10));
|
|
231
|
+
}
|
|
232
|
+
let output = child.wait_with_output().unwrap();
|
|
233
|
+
assert_eq!(output.status.code(), Some(1));
|
|
234
|
+
assert!(output.stdout.is_empty());
|
|
235
|
+
assert!(String::from_utf8(output.stderr)
|
|
236
|
+
.unwrap()
|
|
237
|
+
.contains("network namespace entry failed"));
|
|
238
|
+
assert_eq!(
|
|
239
|
+
unsafe { libc::ioctl(namespace.as_raw_fd(), libc::NS_GET_NSTYPE) },
|
|
240
|
+
libc::CLONE_NEWNET
|
|
241
|
+
);
|
|
242
|
+
}
|
package/rust/src/owner_tests.rs
CHANGED
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -53,12 +53,15 @@ export class ManagedNftables {
|
|
|
53
53
|
|
|
54
54
|
constructor(options: IManagedNftOptions) {
|
|
55
55
|
this.#options = snapshot(options);
|
|
56
|
-
if (Object.keys(this.#options).some((key) => !['ownerId', 'instanceId', 'tableName', 'binaryPath'].includes(key))
|
|
56
|
+
if (Object.keys(this.#options).some((key) => !['ownerId', 'instanceId', 'tableName', 'binaryPath', 'networkNamespaceFd'].includes(key))
|
|
57
57
|
|| ![this.#options.ownerId, this.#options.instanceId, this.#options.tableName].every((value) => typeof value === 'string' && /^[A-Za-z0-9_-]{1,64}$/.test(value))
|
|
58
58
|
|| this.#options.instanceId.length < 16 || !this.#options.tableName.startsWith('snft_')
|
|
59
59
|
|| this.#options.binaryPath !== undefined && (!plugins.path.isAbsolute(this.#options.binaryPath) || this.#options.binaryPath.includes('\0'))) {
|
|
60
60
|
throw new ManagedNftablesError('INVALID');
|
|
61
61
|
}
|
|
62
|
+
if (this.#options.networkNamespaceFd !== undefined && (process.platform !== 'linux'
|
|
63
|
+
|| !Number.isInteger(this.#options.networkNamespaceFd) || this.#options.networkNamespaceFd < 0
|
|
64
|
+
|| this.#options.networkNamespaceFd > 0x7fff_ffff)) throw new ManagedNftablesError('INVALID');
|
|
62
65
|
}
|
|
63
66
|
|
|
64
67
|
public get state(): string { return this.#state; }
|
|
@@ -73,7 +76,9 @@ export class ManagedNftables {
|
|
|
73
76
|
this.#bridge = new plugins.smartrust.RustBridge<TManagedNftCommands>({
|
|
74
77
|
binaryName: 'smartnftables', binaryPath: this.#options.binaryPath
|
|
75
78
|
?? plugins.path.join(root, 'dist_rust', `smartnftables_linux_${process.arch === 'x64' ? 'amd64' : 'arm64'}_musl`),
|
|
76
|
-
localPaths: [], searchSystemPath: false,
|
|
79
|
+
localPaths: [], searchSystemPath: false,
|
|
80
|
+
cliArgs: ['--management', ...(this.#options.networkNamespaceFd === undefined ? [] : ['--network-namespace-fd', '3'])],
|
|
81
|
+
inheritedFileDescriptors: this.#options.networkNamespaceFd === undefined ? undefined : [this.#options.networkNamespaceFd],
|
|
77
82
|
readyTimeoutMs: 3000, requestTimeoutMs: 30_000, maxPayloadSize: 262_144,
|
|
78
83
|
maxPendingRequestsByMethod: { preparePolicy: 1, openOwner: 1, reconcilePolicy: 1, inspectPolicy: 1, releasePolicy: 1, closeOwner: 1 },
|
|
79
84
|
});
|
package/ts/managed.types.ts
CHANGED
|
@@ -75,11 +75,15 @@ export interface IManagedNftOptions {
|
|
|
75
75
|
tableName: string;
|
|
76
76
|
/** Explicit executable selection for qualified distributions and isolated tests. */
|
|
77
77
|
binaryPath?: string;
|
|
78
|
+
/** Linux network namespace descriptor, owned by the caller and valid through start().
|
|
79
|
+
* The native process enters before readiness or netlink activity. Keep a namespace
|
|
80
|
+
* owner alive for policy lifetime and recovery; this process option is not durable authority. */
|
|
81
|
+
networkNamespaceFd?: number;
|
|
78
82
|
}
|
|
79
83
|
|
|
80
84
|
export type TManagedNftCommands = {
|
|
81
85
|
preparePolicy: { params: IManagedNftPolicy; result: IPreparedManagedNftPolicy };
|
|
82
|
-
openOwner: { params:
|
|
86
|
+
openOwner: { params: Pick<IManagedNftOptions, 'ownerId' | 'instanceId' | 'tableName'>; result: IManagedNftStatus };
|
|
83
87
|
reconcilePolicy: { params: IManagedNftTransition; result: IAppliedManagedNftPolicy };
|
|
84
88
|
inspectPolicy: { params: Record<string, never>; result: IManagedNftStatus };
|
|
85
89
|
releasePolicy: { params: IAppliedManagedNftPolicy; result: { released: true } };
|