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

Merge "Verify that the underlying network info will be cleared/sent or not"

Browse Source
This commit is contained in:
Lucas Lin
2022-12-08 05:30:47 +00:00
committed by Gerrit Code Review
parent 6abbb4111f d1938dffce
commit dc824e95de
1 changed files with 38 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1268,6 +1268,23 @@ public class VpnTest extends VpnTestBase {
intent.getIntExtra(VpnManager.EXTRA_ERROR_CLASS, -1 /* defaultValue */));
assertEquals(errorCode,
intent.getIntExtra(VpnManager.EXTRA_ERROR_CODE, -1 /* defaultValue */));
// CATEGORY_EVENT_DEACTIVATED_BY_USER & CATEGORY_EVENT_ALWAYS_ON_STATE_CHANGED won't
// send NetworkCapabilities & LinkProperties to VPN app.
// For ERROR_CODE_NETWORK_LOST, the NetworkCapabilities & LinkProperties of underlying
// network will be cleared. So the VPN app will receive null for those 2 extra values.
if (category.equals(VpnManager.CATEGORY_EVENT_DEACTIVATED_BY_USER)
|| category.equals(VpnManager.CATEGORY_EVENT_ALWAYS_ON_STATE_CHANGED)
|| errorCode == VpnManager.ERROR_CODE_NETWORK_LOST) {
assertNull(intent.getParcelableExtra(
VpnManager.EXTRA_UNDERLYING_NETWORK_CAPABILITIES));
assertNull(intent.getParcelableExtra(VpnManager.EXTRA_UNDERLYING_LINK_PROPERTIES));
} else {
assertNotNull(intent.getParcelableExtra(
VpnManager.EXTRA_UNDERLYING_NETWORK_CAPABILITIES));
assertNotNull(intent.getParcelableExtra(
VpnManager.EXTRA_UNDERLYING_LINK_PROPERTIES));
}
if (profileState != null) {
assertEquals(profileState[i], intent.getParcelableExtra(
VpnManager.EXTRA_VPN_PROFILE_STATE, VpnProfileState.class));
@@ -1470,6 +1487,12 @@ public class VpnTest extends VpnTestBase {
when(mNetd.interfaceGetCfg(anyString())).thenReturn(config);
final NetworkCallback cb = networkCallbackCaptor.getValue();
cb.onAvailable(TEST_NETWORK);
// Trigger onCapabilitiesChanged() and onLinkPropertiesChanged() so the test can verify that
// if NetworkCapabilities and LinkProperties of underlying network will be sent/cleared or
// not.
// See verifyVpnManagerEvent().
cb.onCapabilitiesChanged(TEST_NETWORK, new NetworkCapabilities());
cb.onLinkPropertiesChanged(TEST_NETWORK, new LinkProperties());
return cb;
}
@@ -1488,6 +1511,11 @@ public class VpnTest extends VpnTestBase {
when(mVpnProfileStore.get(vpn.getProfileNameForPackage(TEST_VPN_PKG)))
.thenReturn(mVpnProfile.encode());
doReturn(new NetworkCapabilities()).when(mConnectivityManager)
.getRedactedNetworkCapabilitiesForPackage(any(), anyInt(), anyString());
doReturn(new LinkProperties()).when(mConnectivityManager)
.getRedactedLinkPropertiesForPackage(any(), anyInt(), anyString());
final String sessionKey = vpn.startVpnProfile(TEST_VPN_PKG);
final NetworkCallback cb = triggerOnAvailableAndGetCallback();
@@ -1518,18 +1546,18 @@ public class VpnTest extends VpnTestBase {
if (errorType == VpnManager.ERROR_CLASS_NOT_RECOVERABLE) {
verify(mConnectivityManager, timeout(TEST_TIMEOUT_MS))
.unregisterNetworkCallback(eq(cb));
} else if (errorType == VpnManager.ERROR_CLASS_RECOVERABLE) {
} else if (errorType == VpnManager.ERROR_CLASS_RECOVERABLE
// Vpn won't retry when there is no usable underlying network.
&& errorCode != VpnManager.ERROR_CODE_NETWORK_LOST) {
int retryIndex = 0;
final IkeSessionCallback ikeCb2 = verifyRetryAndGetNewIkeCb(retryIndex++, errorCode);
final IkeSessionCallback ikeCb2 = verifyRetryAndGetNewIkeCb(retryIndex++);
if (ikeCb2 != null) {
ikeCb2.onClosedWithException(exception);
verifyRetryAndGetNewIkeCb(retryIndex++, errorCode);
}
ikeCb2.onClosedWithException(exception);
verifyRetryAndGetNewIkeCb(retryIndex++);
}
}
private IkeSessionCallback verifyRetryAndGetNewIkeCb(int retryIndex, int errorCode) {
private IkeSessionCallback verifyRetryAndGetNewIkeCb(int retryIndex) {
final ArgumentCaptor<Runnable> runnableCaptor =
ArgumentCaptor.forClass(Runnable.class);
final ArgumentCaptor<IkeSessionCallback> ikeCbCaptor =
@@ -1542,21 +1570,15 @@ public class VpnTest extends VpnTestBase {
// Mock the event of firing the retry task
runnableCaptor.getValue().run();
// Vpn won't retry when there is no usable underlying network.
if (errorCode == VpnManager.ERROR_CODE_NETWORK_LOST) {
verify(mIkev2SessionCreator, never())
.createIkeSession(any(), any(), any(), any(), ikeCbCaptor.capture(), any());
} else {
verify(mIkev2SessionCreator)
.createIkeSession(any(), any(), any(), any(), ikeCbCaptor.capture(), any());
}
verify(mIkev2SessionCreator)
.createIkeSession(any(), any(), any(), any(), ikeCbCaptor.capture(), any());
// Forget the mIkev2SessionCreator#createIkeSession call and mExecutor#schedule call
// for the next retry verification
resetIkev2SessionCreator(mIkeSessionWrapper);
resetExecutor(mScheduledFuture);
return (ikeCbCaptor.getAllValues().size() == 0) ? null : ikeCbCaptor.getValue();
return ikeCbCaptor.getValue();
}
@Test