Skip to content

Support following symlinks in tar when setting default kernel #575

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
katiewasnothere merged 1 commit into from
Sep 4, 2025
Merged

Support following symlinks in tar when setting default kernel #575

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
27 changes: 20 additions & 7 deletions Sources/APIServer/Kernel/KernelService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,7 @@ actor KernelService {
await progressUpdate?([
.setDescription("Unpacking kernel")
])
let archiveReader = try ArchiveReader(file: tarFile)
let kernelFile = try archiveReader.extractFile(from: kernelFilePath, to: tempDir)
let kernelFile = try self.extractFile(tarFile: tarFile, at: kernelFilePath, to: tempDir)
try self.installKernel(kernelFile: kernelFile, platform: platform)

if !FileManager.default.fileExists(atPath: tar.absoluteString) {
Expand Down Expand Up @@ -112,13 +111,27 @@ actor KernelService {
}
return Kernel(path: defaultKernelPath, platform: platform)
}
}

extension ArchiveReader {
fileprivate func extractFile(from: String, to directory: URL) throws -> URL {
let (_, data) = try self.extractFile(path: from)
private func extractFile(tarFile: URL, at: String, to directory: URL) throws -> URL {
var target = at
var archiveReader = try ArchiveReader(file: tarFile)
var (entry, data) = try archiveReader.extractFile(path: target)

// if the target file is a symlink, get the data for the actual file
if entry.fileType == .symbolicLink, let symlinkRelative = entry.symlinkTarget {
// the previous extractFile changes the underlying file pointer, so we need to reopen the file
// to ensure we traverse all the files in the archive
archiveReader = try ArchiveReader(file: tarFile)
let symlinkTarget = URL(filePath: target).deletingLastPathComponent().appending(path: symlinkRelative)

// standardize so that we remove any and all ../ and ./ in the path since symlink targets
// are relative paths to the target file from the symlink's parent dir itself
target = symlinkTarget.standardized.relativePath
let (_, targetData) = try archiveReader.extractFile(path: target)
data = targetData
}
try FileManager.default.createDirectory(at: directory, withIntermediateDirectories: true, attributes: nil)
let fileName = URL(filePath: from).lastPathComponent
let fileName = URL(filePath: target).lastPathComponent
let fileURL = directory.appendingPathComponent(fileName)
try data.write(to: fileURL, options: .atomic)
return fileURL
Expand Down