mirror of
https://github.com/apple/container.git
synced 2026-07-15 22:17:01 +00:00
Aditya Ramani
0846bb6640
Its a bit weird to have to pass `--http` when pulling / pushing images if we are trying to do so from a local registry This PR adds a `RequestScheme` enum type which tries to detect if the connection to the registry should be over http or https. This auto detection is the default behavior and can be overridden by passing the `--scheme http/https` flag to the `run` ,`pull`, `push` `login` and `registry default` command The auto detection works by looking at the hostname / IP. HTTP is used in the following cases - If the hostname starts with `localhost` or is `127.x.x.x` - if the host looks like an IP from the private address space - If the host ends with the current default dns domain name Also in this PR: - Removing some used CLI flag groups and TODOs - Better error messages when registry credentials are not found for a host Signed-off-by: Aditya Ramani <a_ramani@apple.com>
64 lines
2.6 KiB
Swift
64 lines
2.6 KiB
Swift
//===----------------------------------------------------------------------===//
|
|
// Copyright © 2025 Apple Inc. and the container project authors. All rights reserved.
|
|
//
|
|
// 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 ContainerizationError
|
|
import Foundation
|
|
import Testing
|
|
|
|
@testable import ContainerClient
|
|
|
|
struct RequestSchemeTests {
|
|
static let defaultDnsDomain = ClientDefaults.get(key: .defaultDNSDomain)
|
|
|
|
internal struct TestArg {
|
|
let scheme: String
|
|
let host: String
|
|
let expected: RequestScheme
|
|
}
|
|
|
|
@Test(arguments: [
|
|
TestArg(scheme: "http", host: "myregistry.io", expected: .http),
|
|
TestArg(scheme: "https", host: "myregistry.io", expected: .https),
|
|
TestArg(scheme: "auto", host: "myregistry.io", expected: .https),
|
|
TestArg(scheme: "https", host: "localhost", expected: .https),
|
|
TestArg(scheme: "http", host: "localhost", expected: .http),
|
|
TestArg(scheme: "auto", host: "localhost", expected: .http),
|
|
TestArg(scheme: "http", host: "127.0.0.1", expected: .http),
|
|
TestArg(scheme: "https", host: "127.0.0.1", expected: .https),
|
|
TestArg(scheme: "auto", host: "127.0.0.1", expected: .http),
|
|
TestArg(scheme: "https", host: "10.3.4.1", expected: .https),
|
|
TestArg(scheme: "auto", host: "10.3.4.1", expected: .http),
|
|
TestArg(scheme: "auto", host: "some-dns-name.io.\(Self.defaultDnsDomain)", expected: .http),
|
|
TestArg(scheme: "auto", host: "some-dns-name.io", expected: .https),
|
|
TestArg(scheme: "auto", host: "172.32.0.1", expected: .https),
|
|
TestArg(scheme: "auto", host: "172.22.23.61", expected: .http),
|
|
])
|
|
|
|
func testIsConnectionSecure(arg: TestArg) throws {
|
|
let requestScheme = RequestScheme(rawValue: arg.scheme)!
|
|
#expect(try requestScheme.schemeFor(host: arg.host) == arg.expected)
|
|
}
|
|
|
|
func testEmptyHostThrowsError() throws {
|
|
#expect(throws: (any Error).self) {
|
|
let requestScheme = RequestScheme(rawValue: "https")!
|
|
_ = try requestScheme.schemeFor(host: "")
|
|
}
|
|
}
|
|
}
|