joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Move VpnManagerServiceTest and VpnTest to frameworks" into main

Browse source
This commit is contained in:
Chiachang Wang 2024-03-01 00:58:31 +00:00 • committed by Gerrit Code Review
commit 0df28d82be
8 changed files with 4 additions and 3806 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Tethering/common/TetheringLib/Android.bp
View file

@ -37,6 +37,7 @@ java_sdk_library {
"//frameworks/base/core/tests/benchmarks",
"//frameworks/base/core/tests/utillib",
"//frameworks/base/packages/Connectivity/tests:__subpackages__",
"//frameworks/base/services/tests/VpnTests",
"//frameworks/base/tests/vcn",
"//frameworks/opt/telephony/tests/telephonytests",
"//packages/modules/CaptivePortalLogin/tests",

1
framework-t/Android.bp
View file

@ -182,6 +182,7 @@ java_sdk_library {
"//frameworks/base/core/tests/bandwidthtests",
"//frameworks/base/core/tests/benchmarks",
"//frameworks/base/core/tests/utillib",
"//frameworks/base/services/tests/VpnTests",
"//frameworks/base/tests/vcn",
"//frameworks/opt/net/ethernet/tests:__subpackages__",
"//frameworks/opt/telephony/tests/telephonytests",

1
framework/Android.bp
View file

@ -176,6 +176,7 @@ java_sdk_library {
"//frameworks/base/core/tests/bandwidthtests",
"//frameworks/base/core/tests/benchmarks",
"//frameworks/base/core/tests/utillib",
"//frameworks/base/services/tests/VpnTests",
"//frameworks/base/tests/vcn",
"//frameworks/opt/net/ethernet/tests:__subpackages__",
"//frameworks/opt/telephony/tests/telephonytests",

1
service-t/Android.bp
View file

@ -75,6 +75,7 @@ java_library {
"com.android.tethering",
],
visibility: [
"//frameworks/base/services/tests/VpnTests",
"//frameworks/base/tests/vcn",
"//packages/modules/Connectivity/service",
"//packages/modules/Connectivity/tests:__subpackages__",

2
tests/unit/Android.bp
View file

@ -66,13 +66,11 @@ filegroup {
"java/android/net/netstats/NetworkStatsDataMigrationUtilsTest.kt",
"java/com/android/internal/net/NetworkUtilsInternalTest.java",
"java/com/android/internal/net/VpnProfileTest.java",
"java/com/android/server/VpnManagerServiceTest.java",
"java/com/android/server/connectivity/IpConnectivityEventBuilderTest.java",
"java/com/android/server/connectivity/IpConnectivityMetricsTest.java",
"java/com/android/server/connectivity/MetricsTestUtil.java",
"java/com/android/server/connectivity/MultipathPolicyTrackerTest.java",
"java/com/android/server/connectivity/NetdEventListenerServiceTest.java",
"java/com/android/server/connectivity/VpnTest.java",
"java/com/android/server/net/ipmemorystore/*.java",
],
}

409
tests/unit/java/com/android/server/VpnManagerServiceTest.java
View file

@ -1,409 +0,0 @@
/*
* Copyright (C) 2022 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.server;
import static android.os.Build.VERSION_CODES.R;
import static com.android.testutils.ContextUtils.mockService;
import static com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo;
import static com.android.testutils.MiscAsserts.assertThrows;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import android.annotation.UserIdInt;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.net.ConnectivityManager;
import android.net.INetd;
import android.net.Uri;
import android.os.Handler;
import android.os.HandlerThread;
import android.os.INetworkManagementService;
import android.os.Looper;
import android.os.UserHandle;
import android.os.UserManager;
import android.security.Credentials;
import androidx.test.filters.SmallTest;
import com.android.internal.net.VpnProfile;
import com.android.server.connectivity.Vpn;
import com.android.server.connectivity.VpnProfileStore;
import com.android.server.net.LockdownVpnTracker;
import com.android.testutils.DevSdkIgnoreRule;
import com.android.testutils.DevSdkIgnoreRunner;
import com.android.testutils.HandlerUtils;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import java.nio.charset.StandardCharsets;
import java.util.List;
@RunWith(DevSdkIgnoreRunner.class)
@IgnoreUpTo(R) // VpnManagerService is not available before R
@SmallTest
public class VpnManagerServiceTest extends VpnTestBase {
private static final String CONTEXT_ATTRIBUTION_TAG = "VPN_MANAGER";
@Rule
public final DevSdkIgnoreRule mIgnoreRule = new DevSdkIgnoreRule();
private static final int TIMEOUT_MS = 2_000;
@Mock Context mContext;
@Mock Context mContextWithoutAttributionTag;
@Mock Context mSystemContext;
@Mock Context mUserAllContext;
private HandlerThread mHandlerThread;
@Mock private Vpn mVpn;
@Mock private INetworkManagementService mNms;
@Mock private ConnectivityManager mCm;
@Mock private UserManager mUserManager;
@Mock private INetd mNetd;
@Mock private PackageManager mPackageManager;
@Mock private VpnProfileStore mVpnProfileStore;
@Mock private LockdownVpnTracker mLockdownVpnTracker;
private VpnManagerServiceDependencies mDeps;
private VpnManagerService mService;
private BroadcastReceiver mUserPresentReceiver;
private BroadcastReceiver mIntentReceiver;
private final String mNotMyVpnPkg = "com.not.my.vpn";
class VpnManagerServiceDependencies extends VpnManagerService.Dependencies {
@Override
public HandlerThread makeHandlerThread() {
return mHandlerThread;
}
@Override
public INetworkManagementService getINetworkManagementService() {
return mNms;
}
@Override
public INetd getNetd() {
return mNetd;
}
@Override
public Vpn createVpn(Looper looper, Context context, INetworkManagementService nms,
INetd netd, @UserIdInt int userId) {
return mVpn;
}
@Override
public VpnProfileStore getVpnProfileStore() {
return mVpnProfileStore;
}
@Override
public LockdownVpnTracker createLockDownVpnTracker(Context context, Handler handler,
Vpn vpn, VpnProfile profile) {
return mLockdownVpnTracker;
}
@Override
public @UserIdInt int getMainUserId() {
return UserHandle.USER_SYSTEM;
}
}
@Before
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
mHandlerThread = new HandlerThread("TestVpnManagerService");
mDeps = new VpnManagerServiceDependencies();
// The attribution tag is a dependency for IKE library to collect VPN metrics correctly
// and thus should not be changed without updating the IKE code.
doReturn(mContext)
.when(mContextWithoutAttributionTag)
.createAttributionContext(CONTEXT_ATTRIBUTION_TAG);
doReturn(mUserAllContext).when(mContext).createContextAsUser(UserHandle.ALL, 0);
doReturn(mSystemContext).when(mContext).createContextAsUser(UserHandle.SYSTEM, 0);
doReturn(mPackageManager).when(mContext).getPackageManager();
setMockedPackages(mPackageManager, sPackages);
mockService(mContext, ConnectivityManager.class, Context.CONNECTIVITY_SERVICE, mCm);
mockService(mContext, UserManager.class, Context.USER_SERVICE, mUserManager);
doReturn(SYSTEM_USER).when(mUserManager).getUserInfo(eq(SYSTEM_USER_ID));
mService = new VpnManagerService(mContextWithoutAttributionTag, mDeps);
mService.systemReady();
final ArgumentCaptor<BroadcastReceiver> intentReceiverCaptor =
ArgumentCaptor.forClass(BroadcastReceiver.class);
final ArgumentCaptor<BroadcastReceiver> userPresentReceiverCaptor =
ArgumentCaptor.forClass(BroadcastReceiver.class);
verify(mSystemContext).registerReceiver(
userPresentReceiverCaptor.capture(), any(), any(), any());
verify(mUserAllContext, times(2)).registerReceiver(
intentReceiverCaptor.capture(), any(), any(), any());
mUserPresentReceiver = userPresentReceiverCaptor.getValue();
mIntentReceiver = intentReceiverCaptor.getValue();
// Add user to create vpn in mVpn
onUserStarted(SYSTEM_USER_ID);
assertNotNull(mService.mVpns.get(SYSTEM_USER_ID));
}
@Test
public void testUpdateAppExclusionList() {
// Start vpn
mService.startVpnProfile(TEST_VPN_PKG);
verify(mVpn).startVpnProfile(eq(TEST_VPN_PKG));
// Remove package due to package replaced.
onPackageRemoved(PKGS[0], PKG_UIDS[0], true /* isReplacing */);
verify(mVpn, never()).refreshPlatformVpnAppExclusionList();
// Add package due to package replaced.
onPackageAdded(PKGS[0], PKG_UIDS[0], true /* isReplacing */);
verify(mVpn, never()).refreshPlatformVpnAppExclusionList();
// Remove package
onPackageRemoved(PKGS[0], PKG_UIDS[0], false /* isReplacing */);
verify(mVpn).refreshPlatformVpnAppExclusionList();
// Add the package back
onPackageAdded(PKGS[0], PKG_UIDS[0], false /* isReplacing */);
verify(mVpn, times(2)).refreshPlatformVpnAppExclusionList();
}
@Test
public void testStartVpnProfileFromDiffPackage() {
assertThrows(
SecurityException.class, () -> mService.startVpnProfile(mNotMyVpnPkg));
}
@Test
public void testStopVpnProfileFromDiffPackage() {
assertThrows(SecurityException.class, () -> mService.stopVpnProfile(mNotMyVpnPkg));
}
@Test
public void testGetProvisionedVpnProfileStateFromDiffPackage() {
assertThrows(SecurityException.class, () ->
mService.getProvisionedVpnProfileState(mNotMyVpnPkg));
}
@Test
public void testGetProvisionedVpnProfileState() {
mService.getProvisionedVpnProfileState(TEST_VPN_PKG);
verify(mVpn).getProvisionedVpnProfileState(TEST_VPN_PKG);
}
private Intent buildIntent(String action, String packageName, int userId, int uid,
boolean isReplacing) {
final Intent intent = new Intent(action);
intent.putExtra(Intent.EXTRA_USER_HANDLE, userId);
intent.putExtra(Intent.EXTRA_UID, uid);
intent.putExtra(Intent.EXTRA_REPLACING, isReplacing);
if (packageName != null) {
intent.setData(Uri.fromParts("package" /* scheme */, packageName, null /* fragment */));
}
return intent;
}
private void sendIntent(Intent intent) {
sendIntent(mIntentReceiver, mContext, intent);
}
private void sendIntent(BroadcastReceiver receiver, Context context, Intent intent) {
final Handler h = mHandlerThread.getThreadHandler();
// Send in handler thread.
h.post(() -> receiver.onReceive(context, intent));
HandlerUtils.waitForIdle(mHandlerThread, TIMEOUT_MS);
}
private void onUserStarted(int userId) {
sendIntent(buildIntent(Intent.ACTION_USER_STARTED,
null /* packageName */, userId, -1 /* uid */, false /* isReplacing */));
}
private void onUserUnlocked(int userId) {
sendIntent(buildIntent(Intent.ACTION_USER_UNLOCKED,
null /* packageName */, userId, -1 /* uid */, false /* isReplacing */));
}
private void onUserStopped(int userId) {
sendIntent(buildIntent(Intent.ACTION_USER_STOPPED,
null /* packageName */, userId, -1 /* uid */, false /* isReplacing */));
}
private void onLockDownReset() {
sendIntent(buildIntent(LockdownVpnTracker.ACTION_LOCKDOWN_RESET, null /* packageName */,
UserHandle.USER_SYSTEM, -1 /* uid */, false /* isReplacing */));
}
private void onPackageAdded(String packageName, int userId, int uid, boolean isReplacing) {
sendIntent(buildIntent(Intent.ACTION_PACKAGE_ADDED, packageName, userId, uid, isReplacing));
}
private void onPackageAdded(String packageName, int uid, boolean isReplacing) {
onPackageAdded(packageName, UserHandle.USER_SYSTEM, uid, isReplacing);
}
private void onPackageRemoved(String packageName, int userId, int uid, boolean isReplacing) {
sendIntent(buildIntent(Intent.ACTION_PACKAGE_REMOVED, packageName, userId, uid,
isReplacing));
}
private void onPackageRemoved(String packageName, int uid, boolean isReplacing) {
onPackageRemoved(packageName, UserHandle.USER_SYSTEM, uid, isReplacing);
}
@Test
public void testReceiveIntentFromNonHandlerThread() {
assertThrows(IllegalStateException.class, () ->
mIntentReceiver.onReceive(mContext, buildIntent(Intent.ACTION_PACKAGE_REMOVED,
PKGS[0], UserHandle.USER_SYSTEM, PKG_UIDS[0], true /* isReplacing */)));
assertThrows(IllegalStateException.class, () ->
mUserPresentReceiver.onReceive(mContext, new Intent(Intent.ACTION_USER_PRESENT)));
}
private void setupLockdownVpn(String packageName) {
final byte[] profileTag = packageName.getBytes(StandardCharsets.UTF_8);
doReturn(profileTag).when(mVpnProfileStore).get(Credentials.LOCKDOWN_VPN);
}
private void setupVpnProfile(String profileName) {
final VpnProfile profile = new VpnProfile(profileName);
profile.name = profileName;
profile.server = "192.0.2.1";
profile.dnsServers = "8.8.8.8";
profile.type = VpnProfile.TYPE_IPSEC_XAUTH_PSK;
final byte[] encodedProfile = profile.encode();
doReturn(encodedProfile).when(mVpnProfileStore).get(Credentials.VPN + profileName);
}
@Test
public void testUserPresent() {
// Verify that LockDownVpnTracker is not created.
verify(mLockdownVpnTracker, never()).init();
setupLockdownVpn(TEST_VPN_PKG);
setupVpnProfile(TEST_VPN_PKG);
// mUserPresentReceiver only registers ACTION_USER_PRESENT intent and does no verification
// on action, so an empty intent is enough.
sendIntent(mUserPresentReceiver, mSystemContext, new Intent());
verify(mLockdownVpnTracker).init();
verify(mSystemContext).unregisterReceiver(mUserPresentReceiver);
verify(mUserAllContext, never()).unregisterReceiver(any());
}
@Test
public void testUpdateLockdownVpn() {
setupLockdownVpn(TEST_VPN_PKG);
onUserUnlocked(SYSTEM_USER_ID);
// Will not create lockDownVpnTracker w/o valid profile configured in the keystore
verify(mLockdownVpnTracker, never()).init();
setupVpnProfile(TEST_VPN_PKG);
// Remove the user from mVpns
onUserStopped(SYSTEM_USER_ID);
onUserUnlocked(SYSTEM_USER_ID);
verify(mLockdownVpnTracker, never()).init();
// Add user back
onUserStarted(SYSTEM_USER_ID);
verify(mLockdownVpnTracker).init();
// Trigger another update. The existing LockDownVpnTracker should be shut down and
// initialize another one.
onUserUnlocked(SYSTEM_USER_ID);
verify(mLockdownVpnTracker).shutdown();
verify(mLockdownVpnTracker, times(2)).init();
}
@Test
public void testLockdownReset() {
// Init LockdownVpnTracker
setupLockdownVpn(TEST_VPN_PKG);
setupVpnProfile(TEST_VPN_PKG);
onUserUnlocked(SYSTEM_USER_ID);
verify(mLockdownVpnTracker).init();
onLockDownReset();
verify(mLockdownVpnTracker).reset();
}
@Test
public void testLockdownResetWhenLockdownVpnTrackerIsNotInit() {
setupLockdownVpn(TEST_VPN_PKG);
setupVpnProfile(TEST_VPN_PKG);
onLockDownReset();
// LockDownVpnTracker is not created. Lockdown reset will not take effect.
verify(mLockdownVpnTracker, never()).reset();
}
@Test
public void testIsVpnLockdownEnabled() {
// Vpn is created but the VPN lockdown is not enabled.
assertFalse(mService.isVpnLockdownEnabled(SYSTEM_USER_ID));
// Set lockdown for the SYSTEM_USER_ID VPN.
doReturn(true).when(mVpn).getLockdown();
assertTrue(mService.isVpnLockdownEnabled(SYSTEM_USER_ID));
// Even lockdown is enabled but no Vpn is created for SECONDARY_USER.
assertFalse(mService.isVpnLockdownEnabled(SECONDARY_USER.id));
}
@Test
public void testGetVpnLockdownAllowlist() {
doReturn(null).when(mVpn).getLockdownAllowlist();
assertNull(mService.getVpnLockdownAllowlist(SYSTEM_USER_ID));
final List<String> expected = List.of(PKGS);
doReturn(expected).when(mVpn).getLockdownAllowlist();
assertEquals(expected, mService.getVpnLockdownAllowlist(SYSTEM_USER_ID));
// Even lockdown is enabled but no Vpn is created for SECONDARY_USER.
assertNull(mService.getVpnLockdownAllowlist(SECONDARY_USER.id));
}
}

