Skip to content

Dereference symlinked config before copying #1944

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
tiferrei wants to merge 1 commit into
base: main
Choose a base branch
from
+27 −1
Open

Dereference symlinked config before copying #1944

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
3 changes: 2 additions & 1 deletion Sources/ContainerPersistence/ConfigurationLoader.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,9 @@ public enum ConfigurationLoader {
let destDir = destPath.removingLastComponent()
try fm.createDirectory(atPath: destDir.string, withIntermediateDirectories: true)

let resolvedSourcePath = try sourcePath.resolvingSymlinks()
try fm.copyItem(
at: URL(filePath: sourcePath.string),
at: URL(filePath: resolvedSourcePath.string),
to: URL(filePath: destPath.string)
)
try fm.setAttributes([.posixPermissions: READ_ONLY], ofItemAtPath: destPath.string)
Expand Down
25 changes: 25 additions & 0 deletions Tests/ContainerPersistenceTests/ConfigurationLoaderTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,31 @@ struct ConfigurationLoaderTests {
}
}

@Test func copyConfigDereferencesSymlink() async throws {
try await TemporaryStorage.withTempDir { tempDir in
let fm = FileManager.default
let target = tempDir.appending("target.toml")
let source = tempDir.appending("config.toml")
try Self.writeToml("[build]\ncpus = 8", to: target)
try fm.setAttributes([.posixPermissions: 0o444], ofItemAtPath: target.string)
try fm.createSymbolicLink(atPath: source.string, withDestinationPath: target.string)

let destBase = tempDir.appending("dest")
try ConfigurationLoader.copyConfigurationToReadOnly(from: source, to: destBase)

let destFile = destBase.appending("config").appending("config.toml")
let attrs = try fm.attributesOfItem(atPath: destFile.string)
let fileType = try #require(attrs[.type] as? FileAttributeType)
#expect(fileType == .typeRegular)
let perms = try #require(attrs[.posixPermissions] as? Int)
#expect(perms == 0o444)

try fm.removeItem(atPath: target.string)
let copied = try String(contentsOf: URL(filePath: destFile.string), encoding: .utf8)
#expect(copied.contains("cpus = 8"))
}
}

@Test func copyConfigOverwritesExistingReadOnlyDestination() async throws {
try await TemporaryStorage.withTempDir { tempDir in
let source = tempDir.appending("config.toml")
Expand Down