Skip to content

fix: import GPG keys when installing swiftly #453

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

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

fix: import GPG keys when installing swiftly #453

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
824f867
refactor: verify GPG keys func
louisunlimited Nov 2, 2025
3d501af
feat: import GPG keys when verify signatures
louisunlimited Nov 2, 2025
7fe287e
Merge branch 'main' into louis/self-update-gpg-verify
louisunlimited Nov 7, 2025
58f4b29
fix: use inherit env
louisunlimited Nov 8, 2025
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
33 changes: 23 additions & 10 deletions Sources/LinuxPlatform/Linux.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,16 +285,7 @@ public struct Linux: Platform {
throw SwiftlyError(message: msg)
}

let tmpFile = self.getTempFilePath()
try await fs.create(.mode(0o600), file: tmpFile, contents: nil)
try await fs.withTemporary(files: tmpFile) {
try await ctx.httpClient.getGpgKeys().download(to: tmpFile)
if let mockedHomeDir = ctx.mockedHomeDir {
try await sys.gpg()._import(key: tmpFile).run(environment: .inherit.updating(["GNUPGHOME": (mockedHomeDir / ".gnupg").string]), quiet: true)
} else {
try await sys.gpg()._import(key: tmpFile).run(quiet: true)
}
}
try await self.importGpgKeys(ctx)
}

guard let manager = manager else {
Expand Down Expand Up @@ -430,6 +421,9 @@ public struct Linux: Platform {
public func verifyToolchainSignature(
_ ctx: SwiftlyCoreContext, toolchainFile: ToolchainFile, archive: FilePath, verbose: Bool
) async throws {
// Ensure GPG keys are imported before attempting signature verification
try await self.importGpgKeys(ctx)

if verbose {
await ctx.message("Downloading toolchain signature...")
}
Expand All @@ -452,9 +446,28 @@ public struct Linux: Platform {
}
}

/// Import Swift.org GPG keys for signature verification
private func importGpgKeys(_ ctx: SwiftlyCoreContext) async throws {
let tmpFile = self.getTempFilePath()
try await fs.create(.mode(0o600), file: tmpFile, contents: nil)
try await fs.withTemporary(files: tmpFile) {
try await ctx.httpClient.getGpgKeys().download(to: tmpFile)
if let mockedHomeDir = ctx.mockedHomeDir {
var env = ProcessInfo.processInfo.environment
env["GNUPGHOME"] = (mockedHomeDir / ".gnupg").string
try await sys.gpg()._import(key: tmpFile).run(environment: .init(env), quiet: true)
Copy link
Member

@cmcgee1024 cmcgee1024 Nov 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

issue (blocking): Since updating to swift-subprocess the environment handling is more explicit in that it can be precisely encoded that the environment should be inherited with specific overrides. This line becomes the following:

try await sys.gpg()._import(key: tmpFile).run(environment: .inherit.updating(["GNUPGHOME": (mockedHomeDir / ".gnupg").string]), quiet: true)

Copy link
Contributor Author

@louisunlimited louisunlimited Nov 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just pushed the change

} else {
try await sys.gpg()._import(key: tmpFile).run(quiet: true)
}
}
}

public func verifySwiftlySignature(
_ ctx: SwiftlyCoreContext, archiveDownloadURL: URL, archive: FilePath, verbose: Bool
) async throws {
// Ensure GPG keys are imported before attempting signature verification
try await self.importGpgKeys(ctx)

if verbose {
await ctx.message("Downloading swiftly signature...")
}
Expand Down
Loading