mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-02-05 14:50:14 -06:00
Code Issues Packages Projects Releases Wiki Activity

More robust PEM parsing. Thanks to Scott Blake.

Browse Source
This commit is contained in:
Greg Neagle
2025-05-31 08:11:33 -07:00
parent bf3f50d984
commit 1b2614a4fb
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/cli/munki/shared/keychain.swift
View File

@@ -32,12 +32,17 @@ func pemCertData(_ certPath: String) throws -> Data {
guard let certString = try? String(contentsOfFile: certPath, encoding: .utf8) else {
throw MunkiError("File not decodeable as UTF-8")
}
guard let startIndex = certString.range(of: "-----BEGIN CERTIFICATE-----")?.upperBound,
let endIndex = certString.range(of: "-----END CERTIFICATE-----")?.lowerBound
let startTag = "-----BEGIN CERTIFICATE-----"
let endTag = "-----END CERTIFICATE-----"
guard let startIndex = certString.range(of: startTag)?.upperBound,
let endIndex = certString.range(of: endTag)?.lowerBound
else {
throw MunkiError("File does not appear to be .pem file")
}
let certDataString = String(certString[startIndex ..< endIndex]).split(separator: "\n").joined()
let certDataString = String(certString[startIndex ..< endIndex])
.trimmingCharacters(in: .whitespacesAndNewlines)
.components(separatedBy: .newlines)
.joined()
guard let certData = Data(base64Encoded: String(certDataString)) else {
throw MunkiError("Could not decode cert string as base64")
}