github-personal/firezone
1
0
Fork 0
mirror of https://github.com/outbackdingo/firezone.git synced 2026-01-27 10:18:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(apple): Reset cached system resolvers while tunnel is reasserting (#3274)

Browse Source 
Fixes an issue where the DNS resolvers returned could be Connlib's if
the network connectivity changed while Firezone was connected.
This commit is contained in:
Jamil
2024-01-16 23:01:50 -08:00
committed by GitHub
parent 98930cc1ba
commit 41bdc1f0f9
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
swift/apple/FirezoneNetworkExtension/Adapter.swift
View File

@@ -294,8 +294,14 @@ extension Adapter {
self.networkSettings?.apply(
on: self.packetTunnelProvider,
logger: self.logger,
completionHandler: nil
)
completionHandler: { _ in
// We can only get the system's default resolvers before connlib starts, and then they'll
// be overwritten by the ones from connlib. So cache them here for getSystemDefaultResolvers
// to retrieve them later.
self.callbackHandler.setSystemDefaultResolvers(
resolvers: Resolv().getservers().map(Resolv.getnameinfo)
)
})
}
private func beginPathMonitoring() {
@@ -339,12 +345,6 @@ extension Adapter {
self.logger.log("Adapter.didReceivePathUpdate: Back online. Starting connlib.")
do {
// We can only get the system's default resolvers before connlib starts, and then they'll
// be overwritten by the ones from connlib. So cache them here for getSystemDefaultResolvers
// to retrieve them later.
self.callbackHandler.setSystemDefaultResolvers(
resolvers: Resolv().getservers().map(Resolv.getnameinfo)
)
self.state = .startingTunnel(
session: try WrappedSession.connect(
controlPlaneURLString,