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

Remove the fail case on IPv6 in testLockdownVpn

Browse Source 
In testLegacyLockdownVpn, remove the fail check on IPv6 networks
and add coverage in VpnTest instead as this interaction relies
on the Vpn implementation, not ConnectivityService.

Bug: 230548427
Test: atest FrameworksNetTests
Change-Id: Ib24809ece2332c4c3d3e08c168e02ad859242eac
This commit is contained in:
Hansen Kurli
2023-08-09 15:17:24 +08:00
parent 35f6fef389
commit acb5205558
2 changed files with 17 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
tests/unit/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -10187,47 +10187,13 @@ public class ConnectivityServiceTest {
mMockVpn.setLockdown(true); mMockVpn.setLockdown(true);
// Bring up a network. // Bring up a network.
// Expect nothing to happen because the network does not have an IPv4 default route: legacy
// VPN only supports IPv4.
final LinkProperties cellLp = new LinkProperties(); final LinkProperties cellLp = new LinkProperties();
cellLp.setInterfaceName("rmnet0"); cellLp.setInterfaceName("rmnet0");
cellLp.addLinkAddress(new LinkAddress("2001:db8::1/64"));
cellLp.addRoute(new RouteInfo(new IpPrefix("::/0"), null, "rmnet0"));
mCellAgent = new TestNetworkAgentWrapper(TRANSPORT_CELLULAR, cellLp);
mCellAgent.connect(false /* validated */);
callback.expectAvailableCallbacksUnvalidatedAndBlocked(mCellAgent);
defaultCallback.expectAvailableCallbacksUnvalidatedAndBlocked(mCellAgent);
systemDefaultCallback.expectAvailableCallbacksUnvalidatedAndBlocked(mCellAgent);
// Simulate LockdownVpnTracker attempting to start the VPN since it received the
// systemDefault callback. IllegalStateException is expected since legacy VPN only supports
// IPv4 and LockdownVpnTracker will catch it to show a notification.
assertThrows(IllegalStateException.class,
() -> mMockVpn.startLegacyVpnPrivileged(profile, mCellAgent.getNetwork(), cellLp));
waitForIdle();
assertNull(mMockVpn.getAgent());
// Add an IPv4 address.
cellLp.addLinkAddress(new LinkAddress("192.0.2.2/25")); cellLp.addLinkAddress(new LinkAddress("192.0.2.2/25"));
cellLp.addRoute(new RouteInfo(new IpPrefix("0.0.0.0/0"), null, "rmnet0")); cellLp.addRoute(new RouteInfo(new IpPrefix("0.0.0.0/0"), null, "rmnet0"));
mCellAgent.sendLinkProperties(cellLp);
callback.expect(LINK_PROPERTIES_CHANGED, mCellAgent);
defaultCallback.expect(LINK_PROPERTIES_CHANGED, mCellAgent);
systemDefaultCallback.expect(LINK_PROPERTIES_CHANGED, mCellAgent);
waitForIdle();
assertNull(mMockVpn.getAgent());
// Disconnect, then try again with a network that supports IPv4 at connection time.
// Expect lockdown VPN to come up.
ExpectedBroadcast b1 = expectConnectivityAction(TYPE_MOBILE, DetailedState.DISCONNECTED);
mCellAgent.disconnect();
callback.expect(LOST, mCellAgent);
defaultCallback.expect(LOST, mCellAgent);
systemDefaultCallback.expect(LOST, mCellAgent);
b1.expectBroadcast();
// When lockdown VPN is active, the NetworkInfo state in CONNECTIVITY_ACTION is overwritten // When lockdown VPN is active, the NetworkInfo state in CONNECTIVITY_ACTION is overwritten
// with the state of the VPN network. So expect a CONNECTING broadcast. // with the state of the VPN network. So expect a CONNECTING broadcast.
b1 = expectConnectivityAction(TYPE_MOBILE, DetailedState.CONNECTING); ExpectedBroadcast b1 = expectConnectivityAction(TYPE_MOBILE, DetailedState.CONNECTING);
mCellAgent = new TestNetworkAgentWrapper(TRANSPORT_CELLULAR, cellLp); mCellAgent = new TestNetworkAgentWrapper(TRANSPORT_CELLULAR, cellLp);
mCellAgent.connect(false /* validated */); mCellAgent.connect(false /* validated */);
callback.expectAvailableCallbacksUnvalidatedAndBlocked(mCellAgent); callback.expectAvailableCallbacksUnvalidatedAndBlocked(mCellAgent);

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

@@ -1839,6 +1839,22 @@ public class VpnTest extends VpnTestBase {
// a subsequent CL. // a subsequent CL.
} }
@Test
public void testStartLegacyVpnIpv6() throws Exception {
setMockedUsers(PRIMARY_USER);
final Vpn vpn = createVpn(PRIMARY_USER.id);
final LinkProperties lp = new LinkProperties();
lp.setInterfaceName(EGRESS_IFACE);
lp.addLinkAddress(new LinkAddress("2001:db8::1/64"));
final RouteInfo defaultRoute = new RouteInfo(
new IpPrefix(Inet6Address.ANY, 0), null, EGRESS_IFACE);
lp.addRoute(defaultRoute);
// IllegalStateException thrown since legacy VPN only supports IPv4.
assertThrows(IllegalStateException.class,
() -> vpn.startLegacyVpn(mVpnProfile, EGRESS_NETWORK, lp));
}
private Vpn startLegacyVpn(final Vpn vpn, final VpnProfile vpnProfile) throws Exception { private Vpn startLegacyVpn(final Vpn vpn, final VpnProfile vpnProfile) throws Exception {
setMockedUsers(PRIMARY_USER); setMockedUsers(PRIMARY_USER);