Skip to content

Propagate host ssh socket permissions to relay socket in guest. #811

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

Merged
realrajaryan merged 2 commits into from
Oct 27, 2025
Merged

Propagate host ssh socket permissions to relay socket in guest. #811

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca4c0b9
Propagate host ssh socket permissions to relay socket in guest.
jglogan Oct 26, 2025
a94f4d7
Fall back to nil socket perms if `attributesOfItem` fails.
jglogan Oct 27, 2025
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
16 changes: 11 additions & 5 deletions Sources/Services/ContainerSandboxService/SandboxService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import NIO
import NIOFoundationCompat
import SocketForwarder
import Synchronization
import SystemPackage

import struct ContainerizationOCI.Mount
import struct ContainerizationOCI.Process
Expand All @@ -51,7 +52,7 @@ public actor SandboxService {
private static let sshAuthSocketGuestPath = "/run/host-services/ssh-auth.sock"
private static let sshAuthSocketEnvVar = "SSH_AUTH_SOCK"

private static func hostSocketUrl(config: ContainerConfiguration) -> URL? {
private static func sshAuthSocketHostUrl(config: ContainerConfiguration) -> URL? {
if config.ssh, let sshSocket = Foundation.ProcessInfo.processInfo.environment[Self.sshAuthSocketEnvVar] {
return URL(fileURLWithPath: sshSocket)
}
Expand Down Expand Up @@ -793,11 +794,16 @@ public actor SandboxService {
czConfig.sockets.append(socketConfig)
}

if let socketUrl = Self.hostSocketUrl(config: config) {
if let socketUrl = Self.sshAuthSocketHostUrl(config: config) {
let socketPath = socketUrl.path(percentEncoded: false)
let attrs = try? FileManager.default.attributesOfItem(atPath: socketPath)
let permissions = (attrs?[.posixPermissions] as? NSNumber)
.map { FilePermissions(rawValue: mode_t($0.intValue)) }
let socketConfig = UnixSocketConfiguration(
source: socketUrl,
destination: URL(fileURLWithPath: Self.sshAuthSocketGuestPath),
direction: .into
permissions: permissions,
direction: .into,
)
czConfig.sockets.append(socketConfig)
}
Expand Down Expand Up @@ -835,7 +841,7 @@ public actor SandboxService {
czConfig.process.arguments = [process.executable] + process.arguments
czConfig.process.environmentVariables = process.environment

if Self.hostSocketUrl(config: config) != nil {
if Self.sshAuthSocketHostUrl(config: config) != nil {
if !czConfig.process.environmentVariables.contains(where: { $0.starts(with: "\(Self.sshAuthSocketEnvVar)=") }) {
czConfig.process.environmentVariables.append("\(Self.sshAuthSocketEnvVar)=\(Self.sshAuthSocketGuestPath)")
}
Expand Down Expand Up @@ -877,7 +883,7 @@ public actor SandboxService {
proc.arguments = [config.executable] + config.arguments
proc.environmentVariables = config.environment

if Self.hostSocketUrl(config: containerConfig) != nil {
if Self.sshAuthSocketHostUrl(config: containerConfig) != nil {
if !proc.environmentVariables.contains(where: { $0.starts(with: "\(Self.sshAuthSocketEnvVar)=") }) {
proc.environmentVariables.append("\(Self.sshAuthSocketEnvVar)=\(Self.sshAuthSocketGuestPath)")
}
Expand Down