mirror of
https://github.com/apple/container.git
synced 2026-10-14 18:19:17 +00:00
Maxime Grenu
1951816427
## What Add a `DNS.validate()` method that verifies all nameserver entries are valid IPv4 or IPv6 addresses. The method is called from `Vminitd.configureDNS()` before applying the configuration. ## Why Closes #467. Currently, any arbitrary string can be passed as a nameserver in `DNSConfiguration`, which silently results in an invalid `/etc/resolv.conf` inside the container. Hostname strings like `dns.example.com` would be written to resolv.conf but would not work as nameservers. ## How - Added `DNS.validate() throws` method in `DNSConfiguration.swift` that iterates over all nameservers and attempts to parse each as either an `IPv4Address` or `IPv6Address` (using the existing parsers in `ContainerizationExtras`) - Added `import ContainerizationExtras` to `DNSConfiguration.swift` (the `Containerization` target already depends on `ContainerizationExtras`) - Called `config.validate()` at the start of `Vminitd.configureDNS()` so validation happens before any GRPC call ## Testing Added 6 new unit tests in `DNSTests.swift`: - ✅ Valid IPv4 nameservers accepted - ✅ Valid IPv6 nameservers accepted - ✅ Mixed IPv4/IPv6 nameservers accepted - ✅ Empty nameserver list accepted - ❌ Hostname rejected - ❌ Invalid address rejected ## Checklist - [x] Tests added - [x] No breaking changes to existing API (validate() is a new method, existing init is unchanged) - [x] Follows existing patterns (uses ContainerizationExtras IP address types, ContainerizationError for errors) Signed-off-by: Maxime Grenu <maxime.grenu@gmail.com>
85 lines
2.9 KiB
Swift
85 lines
2.9 KiB
Swift
//===----------------------------------------------------------------------===//
|
|
// Copyright © 2025-2026 Apple Inc. and the Containerization project authors.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// https://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
import Foundation
|
|
import Testing
|
|
|
|
@testable import Containerization
|
|
|
|
struct DNSTests {
|
|
|
|
@Test func dnsResolvConfWithAllFields() {
|
|
let dns = DNS(
|
|
nameservers: ["8.8.8.8", "1.1.1.1"],
|
|
domain: "example.com",
|
|
searchDomains: ["internal.com", "test.com"],
|
|
options: ["ndots:2", "timeout:1"]
|
|
)
|
|
|
|
let expected = "nameserver 8.8.8.8\nnameserver 1.1.1.1\ndomain example.com\nsearch internal.com test.com\noptions ndots:2 timeout:1\n"
|
|
#expect(dns.resolvConf == expected)
|
|
}
|
|
|
|
@Test func dnsResolvConfWithEmptyFields() {
|
|
let dns = DNS(
|
|
nameservers: [],
|
|
domain: nil,
|
|
searchDomains: [],
|
|
options: []
|
|
)
|
|
|
|
// Should return empty string when all fields are empty
|
|
#expect(dns.resolvConf == "")
|
|
}
|
|
|
|
@Test func dnsResolvConfWithOnlyNameservers() {
|
|
let dns = DNS(nameservers: ["8.8.8.8"])
|
|
|
|
let expected = "nameserver 8.8.8.8\n"
|
|
#expect(dns.resolvConf == expected)
|
|
}
|
|
|
|
@Test func dnsValidateAcceptsValidIPv4Nameservers() throws {
|
|
let dns = DNS(nameservers: ["8.8.8.8", "1.1.1.1"])
|
|
#expect(throws: Never.self) { try dns.validate() }
|
|
}
|
|
|
|
@Test func dnsValidateAcceptsValidIPv6Nameservers() throws {
|
|
let dns = DNS(nameservers: ["2001:4860:4860::8888", "::1"])
|
|
#expect(throws: Never.self) { try dns.validate() }
|
|
}
|
|
|
|
@Test func dnsValidateAcceptsMixedIPv4AndIPv6Nameservers() throws {
|
|
let dns = DNS(nameservers: ["8.8.8.8", "2001:4860:4860::8844"])
|
|
#expect(throws: Never.self) { try dns.validate() }
|
|
}
|
|
|
|
@Test func dnsValidateAcceptsEmptyNameservers() throws {
|
|
let dns = DNS(nameservers: [])
|
|
#expect(throws: Never.self) { try dns.validate() }
|
|
}
|
|
|
|
@Test func dnsValidateRejectsHostname() {
|
|
let dns = DNS(nameservers: ["dns.example.com"])
|
|
#expect(throws: (any Error).self) { try dns.validate() }
|
|
}
|
|
|
|
@Test func dnsValidateRejectsInvalidAddress() {
|
|
let dns = DNS(nameservers: ["not-an-ip"])
|
|
#expect(throws: (any Error).self) { try dns.validate() }
|
|
}
|
|
}
|