This commit is contained in:
Max Goedjen 2025-09-06 19:26:40 -07:00
parent e966203312
commit 53296ed166
No known key found for this signature in database

View File

@ -6,35 +6,34 @@ private let logger = Logger(subsystem: "com.maxgoedjen.secretive.secretagent.Age
func handleRequest(_ request: XPCListener.IncomingSessionRequest) -> XPCListener.IncomingSessionRequest.Decision { func handleRequest(_ request: XPCListener.IncomingSessionRequest) -> XPCListener.IncomingSessionRequest.Decision {
logger.log("Parser received inbound request") logger.log("Parser received inbound request")
return request.accept { xpcDictionary in return request.accept { xpcMessage in
xpcDictionary.handoffReply(to: .global(qos: .userInteractive)) { xpcMessage.handoffReply(to: .global(qos: .userInteractive)) {
logger.log("Parser accepted inbound request") logger.log("Parser accepted inbound request")
handle(with: xpcMessage)
}
}
}
func handle(with xpcMessage: XPCReceivedMessage) {
do { do {
let parser = SSHAgentInputParser() let parser = SSHAgentInputParser()
let result = try parser.parse(data: xpcDictionary.decode(as: Data.self)) let result = try parser.parse(data: xpcMessage.wrappedDecode())
logger.log("Parser parsed message as type \(result.debugDescription)") logger.log("Parser parsed message as type \(result.debugDescription)")
xpcDictionary.reply(result) xpcMessage.reply(result)
} catch let error as SSHAgentInputParser.AgentParsingError {
logger.error("Parser failed with error \(error)")
xpcDictionary.reply(error)
} catch { } catch {
// This should never actually happen because SSHAgentInputParser is a typed thrower, but the type system doesn't seem to know that across framework boundaries? logger.error("Parser failed with error \(error)")
logger.error("Parser failed with unknown error \(error)") xpcMessage.reply(error)
}
}
} }
} }
public struct WrappedError<Wrapped: Codable & Error>: Codable { extension XPCReceivedMessage {
public struct DescriptionOnlyError: Error, Codable { func wrappedDecode() throws(SSHAgentInputParser.AgentParsingError) -> Data {
let localizedDescription: String do {
return try decode(as: Data.self)
} catch {
throw SSHAgentInputParser.AgentParsingError.invalidData
} }
public let wrapped: Wrapped
public init(_ error: Wrapped) {
wrapped = error
} }
} }