Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

android: add entry gateway host name to tun config #1741

Draft
wants to merge 1 commit into
base: develop
Choose a base branch
from
+55 −10
Draft

android: add entry gateway host name to tun config #1741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions nym-vpn-android/nym-vpn-client/src/main/java/net/nymtech/vpn/backend/NymBackend.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ import nym_vpn_lib.waitForRegisterDevice
import nym_vpn_lib.waitForUpdateAccount
import nym_vpn_lib.waitForUpdateDevice
import timber.log.Timber
import java.net.InetAddress
import java.util.concurrent.atomic.AtomicBoolean
import kotlin.properties.Delegates

Expand Down
17 changes: 14 additions & 3 deletions ...-android/nym-vpn-client/src/main/java/net/nymtech/vpn/util/extensions/TunnelExtensions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ import nym_vpn_lib.Ipv4Route
import nym_vpn_lib.Ipv6Route
import nym_vpn_lib.TunnelNetworkSettings
import timber.log.Timber
import java.net.InetAddress

fun VpnService.Builder.addRoutes(config: TunnelNetworkSettings, calculator: IpCalculator) {
val includedRoutes = mutableListOf<String>()
val excludedRoutes = mutableListOf<String>()
val includedRoutes = mutableSetOf<String>()
val excludedRoutes = mutableSetOf<String>()
with(config.ipv4Settings) {
this?.includedRoutes?.forEach {
when (it) {
Expand Down Expand Up @@ -38,6 +39,16 @@ fun VpnService.Builder.addRoutes(config: TunnelNetworkSettings, calculator: IpCa
}
}
}
config.entryGatewayHostname?.let {
runCatching {
val address: InetAddress = InetAddress.getByName(it)
Timber.d("Entry gateway host name: ${address.hostName}")
Timber.d("Host name address: ${address.hostAddress}")
address.hostAddress?.let {
excludedRoutes.add(it)
}
}
}
with(config.ipv6Settings) {
this?.includedRoutes?.forEach {
when (it) {
Expand Down Expand Up @@ -67,7 +78,7 @@ fun VpnService.Builder.addRoutes(config: TunnelNetworkSettings, calculator: IpCa
Timber.d("Excluded routes: $excludedRoutes")
// Add all ipv6 to included to block ipv6 leaks
if (!includedRoutes.contains(IpCalculator.ALL_IPV6_ADDRESS)) includedRoutes.add(IpCalculator.ALL_IPV6_ADDRESS)
val allowedIps = calculator.calculateAllowedIps(includedRoutes, excludedRoutes)
val allowedIps = calculator.calculateAllowedIps(includedRoutes.toList(), excludedRoutes.toList())
allowedIps.forEach {
Timber.d("Adding allowed route: ${it.first}/${it.second}")
addRoute(it.first, it.second)
Expand Down
1 change: 1 addition & 0 deletions nym-vpn-core/crates/nym-vpn-lib/src/platform/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ impl From<nym_vpn_account_controller::AccountCommandError> for VpnError {
code_reference_id: e.code_reference_id,
}
}

AccountCommandError::RegisterDeviceEndpointFailure(e) => {
VpnError::DeviceRegistrationFailed {
details: e.message,
Expand Down
7 changes: 7 additions & 0 deletions nym-vpn-core/crates/nym-vpn-lib/src/tunnel_provider/tunnel_settings.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ pub struct TunnelSettings {
/// Tunnel interface addresses.
pub interface_addresses: Vec<IpNetwork>,

#[cfg(any(target_os = "ios", target_os = "android"))]
pub entry_gateway_hostname: Option<String>,

/// DNS servers to set on tunnel interface.
pub dns_servers: Vec<IpAddr>,

Expand Down Expand Up @@ -47,6 +50,7 @@ impl TunnelSettings {

TunnelNetworkSettings {
tunnel_remote_address: "127.0.0.1".to_owned(),
entry_gateway_hostname: self.entry_gateway_hostname,
ipv4_settings,
ipv6_settings,
dns_settings: Some(DnsSettings {
Expand Down Expand Up @@ -226,6 +230,9 @@ pub struct TunnelNetworkSettings {
/// Tunnel remote address, which is mostly of decorative value.
pub tunnel_remote_address: String,

/// host name of the entry gateway
pub entry_gateway_hostname: Option<String>,

/// IPv4 interface settings.
pub ipv4_settings: Option<Ipv4Settings>,

Expand Down
39 changes: 32 additions & 7 deletions nym-vpn-core/crates/nym-vpn-lib/src/tunnel_state_machine/tunnel_monitor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@ use tun::AsyncDevice;
#[cfg(any(target_os = "linux", target_os = "macos", target_os = "windows"))]
use tun::Device;

#[cfg(any(target_os = "linux", target_os = "macos", target_os = "windows"))]
use nym_ip_packet_requests::IpPair;

#[cfg(target_os = "linux")]
use super::default_interface::DefaultInterface;
#[cfg(any(target_os = "linux", target_os = "macos", target_os = "windows"))]
Expand All @@ -36,6 +33,9 @@ use super::{
ConnectionData, Error, ErrorStateReason, MixnetConnectionData, MixnetEvent, NymConfig, Result,
TunnelConnectionData, TunnelSettings, TunnelType, WireguardConnectionData, WireguardNode,
};
#[cfg(any(target_os = "linux", target_os = "macos", target_os = "windows"))]
use nym_ip_packet_requests::IpPair;
use nym_topology::NetworkAddress;

#[cfg(any(target_os = "linux", target_os = "macos", target_os = "windows"))]
use super::tunnel::wireguard::connected_tunnel::{
Expand Down Expand Up @@ -282,7 +282,7 @@ impl TunnelMonitor {
#[cfg(target_os = "android")]
match connected_mixnet.websocket_fd().await {
Some(fd) => {
self.tun_provider.bypass(fd);
//self.tun_provider.bypass(fd);
}
None => {
tracing::error!("Failed to obtain websocket for bypass");
Expand All @@ -294,17 +294,38 @@ impl TunnelMonitor {
.await;

let selected_gateways = connected_mixnet.selected_gateways().clone();

#[cfg(any(target_os = "ios", target_os = "android"))]
let entry_hostname = match selected_gateways.clone().entry.host {
Some(address) => match address {
NetworkAddress::IpAddr(ip) => Some(ip.to_string()),
NetworkAddress::Hostname(host) => Some(host),
},
None => None,
};

let (tunnel_conn_data, mut tunnel_handle) = match self.tunnel_settings.tunnel_type {
TunnelType::Mixnet => self.start_mixnet_tunnel(connected_mixnet).await?,
TunnelType::Mixnet => {
self.start_mixnet_tunnel(
connected_mixnet,
#[cfg(any(target_os = "ios", target_os = "android"))]
entry_hostname,
)
.await?
}
TunnelType::Wireguard => {
match self.tunnel_settings.wireguard_tunnel_options.multihop_mode {
#[cfg(any(target_os = "linux", target_os = "macos", target_os = "windows"))]
WireguardMultihopMode::TunTun => {
self.start_wireguard_tunnel(connected_mixnet).await?
}
WireguardMultihopMode::Netstack => {
self.start_wireguard_netstack_tunnel(connected_mixnet)
.await?
self.start_wireguard_netstack_tunnel(
connected_mixnet,
#[cfg(any(target_os = "ios", target_os = "android"))]
entry_hostname,
)
.await?
}
}
}
Expand Down Expand Up @@ -365,6 +386,7 @@ impl TunnelMonitor {
async fn start_mixnet_tunnel(
&mut self,
connected_mixnet: ConnectedMixnet,
#[cfg(any(target_os = "ios", target_os = "android"))] entry_hostname: Option<String>,
) -> Result<(TunnelConnectionData, AnyTunnelHandle)> {
let interface_addrs = self.tunnel_settings.mixnet_tunnel_options.interface_addrs;

Expand All @@ -386,6 +408,7 @@ impl TunnelMonitor {
let tun_device = {
let packet_tunnel_settings = tunnel_provider::tunnel_settings::TunnelSettings {
dns_servers: self.tunnel_settings.dns.ip_addresses().to_vec(),
entry_gateway_hostname: entry_hostname,
interface_addresses: vec![
IpNetwork::V4(Ipv4Network::from(
assigned_addresses.interface_addresses.ipv4,
Expand Down Expand Up @@ -690,6 +713,7 @@ impl TunnelMonitor {
async fn start_wireguard_netstack_tunnel(
&self,
connected_mixnet: ConnectedMixnet,
entry_hostname: Option<String>,
) -> Result<(TunnelConnectionData, AnyTunnelHandle)> {
let connected_tunnel = connected_mixnet
.connect_wireguard_tunnel(self.tunnel_settings.enable_credentials_mode)
Expand All @@ -699,6 +723,7 @@ impl TunnelMonitor {

let packet_tunnel_settings = tunnel_provider::tunnel_settings::TunnelSettings {
dns_servers: self.tunnel_settings.dns.ip_addresses().to_vec(),
entry_gateway_hostname: entry_hostname,
interface_addresses: vec![
IpNetwork::V4(Ipv4Network::from(conn_data.exit.private_ipv4)),
IpNetwork::V6(Ipv6Network::from(conn_data.exit.private_ipv6)),
Expand Down
Loading