Skip to content

fix(server): harden sandbox TLS secret volume permissions #341

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
drew wants to merge 1 commit into from
Closed

fix(server): harden sandbox TLS secret volume permissions #341

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 46 additions & 2 deletions crates/openshell-server/src/sandbox/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -969,12 +969,17 @@ fn sandbox_template_to_k8s(
);

// Add TLS secret volume.
// Use mode 0400 (owner-read only) so unprivileged processes in the
// sandbox cannot read the client private key material.
if !client_tls_secret_name.is_empty() {
spec.insert(
"volumes".to_string(),
serde_json::json!([{
"name": "openshell-client-tls",
"secret": { "secretName": client_tls_secret_name }
"secret": {
"secretName": client_tls_secret_name,
"defaultMode": 256
}
}]),
);
}
Expand Down Expand Up @@ -1047,14 +1052,19 @@ fn inject_pod_template(
}

// Inject TLS volume at the pod spec level.
// Use mode 0400 (owner-read only) so unprivileged processes in the
// sandbox cannot read the client private key material.
if !client_tls_secret_name.is_empty() {
let volumes = spec
.entry("volumes")
.or_insert_with(|| serde_json::Value::Array(Vec::new()));
if let Some(volumes_arr) = volumes.as_array_mut() {
volumes_arr.push(serde_json::json!({
"name": "openshell-client-tls",
"secret": { "secretName": client_tls_secret_name }
"secret": {
"secretName": client_tls_secret_name,
"defaultMode": 256
}
}));
}
}
Expand Down Expand Up @@ -2013,6 +2023,40 @@ mod tests {
);
}

#[test]
fn tls_secret_volume_uses_owner_read_only_mode() {
let pod_template = sandbox_template_to_k8s(
&SandboxTemplate::default(),
false,
"openshell/sandbox:latest",
"",
"sandbox-id",
"sandbox-name",
"https://gateway.example.com",
"0.0.0.0:2222",
"secret",
300,
&std::collections::HashMap::new(),
"openshell-client-tls",
"",
);

let volumes = pod_template["spec"]["volumes"]
.as_array()
.expect("volumes should exist");
let tls_volume = volumes
.iter()
.find(|v| v["name"] == "openshell-client-tls")
.expect("openshell-client-tls volume should exist");

assert_eq!(tls_volume["secret"]["secretName"], "openshell-client-tls");
assert_eq!(
tls_volume["secret"]["defaultMode"],
serde_json::json!(256),
"TLS secret defaultMode should be 0400 (decimal 256)"
);
}

#[test]
fn host_aliases_injected_in_custom_pod_template() {
let template = SandboxTemplate {
Expand Down
Loading