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

Merge "The net cap value should be bit shifted before &ing" am: 43dd35b6fc am: b266811ecf

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1790357

Change-Id: Ib611f1895bc9856adc489a4e5808f5f89d865b16
This commit is contained in:
Chiachang Wang
2021-08-12 05:41:05 +00:00
committed by Automerger Merge Worker
parent 06d22ebcb5 b266811ecf
commit a042b9ad03
3 changed files with 48 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
framework/src/android/net/NetworkCapabilities.java
View File

@@ -818,7 +818,7 @@ public final class NetworkCapabilities implements Parcelable {
* restrictions.
* @hide
*/
public void restrictCapabilitesForTestNetwork(int creatorUid) {
public void restrictCapabilitiesForTestNetwork(int creatorUid) {
final long originalCapabilities = mNetworkCapabilities;
final long originalTransportTypes = mTransportTypes;
final NetworkSpecifier originalSpecifier = mNetworkSpecifier;
@@ -828,7 +828,7 @@ public final class NetworkCapabilities implements Parcelable {
final TransportInfo originalTransportInfo = getTransportInfo();
final Set<Integer> originalSubIds = getSubscriptionIds();
clearAll();
if (0 != (originalCapabilities & NET_CAPABILITY_NOT_RESTRICTED)) {
if (0 != (originalCapabilities & (1 << NET_CAPABILITY_NOT_RESTRICTED))) {
// If the test network is not restricted, then it is only allowed to declare some
// specific transports. This is to minimize impact on running apps in case an app
// run from the shell creates a test a network.

4
service/src/com/android/server/ConnectivityService.java
View File

@@ -3263,7 +3263,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
// the Messenger, but if this ever changes, not making a defensive copy
// here will give attack vectors to clients using this code path.
networkCapabilities = new NetworkCapabilities(networkCapabilities);
networkCapabilities.restrictCapabilitesForTestNetwork(nai.creatorUid);
networkCapabilities.restrictCapabilitiesForTestNetwork(nai.creatorUid);
}
processCapabilitiesFromAgent(nai, networkCapabilities);
updateCapabilities(nai.getCurrentScore(), nai, networkCapabilities);
@@ -6772,7 +6772,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
// the call to mixInCapabilities below anyway, but sanitizing here means the NAI never
// sees capabilities that may be malicious, which might prevent mistakes in the future.
networkCapabilities = new NetworkCapabilities(networkCapabilities);
networkCapabilities.restrictCapabilitesForTestNetwork(uid);
networkCapabilities.restrictCapabilitiesForTestNetwork(uid);
}
LinkProperties lp = new LinkProperties(linkProperties);

44
tests/common/java/android/net/NetworkCapabilitiesTest.java
View File

@@ -1167,4 +1167,48 @@ public class NetworkCapabilitiesTest {
// Ensure test case fails if new net cap is added into default cap but no update here.
assertEquals(0, nc.getCapabilities().length);
}
@Test @IgnoreUpTo(Build.VERSION_CODES.R)
public void testRestrictCapabilitiesForTestNetwork() {
final int ownerUid = 1234;
final int[] administratorUids = {1001, ownerUid};
final NetworkCapabilities nonRestrictedNc = new NetworkCapabilities.Builder()
.addTransportType(TRANSPORT_CELLULAR)
.addTransportType(TRANSPORT_VPN)
.addCapability(NET_CAPABILITY_MMS)
.addCapability(NET_CAPABILITY_NOT_METERED)
.setAdministratorUids(administratorUids)
.setOwnerUid(ownerUid)
.setSubscriptionIds(Set.of(TEST_SUBID1)).build();
nonRestrictedNc.restrictCapabilitiesForTestNetwork(ownerUid);
// TRANSPORT_TEST will be appended
assertTrue(nonRestrictedNc.hasTransport(TRANSPORT_TEST));
assertEquals(Set.of(TEST_SUBID1), nonRestrictedNc.getSubscriptionIds());
// Non-UNRESTRICTED_TEST_NETWORKS_ALLOWED_TRANSPORTS will be removed
assertFalse(nonRestrictedNc.hasTransport(TRANSPORT_CELLULAR));
assertTrue(nonRestrictedNc.hasTransport(TRANSPORT_VPN));
// Only TEST_NETWORKS_ALLOWED_CAPABILITIES will be kept
assertFalse(nonRestrictedNc.hasCapability(NET_CAPABILITY_MMS));
assertTrue(nonRestrictedNc.hasCapability(NET_CAPABILITY_NOT_METERED));
final NetworkCapabilities restrictedNc = new NetworkCapabilities.Builder(nonRestrictedNc)
.removeCapability(NET_CAPABILITY_NOT_RESTRICTED)
.addTransportType(TRANSPORT_CELLULAR)
.addCapability(NET_CAPABILITY_MMS).build();
restrictedNc.restrictCapabilitiesForTestNetwork(ownerUid);
// It may declare any transport if the net cap is restricted
assertTrue(restrictedNc.hasTransport(TRANSPORT_CELLULAR));
// SubIds will be cleared.
assertEquals(new ArraySet<>(), restrictedNc.getSubscriptionIds());
// Only retain the owner and administrator UIDs if they match the app registering the remote
// caller that registered the network.
assertEquals(ownerUid, restrictedNc.getOwnerUid());
assertArrayEquals(new int[] {ownerUid}, restrictedNc.getAdministratorUids());
// The creator UID does not match the owner and administrator UIDs will clear the owner and
// administrator UIDs.
restrictedNc.restrictCapabilitiesForTestNetwork(5678);
assertEquals(INVALID_UID, restrictedNc.getOwnerUid());
assertArrayEquals(new int[0], restrictedNc.getAdministratorUids());
}
}