LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Check if VpnConfig#allowBypass is set or not"

Browse Source
This commit is contained in:
Lucas Lin
2022-08-19 09:13:35 +00:00
committed by Gerrit Code Review
parent 370f10d117 03dcd7123f
commit d17c5ea7f0
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/unit/java/com/android/server/connectivity/VpnTest.java
View File

@@ -92,6 +92,7 @@ import android.net.LinkAddress;
import android.net.LinkProperties; import android.net.LinkProperties;
import android.net.LocalSocket; import android.net.LocalSocket;
import android.net.Network; import android.net.Network;
import android.net.NetworkAgentConfig;
import android.net.NetworkCapabilities; import android.net.NetworkCapabilities;
import android.net.NetworkInfo.DetailedState; import android.net.NetworkInfo.DetailedState;
import android.net.RouteInfo; import android.net.RouteInfo;
@@ -264,6 +265,7 @@ public class VpnTest extends VpnTestBase {
final Ikev2VpnProfile.Builder builder = final Ikev2VpnProfile.Builder builder =
new Ikev2VpnProfile.Builder(TEST_VPN_SERVER, TEST_VPN_IDENTITY); new Ikev2VpnProfile.Builder(TEST_VPN_SERVER, TEST_VPN_IDENTITY);
builder.setAuthPsk(TEST_VPN_PSK); builder.setAuthPsk(TEST_VPN_PSK);
builder.setBypassable(true /* isBypassable */);
mVpnProfile = builder.build().toVpnProfile(); mVpnProfile = builder.build().toVpnProfile();
} }
@@ -1787,9 +1789,11 @@ public class VpnTest extends VpnTestBase {
ArgumentCaptor<LinkProperties> lpCaptor = ArgumentCaptor.forClass(LinkProperties.class); ArgumentCaptor<LinkProperties> lpCaptor = ArgumentCaptor.forClass(LinkProperties.class);
ArgumentCaptor<NetworkCapabilities> ncCaptor = ArgumentCaptor<NetworkCapabilities> ncCaptor =
ArgumentCaptor.forClass(NetworkCapabilities.class); ArgumentCaptor.forClass(NetworkCapabilities.class);
ArgumentCaptor<NetworkAgentConfig> nacCaptor =
ArgumentCaptor.forClass(NetworkAgentConfig.class);
verify(mTestDeps).newNetworkAgent( verify(mTestDeps).newNetworkAgent(
any(), any(), anyString(), ncCaptor.capture(), lpCaptor.capture(), any(), any(), anyString(), ncCaptor.capture(), lpCaptor.capture(),
any(), any(), any()); any(), nacCaptor.capture(), any());
// Check LinkProperties // Check LinkProperties
final LinkProperties lp = lpCaptor.getValue(); final LinkProperties lp = lpCaptor.getValue();
@@ -1811,6 +1815,9 @@ public class VpnTest extends VpnTestBase {
// Check NetworkCapabilities // Check NetworkCapabilities
assertEquals(Arrays.asList(TEST_NETWORK), ncCaptor.getValue().getUnderlyingNetworks()); assertEquals(Arrays.asList(TEST_NETWORK), ncCaptor.getValue().getUnderlyingNetworks());
// Check if allowBypass is set or not.
assertTrue(nacCaptor.getValue().isBypassableVpn());
return new PlatformVpnSnapshot(vpn, nwCb, ikeCb, childCb); return new PlatformVpnSnapshot(vpn, nwCb, ikeCb, childCb);
} }