Skip to content

add ID validation to daemon service #1735

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

Open
0xf00sec wants to merge 1 commit into
base: main
Choose a base branch
from
+26 −0
Open

add ID validation to daemon service #1735

Show file tree
Hide file tree
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
6 changes: 6 additions & 0 deletions Sources/Services/ContainerAPIService/Server/Containers/ContainersService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,8 @@ public actor ContainersService {
}

try await self.lock.withLock(logMetadata: ["acquirer": "\(#function)", "id": "\(configuration.id)"]) { context in
try Utility.validEntityName(configuration.id)

guard await self.containers[configuration.id] == nil else {
throw ContainerizationError(
.exists,
Expand Down Expand Up @@ -892,6 +894,8 @@ public actor ContainersService {
)
}

try Utility.validEntityName(id)

let containerPath = self.containerRoot.appendingPathComponent(id).path

return FileManager.default.allocatedSize(of: URL(fileURLWithPath: containerPath))
Expand All @@ -900,6 +904,8 @@ public actor ContainersService {
public func exportRootfs(id: String, archive: URL) async throws {
self.log.debug("\(#function)")

try Utility.validEntityName(id)

let state = try self._getContainerState(id: id)
guard state.snapshot.status == .stopped else {
throw ContainerizationError(.invalidState, message: "container is not stopped")
Expand Down
20 changes: 20 additions & 0 deletions Tests/ContainerAPIClientTests/UtilityTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,26 @@ struct UtilityTests {
#expect(Utility.trimDigest(digest: "sha256:abc") == "abc")
}

@Test("Valid entity names are accepted")
func testValidEntityNames() throws {
try Utility.validEntityName("my-container")
try Utility.validEntityName("test.container")
try Utility.validEntityName("abc123")
try Utility.validEntityName("a1")
try Utility.validEntityName("container_1.test-abc")
}

@Test("Path traversal sequences are rejected")
func testTraversalSequencesRejected() {
#expect(throws: Error.self) { try Utility.validEntityName("../../tmp/evil") }
#expect(throws: Error.self) { try Utility.validEntityName("../foo") }
#expect(throws: Error.self) { try Utility.validEntityName("foo/bar") }
#expect(throws: Error.self) { try Utility.validEntityName("/tmp/evil") }
#expect(throws: Error.self) { try Utility.validEntityName("") }
#expect(throws: Error.self) { try Utility.validEntityName(".hidden") }
#expect(throws: Error.self) { try Utility.validEntityName("-bad") }
}

@Test
func testPublishPortParser() throws {
let ports = try Parser.publishPorts([
Expand Down