starred/container
1
0
Fork 0
mirror of https://github.com/apple/container.git synced 2026-08-24 10:05:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use FilePath for PublishSocket (#1594)

Browse Source 
- Closes #1593.
This commit is contained in:
Chris George
2026-06-01 13:35:58 -07:00
committed by GitHub
parent 37595a734c
commit da8daf31de
4 changed files with 383 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/Services/ContainerAPIService/Client/Parser.swift
+11 -23
View File
@@ -22,6 +22,7 @@ import ContainerizationExtras
import ContainerizationOCI
import ContainerizationOS
import Foundation
import SystemPackage
/// A parsed volume specification from user input
public struct ParsedVolume {
@@ -739,7 +740,6 @@ public struct Parser {
let hostPath = String(parts[0])
let containerPath = String(parts[1])
// Validate paths are not empty
if hostPath.isEmpty {
throw ContainerizationError(
.invalidArgument, message: "host socket path cannot be empty")
@@ -749,28 +749,18 @@ public struct Parser {
.invalidArgument, message: "container socket path cannot be empty")
}
// Ensure container path must start with /
if !containerPath.hasPrefix("/") {
throw ContainerizationError(
.invalidArgument,
message: "container socket path must be absolute: \(containerPath)")
}
let absoluteHostPath = FilePathOps.absolutePath(FilePath(hostPath))
// Convert host path to absolute path for consistency
let hostURL = URL(fileURLWithPath: hostPath)
let absoluteHostPath = hostURL.absoluteURL.path
// Check if host socket already exists and might be in use
if FileManager.default.fileExists(atPath: absoluteHostPath) {
if FileManager.default.fileExists(atPath: absoluteHostPath.string) {
do {
let attrs = try FileManager.default.attributesOfItem(atPath: absoluteHostPath)
let attrs = try FileManager.default.attributesOfItem(atPath: absoluteHostPath.string)
if let fileType = attrs[.type] as? FileAttributeType, fileType == .typeSocket {
throw ContainerizationError(
.invalidArgument,
message: "host socket \(absoluteHostPath) already exists and may be in use")
}
// If it exists but is not a socket, we can remove it and create socket
try FileManager.default.removeItem(atPath: absoluteHostPath)
try FileManager.default.removeItem(atPath: absoluteHostPath.string)
} catch let error as ContainerizationError {
throw error
} catch {
@@ -778,17 +768,15 @@ public struct Parser {
}
}
// Create host directory if it doesn't exist
let hostDir = hostURL.deletingLastPathComponent()
if !FileManager.default.fileExists(atPath: hostDir.path) {
let hostDir = absoluteHostPath.removingLastComponent()
if !FileManager.default.fileExists(atPath: hostDir.string) {
try FileManager.default.createDirectory(
at: hostDir, withIntermediateDirectories: true)
atPath: hostDir.string, withIntermediateDirectories: true)
}
// Create and return PublishSocket object with validated paths
return PublishSocket(
containerPath: URL(fileURLWithPath: containerPath),
hostPath: URL(fileURLWithPath: absoluteHostPath),
return try PublishSocket(
containerPath: FilePath(containerPath),
hostPath: absoluteHostPath,
permissions: nil
)
Sources/Services/RuntimeLinux/Server/RuntimeService.swift
+3 -2
View File
@@ -1000,9 +1000,10 @@ public actor RuntimeService {
}
for publishedSocket in config.publishedSockets {
// UnixSocketConfiguration (Containerization) takes URL; convert from FilePath at the boundary.
let socketConfig = UnixSocketConfiguration(
source: publishedSocket.containerPath,
destination: publishedSocket.hostPath,
source: URL(filePath: publishedSocket.containerPath.string),
destination: URL(filePath: publishedSocket.hostPath.string),
permissions: publishedSocket.permissions,
direction: .outOf
)