Skip to content

Commit 7c06aec

Browse files
fix(supervisor): quote nft log prefix in bypass rules
The log prefix value passed to nft contains colons (e.g. openshell:bypass:sandbox-cc817378:) but was not wrapped in double quotes. Since nft concatenates argv entries and parses the result, the bare colons cause a syntax error that silently prevents all bypass-attempt LOG rules from installing. Wrap log prefix values in nft-quoted strings via a new nft_quote() helper that also escapes internal backslashes and double quotes. All four log-rule generation sites (TCP and UDP, for both per-sandbox and sidecar rulesets) are updated. Fixes NVIDIA#2470 Signed-off-by: Grace Smith <[email protected]> Signed-off-by: Grace Smith <[email protected]>
1 parent 101cbc9 commit 7c06aec

1 file changed

Lines changed: 40 additions & 6 deletions

File tree

‎crates/openshell-supervisor-process/src/netns/nft_ruleset.rs‎

Lines changed: 40 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,12 @@ pub fn generate_bypass_commands(
9393
];
9494

9595
if let Some(prefix) = log_prefix {
96+
let quoted = nft_quote(prefix);
9697
cmds.push(nft_cmd(
9798
false,
9899
&[
99100
"add", "rule", "inet", table, "output", "tcp", "flags", "syn", "limit", "rate",
100-
"5/second", "burst", "10", "packets", "log", "prefix", prefix, "flags", "skuid",
101+
"5/second", "burst", "10", "packets", "log", "prefix", &quoted, "flags", "skuid",
101102
],
102103
));
103104
}
@@ -146,11 +147,12 @@ pub fn generate_bypass_commands(
146147
));
147148

148149
if let Some(prefix) = log_prefix {
150+
let quoted = nft_quote(prefix);
149151
cmds.push(nft_cmd(
150152
false,
151153
&[
152154
"add", "rule", "inet", table, "output", "meta", "l4proto", "udp", "limit", "rate",
153-
"5/second", "burst", "10", "packets", "log", "prefix", prefix, "flags", "skuid",
155+
"5/second", "burst", "10", "packets", "log", "prefix", &quoted, "flags", "skuid",
154156
],
155157
));
156158
}
@@ -258,11 +260,12 @@ pub fn generate_sidecar_bypass_commands(
258260
];
259261

260262
if let Some(prefix) = log_prefix {
263+
let quoted = nft_quote(prefix);
261264
cmds.push(nft_cmd(
262265
false,
263266
&[
264267
"add", "rule", "inet", table, "output", "tcp", "flags", "syn", "limit", "rate",
265-
"5/second", "burst", "10", "packets", "log", "prefix", prefix, "flags", "skuid",
268+
"5/second", "burst", "10", "packets", "log", "prefix", &quoted, "flags", "skuid",
266269
],
267270
));
268271
}
@@ -311,11 +314,12 @@ pub fn generate_sidecar_bypass_commands(
311314
));
312315

313316
if let Some(prefix) = log_prefix {
317+
let quoted = nft_quote(prefix);
314318
cmds.push(nft_cmd(
315319
false,
316320
&[
317321
"add", "rule", "inet", table, "output", "meta", "l4proto", "udp", "limit", "rate",
318-
"5/second", "burst", "10", "packets", "log", "prefix", prefix, "flags", "skuid",
322+
"5/second", "burst", "10", "packets", "log", "prefix", &quoted, "flags", "skuid",
319323
],
320324
));
321325
}
@@ -373,6 +377,10 @@ fn nft_cmd(required: bool, args: &[&str]) -> NftCommand {
373377
}
374378
}
375379

380+
fn nft_quote(s: &str) -> String {
381+
format!("\"{}\"", s.replace('\\', "\\\\").replace('"', "\\\""))
382+
}
383+
376384
#[cfg(test)]
377385
mod tests {
378386
use super::*;
@@ -451,7 +459,9 @@ mod tests {
451459
fn log_commands_contain_prefix_for_tcp_and_udp() {
452460
let cmds = generate_bypass_commands("10.0.2.2", 8080, Some("openshell:bypass:test:"));
453461
let text = all_strs(&cmds);
454-
let count = text.matches("log prefix openshell:bypass:test:").count();
462+
let count = text
463+
.matches("log prefix \"openshell:bypass:test:\"")
464+
.count();
455465
assert_eq!(count, 2, "need log rules for both TCP and UDP");
456466
assert!(text.contains("tcp flags syn limit rate 5/second burst 10 packets"));
457467
assert!(text.contains("meta l4proto udp limit rate 5/second burst 10 packets"));
@@ -524,8 +534,32 @@ mod tests {
524534
assert!(text.contains("meta nfproto ipv4 meta l4proto udp reject"));
525535
assert!(text.contains("meta nfproto ipv6 meta l4proto udp reject"));
526536
assert_eq!(
527-
text.matches("log prefix openshell:sidecar:test:").count(),
537+
text.matches("log prefix \"openshell:sidecar:test:\"")
538+
.count(),
528539
2
529540
);
530541
}
542+
543+
#[test]
544+
fn log_prefix_is_quoted_as_nft_string_literal() {
545+
let cmds = generate_bypass_commands("10.0.2.2", 8080, Some("openshell:bypass:test:"));
546+
for cmd in &cmds {
547+
let s = cmd_str(cmd);
548+
if let Some(idx) = s.find("log prefix ") {
549+
let after_prefix = &s[idx + "log prefix ".len()..];
550+
assert!(
551+
after_prefix.starts_with('"'),
552+
"log prefix value must be an nft-quoted string, got: {after_prefix}"
553+
);
554+
}
555+
}
556+
}
557+
558+
#[test]
559+
fn nft_quote_wraps_in_double_quotes() {
560+
assert_eq!(nft_quote("simple"), "\"simple\"");
561+
assert_eq!(nft_quote("has:colons:"), "\"has:colons:\"");
562+
assert_eq!(nft_quote("has\"quote"), "\"has\\\"quote\"");
563+
assert_eq!(nft_quote("has\\backslash"), "\"has\\\\backslash\"");
564+
}
531565
}

0 commit comments

Comments
 (0)