chore: use slim binary over dylib #210
Conversation
|
Warning This pull request is not mergeable via GitHub because a downstack PR is open. Once all requirements are satisfied, merge this PR as a stack on Graphite.
This stack of pull requests is managed by Graphite. Learn more about stacking. |
ethanndickson
force-pushed
the
ethan/slim-over-dylib
branch
from
7ef8131 to
8f00c6a
Compare
ethanndickson
force-pushed
the
ethan/xpc-validation
branch
from
547fd97 to
6687411
Compare
ethanndickson
force-pushed
the
ethan/slim-over-dylib
branch
from
8f00c6a to
479576a
Compare
| @@ -69,7 +69,7 @@ actor Receiver<RecvMsg: Message> { | |||
| }, | |||
| onCancel: { | |||
| self.logger.debug("async stream canceled") | |||
| self.dispatch.close() | |||
| self.dispatch.close(flags: [.stop]) | |||
There was a problem hiding this comment.
This causes any currently running dispatch.read calls to supply their callback with an error which lets us actually end the read loop and cause the manager and all of it's children to be deallocated, including pipe file descriptors.
Previously we would leak pipes, but it didn't matter because the process would die each time.
| 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) | ||
| } | ||
|
|
||
| // 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 | ||
| } | ||
| } |
There was a problem hiding this comment.
Unfortunate, but because we don't build the slim binary with an external linker (previously xcode via cgo for the dylib) we can no longer create an info.plist section in the binary with -sectcreate. If we ever need to build the slim binary with cgo then we can add this back.
There was a problem hiding this comment.
I'll add another PR to check the version by exec'ing.
ethanndickson
force-pushed
the
ethan/xpc-validation
branch
from
6687411 to
ef370db
Compare
ethanndickson
force-pushed
the
ethan/slim-over-dylib
branch
from
479576a to
e9e15db
Compare
Closes #201.
This PR:
TunnelHandlewithTunnelDaemon, an abstraction which runsposix_spawnon the slim binary, and manages the spawned process.TunnelDaemon.In a future PR: