From: Jason A. Donenfeld Date: Wed, 16 Dec 2020 23:10:28 +0000 (+0100) Subject: Kit: PacketTunnelSettingsGenerator: do not require DNS queries if no DNS X-Git-Tag: 1.0.11-20~3 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=20bdf46792905de8862ae7641e50e0f9f99ec946;p=thirdparty%2Fwireguard-apple.git Kit: PacketTunnelSettingsGenerator: do not require DNS queries if no DNS Prior, we would set matchDomains=[""] even if the user didn't provide any DNS servers. This was kind of incoherent, but I guess we had in mind some kind of non-sensical leakproof scheme that never really worked anyway. NetworkExtension didn't like this, so setTunnelNetworkSettings would, rather than return an error, simply timeout and never call its callback function. But everything worked fine, so we had code in the UI to check to make sure everything was okay after 5 seconds or so of no callback. Recent changes made the timeout fatal on the network extension side, so rather than succeed, configs with no DNS server started erroring out, causing user reports. This commit attempts to handle the root cause of the timeout issue by not twiddling with DNS settings if no DNS server was specified. For now, however, it leaves the hard-timeout semantics in place. Reported-by: Filipe Mendonça Signed-off-by: Jason A. Donenfeld --- diff --git a/Sources/WireGuardKit/PacketTunnelSettingsGenerator.swift b/Sources/WireGuardKit/PacketTunnelSettingsGenerator.swift index 034ecaf..2d8cda1 100644 --- a/Sources/WireGuardKit/PacketTunnelSettingsGenerator.swift +++ b/Sources/WireGuardKit/PacketTunnelSettingsGenerator.swift @@ -83,11 +83,15 @@ class PacketTunnelSettingsGenerator { */ let networkSettings = NEPacketTunnelNetworkSettings(tunnelRemoteAddress: "127.0.0.1") - let dnsServerStrings = tunnelConfiguration.interface.dns.map { $0.stringRepresentation } - let dnsSettings = NEDNSSettings(servers: dnsServerStrings) - dnsSettings.searchDomains = tunnelConfiguration.interface.dnsSearch - dnsSettings.matchDomains = [""] // All DNS queries must first go through the tunnel's DNS - networkSettings.dnsSettings = dnsSettings + if !tunnelConfiguration.interface.dnsSearch.isEmpty || !tunnelConfiguration.interface.dns.isEmpty { + let dnsServerStrings = tunnelConfiguration.interface.dns.map { $0.stringRepresentation } + let dnsSettings = NEDNSSettings(servers: dnsServerStrings) + dnsSettings.searchDomains = tunnelConfiguration.interface.dnsSearch + if !tunnelConfiguration.interface.dns.isEmpty { + dnsSettings.matchDomains = [""] // All DNS queries must first go through the tunnel's DNS + } + networkSettings.dnsSettings = dnsSettings + } let mtu = tunnelConfiguration.interface.mtu ?? 0