-
Notifications
You must be signed in to change notification settings - Fork 375
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Replace old waitForTunnelUp function
After invoking VpnService.establish() we will get a tunnel file descriptor that corresponds to the interface that was created. However, this has no guarantee of the routing table beeing up to date, and we might thus send traffic outside the tunnel. Previously this was done through looking at the tunFd to see that traffic is sent to verify that the routing table has changed. If no traffic is seen some traffic is induced to a random IP address to ensure traffic can be seen. This new implementation is slower but won't risk sending UDP traffic to a random public address at the internet.
- Loading branch information
Showing
24 changed files
with
748 additions
and
412 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
146 changes: 146 additions & 0 deletions
146
android/app/src/test/kotlin/net/mullvad/talpid/TalpidVpnServiceFallbackDnsTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,146 @@ | ||
| package net.mullvad.talpid | ||
|
|
||
| import android.net.VpnService | ||
| import android.os.ParcelFileDescriptor | ||
| import arrow.core.right | ||
| import io.mockk.MockKAnnotations | ||
| import io.mockk.coVerify | ||
| import io.mockk.every | ||
| import io.mockk.mockk | ||
| import io.mockk.mockkConstructor | ||
| import io.mockk.mockkStatic | ||
| import io.mockk.spyk | ||
| import java.net.InetAddress | ||
| import net.mullvad.mullvadvpn.lib.common.test.assertLists | ||
| import net.mullvad.mullvadvpn.lib.common.util.prepareVpnSafe | ||
| import net.mullvad.mullvadvpn.lib.model.Prepared | ||
| import net.mullvad.talpid.model.CreateTunResult | ||
| import net.mullvad.talpid.model.InetNetwork | ||
| import net.mullvad.talpid.model.TunConfig | ||
| import org.junit.jupiter.api.BeforeEach | ||
| import org.junit.jupiter.api.Test | ||
| import org.junit.jupiter.api.assertInstanceOf | ||
|
|
||
| class TalpidVpnServiceFallbackDnsTest { | ||
| lateinit var talpidVpnService: TalpidVpnService | ||
| var builderMockk = mockk<VpnService.Builder>() | ||
|
|
||
| @BeforeEach | ||
| fun setup() { | ||
| MockKAnnotations.init(this) | ||
| mockkStatic(VPN_SERVICE_EXTENSION) | ||
|
|
||
| talpidVpnService = spyk<TalpidVpnService>(recordPrivateCalls = true) | ||
| every { talpidVpnService.prepareVpnSafe() } returns Prepared.right() | ||
| builderMockk = mockk<VpnService.Builder>() | ||
|
|
||
| mockkConstructor(VpnService.Builder::class) | ||
| every { anyConstructed<VpnService.Builder>().setMtu(any()) } returns builderMockk | ||
| every { anyConstructed<VpnService.Builder>().setBlocking(any()) } returns builderMockk | ||
| every { anyConstructed<VpnService.Builder>().addAddress(any<InetAddress>(), any()) } returns | ||
| builderMockk | ||
| every { anyConstructed<VpnService.Builder>().addRoute(any<InetAddress>(), any()) } returns | ||
| builderMockk | ||
| every { | ||
| anyConstructed<VpnService.Builder>() | ||
| .addDnsServer(TalpidVpnService.FALLBACK_DUMMY_DNS_SERVER) | ||
| } returns builderMockk | ||
| val parcelFileDescriptor: ParcelFileDescriptor = mockk() | ||
| every { anyConstructed<VpnService.Builder>().establish() } returns parcelFileDescriptor | ||
| every { parcelFileDescriptor.detachFd() } returns 1 | ||
| } | ||
|
|
||
| @Test | ||
| fun `opening tun with no DnsServers should add fallback DNS server`() { | ||
| val tunConfig = baseTunConfig.copy(dnsServers = arrayListOf()) | ||
|
|
||
| val result = talpidVpnService.openTun(tunConfig) | ||
|
|
||
| assertInstanceOf<CreateTunResult.Success>(result) | ||
|
|
||
| // Fallback DNS server should be added if no DNS servers are provided | ||
| coVerify(exactly = 1) { | ||
| anyConstructed<VpnService.Builder>() | ||
| .addDnsServer(TalpidVpnService.FALLBACK_DUMMY_DNS_SERVER) | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| fun `opening tun with all bad DnsServers should return InvalidDnsServers and add fallback`() { | ||
| val badDns1 = InetAddress.getByName("0.0.0.0") | ||
| val badDns2 = InetAddress.getByName("255.255.255.255") | ||
| every { anyConstructed<VpnService.Builder>().addDnsServer(badDns1) } throws | ||
| IllegalArgumentException() | ||
| every { anyConstructed<VpnService.Builder>().addDnsServer(badDns2) } throws | ||
| IllegalArgumentException() | ||
|
|
||
| val tunConfig = baseTunConfig.copy(dnsServers = arrayListOf(badDns1, badDns2)) | ||
| val result = talpidVpnService.openTun(tunConfig) | ||
|
|
||
| assertInstanceOf<CreateTunResult.InvalidDnsServers>(result) | ||
| assertLists(tunConfig.dnsServers, result.addresses) | ||
| // Fallback DNS server should be added if no valid DNS servers are provided | ||
| coVerify(exactly = 1) { | ||
| anyConstructed<VpnService.Builder>() | ||
| .addDnsServer(TalpidVpnService.FALLBACK_DUMMY_DNS_SERVER) | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| fun `opening tun with 1 good and 1 bad DnsServers should return InvalidDnsServers`() { | ||
| val goodDnsServer = InetAddress.getByName("1.1.1.1") | ||
| val badDns = InetAddress.getByName("255.255.255.255") | ||
| every { anyConstructed<VpnService.Builder>().addDnsServer(goodDnsServer) } returns | ||
| builderMockk | ||
| every { anyConstructed<VpnService.Builder>().addDnsServer(badDns) } throws | ||
| IllegalArgumentException() | ||
|
|
||
| val tunConfig = baseTunConfig.copy(dnsServers = arrayListOf(goodDnsServer, badDns)) | ||
| val result = talpidVpnService.openTun(tunConfig) | ||
|
|
||
| assertInstanceOf<CreateTunResult.InvalidDnsServers>(result) | ||
| assertLists(arrayListOf(badDns), result.addresses) | ||
|
|
||
| // Fallback DNS server should not be added since we have 1 good DNS server | ||
| coVerify(exactly = 0) { | ||
| anyConstructed<VpnService.Builder>() | ||
| .addDnsServer(TalpidVpnService.FALLBACK_DUMMY_DNS_SERVER) | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| fun `providing good dns servers should not add the fallback dns and return success`() { | ||
| val goodDnsServer = InetAddress.getByName("1.1.1.1") | ||
| every { anyConstructed<VpnService.Builder>().addDnsServer(goodDnsServer) } returns | ||
| builderMockk | ||
|
|
||
| val tunConfig = baseTunConfig.copy(dnsServers = arrayListOf(goodDnsServer)) | ||
| val result = talpidVpnService.openTun(tunConfig) | ||
|
|
||
| assertInstanceOf<CreateTunResult.Success>(result) | ||
|
|
||
| // Fallback DNS server should not be added since we have good DNS servers. | ||
| coVerify(exactly = 0) { | ||
| anyConstructed<VpnService.Builder>() | ||
| .addDnsServer(TalpidVpnService.FALLBACK_DUMMY_DNS_SERVER) | ||
| } | ||
| } | ||
|
|
||
| companion object { | ||
| private const val VPN_SERVICE_EXTENSION = | ||
| "net.mullvad.mullvadvpn.lib.common.util.VpnServiceUtilsKt" | ||
|
|
||
| val baseTunConfig = | ||
| TunConfig( | ||
| addresses = arrayListOf(InetAddress.getByName("45.83.223.209")), | ||
| dnsServers = arrayListOf(), | ||
| routes = | ||
| arrayListOf( | ||
| InetNetwork(InetAddress.getByName("0.0.0.0"), 0), | ||
| InetNetwork(InetAddress.getByName("::"), 0), | ||
| ), | ||
| mtu = 1280, | ||
| excludedPackages = arrayListOf(), | ||
| ) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.