Compare commits

..
11 Commits
Author SHA1 Message Date
edi-oai 5c1c6bd315 tart ip: read /etc/bootptab in addition to /var/db/dhcpd_leases (#1355) 2026-09-28 16:49:06 +01:00
RKS 27d3e2c5da Weak-link Swift compatibility library in Tart releases (#1339)
* Bundle Swift compatibility libraries in Tart releases

* fix(release): weak-link Swift compatibility library

* fix(release): weak-link from Xcode 27 library path
2026-09-26 08:48:02 -07:00
Minh Vu a80ec74a42 Preserve modification date when updating access time (#1292) 2026-09-26 08:45:14 -07:00
RKS 8ac52501c3 fix(storage): preserve running VM delete errors (#1350)
* fix(storage): preserve running VM delete errors

Do not reinterpret RuntimeError.VMIsRunning as a missing VM when the storage wrapper bridges errors through NSError.

Refs #1345

* test(storage): initialize running VM lock file

* test(storage): hold VM lock in a child process

* fix(storage): narrow file-not-found error matching

* test(storage): use Swift error-domain regression coverage
2026-09-26 08:40:20 -07:00
Yoshimasa Niwa bb4acb2468 Fix listing VMs when disk capacity is unavailable (#1349)
* Allow HumanReadableByteCount to represent an unknown byte count

Some byte counts, such as the capacity of an ASIF disk image, can't
always be determined. Accept an optional byte count and render an
unknown value as "-" in text output and as null in JSON output.

* Fix listing and getting VMs when disk capacity is unavailable

For ASIF disk images, the disk capacity is read with "diskutil image
info". The command fails with "Resource temporarily unavailable" while
a running VM holds the disk image open. As a result, "tart list" and
"tart get" fail entirely when any such VM exists.

Treat the disk capacity as unknown when it can't be determined, so
that both commands still show the remaining information.

Fixes #1344

* Remove unused VMDirectory.diskSizeGB()

The method was added together with diskSizeBytes() but has never been
used. "tart list" and "tart get" use diskSizeBytes() directly.
2026-09-25 17:08:34 -07:00
om singhal 65aea029ab Use registry-1.docker.io for Docker Hub's docker.io host (#1332)
* Use registry-1.docker.io for Docker Hub's docker.io host

docker.io doesn't serve the registry API: https://docker.io/v2/ redirects
to https://www.docker.com/, which URLSession follows, getting back an HTML
page with HTTP 200. As a result, pushing fails with
UnexpectedHTTPStatusCode("pushing blob (POST)", 200, ...), pulling fails
to parse the manifest and "tart login docker.io" accepts any credentials,
because ping() never gets an authentication challenge.

Send the API requests for docker.io to registry-1.docker.io instead, while
still using docker.io for the pushed image names and for the credentials
lookup, so that credentials saved with "tart login docker.io" keep working.

Fixes #1275

* Match docker.io case insensitively

* Recognize Docker Hub with an explicit port

* Parse the registry host once and keep it normalized

Using the host exactly as specified for naming and credentials lookup
changed the behavior for other registries too. For example,
"127.0.0.1:05000" used to find credentials stored for "127.0.0.1:5000",
but didn't anymore.

Parse the URL once instead, take the normalized host and port from it
like before, and only replace the URL's host with registry-1.docker.io
for Docker Hub.
2026-09-24 14:00:30 -07:00
12 4e58a2a0b9 Fix export overwrite confirmation on EOF (#1342) 2026-09-23 15:10:01 -07:00
Yibo Zhuang f8ce0f9acb Add an option to disable USB accessories (#1338)
* Add an option to disable USB accessories

* Select USB accessories in platform input factories
2026-09-23 12:14:39 -07:00
Yibo Zhuang 6fff37f0e0 Wait for collector in OpenTelemetry integration test (#1335) 2026-09-21 09:10:53 -07:00
Brendan Shanks 89017ff0b3 VMConfig: Save JSON with sorted keys (#1326) 2026-09-16 16:24:50 -07:00
edi-oai acaf3ca7ef ControlSocket: duplicate VirtIO socket connection's file descriptor (#1333) 2026-09-16 11:37:56 +01:00
28 changed files with 744 additions and 96 deletions
+3
View File
@@ -5,12 +5,15 @@ set -eu
ARCH="$1" ARCH="$1"
SCRATCH_PATH=".build/$ARCH" SCRATCH_PATH=".build/$ARCH"
OUTPUT_PATH=".build/prebuilt/$ARCH" OUTPUT_PATH=".build/prebuilt/$ARCH"
SWIFT_COMPATIBILITY_LIBRARY="$(dirname "$(xcrun --find swiftc)")/../lib/swift-6.2/macosx/libswiftCompatibilitySpan.dylib"
swift build \ swift build \
--build-system swiftbuild \ --build-system swiftbuild \
--scratch-path "$SCRATCH_PATH" \ --scratch-path "$SCRATCH_PATH" \
--arch "$ARCH" \ --arch "$ARCH" \
--configuration release \ --configuration release \
-Xlinker -weak_library \
-Xlinker "$SWIFT_COMPATIBILITY_LIBRARY" \
--product tart --product tart
BIN_PATH=$(swift build \ BIN_PATH=$(swift build \
+1 -1
View File
@@ -37,7 +37,7 @@ struct Export: AsyncParsableCommand {
func userWantsOverwrite(_ filename: String) -> Bool { func userWantsOverwrite(_ filename: String) -> Bool {
print("file \(filename) already exists, are you sure you want to overwrite it? (yes, [no])? ", terminator: "") print("file \(filename) already exists, are you sure you want to overwrite it? (yes, [no])? ", terminator: "")
let answer = readLine()! let answer = readLine()
return answer == "yes" return answer == "yes"
} }
+2 -1
View File
@@ -31,7 +31,8 @@ struct Get: AsyncParsableCommand {
OS: vmConfig.os, OS: vmConfig.os,
CPU: vmConfig.cpuCount, CPU: vmConfig.cpuCount,
Memory: memorySizeInMb, Memory: memorySizeInMb,
Disk: HumanReadableByteCount(try vmDir.diskSizeBytes()) { $0 / 1000 / 1000 / 1000 }, // ASIF capacity lookup can fail while a running VM holds the disk open.
Disk: HumanReadableByteCount(try? vmDir.diskSizeBytes()) { $0 / 1000 / 1000 / 1000 },
DiskFormat: vmConfig.diskFormat.rawValue, DiskFormat: vmConfig.diskFormat.rawValue,
Size: HumanReadableByteCount(try vmDir.allocatedSizeBytes()) { Size: HumanReadableByteCount(try vmDir.allocatedSizeBytes()) {
String(format: "%.3f", Float($0) / 1000 / 1000 / 1000) String(format: "%.3f", Float($0) / 1000 / 1000 / 1000)
+4 -1
View File
@@ -20,7 +20,7 @@ struct IP: AsyncParsableCommand {
@Option(help: ArgumentHelp("Strategy for resolving IP address", @Option(help: ArgumentHelp("Strategy for resolving IP address",
discussion: """ discussion: """
By default, Tart is using a "dhcp" resolver which parses the DHCP lease file on host and tries to find an entry containing the VM's MAC address. This method is fast and the most reliable, but only works for VMs are not using the bridged networking.\n By default, Tart is using a "dhcp" resolver which parses the DHCP reservation file, then the lease file on host and tries to find an entry containing the VM's MAC address. This method is fast and the most reliable, but only works for VMs not using the bridged networking.\n
Alternatively, Tart has an "arp" resolver which calls an external "arp" executable and parses it's output. This works for VMs using bridged networking and returns their IP, but when they generate enough network activity to populate the host's ARP table. Note that "arp" strategy won't work for VMs using the Softnet networking.\n Alternatively, Tart has an "arp" resolver which calls an external "arp" executable and parses it's output. This works for VMs using bridged networking and returns their IP, but when they generate enough network activity to populate the host's ARP table. Note that "arp" strategy won't work for VMs using the Softnet networking.\n
A third strategy, "agent" works in all cases reliably, but requires Guest agent for Tart VMs (https://github.com/cirruslabs/tart-guest-agent) to be installed inside of a VM. A third strategy, "agent" works in all cases reliably, but requires Guest agent for Tart VMs (https://github.com/cirruslabs/tart-guest-agent) to be installed inside of a VM.
""")) """))
@@ -60,6 +60,9 @@ struct IP: AsyncParsableCommand {
return ip return ip
} }
case .dhcp: case .dhcp:
if let bootptab = try Bootptab(), let ip = try bootptab.ResolveMACAddress(macAddress: vmMACAddress) {
return ip
}
if let leases = try Leases(), let ip = leases.ResolveMACAddress(macAddress: vmMACAddress) { if let leases = try Leases(), let ip = leases.ResolveMACAddress(macAddress: vmMACAddress) {
return ip return ip
} }
+3 -2
View File
@@ -42,7 +42,8 @@ struct List: AsyncParsableCommand {
try VMInfo( try VMInfo(
Source: "local", Source: "local",
Name: name, Name: name,
Disk: HumanReadableByteCount(try vmDir.diskSizeBytes()) { $0 / 1000 / 1000 / 1000 }, // ASIF capacity lookup can fail while a running VM holds the disk open.
Disk: HumanReadableByteCount(try? vmDir.diskSizeBytes()) { $0 / 1000 / 1000 / 1000 },
Size: HumanReadableByteCount(try vmDir.allocatedSizeBytes()) { $0 / 1000 / 1000 / 1000 }, Size: HumanReadableByteCount(try vmDir.allocatedSizeBytes()) { $0 / 1000 / 1000 / 1000 },
Accessed: formatAccessDate(try vmDir.accessDate()), Accessed: formatAccessDate(try vmDir.accessDate()),
Running: vmDir.running(), Running: vmDir.running(),
@@ -56,7 +57,7 @@ struct List: AsyncParsableCommand {
try VMInfo( try VMInfo(
Source: "OCI", Source: "OCI",
Name: name, Name: name,
Disk: HumanReadableByteCount(try vmDir.diskSizeBytes()) { $0 / 1000 / 1000 / 1000 }, Disk: HumanReadableByteCount(try? vmDir.diskSizeBytes()) { $0 / 1000 / 1000 / 1000 },
Size: HumanReadableByteCount(try vmDir.allocatedSizeBytes()) { $0 / 1000 / 1000 / 1000 }, Size: HumanReadableByteCount(try vmDir.allocatedSizeBytes()) { $0 / 1000 / 1000 / 1000 },
Accessed: formatAccessDate(try vmDir.accessDate()), Accessed: formatAccessDate(try vmDir.accessDate()),
Running: vmDir.running(), Running: vmDir.running(),
+4
View File
@@ -90,6 +90,9 @@ struct Run: AsyncParsableCommand {
@Flag(help: "Disable audio pass-through to host.") @Flag(help: "Disable audio pass-through to host.")
var noAudio: Bool = false var noAudio: Bool = false
@Flag(help: "Disable USB accessories.")
var noUSBAccessories: Bool = false
@Flag(help: ArgumentHelp( @Flag(help: ArgumentHelp(
"Disable clipboard sharing between host and guest.", "Disable clipboard sharing between host and guest.",
discussion: "Clipboard sharing requires spice-vdagent package on Linux and https://github.com/cirruslabs/tart-guest-agent on macOS.")) discussion: "Clipboard sharing requires spice-vdagent package on Linux and https://github.com/cirruslabs/tart-guest-agent on macOS."))
@@ -470,6 +473,7 @@ struct Run: AsyncParsableCommand {
nested: nested, nested: nested,
audio: !noAudio, audio: !noAudio,
clipboard: !noClipboard, clipboard: !noClipboard,
noUSBAccessories: noUSBAccessories,
sync: VZDiskImageSynchronizationMode(diskOptions.syncModeRaw), sync: VZDiskImageSynchronizationMode(diskOptions.syncModeRaw),
caching: VZDiskImageCachingMode(diskOptions.cachingModeRaw), caching: VZDiskImageCachingMode(diskOptions.cachingModeRaw),
noTrackpad: noTrackpad, noTrackpad: noTrackpad,
+21 -1
View File
@@ -1,4 +1,7 @@
import Foundation import Foundation
import Darwin
import System
import Virtualization
import Network import Network
import os.log import os.log
import NIO import NIO
@@ -72,7 +75,13 @@ class ControlSocket {
self.logger.info("running control socket proxy") self.logger.info("running control socket proxy")
let vmChannel = try await ClientBootstrap(group: eventLoopGroup).withConnectedSocket(vmConnection.fileDescriptor) { childChannel in // Duplicate the connection's file descriptor
//
// This way VZVirtioSocketConnection and NIO won't race to close the same descriptor,
// which may result in "tart run" crashing because of NIO's fatal assertion on EBADF.
let vmSocket = try duplicateAndCloseConnection(vmConnection)
let vmChannel = try await ClientBootstrap(group: eventLoopGroup).withConnectedSocket(vmSocket) { childChannel in
childChannel.eventLoop.makeCompletedFuture { childChannel.eventLoop.makeCompletedFuture {
try NIOAsyncChannel<ByteBuffer, ByteBuffer>( try NIOAsyncChannel<ByteBuffer, ByteBuffer>(
wrappingChannelSynchronously: childChannel wrappingChannelSynchronously: childChannel
@@ -104,4 +113,15 @@ class ControlSocket {
} }
} }
} }
private func duplicateAndCloseConnection(_ connection: VZVirtioSocketConnection) throws -> CInt {
defer { connection.close() }
let fd = fcntl(connection.fileDescriptor, F_DUPFD_CLOEXEC, 0)
guard fd >= 0 else {
throw Errno(rawValue: errno)
}
return fd
}
} }
@@ -1,15 +1,19 @@
import Foundation import Foundation
struct HumanReadableByteCount: Encodable, CustomStringConvertible { struct HumanReadableByteCount: Encodable, CustomStringConvertible {
private let byteCount: Int private let byteCount: Int?
private let jsonValue: any Encodable private let jsonValue: any Encodable
init<JSONValue: Encodable>(_ byteCount: Int, encodedAs: (Int) -> JSONValue) { init<JSONValue: Encodable>(_ byteCount: Int?, encodedAs: (Int) -> JSONValue) {
self.byteCount = byteCount self.byteCount = byteCount
self.jsonValue = encodedAs(byteCount) self.jsonValue = byteCount.map(encodedAs)
} }
var description: String { var description: String {
guard let byteCount else {
return "-"
}
let formatter = MeasurementFormatter() let formatter = MeasurementFormatter()
formatter.unitOptions = .naturalScale formatter.unitOptions = .naturalScale
formatter.unitStyle = .medium formatter.unitStyle = .medium
@@ -0,0 +1,65 @@
import Foundation
import Network
struct Bootptab {
private var reservations: [MACAddress: Swift.Set<IPv4Address>] = [:]
init?(_ fromURL: URL = URL(fileURLWithPath: "/etc/bootptab")) throws {
let contents: String
do {
contents = try String(contentsOf: fromURL, encoding: .utf8)
} catch {
if error.isFileNotFound() {
return nil
}
throw error
}
for line in contents.split(whereSeparator: \.isNewline) {
let fields = line.split(whereSeparator: \.isWhitespace)
// Skip lines that don't look like reservation fields
guard fields.count >= 4 else {
continue
}
// Assign reservation fields
let hardwareType = fields[1]
let hardwareAddress = fields[2]
let ipAddress = fields[3]
// Skip non-Ethernet reservations
guard hardwareType == "1" else {
continue
}
// Skip malformed MAC addresses
guard let mac = MACAddress(fromString: String(hardwareAddress)) else {
continue
}
// Skip malformed IPv4 addresses
guard let ip = IPv4Address(String(ipAddress)) else {
continue
}
reservations[mac, default: []].insert(ip)
}
}
func ResolveMACAddress(macAddress: MACAddress) throws -> IPv4Address? {
guard let addresses = reservations[macAddress] else {
return nil
}
if addresses.count > 1 {
let addresses = addresses.map { $0.debugDescription }.sorted().joined(separator: ", ")
throw RuntimeError.Generic("multiple DHCP reservations in /etc/bootptab for \(macAddress): \(addresses)")
}
return addresses.first
}
}
@@ -11,7 +11,11 @@ struct MACAddress: Equatable, Hashable, CustomStringConvertible {
} }
for (index, component) in components.enumerated() { for (index, component) in components.enumerated() {
mac[index] = UInt8(component, radix: 16)! guard let byte = UInt8(component, radix: 16) else {
return nil
}
mac[index] = byte
} }
} }
+38 -19
View File
@@ -111,27 +111,24 @@ struct TokenResponse: Decodable, Authentication {
} }
class Registry { class Registry {
private let baseURL: URL let baseURL: URL
let namespace: String let namespace: String
let credentialsProviders: [CredentialsProvider] let credentialsProviders: [CredentialsProvider]
let authenticationKeeper = AuthenticationKeeper() let authenticationKeeper = AuthenticationKeeper()
var host: String? { // Host with an optional port (e.g. "127.0.0.1:5000"), which is used for naming
guard let host = baseURL.host else { return nil } // and credentials lookup. For Docker Hub it stays "docker.io", while baseURL
// points to registry-1.docker.io.
if let port = baseURL.port { let host: String?
return "\(host):\(port)"
}
return host
}
init(baseURL: URL, init(baseURL: URL,
namespace: String, namespace: String,
host: String? = nil,
credentialsProviders: [CredentialsProvider] = [EnvironmentCredentialsProvider(), DockerConfigCredentialsProvider(), KeychainCredentialsProvider()] credentialsProviders: [CredentialsProvider] = [EnvironmentCredentialsProvider(), DockerConfigCredentialsProvider(), KeychainCredentialsProvider()]
) throws { ) throws {
self.baseURL = baseURL self.baseURL = baseURL
self.namespace = namespace self.namespace = namespace
self.host = host ?? Registry.hostWithPort(of: baseURL)
self.credentialsProviders = credentialsProviders self.credentialsProviders = credentialsProviders
} }
@@ -142,9 +139,9 @@ class Registry {
credentialsProviders: [CredentialsProvider] = [EnvironmentCredentialsProvider(), DockerConfigCredentialsProvider(), KeychainCredentialsProvider()] credentialsProviders: [CredentialsProvider] = [EnvironmentCredentialsProvider(), DockerConfigCredentialsProvider(), KeychainCredentialsProvider()]
) throws { ) throws {
let proto = insecure ? "http" : "https" let proto = insecure ? "http" : "https"
let baseURLComponents = URLComponents(string: proto + "://" + host + "/v2/")! var baseURLComponents = URLComponents(string: proto + "://" + host + "/v2/")!
guard let baseURL = baseURLComponents.url else { guard var baseURL = baseURLComponents.url else {
var hint = "" var hint = ""
if host.hasPrefix("http://") || host.hasPrefix("https://") { if host.hasPrefix("http://") || host.hasPrefix("https://") {
@@ -154,7 +151,33 @@ class Registry {
throw RuntimeError.ImproperlyFormattedHost(host, hint) throw RuntimeError.ImproperlyFormattedHost(host, hint)
} }
try self.init(baseURL: baseURL, namespace: namespace, credentialsProviders: credentialsProviders) // Naming and credentials lookup use the host and port of the original URL,
// so it's "docker.io" for Docker Hub and "127.0.0.1:5000" for "127.0.0.1:05000"
let normalizedHost = Registry.hostWithPort(of: baseURL)
// Docker Hub serves its registry API from registry-1.docker.io, while docker.io,
// the host used in image names, redirects to Docker's website. URLSession follows
// these redirects, so we'd get an HTML page with HTTP 200 instead of an API
// response, which breaks pushing, pulling and "tart login" credentials validation.
//
// Host names are case insensitive, and only the host is replaced,
// so an explicit port like in "Docker.IO:443" is kept.
if baseURLComponents.host?.lowercased() == "docker.io" {
baseURLComponents.host = "registry-1.docker.io"
baseURL = baseURLComponents.url!
}
try self.init(baseURL: baseURL, namespace: namespace, host: normalizedHost, credentialsProviders: credentialsProviders)
}
private static func hostWithPort(of url: URL) -> String? {
guard let host = url.host else { return nil }
if let port = url.port {
return "\(host):\(port)"
}
return host
} }
func ping() async throws { func ping() async throws {
@@ -421,12 +444,8 @@ class Registry {
await authenticationKeeper.set(try TokenResponse.parse(fromData: data)) await authenticationKeeper.set(try TokenResponse.parse(fromData: data))
} }
private func lookupCredentials() throws -> (String, String)? { func lookupCredentials() throws -> (String, String)? {
var host = baseURL.host! let host = self.host!
if let port = baseURL.port {
host += ":\(port)"
}
for provider in credentialsProviders { for provider in credentialsProviders {
do { do {
+14 -12
View File
@@ -104,40 +104,42 @@ struct UnsupportedHostOSError: Error, CustomStringConvertible {
return result return result
} }
func keyboards() -> [VZKeyboardConfiguration] { func keyboards(noUSB: Bool) -> [VZKeyboardConfiguration] {
var devices: [VZKeyboardConfiguration] = noUSB ? [] : [VZUSBKeyboardConfiguration()]
if #available(macOS 14, *) { if #available(macOS 14, *) {
// Mac keyboard is only supported by guests starting with macOS Ventura // Mac keyboard is only supported by guests starting with macOS Ventura
return [VZUSBKeyboardConfiguration(), VZMacKeyboardConfiguration()] devices.append(VZMacKeyboardConfiguration())
} else {
return [VZUSBKeyboardConfiguration()]
} }
return devices
} }
func keyboardsSuspendable() -> [VZKeyboardConfiguration] { func keyboardsSuspendable(noUSB: Bool) -> [VZKeyboardConfiguration] {
if #available(macOS 14, *) { if #available(macOS 14, *) {
return [VZMacKeyboardConfiguration()] return [VZMacKeyboardConfiguration()]
} else { } else {
// fallback to the regular configuration // fallback to the regular configuration
return keyboards() return keyboards(noUSB: noUSB)
} }
} }
func pointingDevices() -> [VZPointingDeviceConfiguration] { func pointingDevices(noUSB: Bool) -> [VZPointingDeviceConfiguration] {
// Trackpad is only supported by guests starting with macOS Ventura // Trackpad is only supported by guests starting with macOS Ventura
[VZUSBScreenCoordinatePointingDeviceConfiguration(), VZMacTrackpadConfiguration()] var devices: [VZPointingDeviceConfiguration] = noUSB ? [] : [VZUSBScreenCoordinatePointingDeviceConfiguration()]
devices.append(VZMacTrackpadConfiguration())
return devices
} }
func pointingDevicesSimplified() -> [VZPointingDeviceConfiguration] { func pointingDevicesSimplified(noUSB: Bool) -> [VZPointingDeviceConfiguration] {
// Only include the USB pointing device, not the trackpad // Only include the USB pointing device, not the trackpad
return [VZUSBScreenCoordinatePointingDeviceConfiguration()] return noUSB ? [] : [VZUSBScreenCoordinatePointingDeviceConfiguration()]
} }
func pointingDevicesSuspendable() -> [VZPointingDeviceConfiguration] { func pointingDevicesSuspendable(noUSB: Bool) -> [VZPointingDeviceConfiguration] {
if #available(macOS 14, *) { if #available(macOS 14, *) {
return [VZMacTrackpadConfiguration()] return [VZMacTrackpadConfiguration()]
} else { } else {
// fallback to the regular configuration // fallback to the regular configuration
return pointingDevices() return pointingDevices(noUSB: noUSB)
} }
} }
} }
+6 -6
View File
@@ -35,16 +35,16 @@ struct Linux: Platform {
return result return result
} }
func keyboards() -> [VZKeyboardConfiguration] { func keyboards(noUSB: Bool) -> [VZKeyboardConfiguration] {
[VZUSBKeyboardConfiguration()] noUSB ? [] : [VZUSBKeyboardConfiguration()]
} }
func pointingDevices() -> [VZPointingDeviceConfiguration] { func pointingDevices(noUSB: Bool) -> [VZPointingDeviceConfiguration] {
[VZUSBScreenCoordinatePointingDeviceConfiguration()] noUSB ? [] : [VZUSBScreenCoordinatePointingDeviceConfiguration()]
} }
func pointingDevicesSimplified() -> [VZPointingDeviceConfiguration] { func pointingDevicesSimplified(noUSB: Bool) -> [VZPointingDeviceConfiguration] {
// Linux doesn't support trackpad, so just return the regular pointing devices // Linux doesn't support trackpad, so just return the regular pointing devices
return pointingDevices() return pointingDevices(noUSB: noUSB)
} }
} }
+5 -5
View File
@@ -5,12 +5,12 @@ protocol Platform: Codable {
func bootLoader(nvramURL: URL) throws -> VZBootLoader func bootLoader(nvramURL: URL) throws -> VZBootLoader
func platform(nvramURL: URL, needsNestedVirtualization: Bool) throws -> VZPlatformConfiguration func platform(nvramURL: URL, needsNestedVirtualization: Bool) throws -> VZPlatformConfiguration
func graphicsDevice(vmConfig: VMConfig) -> VZGraphicsDeviceConfiguration func graphicsDevice(vmConfig: VMConfig) -> VZGraphicsDeviceConfiguration
func keyboards() -> [VZKeyboardConfiguration] func keyboards(noUSB: Bool) -> [VZKeyboardConfiguration]
func pointingDevices() -> [VZPointingDeviceConfiguration] func pointingDevices(noUSB: Bool) -> [VZPointingDeviceConfiguration]
func pointingDevicesSimplified() -> [VZPointingDeviceConfiguration] func pointingDevicesSimplified(noUSB: Bool) -> [VZPointingDeviceConfiguration]
} }
protocol PlatformSuspendable: Platform { protocol PlatformSuspendable: Platform {
func pointingDevicesSuspendable() -> [VZPointingDeviceConfiguration] func pointingDevicesSuspendable(noUSB: Bool) -> [VZPointingDeviceConfiguration]
func keyboardsSuspendable() -> [VZKeyboardConfiguration] func keyboardsSuspendable(noUSB: Bool) -> [VZKeyboardConfiguration]
} }
+8 -8
View File
@@ -8,21 +8,21 @@ extension URL {
} }
func updateAccessDate(_ accessDate: Date = Date()) throws { func updateAccessDate(_ accessDate: Date = Date()) throws {
let attrs = try resourceValues(forKeys: [.contentAccessDateKey]) let times = [accessDate.asTimespec(), timespec(tv_sec: 0, tv_nsec: Int(UTIME_OMIT))]
let modificationDate = attrs.contentAccessDate! let ret = utimensat(AT_FDCWD, path, times, 0)
let times = [accessDate.asTimeval(), modificationDate.asTimeval()]
let ret = utimes(path, times)
if ret != 0 { if ret != 0 {
let details = Errno(rawValue: CInt(errno)) let details = Errno(rawValue: CInt(errno))
throw RuntimeError.FailedToUpdateAccessDate("utimes(2) failed: \(details)") throw RuntimeError.FailedToUpdateAccessDate("utimensat(2) failed: \(details)")
} }
} }
} }
extension Date { extension Date {
func asTimeval() -> timeval { func asTimespec() -> timespec {
timeval(tv_sec: Int(timeIntervalSince1970), tv_usec: 0) let seconds = floor(timeIntervalSince1970)
let nanoseconds = (timeIntervalSince1970 - seconds) * 1_000_000_000
return timespec(tv_sec: Int(seconds), tv_nsec: Int(nanoseconds))
} }
} }
+37 -19
View File
@@ -49,6 +49,7 @@ class VM: NSObject, VZVirtualMachineDelegate, ObservableObject {
nested: Bool = false, nested: Bool = false,
audio: Bool = true, audio: Bool = true,
clipboard: Bool = true, clipboard: Bool = true,
noUSBAccessories: Bool = false,
sync: VZDiskImageSynchronizationMode = .full, sync: VZDiskImageSynchronizationMode = .full,
caching: VZDiskImageCachingMode? = nil, caching: VZDiskImageCachingMode? = nil,
noTrackpad: Bool = false, noTrackpad: Bool = false,
@@ -73,6 +74,7 @@ class VM: NSObject, VZVirtualMachineDelegate, ObservableObject {
nested: nested, nested: nested,
audio: audio, audio: audio,
clipboard: clipboard, clipboard: clipboard,
noUSBAccessories: noUSBAccessories,
sync: sync, sync: sync,
caching: caching, caching: caching,
noTrackpad: noTrackpad, noTrackpad: noTrackpad,
@@ -324,6 +326,7 @@ class VM: NSObject, VZVirtualMachineDelegate, ObservableObject {
nested: Bool = false, nested: Bool = false,
audio: Bool = true, audio: Bool = true,
clipboard: Bool = true, clipboard: Bool = true,
noUSBAccessories: Bool = false,
sync: VZDiskImageSynchronizationMode = .full, sync: VZDiskImageSynchronizationMode = .full,
caching: VZDiskImageCachingMode? = nil, caching: VZDiskImageCachingMode? = nil,
noTrackpad: Bool = false, noTrackpad: Bool = false,
@@ -364,25 +367,15 @@ class VM: NSObject, VZVirtualMachineDelegate, ObservableObject {
configuration.audioDevices = [soundDeviceConfiguration] configuration.audioDevices = [soundDeviceConfiguration]
// Keyboard and mouse // Keyboard and mouse
if suspendable, let platformSuspendable = vmConfig.platform.self as? PlatformSuspendable { configureInputDevices(
configuration.keyboards = platformSuspendable.keyboardsSuspendable() configuration,
configuration.pointingDevices = platformSuspendable.pointingDevicesSuspendable() platform: vmConfig.platform,
} else { suspendable: suspendable,
noUSBAccessories: noUSBAccessories,
if noKeyboard { noTrackpad: noTrackpad,
configuration.keyboards = [] noPointer: noPointer,
} else { noKeyboard: noKeyboard
configuration.keyboards = vmConfig.platform.keyboards() )
}
if noPointer {
configuration.pointingDevices = []
} else if noTrackpad {
configuration.pointingDevices = vmConfig.platform.pointingDevicesSimplified()
} else {
configuration.pointingDevices = vmConfig.platform.pointingDevices()
}
}
// Networking // Networking
configuration.networkDevices = network.attachments().map { configuration.networkDevices = network.attachments().map {
@@ -460,6 +453,31 @@ class VM: NSObject, VZVirtualMachineDelegate, ObservableObject {
return configuration return configuration
} }
static func configureInputDevices(
_ configuration: VZVirtualMachineConfiguration,
platform: Platform,
suspendable: Bool = false,
noUSBAccessories: Bool = false,
noTrackpad: Bool = false,
noPointer: Bool = false,
noKeyboard: Bool = false
) {
if suspendable, let platformSuspendable = platform as? PlatformSuspendable {
configuration.keyboards = platformSuspendable.keyboardsSuspendable(noUSB: noUSBAccessories)
configuration.pointingDevices = platformSuspendable.pointingDevicesSuspendable(noUSB: noUSBAccessories)
} else {
configuration.keyboards = noKeyboard ? [] : platform.keyboards(noUSB: noUSBAccessories)
if noPointer {
configuration.pointingDevices = []
} else if noTrackpad {
configuration.pointingDevices = platform.pointingDevicesSimplified(noUSB: noUSBAccessories)
} else {
configuration.pointingDevices = platform.pointingDevices(noUSB: noUSBAccessories)
}
}
}
func guestDidStop(_ virtualMachine: VZVirtualMachine) { func guestDidStop(_ virtualMachine: VZVirtualMachine) {
print("guest has stopped the virtual machine") print("guest has stopped the virtual machine")
sema.signal() sema.signal()
+1 -1
View File
@@ -99,7 +99,7 @@ struct VMConfig: Codable {
func save(toURL: URL) throws { func save(toURL: URL) throws {
let encoder = JSONEncoder() let encoder = JSONEncoder()
encoder.outputFormatting = .prettyPrinted encoder.outputFormatting = [.prettyPrinted, .sortedKeys]
try encoder.encode(self).write(to: toURL) try encoder.encode(self).write(to: toURL)
} }
-4
View File
@@ -469,10 +469,6 @@ struct VMDirectory: Prunable {
} }
} }
func diskSizeGB() throws -> Int {
try diskSizeBytes() / 1000 / 1000 / 1000
}
func markExplicitlyPulled() { func markExplicitlyPulled() {
FileManager.default.createFile(atPath: explicitlyPulledMark.path, contents: nil) FileManager.default.createFile(atPath: explicitlyPulledMark.path, contents: nil)
} }
+2 -1
View File
@@ -38,7 +38,8 @@ class VMStorageHelper {
extension NSError { extension NSError {
func isFileNotFound() -> Bool { func isFileNotFound() -> Bool {
return self.code == NSFileNoSuchFileError || self.code == NSFileReadNoSuchFileError return self.domain == NSCocoaErrorDomain &&
(self.code == NSFileNoSuchFileError || self.code == NSFileReadNoSuchFileError)
} }
} }
+40
View File
@@ -0,0 +1,40 @@
import XCTest
import Network
@testable import tart
final class BootptabTests: XCTestCase {
func testResolveMACAddress() throws {
let url = FileManager.default.temporaryDirectory.appendingPathComponent(UUID().uuidString)
// A missing file produces no Bootptab
XCTAssertNil(try Bootptab(url))
// Write reservations with duplicates, conflicts, and a malformed MAC address
let contents = """
# DHCP reservations
%
client1 1 02:ab:00:01:02:03 192.168.64.2
client2 1 02:ab:00:01:02:03 192.168.64.2
client3 1 02:ab:00:01:02:04 192.168.64.3
client4 1 02:ab:00:01:02:04 192.168.65.3
malformed 1 02:gg:00:01:02:03 192.168.64.9
"""
try contents.write(to: url, atomically: true, encoding: .utf8)
defer { try? FileManager.default.removeItem(at: url) }
// Parse the reservation file
let bootptab = try XCTUnwrap(Bootptab(url))
// Identical reservations resolve to one address
XCTAssertEqual(try bootptab.ResolveMACAddress(
macAddress: MACAddress(fromString: "02:ab:00:01:02:03")!), IPv4Address("192.168.64.2"))
// An unknown MAC address has no reservation
XCTAssertNil(try bootptab.ResolveMACAddress(
macAddress: MACAddress(fromString: "02:ab:00:01:02:05")!))
// Conflicting reservations produce an error
XCTAssertThrowsError(try bootptab.ResolveMACAddress(
macAddress: MACAddress(fromString: "02:ab:00:01:02:04")!))
}
}
+139
View File
@@ -4,6 +4,101 @@ import XCTest
@testable import tart @testable import tart
final class CommandBehaviorTests: XCTestCase { final class CommandBehaviorTests: XCTestCase {
func testListSurvivesUnavailableDiskCapacity() async throws {
try await withTemporaryTartHome {
let previousPath = try installUnavailableDiskutil()
defer { restoreEnvironment("PATH", to: previousPath) }
let local = try VMStorageLocal()
let oci = try VMStorageOCI()
for (name, diskFormat) in [("unavailable", DiskImageFormat.asif), ("healthy", .raw)] {
let remoteName = try RemoteName("example.com/org/\(name):latest")
for vmDir in [try local.create(name), try oci.create(remoteName)] {
var vmConfig = config()
vmConfig.diskFormat = diskFormat
try vmConfig.save(toURL: vmDir.configURL)
XCTAssertTrue(FileManager.default.createFile(atPath: vmDir.nvramURL.path, contents: Data()))
// The diskutil stub simulates a locked ASIF disk without needing a running VM.
XCTAssertTrue(FileManager.default.createFile(
atPath: vmDir.diskURL.path,
contents: Data(repeating: 0, count: 4096)
))
if diskFormat == .asif {
XCTAssertThrowsError(try vmDir.diskSizeBytes())
}
}
}
for sourceArguments in [[], ["--source", "local"], ["--source", "oci"]] {
let json = try await commandOutput(List.self, sourceArguments + ["--format", "json"])
let rows = try XCTUnwrap(JSONSerialization.jsonObject(with: Data(json.utf8)) as? [[String: Any]])
XCTAssertEqual(rows.count, sourceArguments.isEmpty ? 4 : 2)
for row in rows {
let name = try XCTUnwrap(row["Name"] as? String)
if name.contains("unavailable") {
XCTAssertTrue(row["Disk"] is NSNull)
} else {
XCTAssertEqual(row["Disk"] as? Int, 0)
}
XCTAssertEqual(row["State"] as? String, "stopped")
XCTAssertEqual(row["Running"] as? Bool, false)
}
let text = try await commandOutput(List.self, sourceArguments)
XCTAssertTrue(text.contains("unavailable"))
XCTAssertTrue(text.contains("healthy"))
XCTAssertTrue(text.contains("-"))
let quiet = try await commandOutput(List.self, sourceArguments + ["--quiet"])
XCTAssertEqual(quiet.split(separator: "\n").map(String.init), rows.compactMap { $0["Name"] as? String })
}
}
}
func testGetSurvivesUnavailableDiskCapacity() async throws {
try await withTemporaryTartHome {
let previousPath = try installUnavailableDiskutil()
defer { restoreEnvironment("PATH", to: previousPath) }
let vmDir = try VMStorageLocal().create("unavailable")
var vmConfig = config()
vmConfig.diskFormat = .asif
try vmConfig.save(toURL: vmDir.configURL)
XCTAssertTrue(FileManager.default.createFile(atPath: vmDir.nvramURL.path, contents: Data()))
XCTAssertTrue(FileManager.default.createFile(
atPath: vmDir.diskURL.path,
contents: Data(repeating: 0, count: 4096)
))
XCTAssertThrowsError(try vmDir.diskSizeBytes())
let json = try await commandOutput(Get.self, ["unavailable", "--format", "json"])
let info = try XCTUnwrap(JSONSerialization.jsonObject(with: Data(json.utf8)) as? [String: Any])
XCTAssertTrue(info["Disk"] is NSNull)
XCTAssertEqual(info["DiskFormat"] as? String, "asif")
XCTAssertEqual(info["State"] as? String, "stopped")
let text = try await commandOutput(Get.self, ["unavailable"])
XCTAssertTrue(text.contains("asif"))
XCTAssertTrue(text.contains("-"))
}
}
func testNoUSBAccessoriesDoesNotEnableSuspendable() throws {
try withTemporaryTartHome {
let vmDir = try VMStorageLocal().create("no-usb-accessories")
try config().save(toURL: vmDir.configURL)
XCTAssertTrue(FileManager.default.createFile(atPath: vmDir.nvramURL.path, contents: Data()))
XCTAssertTrue(FileManager.default.createFile(atPath: vmDir.diskURL.path, contents: Data()))
let command = try Run.parseAsRoot(["no-usb-accessories", "--no-usb-accessories"]) as! Run
XCTAssertTrue(command.noUSBAccessories)
XCTAssertFalse(command.suspendable)
XCTAssertFalse(command.noAudio)
XCTAssertFalse(command.noGraphics)
}
}
func testStandaloneDeleteDoesNotInitializeContentStore() throws { func testStandaloneDeleteDoesNotInitializeContentStore() throws {
try withTemporaryTartHome { try withTemporaryTartHome {
let vmDir = try VMStorageLocal().create("standalone") let vmDir = try VMStorageLocal().create("standalone")
@@ -21,6 +116,12 @@ final class CommandBehaviorTests: XCTestCase {
} }
} }
func testFileNotFoundRequiresCocoaErrorDomain() {
XCTAssertTrue(NSError(domain: NSCocoaErrorDomain, code: NSFileNoSuchFileError).isFileNotFound())
XCTAssertTrue(NSError(domain: NSCocoaErrorDomain, code: NSFileReadNoSuchFileError).isFileNotFound())
XCTAssertFalse(RuntimeError.VMIsRunning("running").isFileNotFound())
}
func testSetDiskRejectsStackedVMBeforeSavingConfig() async throws { func testSetDiskRejectsStackedVMBeforeSavingConfig() async throws {
try await withTemporaryTartHome { try await withTemporaryTartHome {
let vmDir = try VMStorageLocal().create("stacked") let vmDir = try VMStorageLocal().create("stacked")
@@ -114,6 +215,44 @@ final class CommandBehaviorTests: XCTestCase {
) )
} }
private func installUnavailableDiskutil() throws -> String? {
let binDirectory = try temporaryDirectory()
let diskutilURL = binDirectory.appendingPathComponent("diskutil")
let script = """
#!/bin/sh
echo 'Resource temporarily unavailable' >&2
exit 1
"""
try script.write(to: diskutilURL, atomically: true, encoding: .utf8)
try FileManager.default.setAttributes([.posixPermissions: 0o755], ofItemAtPath: diskutilURL.path)
let previousPath = ProcessInfo.processInfo.environment["PATH"]
setenv("PATH", binDirectory.path, 1)
return previousPath
}
private func commandOutput<Command: AsyncParsableCommand>(
_ commandType: Command.Type,
_ arguments: [String]
) async throws -> String {
let outputURL = try temporaryDirectory().appendingPathComponent("stdout")
XCTAssertTrue(FileManager.default.createFile(atPath: outputURL.path, contents: nil))
let output = try FileHandle(forWritingTo: outputURL)
defer { try? output.close() }
fflush(stdout)
let savedStdout = dup(STDOUT_FILENO)
defer {
fflush(stdout)
dup2(savedStdout, STDOUT_FILENO)
close(savedStdout)
}
dup2(output.fileDescriptor, STDOUT_FILENO)
var command = try Command.parseAsRoot(arguments) as! Command
try await command.run()
fflush(stdout)
return try String(contentsOf: outputURL, encoding: .utf8)
}
private func withTemporaryTartHome(_ body: () throws -> Void) throws { private func withTemporaryTartHome(_ body: () throws -> Void) throws {
let home = try temporaryDirectory() let home = try temporaryDirectory()
let previousHome = ProcessInfo.processInfo.environment["TART_HOME"] let previousHome = ProcessInfo.processInfo.environment["TART_HOME"]
@@ -3,6 +3,13 @@ import XCTest
@testable import tart @testable import tart
final class HumanReadableByteCountTests: XCTestCase { final class HumanReadableByteCountTests: XCTestCase {
func testUnknownByteCount() throws {
let unknown = HumanReadableByteCount(nil) { $0 / 1000 / 1000 / 1000 }
XCTAssertEqual(unknown.description, "-")
XCTAssertEqual(String(data: try JSONEncoder().encode(unknown), encoding: .utf8), "null")
}
func testTextAndJSONRepresentations() throws { func testTextAndJSONRepresentations() throws {
let integer = HumanReadableByteCount(51_400_000_000) { _ in 51 } let integer = HumanReadableByteCount(51_400_000_000) { _ in 51 }
let string = HumanReadableByteCount(17_234_000_000) { _ in "17.234" } let string = HumanReadableByteCount(17_234_000_000) { _ in "17.234" }
@@ -0,0 +1,152 @@
import Virtualization
import XCTest
@testable import tart
final class InputDeviceConfigurationTests: XCTestCase {
func testLinuxUSBInputsCanBeDisabled() {
let configuration = VZVirtualMachineConfiguration()
VM.configureInputDevices(configuration, platform: Linux())
XCTAssertEqual(configuration.keyboards.count, 1)
XCTAssertTrue(configuration.keyboards.contains { $0 is VZUSBKeyboardConfiguration })
XCTAssertEqual(configuration.pointingDevices.count, 1)
XCTAssertTrue(configuration.pointingDevices.contains { $0 is VZUSBScreenCoordinatePointingDeviceConfiguration })
VM.configureInputDevices(configuration, platform: Linux(), noUSBAccessories: true)
XCTAssertTrue(configuration.keyboards.isEmpty)
XCTAssertTrue(configuration.pointingDevices.isEmpty)
VM.configureInputDevices(configuration, platform: Linux(), noUSBAccessories: true, noTrackpad: true)
XCTAssertTrue(configuration.keyboards.isEmpty)
XCTAssertTrue(configuration.pointingDevices.isEmpty)
}
#if arch(arm64)
func testMacOS13RetainsItsNativeTrackpad() {
let platform = MacInputPlatform(nativeKeyboard: false)
let configuration = VZVirtualMachineConfiguration()
VM.configureInputDevices(configuration, platform: platform)
XCTAssertEqual(configuration.keyboards.count, 1)
XCTAssertEqual(configuration.pointingDevices.count, 2)
VM.configureInputDevices(configuration, platform: platform, noUSBAccessories: true)
XCTAssertTrue(configuration.keyboards.isEmpty)
XCTAssertEqual(configuration.pointingDevices.count, 1)
XCTAssertTrue(configuration.pointingDevices.contains { $0 is VZMacTrackpadConfiguration })
}
func testMacOS14RetainsBothNativeInputs() throws {
guard #available(macOS 14, *) else {
throw XCTSkip("Mac keyboards require macOS 14")
}
let configuration = VZVirtualMachineConfiguration()
VM.configureInputDevices(configuration, platform: MacInputPlatform(nativeKeyboard: true), noUSBAccessories: true)
XCTAssertEqual(configuration.keyboards.count, 1)
XCTAssertTrue(configuration.keyboards.contains { $0 is VZMacKeyboardConfiguration })
XCTAssertEqual(configuration.pointingDevices.count, 1)
XCTAssertTrue(configuration.pointingDevices.contains { $0 is VZMacTrackpadConfiguration })
}
func testInputFlagsStillSelectTheExpectedDevices() throws {
guard #available(macOS 14, *) else {
throw XCTSkip("Mac keyboards require macOS 14")
}
let platform = MacInputPlatform(nativeKeyboard: true)
for noUSBAccessories in [false, true] {
for noKeyboard in [false, true] {
for noPointer in [false, true] {
for noTrackpad in [false, true] {
let configuration = VZVirtualMachineConfiguration()
VM.configureInputDevices(
configuration,
platform: platform,
noUSBAccessories: noUSBAccessories,
noTrackpad: noTrackpad,
noPointer: noPointer,
noKeyboard: noKeyboard
)
XCTAssertEqual(configuration.keyboards.contains { $0 is VZUSBKeyboardConfiguration }, !noUSBAccessories && !noKeyboard)
XCTAssertEqual(configuration.keyboards.contains { $0 is VZMacKeyboardConfiguration }, !noKeyboard)
XCTAssertEqual(configuration.pointingDevices.contains { $0 is VZUSBScreenCoordinatePointingDeviceConfiguration }, !noUSBAccessories && !noPointer)
XCTAssertEqual(configuration.pointingDevices.contains { $0 is VZMacTrackpadConfiguration }, !noPointer && !noTrackpad)
}
}
}
}
}
func testSuspendableFallbackCannotReintroduceUSBInputs() {
let configuration = VZVirtualMachineConfiguration()
let platform = MacInputPlatform(nativeKeyboard: false)
VM.configureInputDevices(configuration, platform: platform, suspendable: true)
XCTAssertEqual(configuration.keyboards.count, 1)
XCTAssertEqual(configuration.pointingDevices.count, 2)
VM.configureInputDevices(
configuration,
platform: platform,
suspendable: true,
noUSBAccessories: true
)
XCTAssertTrue(configuration.keyboards.isEmpty)
XCTAssertEqual(configuration.pointingDevices.count, 1)
XCTAssertTrue(configuration.pointingDevices.contains { $0 is VZMacTrackpadConfiguration })
}
#endif
}
#if arch(arm64)
// Model macOS 13 and 14 input availability without requiring a second host.
private struct MacInputPlatform: PlatformSuspendable {
var nativeKeyboard: Bool
func os() -> OS { .darwin }
func bootLoader(nvramURL: URL) throws -> VZBootLoader {
try Linux().bootLoader(nvramURL: nvramURL)
}
func platform(nvramURL: URL, needsNestedVirtualization: Bool) throws -> VZPlatformConfiguration {
try Linux().platform(nvramURL: nvramURL, needsNestedVirtualization: needsNestedVirtualization)
}
func graphicsDevice(vmConfig: VMConfig) -> VZGraphicsDeviceConfiguration {
Linux().graphicsDevice(vmConfig: vmConfig)
}
func keyboards(noUSB: Bool) -> [VZKeyboardConfiguration] {
var devices: [VZKeyboardConfiguration] = noUSB ? [] : [VZUSBKeyboardConfiguration()]
if nativeKeyboard, #available(macOS 14, *) {
devices.append(VZMacKeyboardConfiguration())
}
return devices
}
func pointingDevices(noUSB: Bool) -> [VZPointingDeviceConfiguration] {
var devices: [VZPointingDeviceConfiguration] = noUSB ? [] : [VZUSBScreenCoordinatePointingDeviceConfiguration()]
devices.append(VZMacTrackpadConfiguration())
return devices
}
func pointingDevicesSimplified(noUSB: Bool) -> [VZPointingDeviceConfiguration] {
noUSB ? [] : [VZUSBScreenCoordinatePointingDeviceConfiguration()]
}
func keyboardsSuspendable(noUSB: Bool) -> [VZKeyboardConfiguration] {
if nativeKeyboard, #available(macOS 14, *) {
return [VZMacKeyboardConfiguration()]
}
return keyboards(noUSB: noUSB)
}
func pointingDevicesSuspendable(noUSB: Bool) -> [VZPointingDeviceConfiguration] {
nativeKeyboard ? [VZMacTrackpadConfiguration()] : pointingDevices(noUSB: noUSB)
}
}
#endif
+88
View File
@@ -0,0 +1,88 @@
import XCTest
@testable import tart
final class RegistryHostTests: XCTestCase {
func testDockerHub() throws {
let credentialsProvider = RecordingCredentialsProvider()
let registry = try Registry(host: "docker.io", namespace: "org/repo",
credentialsProviders: [credentialsProvider])
// docker.io redirects to Docker's website, so the API
// requests should go to registry-1.docker.io instead
XCTAssertEqual(registry.baseURL, URL(string: "https://registry-1.docker.io/v2/"))
// ...while naming and credentials lookup should still use the host specified by the user
XCTAssertEqual(registry.host, "docker.io")
XCTAssertNil(try registry.lookupCredentials())
XCTAssertEqual(credentialsProvider.requestedHosts, ["docker.io"])
}
func testDockerHubIsMatchedCaseInsensitively() throws {
let credentialsProvider = RecordingCredentialsProvider()
let registry = try Registry(host: "Docker.IO", namespace: "org/repo",
credentialsProviders: [credentialsProvider])
XCTAssertEqual(registry.baseURL, URL(string: "https://registry-1.docker.io/v2/"))
XCTAssertEqual(registry.host, "Docker.IO")
XCTAssertNil(try registry.lookupCredentials())
XCTAssertEqual(credentialsProvider.requestedHosts, ["Docker.IO"])
}
func testDockerHubWithExplicitPort() throws {
for host in ["docker.io:443", "DOCKER.IO:443"] {
let registry = try Registry(host: host, namespace: "org/repo")
XCTAssertEqual(registry.baseURL, URL(string: "https://registry-1.docker.io:443/v2/"))
XCTAssertEqual(registry.host, host)
}
}
func testOtherHostsAreUnchanged() throws {
for host in ["ghcr.io", "index.docker.io", "registry-1.docker.io", "registry.hub.docker.com", "127.0.0.1:8080"] {
let registry = try Registry(host: host, namespace: "org/repo")
XCTAssertEqual(registry.baseURL, URL(string: "https://\(host)/v2/"))
XCTAssertEqual(registry.host, host)
}
let registry = try Registry(host: "127.0.0.1:5000", namespace: "org/repo", insecure: true)
XCTAssertEqual(registry.baseURL, URL(string: "http://127.0.0.1:5000/v2/"))
XCTAssertEqual(registry.host, "127.0.0.1:5000")
}
func testHostPortIsNormalized() throws {
// Credentials stored for "127.0.0.1:5000" should still be found
// when the port is written with a leading zero
let credentialsProvider = RecordingCredentialsProvider(credentials: ["127.0.0.1:5000": ("user", "password")])
let registry = try Registry(host: "127.0.0.1:05000", namespace: "org/repo", insecure: true,
credentialsProviders: [credentialsProvider])
XCTAssertEqual(registry.baseURL, URL(string: "http://127.0.0.1:05000/v2/"))
XCTAssertEqual(registry.host, "127.0.0.1:5000")
let (user, password) = try XCTUnwrap(registry.lookupCredentials())
XCTAssertEqual(user, "user")
XCTAssertEqual(password, "password")
XCTAssertEqual(credentialsProvider.requestedHosts, ["127.0.0.1:5000"])
}
}
fileprivate class RecordingCredentialsProvider: CredentialsProvider {
let userFriendlyName = "recording credentials provider"
let credentials: [String: (String, String)]
var requestedHosts: [String] = []
init(credentials: [String: (String, String)] = [:]) {
self.credentials = credentials
}
func retrieve(host: String) throws -> (String, String)? {
requestedHosts.append(host)
return credentials[host]
}
func store(host: String, user: String, password: String) throws {
}
}
+14 -6
View File
@@ -2,21 +2,29 @@ import XCTest
@testable import tart @testable import tart
final class URLAccessDateTests: XCTestCase { final class URLAccessDateTests: XCTestCase {
func testGetAndSetAccessTime() throws { func testUpdateAccessDatePreservesModificationDate() throws {
// Create a temporary file // Create a temporary file
let tmpDir = URL(fileURLWithPath: NSTemporaryDirectory(), isDirectory: true) let tmpDir = URL(fileURLWithPath: NSTemporaryDirectory(), isDirectory: true)
var tmpFile = tmpDir.appendingPathComponent(UUID().uuidString) var tmpFile = tmpDir.appendingPathComponent(UUID().uuidString)
FileManager.default.createFile(atPath: tmpFile.path, contents: nil) FileManager.default.createFile(atPath: tmpFile.path, contents: nil)
defer { try? FileManager.default.removeItem(at: tmpFile) }
// Ensure it's access date is different than our desired access date // Ensure its access date is different from our desired access date
let arbitraryDate = Date.init(year: 2008, month: 09, day: 28, hour: 23, minute: 15) let accessDate = Date.init(year: 2008, month: 09, day: 28, hour: 23, minute: 15)
XCTAssertNotEqual(arbitraryDate, try tmpFile.accessDate()) let modificationDate = Date(timeIntervalSince1970: 1_577_836_800.125)
try FileManager.default.setAttributes([.modificationDate: modificationDate], ofItemAtPath: tmpFile.path)
XCTAssertNotEqual(accessDate, try tmpFile.accessDate())
// Set our desired access date for a file // Set our desired access date for a file
try tmpFile.updateAccessDate(arbitraryDate) try tmpFile.updateAccessDate(accessDate)
// Ensure the access date has changed to our value // Ensure the access date has changed to our value
tmpFile.removeCachedResourceValue(forKey: .contentAccessDateKey) tmpFile.removeCachedResourceValue(forKey: .contentAccessDateKey)
XCTAssertEqual(arbitraryDate, try tmpFile.accessDate()) XCTAssertEqual(accessDate, try tmpFile.accessDate())
// Ensure the modification date has not changed
tmpFile.removeCachedResourceValue(forKey: .contentModificationDateKey)
let attrs = try tmpFile.resourceValues(forKeys: [.contentModificationDateKey])
XCTAssertEqual(modificationDate, try XCTUnwrap(attrs.contentModificationDate))
} }
} }
+1 -1
View File
@@ -132,7 +132,7 @@ And no worries, this file will be re-created on the next `tart run`.
Due to the limitations of the macOS built-in DHCP server, `tart ip` is unable to correctly report the IP addresses for VMs using DHCP client identifiers that are not based on VMs link-layer addresses (MAC addresses). Due to the limitations of the macOS built-in DHCP server, `tart ip` is unable to correctly report the IP addresses for VMs using DHCP client identifiers that are not based on VMs link-layer addresses (MAC addresses).
By default, when [no `--resolver=arp` is specified](#resolving-the-vms-ip-when-using-bridged-networking), `tart ip` reads the `/var/db/dhcpd_leases` file and tries to find the freshest entry that matches the VM's MAC address (based on the `hw_address` field). By default, when [no `--resolver=arp` is specified](#resolving-the-vms-ip-when-using-bridged-networking), `tart ip` first checks the `/etc/bootptab` file for a matching DHCP reservation. Otherwise, it reads the `/var/db/dhcpd_leases` file and tries to find the freshest entry that matches the VM's MAC address (based on the `hw_address` field).
However, things starts to break when the VM uses a [DUID-EN](https://metebalci.com/blog/a-note-on-dhcpv6-duid-and-prefix-delegation#duid-types) identifier, for example. One of the notorious examples of this being Ubuntu, using this type of identifier by default on latest versions. This results in the `/var/db/dhcpd_leases` entry for Ubuntu appearing as follows: However, things starts to break when the VM uses a [DUID-EN](https://metebalci.com/blog/a-note-on-dhcpv6-duid-and-prefix-delegation#duid-types) identifier, for example. One of the notorious examples of this being Ubuntu, using this type of identifier by default on latest versions. This results in the `/var/db/dhcpd_leases` entry for Ubuntu appearing as follows:
+60
View File
@@ -0,0 +1,60 @@
package integration_test
import (
"bytes"
"os"
"os/exec"
"path/filepath"
"strings"
"testing"
)
func TestExportOverwriteConfirmation(t *testing.T) {
for _, tt := range []struct {
name string
input string
overwrite bool
}{
{name: "EOF"},
{name: "empty line", input: "\n"},
{name: "no", input: "no\n"},
{name: "yes", input: "yes\n", overwrite: true},
} {
t.Run(tt.name, func(t *testing.T) {
home := t.TempDir()
t.Setenv("TART_HOME", home)
t.Setenv("TART_NO_AUTO_PRUNE", "1")
createSyntheticVM(t, home, "source", "92:81:b5:ab:39:37")
directory := t.TempDir()
destination := filepath.Join(directory, "source.tvm")
original := []byte("existing archive")
if err := os.WriteFile(destination, original, 0600); err != nil {
t.Fatal(err)
}
cmd := exec.CommandContext(t.Context(), "tart", "export", "source")
cmd.Dir = directory
cmd.Stdin = strings.NewReader(tt.input)
output, err := cmd.CombinedOutput()
if err != nil {
t.Fatalf("export: %v: %s", err, output)
}
if !strings.Contains(string(output), "are you sure you want to overwrite it?") {
t.Fatalf("expected overwrite confirmation: %s", output)
}
if strings.Contains(string(output), "exporting...") != tt.overwrite {
t.Fatalf("unexpected export behavior: %s", output)
}
current, err := os.ReadFile(destination)
if err != nil {
t.Fatal(err)
}
changed := !bytes.Equal(original, current)
if changed != tt.overwrite {
t.Fatalf("destination changed = %t, want %t", changed, tt.overwrite)
}
})
}
}
+17 -4
View File
@@ -9,6 +9,7 @@ import (
"net/http/httptest" "net/http/httptest"
"net/url" "net/url"
"testing" "testing"
"time"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
semconv "go.opentelemetry.io/otel/semconv/v1.37.0" semconv "go.opentelemetry.io/otel/semconv/v1.37.0"
@@ -19,7 +20,7 @@ import (
func TestOpenTelemetry(t *testing.T) { func TestOpenTelemetry(t *testing.T) {
// Start a mock OpenTelemetry collector server // Start a mock OpenTelemetry collector server
var traces []*tracepkg.ExportTraceServiceRequest traces := make(chan *tracepkg.ExportTraceServiceRequest, 1)
server := httptest.NewServer(http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) { server := httptest.NewServer(http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
var trace tracepkg.ExportTraceServiceRequest var trace tracepkg.ExportTraceServiceRequest
@@ -43,7 +44,11 @@ func TestOpenTelemetry(t *testing.T) {
"we do not support %q yet", request.Header.Get("Content-Type")) "we do not support %q yet", request.Header.Get("Content-Type"))
} }
traces = append(traces, &trace) select {
case traces <- &trace:
default:
t.Error("received an unexpected additional trace")
}
var response tracepkg.ExportTraceServiceResponse var response tracepkg.ExportTraceServiceResponse
@@ -54,6 +59,7 @@ func TestOpenTelemetry(t *testing.T) {
_, err = writer.Write(responseBytes) _, err = writer.Write(responseBytes)
require.NoError(t, err) require.NoError(t, err)
})) }))
t.Cleanup(server.Close)
// Start a "tart list" command // Start a "tart list" command
serverURL, err := url.Parse(server.URL) serverURL, err := url.Parse(server.URL)
@@ -67,9 +73,16 @@ func TestOpenTelemetry(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
// Ensure that the mock OpenTelemetry collector received a trace from "tart list" // Ensure that the mock OpenTelemetry collector received a trace from "tart list"
require.Len(t, traces, 1) var trace *tracepkg.ExportTraceServiceRequest
select {
case trace = <-traces:
case <-time.After(5 * time.Second):
t.Fatal("timed out waiting for OpenTelemetry trace")
}
server.Close()
require.Empty(t, traces, "received an unexpected additional trace")
resourceSpans := traces[0].GetResourceSpans() resourceSpans := trace.GetResourceSpans()
require.Len(t, resourceSpans, 1) require.Len(t, resourceSpans, 1)
// Ensure that service name and version resources are set // Ensure that service name and version resources are set