Skip to content

update registry publishing #6146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 15, 2023
Merged

update registry publishing #6146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dff8d36
update registry publishing
tomerd Feb 10, 2023
e8196d3
fixup
tomerd Feb 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
130 changes: 22 additions & 108 deletions Sources/PackageRegistry/RegistryClient.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -648,74 +648,6 @@ public final class RegistryClient: Cancellable {
}
}

public func getPublishRequirements(
registryURL: URL,
timeout: DispatchTimeInterval? = .none,
observabilityScope: ObservabilityScope,
callbackQueue: DispatchQueue,
completion: @escaping (Result<PublishRequirements, Error>) -> Void
) {
let completion = self.makeAsync(completion, on: callbackQueue)

guard var components = URLComponents(url: registryURL, resolvingAgainstBaseURL: true) else {
return completion(.failure(RegistryError.invalidURL(registryURL)))
}
components.appendPathComponents("publish-requirements")
guard let url = components.url else {
return completion(.failure(RegistryError.invalidURL(registryURL)))
}

let request = LegacyHTTPClient.Request(
method: .get,
url: url,
headers: [
"Accept": self.acceptHeader(mediaType: .json),
],
options: self.defaultRequestOptions(timeout: timeout, callbackQueue: callbackQueue)
)

self.httpClient.execute(request, observabilityScope: observabilityScope, progress: nil) { result in
completion(
result.tryMap { response in
switch response.statusCode {
case 200:
let publishRequirements = try response.parseJSON(
Serialization.PublishRequirements.self,
decoder: self.jsonDecoder
)

return PublishRequirements(
metadata: .init(
location: publishRequirements.metadata.location.map {
switch $0 {
case .archive:
return .archive
case .request:
return .request
}
}
),
signing: .init(
required: publishRequirements.signing.required,
acceptedSignatureFormats: publishRequirements.signing.acceptedSignatureFormats.map {
switch $0 {
case .CMS_1_0_0:
return .CMS_1_0_0
}
},
trustedRootCertificates: publishRequirements.signing.trustedRootCertificates
)
)
default:
throw self.unexpectedStatusError(response, expectedStatus: [200])
}
}.mapError {
RegistryError.failedRetrievingRegistryPublishRequirements($0)
}
)
}
}

public func publish(
registryURL: URL,
packageIdentity: PackageIdentity,
Expand Down Expand Up @@ -759,43 +691,46 @@ public final class RegistryClient: Cancellable {
}

// TODO: add generic support for upload requests in Basics
var body = Data()
let boundary = UUID().uuidString
var parts = [String]()

// archive field
body.append(contentsOf: """
--\(boundary)
parts.append("""
Content-Disposition: form-data; name=\"source-archive\"\r
Content-Type: application/zip\r
Content-Transfer-Encoding: base64\r
Content-Length: \(packageArchiveContent.count)\r
\r
\(packageArchiveContent.base64EncodedString())
""".utf8)
\(packageArchiveContent.base64EncodedString())\r
""")

if let metadataContent = metadataContent {
// spacer
body.append(contentsOf: "\r\n".utf8)
// metadata fiels
body.append(contentsOf: """
--\(boundary)\r
parts.append("""
Content-Disposition: form-data; name=\"metadata\"\r
Content-Type: application/json\r
Content-Transfer-Encoding: quoted-printable\r
Content-Length: \(metadataContent.count)\r
\r
\(metadataContent)
""".utf8)
\(metadataContent)\r
""")
}

let bodyString = """
--\(boundary)\r
\(parts.joined(separator: "\n--\(boundary)\r\n"))
--\(boundary)--\r\n
"""

let request = LegacyHTTPClient.Request(
method: .put,
url: url,
headers: [
"Content-Type": "multipart/form-data;boundary=\"\(boundary)\"",
"Accept": self.acceptHeader(mediaType: .json),
"Expect": "100-continue",
"Prefer": "respond-async",
],
body: body,
body: Data(bodyString.utf8),
options: self.defaultRequestOptions(timeout: timeout, callbackQueue: callbackQueue)
)

Expand Down Expand Up @@ -1017,33 +952,12 @@ extension RegistryClient {
}
}

extension RegistryClient {
public enum SignatureFormat {
case CMS_1_0_0
}
}

extension RegistryClient {
public struct PublishRequirements {
public let metadata: Metadata
public let signing: Signing

public struct Metadata {
public let location: [MetadataLocation]
}

public enum MetadataLocation {
case request
case archive
}

public struct Signing {
public let required: Bool
public let acceptedSignatureFormats: [SignatureFormat]
public let trustedRootCertificates: [String]
}
}
}
/*
extension RegistryClient {
public enum SignatureFormat {
case CMS_1_0_0
}
}*/

extension RegistryClient {
public enum PublishResult: Equatable {
Expand Down
Loading