external/secretive
1
0
Fork 0
mirror of https://github.com/maxgoedjen/secretive.git synced 2025-12-14 21:10:56 +00:00
Code Issues Projects Releases Wiki Activity

[fix]: eliminate race condition in SocketController

Browse Source
This commit is contained in:
Jamie 2025-12-03 20:17:09 -06:00
parent bb0b6d8dc3
commit 8ed9f275af
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Sources/Packages/Sources/SecretAgentKit/SocketController.swift
View File

@ -37,7 +37,15 @@ public struct SocketController {
port = SocketPort(path: path) port = SocketPort(path: path)
fileHandle = FileHandle(fileDescriptor: port.socket, closeOnDealloc: true) fileHandle = FileHandle(fileDescriptor: port.socket, closeOnDealloc: true)
Task { @MainActor [fileHandle, sessionsContinuation, logger] in Task { @MainActor [fileHandle, sessionsContinuation, logger] in
for await notification in NotificationCenter.default.notifications(named: .NSFileHandleConnectionAccepted) { // Create the iterator before triggering the notification to
// ensure it will not be missed.
let connectionAvailableIterator = NotificationCenter.default
.notifications(named: .NSFileHandleConnectionAccepted)
.makeAsyncIterator()
fileHandle.acceptConnectionInBackgroundAndNotify()
while let notification = await connectionAvailableIterator.next() {
logger.debug("Socket controller accepted connection") logger.debug("Socket controller accepted connection")
guard let new = notification.userInfo?[NSFileHandleNotificationFileHandleItem] as? FileHandle else { continue } guard let new = notification.userInfo?[NSFileHandleNotificationFileHandleItem] as? FileHandle else { continue }
let session = Session(fileHandle: new) let session = Session(fileHandle: new)
@ -45,7 +53,6 @@ public struct SocketController {
fileHandle.acceptConnectionInBackgroundAndNotify() fileHandle.acceptConnectionInBackgroundAndNotify()
} }
} }
fileHandle.acceptConnectionInBackgroundAndNotify()
logger.debug("Socket listening at \(path)") logger.debug("Socket listening at \(path)")
} }
@ -77,8 +84,16 @@ extension SocketController {
self.fileHandle = fileHandle self.fileHandle = fileHandle
provenance = SigningRequestTracer().provenance(from: fileHandle) provenance = SigningRequestTracer().provenance(from: fileHandle)
(messages, messagesContinuation) = AsyncStream.makeStream() (messages, messagesContinuation) = AsyncStream.makeStream()
Task { [messagesContinuation, logger] in Task { @MainActor [messagesContinuation, logger] in
for await _ in NotificationCenter.default.notifications(named: .NSFileHandleDataAvailable, object: fileHandle) { // Create the iterator before triggering the notification to
// ensure it will not be missed.
let dataAvailableIterator = NotificationCenter.default
.notifications(named: .NSFileHandleDataAvailable, object: fileHandle)
.makeAsyncIterator()
fileHandle.waitForDataInBackgroundAndNotify()
while let _ = await dataAvailableIterator.next() {
let data = fileHandle.availableData let data = fileHandle.availableData
guard !data.isEmpty else { guard !data.isEmpty else {
logger.debug("Socket controller received empty data, ending continuation.") logger.debug("Socket controller received empty data, ending continuation.")
@ -90,16 +105,13 @@ extension SocketController {
logger.debug("Socket controller yielded data.") logger.debug("Socket controller yielded data.")
} }
} }
fileHandle.waitForDataInBackgroundAndNotify()
} }
/// Writes new data to the socket. /// Writes new data to the socket.
/// - Parameter data: The data to write. /// - Parameter data: The data to write.
public func write(_ data: Data) async throws { @MainActor public func write(_ data: Data) throws {
try fileHandle.write(contentsOf: data) try fileHandle.write(contentsOf: data)
await MainActor.run { fileHandle.waitForDataInBackgroundAndNotify()
fileHandle.waitForDataInBackgroundAndNotify()
}
} }
/// Closes the socket and cleans up resources. /// Closes the socket and cleans up resources.