-
Notifications
You must be signed in to change notification settings - Fork 3
fix: add code signing requirements to xpc connections #206
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.
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
+132
−124
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,128 @@ | ||||||
| import Foundation | ||||||
|
|
||||||
| public enum ValidationError: Error { | ||||||
| case fileNotFound | ||||||
| case unableToCreateStaticCode | ||||||
| case invalidSignature | ||||||
| case unableToRetrieveInfo | ||||||
| case invalidIdentifier(identifier: String?) | ||||||
| case invalidTeamIdentifier(identifier: String?) | ||||||
| case missingInfoPList | ||||||
| case invalidVersion(version: String?) | ||||||
| case belowMinimumCoderVersion | ||||||
|
|
||||||
| public var description: String { | ||||||
| switch self { | ||||||
| case .fileNotFound: | ||||||
| "The file does not exist." | ||||||
| case .unableToCreateStaticCode: | ||||||
| "Unable to create a static code object." | ||||||
| case .invalidSignature: | ||||||
| "The file's signature is invalid." | ||||||
| case .unableToRetrieveInfo: | ||||||
| "Unable to retrieve signing information." | ||||||
| case let .invalidIdentifier(identifier): | ||||||
| "Invalid identifier: \(identifier ?? "unknown")." | ||||||
| case let .invalidVersion(version): | ||||||
| "Invalid runtime version: \(version ?? "unknown")." | ||||||
| case let .invalidTeamIdentifier(identifier): | ||||||
| "Invalid team identifier: \(identifier ?? "unknown")." | ||||||
| case .missingInfoPList: | ||||||
| "Info.plist is not embedded within the dylib." | ||||||
| case .belowMinimumCoderVersion: | ||||||
| """ | ||||||
| The Coder deployment must be version \(Validator.minimumCoderVersion) | ||||||
| or higher to use Coder Desktop. | ||||||
| """ | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| public var localizedDescription: String { description } | ||||||
| } | ||||||
|
|
||||||
| public class Validator { | ||||||
| // Whilst older dylibs exist, this app assumes v2.20 or later. | ||||||
| public static let minimumCoderVersion = "2.20.0" | ||||||
|
|
||||||
| private static let expectedName = "CoderVPN" | ||||||
| private static let expectedIdentifier = "com.coder.Coder-Desktop.VPN.dylib" | ||||||
| private static let expectedTeamIdentifier = "4399GN35BJ" | ||||||
|
|
||||||
| private static let infoIdentifierKey = "CFBundleIdentifier" | ||||||
| private static let infoNameKey = "CFBundleName" | ||||||
| private static let infoShortVersionKey = "CFBundleShortVersionString" | ||||||
|
|
||||||
| private static let signInfoFlags: SecCSFlags = .init(rawValue: kSecCSSigningInformation) | ||||||
|
|
||||||
| // `expectedVersion` must be of the form `[0-9]+.[0-9]+.[0-9]+` | ||||||
| public static func validate(path: URL, expectedVersion: String) throws(ValidationError) { | ||||||
| guard FileManager.default.fileExists(atPath: path.path) else { | ||||||
| throw .fileNotFound | ||||||
| } | ||||||
|
|
||||||
| var staticCode: SecStaticCode? | ||||||
| let status = SecStaticCodeCreateWithPath(path as CFURL, SecCSFlags(), &staticCode) | ||||||
| guard status == errSecSuccess, let code = staticCode else { | ||||||
| throw .unableToCreateStaticCode | ||||||
| } | ||||||
|
|
||||||
| let validateStatus = SecStaticCodeCheckValidity(code, SecCSFlags(), nil) | ||||||
| guard validateStatus == errSecSuccess else { | ||||||
| throw .invalidSignature | ||||||
| } | ||||||
|
|
||||||
| var information: CFDictionary? | ||||||
| let infoStatus = SecCodeCopySigningInformation(code, signInfoFlags, &information) | ||||||
| guard infoStatus == errSecSuccess, let info = information as? [String: Any] else { | ||||||
| throw .unableToRetrieveInfo | ||||||
| } | ||||||
|
|
||||||
| guard let identifier = info[kSecCodeInfoIdentifier as String] as? String, | ||||||
| identifier == expectedIdentifier | ||||||
| else { | ||||||
| throw .invalidIdentifier(identifier: info[kSecCodeInfoIdentifier as String] as? String) | ||||||
| } | ||||||
|
|
||||||
| guard let teamIdentifier = info[kSecCodeInfoTeamIdentifier as String] as? String, | ||||||
| teamIdentifier == expectedTeamIdentifier | ||||||
| else { | ||||||
| throw .invalidTeamIdentifier( | ||||||
| identifier: info[kSecCodeInfoTeamIdentifier as String] as? String | ||||||
| ) | ||||||
| } | ||||||
|
|
||||||
| guard let infoPlist = info[kSecCodeInfoPList as String] as? [String: AnyObject] else { | ||||||
| throw .missingInfoPList | ||||||
| } | ||||||
|
|
||||||
| try validateInfo(infoPlist: infoPlist, expectedVersion: expectedVersion) | ||||||
| } | ||||||
|
|
||||||
| public static let xpcPeerRequirement = "anchor apple generic" + // Apple-issued certificate chain | ||||||
| " and certificate leaf[subject.OU] = \"" + expectedTeamIdentifier + "\"" // Signed by the Coder team | ||||||
|
|
||||||
| private static func validateInfo(infoPlist: [String: AnyObject], expectedVersion: String) throws(ValidationError) { | ||||||
| guard let plistIdent = infoPlist[infoIdentifierKey] as? String, plistIdent == expectedIdentifier else { | ||||||
| throw .invalidIdentifier(identifier: infoPlist[infoIdentifierKey] as? String) | ||||||
| } | ||||||
|
|
||||||
| guard let plistName = infoPlist[infoNameKey] as? String, plistName == expectedName else { | ||||||
| throw .invalidIdentifier(identifier: infoPlist[infoNameKey] as? String) | ||||||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The error type should be a name-specific validation error, not
Suggested change
Copilot uses AI. Check for mistakes. Positive FeedbackNegative Feedback |
||||||
| } | ||||||
|
|
||||||
| // Downloaded dylib must match the version of the server | ||||||
| guard let dylibVersion = infoPlist[infoShortVersionKey] as? String, | ||||||
| expectedVersion == dylibVersion | ||||||
| else { | ||||||
| throw .invalidVersion(version: infoPlist[infoShortVersionKey] as? String) | ||||||
| } | ||||||
|
|
||||||
| // Downloaded dylib must be at least the minimum Coder server version | ||||||
| guard let dylibVersion = infoPlist[infoShortVersionKey] as? String, | ||||||
| // x.compare(y) is .orderedDescending if x > y | ||||||
| minimumCoderVersion.compare(dylibVersion, options: .numeric) != .orderedDescending | ||||||
| else { | ||||||
| throw .belowMinimumCoderVersion | ||||||
| } | ||||||
| } | ||||||
| } | ||||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.