Merge "Adding per-app default network callbacks support" am: a64b652d95 am:... (f5462a5b) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/ConnectivityService.java

+259 −38

Original line number	Diff line number	Diff line
		@@ -3584,10 +3584,10 @@ public class ConnectivityService extends IConnectivityManager.Stub
		}

		private void handleRegisterNetworkRequest(@NonNull final NetworkRequestInfo nri) {
		handleRegisterNetworkRequest(Collections.singletonList(nri));
		handleRegisterNetworkRequests(Collections.singleton(nri));
		}

		private void handleRegisterNetworkRequest(@NonNull final List<NetworkRequestInfo> nris) {
		private void handleRegisterNetworkRequests(@NonNull final Set<NetworkRequestInfo> nris) {
		ensureRunningOnConnectivityServiceThread();
		for (final NetworkRequestInfo nri : nris) {
		mNetworkRequestInfoLogs.log("REGISTER " + nri);
		@@ -3718,7 +3718,10 @@ public class ConnectivityService extends IConnectivityManager.Stub

		private NetworkRequestInfo getNriForAppRequest(
		NetworkRequest request, int callingUid, String requestedOperation) {
		final NetworkRequestInfo nri = mNetworkRequests.get(request);
		// Looking up the app passed param request in mRequests isn't possible since it may return
		// null for a request managed by a per-app default. Therefore use getNriForAppRequest() to
		// do the lookup since that will also find per-app default managed requests.
		final NetworkRequestInfo nri = getNriForAppRequest(request);

		if (nri != null) {
		if (Process.SYSTEM_UID != callingUid && Process.NETWORK_STACK_UID != callingUid
		@@ -3767,8 +3770,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
		if (nri == null) {
		return;
		}
		// handleReleaseNetworkRequest() paths don't apply to multilayer requests.
		ensureNotMultilayerRequest(nri, "handleReleaseNetworkRequest");
		if (VDBG \|\| (DBG && request.isRequest())) {
		log("releasing " + request + " (release request)");
		}
		@@ -3780,7 +3781,6 @@ public class ConnectivityService extends IConnectivityManager.Stub

		private void handleRemoveNetworkRequest(@NonNull final NetworkRequestInfo nri) {
		ensureRunningOnConnectivityServiceThread();

		nri.unlinkDeathRecipient();
		for (final NetworkRequest req : nri.mRequests) {
		mNetworkRequests.remove(req);
		@@ -3803,6 +3803,16 @@ public class ConnectivityService extends IConnectivityManager.Stub
		cancelNpiRequests(nri);
		}

		private void handleRemoveNetworkRequests(@NonNull final Set<NetworkRequestInfo> nris) {
		for (final NetworkRequestInfo nri : nris) {
		if (mDefaultRequest == nri) {
		// Make sure we never remove the default request.
		continue;
		}
		handleRemoveNetworkRequest(nri);
		}
		}

		private void cancelNpiRequests(@NonNull final NetworkRequestInfo nri) {
		for (final NetworkRequest req : nri.mRequests) {
		cancelNpiRequest(req);
		@@ -5110,6 +5120,21 @@ public class ConnectivityService extends IConnectivityManager.Stub
		final int mUid;
		@Nullable
		final String mCallingAttributionTag;
		// In order to preserve the mapping of NetworkRequest-to-callback when apps register
		// callbacks using a returned NetworkRequest, the original NetworkRequest needs to be
		// maintained for keying off of. This is only a concern when the original nri
		// mNetworkRequests changes which happens currently for apps that register callbacks to
		// track the default network. In those cases, the nri is updated to have mNetworkRequests
		// that match the per-app default nri that currently tracks the calling app's uid so that
		// callbacks are fired at the appropriate time. When the callbacks fire,
		// mNetworkRequestForCallback will be used so as to preserve the caller's mapping. When
		// callbacks are updated to key off of an nri vs NetworkRequest, this stops being an issue.
		// TODO b/177608132: make sure callbacks are indexed by NRIs and not NetworkRequest objects.
		@NonNull
		private final NetworkRequest mNetworkRequestForCallback;
		NetworkRequest getNetworkRequestForCallback() {
		return mNetworkRequestForCallback;
		}

		/**
		* Get the list of UIDs this nri applies to.
		@@ -5125,13 +5150,15 @@ public class ConnectivityService extends IConnectivityManager.Stub

		NetworkRequestInfo(@NonNull final NetworkRequest r, @Nullable final PendingIntent pi,
		@Nullable String callingAttributionTag) {
		this(Collections.singletonList(r), pi, callingAttributionTag);
		this(Collections.singletonList(r), r, pi, callingAttributionTag);
		}

		NetworkRequestInfo(@NonNull final List<NetworkRequest> r,
		@Nullable final PendingIntent pi, @Nullable String callingAttributionTag) {
		@NonNull final NetworkRequest requestForCallback, @Nullable final PendingIntent pi,
		@Nullable String callingAttributionTag) {
		ensureAllNetworkRequestsHaveType(r);
		mRequests = initializeRequests(r);
		ensureAllNetworkRequestsHaveType(mRequests);
		mNetworkRequestForCallback = requestForCallback;
		mPendingIntent = pi;
		mMessenger = null;
		mBinder = null;
		@@ -5143,15 +5170,17 @@ public class ConnectivityService extends IConnectivityManager.Stub

		NetworkRequestInfo(@NonNull final NetworkRequest r, @Nullable final Messenger m,
		@Nullable final IBinder binder, @Nullable String callingAttributionTag) {
		this(Collections.singletonList(r), m, binder, callingAttributionTag);
		this(Collections.singletonList(r), r, m, binder, callingAttributionTag);
		}

		NetworkRequestInfo(@NonNull final List<NetworkRequest> r, @Nullable final Messenger m,
		NetworkRequestInfo(@NonNull final List<NetworkRequest> r,
		@NonNull final NetworkRequest requestForCallback, @Nullable final Messenger m,
		@Nullable final IBinder binder, @Nullable String callingAttributionTag) {
		super();
		ensureAllNetworkRequestsHaveType(r);
		mRequests = initializeRequests(r);
		mNetworkRequestForCallback = requestForCallback;
		mMessenger = m;
		ensureAllNetworkRequestsHaveType(mRequests);
		mBinder = binder;
		mPid = getCallingPid();
		mUid = mDeps.getCallingUid();
		@@ -5166,12 +5195,26 @@ public class ConnectivityService extends IConnectivityManager.Stub
		}
		}

		NetworkRequestInfo(@NonNull final NetworkRequestInfo nri,
		@NonNull final List<NetworkRequest> r) {
		super();
		ensureAllNetworkRequestsHaveType(r);
		mRequests = initializeRequests(r);
		mNetworkRequestForCallback = nri.getNetworkRequestForCallback();
		mMessenger = nri.mMessenger;
		mBinder = nri.mBinder;
		mPid = nri.mPid;
		mUid = nri.mUid;
		mPendingIntent = nri.mPendingIntent;
		mCallingAttributionTag = nri.mCallingAttributionTag;
		}

		NetworkRequestInfo(@NonNull final NetworkRequest r) {
		this(Collections.singletonList(r));
		}

		NetworkRequestInfo(@NonNull final List<NetworkRequest> r) {
		this(r, null /* pi /, null / callingAttributionTag */);
		this(r, r.get(0), null /* pi /, null / callingAttributionTag */);
		}

		// True if this NRI is being satisfied. It also accounts for if the nri has its satisifer
		@@ -5330,7 +5373,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
		// If the request type is TRACK_DEFAULT, the passed {@code networkCapabilities}
		// is unused and will be replaced by ones appropriate for the caller.
		// This allows callers to keep track of the default network for their app.
		networkCapabilities = createDefaultNetworkCapabilitiesForUid(callingUid);
		networkCapabilities = copyDefaultNetworkCapabilitiesForUid(
		defaultNc, callingUid, callingPackageName);
		enforceAccessPermission();
		break;
		case TRACK_SYSTEM_DEFAULT:
		@@ -5369,10 +5413,10 @@ public class ConnectivityService extends IConnectivityManager.Stub
		}
		ensureValid(networkCapabilities);

		NetworkRequest networkRequest = new NetworkRequest(networkCapabilities, legacyType,
		final NetworkRequest networkRequest = new NetworkRequest(networkCapabilities, legacyType,
		nextNetworkRequestId(), reqType);
		NetworkRequestInfo nri =
		new NetworkRequestInfo(networkRequest, messenger, binder, callingAttributionTag);
		final NetworkRequestInfo nri = getNriToRegister(
		networkRequest, messenger, binder, callingAttributionTag);
		if (DBG) log("requestNetwork for " + nri);

		// For TRACK_SYSTEM_DEFAULT callbacks, the capabilities have been modified since they were
		@@ -5394,6 +5438,30 @@ public class ConnectivityService extends IConnectivityManager.Stub
		return networkRequest;
		}

		/**
		* Return the nri to be used when registering a network request. Specifically, this is used with
		* requests registered to track the default request. If there is currently a per-app default
		* tracking the app requestor, then we need to create a version of this nri that mirrors that of
		* the tracking per-app default so that callbacks are sent to the app requestor appropriately.
		* @param nr the network request for the nri.
		* @param msgr the messenger for the nri.
		* @param binder the binder for the nri.
		* @param callingAttributionTag the calling attribution tag for the nri.
		* @return the nri to register.
		*/
		private NetworkRequestInfo getNriToRegister(@NonNull final NetworkRequest nr,
		@Nullable final Messenger msgr, @Nullable final IBinder binder,
		@Nullable String callingAttributionTag) {
		final List<NetworkRequest> requests;
		if (NetworkRequest.Type.TRACK_DEFAULT == nr.type) {
		requests = copyDefaultNetworkRequestsForUid(
		nr.getRequestorUid(), nr.getRequestorPackageName());
		} else {
		requests = Collections.singletonList(nr);
		}
		return new NetworkRequestInfo(requests, nr, msgr, binder, callingAttributionTag);
		}

		private void enforceNetworkRequestPermissions(NetworkCapabilities networkCapabilities,
		String callingPackageName, String callingAttributionTag) {
		if (networkCapabilities.hasCapability(NET_CAPABILITY_NOT_RESTRICTED) == false) {
		@@ -5686,6 +5754,102 @@ public class ConnectivityService extends IConnectivityManager.Stub
		return (mDefaultNetworkRequests.contains(nri) && mDefaultRequest != nri);
		}

		/**
		* Return the default network request currently tracking the given uid.
		* @param uid the uid to check.
		* @return the NetworkRequestInfo tracking the given uid.
		*/
		@NonNull
		private NetworkRequestInfo getDefaultRequestTrackingUid(@NonNull final int uid) {
		for (final NetworkRequestInfo nri : mDefaultNetworkRequests) {
		if (nri == mDefaultRequest) {
		continue;
		}
		// Checking the first request is sufficient as only multilayer requests will have more
		// than one request and for multilayer, all requests will track the same uids.
		if (nri.mRequests.get(0).networkCapabilities.appliesToUid(uid)) {
		return nri;
		}
		}
		return mDefaultRequest;
		}

		/**
		* Get a copy of the network requests of the default request that is currently tracking the
		* given uid.
		* @param requestorUid the uid to check the default for.
		* @param requestorPackageName the requestor's package name.
		* @return a copy of the default's NetworkRequest that is tracking the given uid.
		*/
		@NonNull
		private List<NetworkRequest> copyDefaultNetworkRequestsForUid(
		@NonNull final int requestorUid, @NonNull final String requestorPackageName) {
		return copyNetworkRequestsForUid(
		getDefaultRequestTrackingUid(requestorUid).mRequests,
		requestorUid, requestorPackageName);
		}

		/**
		* Copy the given nri's NetworkRequest collection.
		* @param requestsToCopy the NetworkRequest collection to be copied.
		* @param requestorUid the uid to set on the copied collection.
		* @param requestorPackageName the package name to set on the copied collection.
		* @return the copied NetworkRequest collection.
		*/
		@NonNull
		private List<NetworkRequest> copyNetworkRequestsForUid(
		@NonNull final List<NetworkRequest> requestsToCopy, @NonNull final int requestorUid,
		@NonNull final String requestorPackageName) {
		final List<NetworkRequest> requests = new ArrayList<>();
		for (final NetworkRequest nr : requestsToCopy) {
		requests.add(new NetworkRequest(copyDefaultNetworkCapabilitiesForUid(
		nr.networkCapabilities, requestorUid, requestorPackageName),
		nr.legacyType, nextNetworkRequestId(), nr.type));
		}
		return requests;
		}

		@NonNull
		private NetworkCapabilities copyDefaultNetworkCapabilitiesForUid(
		@NonNull final NetworkCapabilities netCapToCopy, @NonNull final int requestorUid,
		@NonNull final String requestorPackageName) {
		final NetworkCapabilities netCap = new NetworkCapabilities(netCapToCopy);
		netCap.removeCapability(NET_CAPABILITY_NOT_VPN);
		netCap.setSingleUid(requestorUid);
		netCap.setUids(new ArraySet<>());
		restrictRequestUidsForCallerAndSetRequestorInfo(
		netCap, requestorUid, requestorPackageName);
		return netCap;
		}

		/**
		* Get the nri that is currently being tracked for callbacks by per-app defaults.
		* @param nr the network request to check for equality against.
		* @return the nri if one exists, null otherwise.
		*/
		@Nullable
		private NetworkRequestInfo getNriForAppRequest(@NonNull final NetworkRequest nr) {
		for (final NetworkRequestInfo nri : mNetworkRequests.values()) {
		if (nri.getNetworkRequestForCallback().equals(nr)) {
		return nri;
		}
		}
		return null;
		}

		/**
		* Check if an nri is currently being managed by per-app default networking.
		* @param nri the nri to check.
		* @return true if this nri is currently being managed by per-app default networking.
		*/
		private boolean isPerAppTrackedNri(@NonNull final NetworkRequestInfo nri) {
		// nri.mRequests.get(0) is only different from the original request filed in
		// nri.getNetworkRequestForCallback() if nri.mRequests was changed by per-app default
		// functionality therefore if these two don't match, it means this particular nri is
		// currently being managed by a per-app default.
		return nri.getNetworkRequestForCallback() != nri.mRequests.get(0);
		}

		/**
		* Determine if an nri is a managed default request that disallows default networking.
		* @param nri the request to evaluate
		@@ -6764,13 +6928,9 @@ public class ConnectivityService extends IConnectivityManager.Stub
		return;
		}
		Bundle bundle = new Bundle();
		// In the case of multi-layer NRIs, the first request is not necessarily the one that
		// is satisfied. This is vexing, but the ConnectivityManager code that receives this
		// callback is only using the request as a token to identify the callback, so it doesn't
		// matter too much at this point as long as the callback can be found.
		// TODO b/177608132: make sure callbacks are indexed by NRIs and not NetworkRequest objects.
		// TODO: check if defensive copies of data is needed.
		final NetworkRequest nrForCallback = new NetworkRequest(nri.mRequests.get(0));
		final NetworkRequest nrForCallback = nri.getNetworkRequestForCallback();
		putParcelable(bundle, nrForCallback);
		Message msg = Message.obtain();
		if (notificationType != ConnectivityManager.CALLBACK_UNAVAIL) {
		@@ -8710,7 +8870,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
		if (DBG) {
		log("set OEM network preferences :" + preference.toString());
		}
		final List<NetworkRequestInfo> nris =
		final ArraySet<NetworkRequestInfo> nris =
		new OemNetworkRequestFactory().createNrisFromOemNetworkPreferences(preference);
		updateDefaultNetworksForOemNetworkPreference(nris);
		mOemNetworkPreferences = preference;
		@@ -8722,27 +8882,88 @@ public class ConnectivityService extends IConnectivityManager.Stub
		}

		private void updateDefaultNetworksForOemNetworkPreference(
		@NonNull final List<NetworkRequestInfo> nris) {
		@NonNull final Set<NetworkRequestInfo> nris) {
		handleRemoveNetworkRequests(mDefaultNetworkRequests);
		addPerAppDefaultNetworkRequests(nris);
		}

		private void addPerAppDefaultNetworkRequests(@NonNull final Set<NetworkRequestInfo> nris) {
		ensureRunningOnConnectivityServiceThread();
		clearNonDefaultNetworkAgents();
		addDefaultNetworkRequests(nris);
		mDefaultNetworkRequests.addAll(nris);
		final ArraySet<NetworkRequestInfo> perAppCallbackRequestsToUpdate =
		getPerAppCallbackRequestsToUpdate();
		handleRemoveNetworkRequests(perAppCallbackRequestsToUpdate);
		final ArraySet<NetworkRequestInfo> nrisToRegister = new ArraySet<>(nris);
		nrisToRegister.addAll(
		createPerAppCallbackRequestsToRegister(perAppCallbackRequestsToUpdate));
		handleRegisterNetworkRequests(nrisToRegister);
		}

		private void clearNonDefaultNetworkAgents() {
		// Copy mDefaultNetworkRequests to iterate and remove elements from it in
		// handleRemoveNetworkRequest() without getting a ConcurrentModificationException.
		final NetworkRequestInfo[] nris =
		mDefaultNetworkRequests.toArray(new NetworkRequestInfo[0]);
		/**
		* All current requests that are tracking the default network need to be assessed as to whether
		* or not the current set of per-application default requests will be changing their default
		* network. If so, those requests will need to be updated so that they will send callbacks for
		* default network changes at the appropriate time. Additionally, those requests tracking the
		* default that were previously updated by this flow will need to be reassessed.
		* @return the nris which will need to be updated.
		*/
		private ArraySet<NetworkRequestInfo> getPerAppCallbackRequestsToUpdate() {
		final ArraySet<NetworkRequestInfo> defaultCallbackRequests = new ArraySet<>();
		// Get the distinct nris to check since for multilayer requests, it is possible to have the
		// same nri in the map's values for each of its NetworkRequest objects.
		final ArraySet<NetworkRequestInfo> nris = new ArraySet<>(mNetworkRequests.values());
		for (final NetworkRequestInfo nri : nris) {
		if (mDefaultRequest != nri) {
		handleRemoveNetworkRequest(nri);
		// Include this nri if it is currently being tracked.
		if (isPerAppTrackedNri(nri)) {
		defaultCallbackRequests.add(nri);
		continue;
		}
		// We only track callbacks for requests tracking the default.
		if (NetworkRequest.Type.TRACK_DEFAULT != nri.mRequests.get(0).type) {
		continue;
		}
		// Include this nri if it will be tracked by the new per-app default requests.
		final boolean isNriGoingToBeTracked =
		getDefaultRequestTrackingUid(nri.mUid) != mDefaultRequest;
		if (isNriGoingToBeTracked) {
		defaultCallbackRequests.add(nri);
		}
		}
		return defaultCallbackRequests;
		}

		private void addDefaultNetworkRequests(@NonNull final List<NetworkRequestInfo> nris) {
		mDefaultNetworkRequests.addAll(nris);
		handleRegisterNetworkRequest(nris);
		/**
		* Create nris for those network requests that are currently tracking the default network that
		* are being controlled by a per-application default.
		* @param perAppCallbackRequestsForUpdate the baseline network requests to be used as the
		* foundation when creating the nri. Important items include the calling uid's original
		* NetworkRequest to be used when mapping callbacks as well as the caller's uid and name. These
		* requests are assumed to have already been validated as needing to be updated.
		* @return the Set of nris to use when registering network requests.
		*/
		private ArraySet<NetworkRequestInfo> createPerAppCallbackRequestsToRegister(
		@NonNull final ArraySet<NetworkRequestInfo> perAppCallbackRequestsForUpdate) {
		final ArraySet<NetworkRequestInfo> callbackRequestsToRegister = new ArraySet<>();
		for (final NetworkRequestInfo callbackRequest : perAppCallbackRequestsForUpdate) {
		final NetworkRequestInfo trackingNri =
		getDefaultRequestTrackingUid(callbackRequest.mUid);

		// If this nri is not being tracked, the change it back to an untracked nri.
		if (trackingNri == mDefaultRequest) {
		callbackRequestsToRegister.add(new NetworkRequestInfo(
		callbackRequest,
		Collections.singletonList(callbackRequest.getNetworkRequestForCallback())));
		continue;
		}

		final String requestorPackageName =
		callbackRequest.mRequests.get(0).getRequestorPackageName();
		callbackRequestsToRegister.add(new NetworkRequestInfo(
		callbackRequest,
		copyNetworkRequestsForUid(
		trackingNri.mRequests, callbackRequest.mUid, requestorPackageName)));
		}
		return callbackRequestsToRegister;
		}

		/**
		@@ -8750,9 +8971,9 @@ public class ConnectivityService extends IConnectivityManager.Stub
		*/
		@VisibleForTesting
		final class OemNetworkRequestFactory {
		List<NetworkRequestInfo> createNrisFromOemNetworkPreferences(
		ArraySet<NetworkRequestInfo> createNrisFromOemNetworkPreferences(
		@NonNull final OemNetworkPreferences preference) {
		final List<NetworkRequestInfo> nris = new ArrayList<>();
		final ArraySet<NetworkRequestInfo> nris = new ArraySet<>();
		final SparseArray<Set<Integer>> uids =
		createUidsFromOemNetworkPreferences(preference);
		for (int i = 0; i < uids.size(); i++) {