97
tests/unit/java/com/android/server/VpnTestBase.java
View file

@ -1,97 +0,0 @@
/*
* Copyright (C) 2022 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.server;
import static android.content.pm.UserInfo.FLAG_ADMIN;
import static android.content.pm.UserInfo.FLAG_MANAGED_PROFILE;
import static android.content.pm.UserInfo.FLAG_PRIMARY;
import static android.content.pm.UserInfo.FLAG_RESTRICTED;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doAnswer;
import android.content.pm.PackageManager;
import android.content.pm.UserInfo;
import android.os.Process;
import android.os.UserHandle;
import android.util.ArrayMap;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/** Common variables or methods shared between VpnTest and VpnManagerServiceTest. */
public class VpnTestBase {
protected static final String TEST_VPN_PKG = "com.testvpn.vpn";
/**
* Names and UIDs for some fake packages. Important points:
* - UID is ordered increasing.
* - One pair of packages have consecutive UIDs.
*/
protected static final String[] PKGS = {"com.example", "org.example", "net.example", "web.vpn"};
protected static final int[] PKG_UIDS = {10066, 10077, 10078, 10400};
// Mock packages
protected static final Map<String, Integer> sPackages = new ArrayMap<>();
static {
for (int i = 0; i < PKGS.length; i++) {
sPackages.put(PKGS[i], PKG_UIDS[i]);
}
sPackages.put(TEST_VPN_PKG, Process.myUid());
}
// Mock users
protected static final int SYSTEM_USER_ID = 0;
protected static final UserInfo SYSTEM_USER = new UserInfo(0, "system", UserInfo.FLAG_PRIMARY);
protected static final UserInfo PRIMARY_USER = new UserInfo(27, "Primary",
FLAG_ADMIN | FLAG_PRIMARY);
protected static final UserInfo SECONDARY_USER = new UserInfo(15, "Secondary", FLAG_ADMIN);
protected static final UserInfo RESTRICTED_PROFILE_A = new UserInfo(40, "RestrictedA",
FLAG_RESTRICTED);
protected static final UserInfo RESTRICTED_PROFILE_B = new UserInfo(42, "RestrictedB",
FLAG_RESTRICTED);
protected static final UserInfo MANAGED_PROFILE_A = new UserInfo(45, "ManagedA",
FLAG_MANAGED_PROFILE);
static {
RESTRICTED_PROFILE_A.restrictedProfileParentId = PRIMARY_USER.id;
RESTRICTED_PROFILE_B.restrictedProfileParentId = SECONDARY_USER.id;
MANAGED_PROFILE_A.profileGroupId = PRIMARY_USER.id;
}
// Populate a fake packageName-to-UID mapping.
protected void setMockedPackages(PackageManager mockPm, final Map<String, Integer> packages) {
try {
doAnswer(invocation -> {
final String appName = (String) invocation.getArguments()[0];
final int userId = (int) invocation.getArguments()[1];
final Integer appId = packages.get(appName);
if (appId == null) {
throw new PackageManager.NameNotFoundException(appName);
}
return UserHandle.getUid(userId, appId);
}).when(mockPm).getPackageUidAsUser(anyString(), anyInt());
} catch (Exception e) {
}
}
protected List<Integer> toList(int[] arr) {
return Arrays.stream(arr).boxed().collect(Collectors.toList());
}
}

3298
tests/unit/java/com/android/server/connectivity/VpnTest.java
View file

File diff suppressed because it is too large Load diff