lee/container
1
0
Fork 0
mirror of https://github.com/apple/container.git synced 2026-09-25 09:05:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds some context to fetchToken errors (#129)

Browse Source 
Fixes https://github.com/apple/container/issues/182 and
https://github.com/apple/container/issues/183

Signed-off-by: Alexey <makhov.alex@gmail.com>
This commit is contained in:
Alexey Makhov
2025-06-17 08:26:46 -07:00
committed by GitHub
parent 4a482a00c0
commit 4a196b6dc2
2 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/ContainerizationOCI/Client/RegistryClient.swift
+19 -6
View File
@@ -184,13 +184,26 @@ public final class RegistryClient: ContentClient {
if let ct = currentToken, ct.isValid(scope: tokenRequest.scope) {
break
}
let _currentToken = try await fetchToken(request: tokenRequest)
guard let token = _currentToken.getToken() else {
throw ContainerizationError(.internalError, message: "Failed to fetch Bearer token")
do {
let _currentToken = try await fetchToken(request: tokenRequest)
guard let token = _currentToken.getToken() else {
throw ContainerizationError(.internalError, message: "Failed to fetch Bearer token")
}
currentToken = _currentToken
request.headers.replaceOrAdd(name: "Authorization", value: token)
retryCount += 1
} catch let err as RegistryClient.Error {
guard case .invalidStatus(_, let status, _) = err else {
throw err
}
if status == .unauthorized || status == .forbidden {
throw RegistryClient.Error.invalidStatus(url: path, _response.status, reason: "Access denied or wrong credentials")
}
throw err
}
currentToken = _currentToken
request.headers.replaceOrAdd(name: "Authorization", value: token)
retryCount += 1
continue
}
guard let retryOptions = self.retryOptions else {
Tests/ContainerizationOCITests/RegistryClientTests.swift
+4 -3
View File
@@ -81,10 +81,11 @@ struct OCIClientTests: ~Copyable {
let authentication = BasicAuthentication(username: "foo", password: "bar")
let client = RegistryClient(host: "ghcr.io", authentication: authentication)
let error = await #expect(throws: RegistryClient.Error.self) { try await client.ping() }
if case .invalidStatus = error {
} else {
Issue.record("encountered unexpected error \(error)")
guard case .invalidStatus(_, let status, let reason) = error else {
throw error!
}
#expect(status == .unauthorized)
#expect(reason == "Access denied or wrong credentials")
}
@Test(.enabled(if: hasRegistryCredentials))