mirror of
https://github.com/apple/container.git
synced 2026-09-14 03:35:42 +00:00
J Logan
356c8d2f88
- Closes #461. - Extract core types into ContainerResources target. - Extract ContainerNetworkServiceClient from ContainerNetworkService. - Relocate sandbox client from ContainerClient to ContainerSandboxServiceClient. - Relocate ContainerClient to ContainerAPIServiceClient. - Common structure from services and clients under Source/Services. Updated project hierarchy: ``` Sources/CAuditToken - audit token access wrapper Sources/CLI - CLI executable Sources/ContainerBuild - builder Sources/ContainerCommands - CLI command implementations Sources/ContainerLog - logging helpers Sources/ContainerPersistence - persistent data and system property helpers Sources/ContainerPlugin - plugin system Sources/ContainerResource - resource (container, image, volume, network) types Sources/ContainerVersion - version helpers Sources/ContainerXPC - XPC helpers Sources/CVersion - injected project version Sources/DNSServer - container DNS resolver Sources/Helpers - service executables Sources/Services/*/Client - service clients Sources/Services/*/Server - service implementations Sources/SocketForwarder - port forwarding Sources/TerminalProgress - progress bar ``` ## Type of Change - [ ] Bug fix - [ ] New feature - [x] Breaking change - [ ] Documentation update ## Motivation and Context The ContainerClient library was a bit of a grab bag. This refactor applies a more sensible project and library structure for resource data types, services, and clients. ## Testing - [x] Tested locally - [x] Added/updated tests - [ ] Added/updated docs
75 lines
2.7 KiB
Swift
75 lines
2.7 KiB
Swift
//===----------------------------------------------------------------------===//
|
|
// Copyright © 2026 Apple Inc. and the container 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 ContainerPersistence
|
|
import ContainerizationError
|
|
|
|
/// The URL scheme to be used for a HTTP request.
|
|
public enum RequestScheme: String, Sendable {
|
|
case http = "http"
|
|
case https = "https"
|
|
|
|
case auto = "auto"
|
|
|
|
public init(_ rawValue: String) throws {
|
|
switch rawValue {
|
|
case RequestScheme.http.rawValue:
|
|
self = .http
|
|
case RequestScheme.https.rawValue:
|
|
self = .https
|
|
case RequestScheme.auto.rawValue:
|
|
self = .auto
|
|
default:
|
|
throw ContainerizationError(.invalidArgument, message: "unsupported scheme \(rawValue)")
|
|
}
|
|
}
|
|
|
|
/// Returns the prescribed protocol to use while making a HTTP request to a webserver
|
|
/// - Parameter host: The domain or IP address of the webserver
|
|
/// - Returns: RequestScheme
|
|
package func schemeFor(host: String) throws -> Self {
|
|
guard host.count > 0 else {
|
|
throw ContainerizationError(.invalidArgument, message: "host cannot be empty")
|
|
}
|
|
switch self {
|
|
case .http, .https:
|
|
return self
|
|
case .auto:
|
|
return Self.isInternalHost(host: host) ? .http : .https
|
|
}
|
|
}
|
|
|
|
/// Checks if the given `host` string is a private IP address
|
|
/// or a domain typically reachable only on the local system.
|
|
private static func isInternalHost(host: String) -> Bool {
|
|
if host.hasPrefix("localhost") || host.hasPrefix("127.") {
|
|
return true
|
|
}
|
|
if host.hasPrefix("192.168.") || host.hasPrefix("10.") {
|
|
return true
|
|
}
|
|
let regex = "(^172\\.1[6-9]\\.)|(^172\\.2[0-9]\\.)|(^172\\.3[0-1]\\.)"
|
|
if host.range(of: regex, options: .regularExpression) != nil {
|
|
return true
|
|
}
|
|
let dnsDomain = DefaultsStore.get(key: .defaultDNSDomain)
|
|
if host.hasSuffix(".\(dnsDomain)") {
|
|
return true
|
|
}
|
|
return false
|
|
}
|
|
}
|