public_git/tart
1
0
Fork 0
mirror of https://github.com/cirruslabs/tart.git synced 2026-10-17 19:36:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Registry: suport pulling public images (#50)

Browse Source
This commit is contained in:
Nikolay Edigaryev
2022-05-06 20:30:04 +03:00
committed by GitHub
parent a4db60d656
commit d5e3a7718e
2 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/tart/Credentials.swift
+2 -10
View File
@@ -1,15 +1,7 @@
import Foundation
class Credentials {
static func retrieve(host: String) throws -> (String, String) {
do {
return try retrieveKeychain(host: host)
} catch RegistryError.AuthFailed {
return try retrieveStdin()
}
}
static func retrieveKeychain(host: String) throws -> (String, String) {
static func retrieveKeychain(host: String) throws -> (String, String)? {
let query: [String: Any] = [kSecClass as String: kSecClassInternetPassword,
kSecAttrProtocol as String: kSecAttrProtocolHTTPS,
kSecAttrServer as String: host,
@@ -24,7 +16,7 @@ class Credentials {
if status != errSecSuccess {
if status == errSecItemNotFound {
throw RegistryError.AuthFailed(why: "Keychain item not found")
return nil
}
throw RegistryError.AuthFailed(why: "Keychain returned unsuccessful status \(status)")
Sources/tart/OCI/Registry.swift
+6 -5
View File
@@ -192,11 +192,12 @@ class Registry {
}
}
let (user, password) = try Credentials.retrieve(host: baseURL.host!)
let encodedCredentials = "\(user):\(password)".data(using: .utf8)?.base64EncodedString()
let headers = [
"Authorization": "Basic \(encodedCredentials!)"
]
var headers: Dictionary<String, String> = Dictionary()
if let (user, password) = try Credentials.retrieveKeychain(host: baseURL.host!) {
let encodedCredentials = "\(user):\(password)".data(using: .utf8)?.base64EncodedString()
headers["Authorization"] = "Basic \(encodedCredentials!)"
}
let (responseData, response) = try await rawRequest("GET", authenticateURL, headers: headers)
if response.statusCode != 200 {