Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a83740d authored by Cody Kesting's avatar Cody Kesting Committed by Automerger Merge Worker
Browse files

Merge "Allow MANAGE_TEST_NETWORKS to register and get VCN policies." am: 7b02279e 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1719273

Change-Id: I74d0dd56f4266b5f535e1353aef4aa2c4890e382
parents 1e3ee547 7b02279e

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

+22 −7
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.server; 


import static android.Manifest.permission.DUMP;

import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED;

import static android.net.NetworkCapabilities.TRANSPORT_TEST;

import static android.net.NetworkCapabilities.TRANSPORT_WIFI;

import static android.net.vcn.VcnManager.VCN_STATUS_CODE_ACTIVE;

import static android.net.vcn.VcnManager.VCN_STATUS_CODE_INACTIVE;
@@ -36,6 +37,7 @@ import android.content.BroadcastReceiver; 
import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;

import android.content.pm.PackageManager;

import android.net.ConnectivityManager;

import android.net.LinkProperties;

import android.net.Network;
@@ -73,6 +75,7 @@ import com.android.internal.annotations.VisibleForTesting; 
import com.android.internal.annotations.VisibleForTesting.Visibility;

import com.android.internal.util.IndentingPrintWriter;

import com.android.net.module.util.LocationPermissionChecker;

import com.android.net.module.util.PermissionUtils;

import com.android.server.vcn.TelephonySubscriptionTracker;

import com.android.server.vcn.Vcn;

import com.android.server.vcn.VcnContext;
@@ -741,9 +744,10 @@ public class VcnManagementService extends IVcnManagementService.Stub { 
            @NonNull IVcnUnderlyingNetworkPolicyListener listener) {

        requireNonNull(listener, "listener was null");



        mContext.enforceCallingOrSelfPermission(

        PermissionUtils.enforceAnyPermissionOf(

                mContext,

                android.Manifest.permission.NETWORK_FACTORY,

                "Must have permission NETWORK_FACTORY to register a policy listener");

                android.Manifest.permission.MANAGE_TEST_NETWORKS);



        Binder.withCleanCallingIdentity(() -> {

            PolicyListenerBinderDeath listenerBinderDeath = new PolicyListenerBinderDeath(listener);
@@ -768,9 +772,10 @@ public class VcnManagementService extends IVcnManagementService.Stub { 
            @NonNull IVcnUnderlyingNetworkPolicyListener listener) {

        requireNonNull(listener, "listener was null");



        mContext.enforceCallingOrSelfPermission(

        PermissionUtils.enforceAnyPermissionOf(

                mContext,

                android.Manifest.permission.NETWORK_FACTORY,

                "Must have permission NETWORK_FACTORY to unregister a policy listener");

                android.Manifest.permission.MANAGE_TEST_NETWORKS);



        Binder.withCleanCallingIdentity(() -> {

            synchronized (mLock) {
@@ -821,10 +826,20 @@ public class VcnManagementService extends IVcnManagementService.Stub { 
        requireNonNull(networkCapabilities, "networkCapabilities was null");

        requireNonNull(linkProperties, "linkProperties was null");



        mContext.enforceCallingOrSelfPermission(

        PermissionUtils.enforceAnyPermissionOf(

                mContext,

                android.Manifest.permission.NETWORK_FACTORY,

                "Must have permission NETWORK_FACTORY or be the SystemServer to get underlying"

                        + " Network policies");

                android.Manifest.permission.MANAGE_TEST_NETWORKS);



        final boolean isUsingManageTestNetworks =

                mContext.checkCallingOrSelfPermission(android.Manifest.permission.NETWORK_FACTORY)

                        != PackageManager.PERMISSION_GRANTED;



        if (isUsingManageTestNetworks && !networkCapabilities.hasTransport(TRANSPORT_TEST)) {

            throw new IllegalStateException(

                    "NetworkCapabilities must be for Test Network if using permission"

                            + " MANAGE_TEST_NETWORKS");

        }



        return Binder.withCleanCallingIdentity(() -> {

            // Defensive copy in case this call is in-process and the given NetworkCapabilities

tests/vcn/java/com/android/server/VcnManagementServiceTest.java

+7 −9
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ import android.app.AppOpsManager; 
import android.content.BroadcastReceiver;

import android.content.Context;

import android.content.Intent;

import android.content.pm.PackageManager;

import android.net.ConnectivityManager;

import android.net.LinkProperties;

import android.net.Network;
@@ -707,10 +708,9 @@ public class VcnManagementServiceTest { 


    @Test(expected = SecurityException.class)

    public void testAddVcnUnderlyingNetworkPolicyListenerInvalidPermission() {

        doThrow(new SecurityException())

        doReturn(PackageManager.PERMISSION_DENIED)

                .when(mMockContext)

                .enforceCallingOrSelfPermission(

                        eq(android.Manifest.permission.NETWORK_FACTORY), any());

                .checkCallingOrSelfPermission(any());



        mVcnMgmtSvc.addVcnUnderlyingNetworkPolicyListener(mMockPolicyListener);

    }
@@ -724,10 +724,9 @@ public class VcnManagementServiceTest { 


    @Test(expected = SecurityException.class)

    public void testRemoveVcnUnderlyingNetworkPolicyListenerInvalidPermission() {

        doThrow(new SecurityException())

        doReturn(PackageManager.PERMISSION_DENIED)

                .when(mMockContext)

                .enforceCallingOrSelfPermission(

                        eq(android.Manifest.permission.NETWORK_FACTORY), any());

                .checkCallingOrSelfPermission(any());



        mVcnMgmtSvc.removeVcnUnderlyingNetworkPolicyListener(mMockPolicyListener);

    }
@@ -919,10 +918,9 @@ public class VcnManagementServiceTest { 


    @Test(expected = SecurityException.class)

    public void testGetUnderlyingNetworkPolicyInvalidPermission() {

        doThrow(new SecurityException())

        doReturn(PackageManager.PERMISSION_DENIED)

                .when(mMockContext)

                .enforceCallingOrSelfPermission(

                        eq(android.Manifest.permission.NETWORK_FACTORY), any());

                .checkCallingOrSelfPermission(any());



        mVcnMgmtSvc.getUnderlyingNetworkPolicy(new NetworkCapabilities(), new LinkProperties());

    }