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

Send access UIDs to netd

Browse Source 
Test: FrameworkNetTests CtsNetTestCases
Change-Id: I8301abaddf5850071fa23d41e8e736ab7071e299
This commit is contained in:
Chalard Jean
2022-01-25 21:04:21 +09:00
parent 9a30acf744
commit e6c9527554
5 changed files with 165 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -439,8 +439,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
* Requests that don't code for a per-app preference use PREFERENCE_ORDER_INVALID.
* The default request uses PREFERENCE_ORDER_DEFAULT.
*/
// Bound for the lowest valid preference order.
static final int PREFERENCE_ORDER_LOWEST = 999;
// Used when sending to netd to code for "no order".
static final int PREFERENCE_ORDER_NONE = 0;
// Order for requests that don't code for a per-app preference. As it is
@@ -448,11 +446,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
// PREFERENCE_ORDER_NONE when sending to netd.
@VisibleForTesting
static final int PREFERENCE_ORDER_INVALID = Integer.MAX_VALUE;
// Order for the default internet request. Since this must always have the
// lowest priority, its value is larger than the largest acceptable value. As
// it is out of the valid range, the corresponding order should be
// PREFERENCE_ORDER_NONE when sending to netd.
static final int PREFERENCE_ORDER_DEFAULT = 1000;
// As a security feature, VPNs have the top priority.
static final int PREFERENCE_ORDER_VPN = 0; // Netd supports only 0 for VPN.
// Order of per-app OEM preference. See {@link #setOemNetworkPreference}.
@@ -467,6 +460,13 @@ public class ConnectivityService extends IConnectivityManager.Stub
// See {@link ConnectivitySettingsManager#setMobileDataPreferredUids}
@VisibleForTesting
static final int PREFERENCE_ORDER_MOBILE_DATA_PREFERERRED = 30;
// Preference order that signifies the network shouldn't be set as a default network for
// the UIDs, only give them access to it. TODO : replace this with a boolean
// in NativeUidRangeConfig
@VisibleForTesting
static final int PREFERENCE_ORDER_IRRELEVANT_BECAUSE_NOT_DEFAULT = 999;
// Bound for the lowest valid preference order.
static final int PREFERENCE_ORDER_LOWEST = 999;
/**
* used internally to clear a wakelock when transitioning
@@ -7749,6 +7749,17 @@ public class ConnectivityService extends IConnectivityManager.Stub
return stableRanges;
}
private static UidRangeParcel[] intsToUidRangeStableParcels(
final @NonNull ArraySet<Integer> uids) {
final UidRangeParcel[] stableRanges = new UidRangeParcel[uids.size()];
int index = 0;
for (int uid : uids) {
stableRanges[index] = new UidRangeParcel(uid, uid);
index++;
}
return stableRanges;
}
private static UidRangeParcel[] toUidRangeStableParcels(UidRange[] ranges) {
final UidRangeParcel[] stableRanges = new UidRangeParcel[ranges.length];
for (int i = 0; i < ranges.length; i++) {
@@ -7819,8 +7830,14 @@ public class ConnectivityService extends IConnectivityManager.Stub
}
}
private void updateUids(NetworkAgentInfo nai, NetworkCapabilities prevNc,
NetworkCapabilities newNc) {
private void updateUids(@NonNull NetworkAgentInfo nai, @Nullable NetworkCapabilities prevNc,
@Nullable NetworkCapabilities newNc) {
updateVpnUids(nai, prevNc, newNc);
updateAccessUids(nai, prevNc, newNc);
}
private void updateVpnUids(@NonNull NetworkAgentInfo nai, @Nullable NetworkCapabilities prevNc,
@Nullable NetworkCapabilities newNc) {
Set<UidRange> prevRanges = null == prevNc ? null : prevNc.getUidRanges();
Set<UidRange> newRanges = null == newNc ? null : newNc.getUidRanges();
if (null == prevRanges) prevRanges = new ArraySet<>();
@@ -7879,6 +7896,46 @@ public class ConnectivityService extends IConnectivityManager.Stub
}
}
private void updateAccessUids(@NonNull NetworkAgentInfo nai,
@Nullable NetworkCapabilities prevNc, @Nullable NetworkCapabilities newNc) {
// In almost all cases both NC code for empty access UIDs. return as fast as possible.
final boolean prevEmpty = null == prevNc || prevNc.getAccessUidsNoCopy().isEmpty();
final boolean newEmpty = null == newNc || newNc.getAccessUidsNoCopy().isEmpty();
if (prevEmpty && newEmpty) return;
final ArraySet<Integer> prevUids =
null == prevNc ? new ArraySet<>() : prevNc.getAccessUidsNoCopy();
final ArraySet<Integer> newUids =
null == newNc ? new ArraySet<>() : newNc.getAccessUidsNoCopy();
if (prevUids.equals(newUids)) return;
// This implementation is very simple and vastly faster for sets of Integers than
// CompareOrUpdateResult, which is tuned for sets that need to be compared based on
// a key computed from the value and has storage for that.
final ArraySet<Integer> toRemove = new ArraySet<>(prevUids);
final ArraySet<Integer> toAdd = new ArraySet<>(newUids);
toRemove.removeAll(newUids);
toAdd.removeAll(prevUids);
try {
if (!toAdd.isEmpty()) {
mNetd.networkAddUidRangesParcel(new NativeUidRangeConfig(
nai.network.netId,
intsToUidRangeStableParcels(toAdd),
PREFERENCE_ORDER_IRRELEVANT_BECAUSE_NOT_DEFAULT));
}
if (!toRemove.isEmpty()) {
mNetd.networkRemoveUidRangesParcel(new NativeUidRangeConfig(
nai.network.netId,
intsToUidRangeStableParcels(toRemove),
PREFERENCE_ORDER_IRRELEVANT_BECAUSE_NOT_DEFAULT));
}
} catch (RemoteException e) {
// Netd died. This usually causes a runtime restart anyway.
}
}
public void handleUpdateLinkProperties(NetworkAgentInfo nai, LinkProperties newLp) {
ensureRunningOnConnectivityServiceThread();

19
service/src/com/android/server/connectivity/NetworkAgentInfo.java
View File

@@ -17,6 +17,7 @@
package com.android.server.connectivity;
import static android.net.ConnectivityDiagnosticsManager.ConnectivityReport;
import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED;
import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR;
import static android.net.NetworkCapabilities.TRANSPORT_TEST;
import static android.net.NetworkCapabilities.transportNamesOf;
@@ -1208,12 +1209,18 @@ public class NetworkAgentInfo implements Comparable<NetworkAgentInfo>, NetworkRa
private static boolean areAccessUidsAcceptableFromNetworkAgent(
@NonNull final NetworkCapabilities nc) {
if (nc.hasAccessUids()) {
Log.w(TAG, "Capabilities from network agent must not contain access UIDs");
// TODO : accept the supported cases
return false;
}
return true;
// NCs without access UIDs are fine.
if (!nc.hasAccessUids()) return true;
// On a non-restricted network, access UIDs make no sense
if (nc.hasCapability(NET_CAPABILITY_NOT_RESTRICTED)) return false;
// If this network has TRANSPORT_TEST, then the caller can do whatever they want to
// access UIDs
if (nc.hasTransport(TRANSPORT_TEST)) return true;
// TODO : accept more supported cases
return false;
}
// TODO: Print shorter members first and only print the boolean variable which value is true