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

Commit 430a95f0 authored by Lorenzo Colitti's avatar Lorenzo Colitti
Browse files

Move applyUnderlyingCapabilities to ConnectivityService. 

This is essentially a straighforward move of code from Vpn to
ConnectivityService, and from VpnTest to ConnectivityServiceTest.

Bug: 173331190
Test: passes existing tests, moved tests pass
Change-Id: I76daa3abcc777e9c3ba57efb750de0e2e2f3bb74
parent 5884555c

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

+63 −4
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import static android.net.INetworkMonitor.NETWORK_VALIDATION_RESULT_VALID; 
import static android.net.NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL;

import static android.net.NetworkCapabilities.NET_CAPABILITY_FOREGROUND;

import static android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET;

import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_CONGESTED;

import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_METERED;

import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED;

import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING;
@@ -6354,6 +6355,67 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        nai.declaredMetered = !nc.hasCapability(NET_CAPABILITY_NOT_METERED);

    }



    @VisibleForTesting

    void applyUnderlyingCapabilities(Network[] underlyingNetworks,

            NetworkCapabilities caps,  boolean declaredMetered) {

        int[] transportTypes = new int[] { NetworkCapabilities.TRANSPORT_VPN };

        int downKbps = NetworkCapabilities.LINK_BANDWIDTH_UNSPECIFIED;

        int upKbps = NetworkCapabilities.LINK_BANDWIDTH_UNSPECIFIED;

        boolean metered = declaredMetered; // metered if any underlying is metered, or agentMetered

        boolean roaming = false; // roaming if any underlying is roaming

        boolean congested = false; // congested if any underlying is congested

        boolean suspended = true; // suspended if all underlying are suspended



        boolean hadUnderlyingNetworks = false;

        if (null != underlyingNetworks) {

            for (Network underlyingNetwork : underlyingNetworks) {

                final NetworkAgentInfo underlying =

                        getNetworkAgentInfoForNetwork(underlyingNetwork);

                if (underlying == null) continue;



                final NetworkCapabilities underlyingCaps = underlying.networkCapabilities;

                hadUnderlyingNetworks = true;

                for (int underlyingType : underlyingCaps.getTransportTypes()) {

                    transportTypes = ArrayUtils.appendInt(transportTypes, underlyingType);

                }



                // Merge capabilities of this underlying network. For bandwidth, assume the

                // worst case.

                downKbps = NetworkCapabilities.minBandwidth(downKbps,

                        underlyingCaps.getLinkDownstreamBandwidthKbps());

                upKbps = NetworkCapabilities.minBandwidth(upKbps,

                        underlyingCaps.getLinkUpstreamBandwidthKbps());

                // If this underlying network is metered, the VPN is metered (it may cost money

                // to send packets on this network).

                metered |= !underlyingCaps.hasCapability(NET_CAPABILITY_NOT_METERED);

                // If this underlying network is roaming, the VPN is roaming (the billing structure

                // is different than the usual, local one).

                roaming |= !underlyingCaps.hasCapability(NET_CAPABILITY_NOT_ROAMING);

                // If this underlying network is congested, the VPN is congested (the current

                // condition of the network affects the performance of this network).

                congested |= !underlyingCaps.hasCapability(NET_CAPABILITY_NOT_CONGESTED);

                // If this network is not suspended, the VPN is not suspended (the VPN

                // is able to transfer some data).

                suspended &= !underlyingCaps.hasCapability(NET_CAPABILITY_NOT_SUSPENDED);

            }

        }

        if (!hadUnderlyingNetworks) {

            // No idea what the underlying networks are; assume reasonable defaults

            metered = true;

            roaming = false;

            congested = false;

            suspended = false;

        }



        caps.setTransportTypes(transportTypes);

        caps.setLinkDownstreamBandwidthKbps(downKbps);

        caps.setLinkUpstreamBandwidthKbps(upKbps);

        caps.setCapability(NET_CAPABILITY_NOT_METERED, !metered);

        caps.setCapability(NET_CAPABILITY_NOT_ROAMING, !roaming);

        caps.setCapability(NET_CAPABILITY_NOT_CONGESTED, !congested);

        caps.setCapability(NET_CAPABILITY_NOT_SUSPENDED, !suspended);

    }



    /** Propagates to |nc| the capabilities declared by the underlying networks of |nai|. */

    private void mixInUnderlyingCapabilities(NetworkAgentInfo nai, NetworkCapabilities nc) {

        Network[] underlyingNetworks = nai.declaredUnderlyingNetworks;
@@ -6362,10 +6424,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
            // null underlying networks means to track the default.

            underlyingNetworks = new Network[] { defaultNetwork };

        }



        // TODO(b/124469351): Get capabilities directly from ConnectivityService instead.

        final ConnectivityManager cm = mContext.getSystemService(ConnectivityManager.class);

        Vpn.applyUnderlyingCapabilities(cm, underlyingNetworks, nc, nai.declaredMetered);

        applyUnderlyingCapabilities(underlyingNetworks, nc, nai.declaredMetered);

    }



    /**

services/core/java/com/android/server/connectivity/Vpn.java

+0 −97
Original line number Diff line number Diff line
@@ -18,10 +18,7 @@ package com.android.server.connectivity; 


import static android.Manifest.permission.BIND_VPN_SERVICE;

import static android.net.ConnectivityManager.NETID_UNSET;

import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_CONGESTED;

import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_METERED;

import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING;

import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_SUSPENDED;

import static android.net.RouteInfo.RTN_THROW;

import static android.net.RouteInfo.RTN_UNREACHABLE;
@@ -111,7 +108,6 @@ import com.android.internal.net.LegacyVpnInfo; 
import com.android.internal.net.VpnConfig;

import com.android.internal.net.VpnInfo;

import com.android.internal.net.VpnProfile;

import com.android.internal.util.ArrayUtils;

import com.android.server.DeviceIdleInternal;

import com.android.server.LocalServices;

import com.android.server.net.BaseNetworkObserver;
@@ -462,99 +458,6 @@ public class Vpn { 
        updateAlwaysOnNotification(detailedState);

    }



    /**

     * Updates {@link #mNetworkCapabilities} based on current underlying networks and returns a

     * defensive copy.

     *

     * <p>Does not propagate updated capabilities to apps.

     *

     * @param defaultNetwork underlying network for VPNs following platform's default

     */

    public synchronized NetworkCapabilities updateCapabilities(@Nullable Network defaultNetwork) {

        if (mConfig == null) {

            // VPN is not running.

            return null;

        }



        Network[] underlyingNetworks = mConfig.underlyingNetworks;

        if (underlyingNetworks == null && defaultNetwork != null) {

            // null underlying networks means to track the default.

            underlyingNetworks = new Network[] { defaultNetwork };

        }

        // Only apps targeting Q and above can explicitly declare themselves as metered.

        final boolean isAlwaysMetered = mIsPackageTargetingAtLeastQ && mConfig.isMetered;



        applyUnderlyingCapabilities(

                mConnectivityManager,

                underlyingNetworks,

                mNetworkCapabilities,

                isAlwaysMetered);



        return new NetworkCapabilities(mNetworkCapabilities);

    }



    @VisibleForTesting

    public static void applyUnderlyingCapabilities(

            @NonNull final ConnectivityManager cm,

            @Nullable final Network[] underlyingNetworks,

            @NonNull final NetworkCapabilities caps,

            final boolean isAlwaysMetered) {

        int[] transportTypes = new int[] { NetworkCapabilities.TRANSPORT_VPN };

        int downKbps = NetworkCapabilities.LINK_BANDWIDTH_UNSPECIFIED;

        int upKbps = NetworkCapabilities.LINK_BANDWIDTH_UNSPECIFIED;

        boolean metered = isAlwaysMetered; // metered if any underlying is metered, or alwaysMetered

        boolean roaming = false; // roaming if any underlying is roaming

        boolean congested = false; // congested if any underlying is congested

        boolean suspended = true; // suspended if all underlying are suspended



        boolean hadUnderlyingNetworks = false;

        if (null != underlyingNetworks) {

            for (Network underlying : underlyingNetworks) {

                // TODO(b/124469351): Get capabilities directly from ConnectivityService instead.

                final NetworkCapabilities underlyingCaps = cm.getNetworkCapabilities(underlying);

                if (underlyingCaps == null) continue;

                hadUnderlyingNetworks = true;

                for (int underlyingType : underlyingCaps.getTransportTypes()) {

                    transportTypes = ArrayUtils.appendInt(transportTypes, underlyingType);

                }



                // Merge capabilities of this underlying network. For bandwidth, assume the

                // worst case.

                downKbps = NetworkCapabilities.minBandwidth(downKbps,

                        underlyingCaps.getLinkDownstreamBandwidthKbps());

                upKbps = NetworkCapabilities.minBandwidth(upKbps,

                        underlyingCaps.getLinkUpstreamBandwidthKbps());

                // If this underlying network is metered, the VPN is metered (it may cost money

                // to send packets on this network).

                metered |= !underlyingCaps.hasCapability(NET_CAPABILITY_NOT_METERED);

                // If this underlying network is roaming, the VPN is roaming (the billing structure

                // is different than the usual, local one).

                roaming |= !underlyingCaps.hasCapability(NET_CAPABILITY_NOT_ROAMING);

                // If this underlying network is congested, the VPN is congested (the current

                // condition of the network affects the performance of this network).

                congested |= !underlyingCaps.hasCapability(NET_CAPABILITY_NOT_CONGESTED);

                // If this network is not suspended, the VPN is not suspended (the VPN

                // is able to transfer some data).

                suspended &= !underlyingCaps.hasCapability(NET_CAPABILITY_NOT_SUSPENDED);

            }

        }

        if (!hadUnderlyingNetworks) {

            // No idea what the underlying networks are; assume the safer defaults

            metered = true;

            roaming = false;

            congested = false;

            suspended = false;

        }



        caps.setTransportTypes(transportTypes);

        caps.setLinkDownstreamBandwidthKbps(downKbps);

        caps.setLinkUpstreamBandwidthKbps(upKbps);

        caps.setCapability(NET_CAPABILITY_NOT_METERED, !metered);

        caps.setCapability(NET_CAPABILITY_NOT_ROAMING, !roaming);

        caps.setCapability(NET_CAPABILITY_NOT_CONGESTED, !congested);

        caps.setCapability(NET_CAPABILITY_NOT_SUSPENDED, !suspended);

    }



    /**

     * Chooses whether to force all connections to go though VPN.

     *

tests/net/java/com/android/server/ConnectivityServiceTest.java

+112 −2
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import static android.net.INetworkMonitor.NETWORK_VALIDATION_PROBE_HTTPS; 
import static android.net.INetworkMonitor.NETWORK_VALIDATION_PROBE_PRIVDNS;

import static android.net.INetworkMonitor.NETWORK_VALIDATION_RESULT_PARTIAL;

import static android.net.INetworkMonitor.NETWORK_VALIDATION_RESULT_VALID;

import static android.net.NetworkCapabilities.LINK_BANDWIDTH_UNSPECIFIED;

import static android.net.NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL;

import static android.net.NetworkCapabilities.NET_CAPABILITY_CBS;

import static android.net.NetworkCapabilities.NET_CAPABILITY_DUN;
@@ -56,8 +57,10 @@ import static android.net.NetworkCapabilities.NET_CAPABILITY_IA; 
import static android.net.NetworkCapabilities.NET_CAPABILITY_IMS;

import static android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET;

import static android.net.NetworkCapabilities.NET_CAPABILITY_MMS;

import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_CONGESTED;

import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_METERED;

import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED;

import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING;

import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_SUSPENDED;

import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_VPN;

import static android.net.NetworkCapabilities.NET_CAPABILITY_PARTIAL_CONNECTIVITY;
@@ -5397,6 +5400,102 @@ public class ConnectivityServiceTest { 
        assertTrue(lp.getDnsServers().containsAll(dnsServers));

    }



    @Test

    public void testApplyUnderlyingCapabilities() throws Exception {

        mCellNetworkAgent = new TestNetworkAgentWrapper(TRANSPORT_CELLULAR);

        mWiFiNetworkAgent = new TestNetworkAgentWrapper(TRANSPORT_WIFI);

        mCellNetworkAgent.connect(false /* validated */);

        mWiFiNetworkAgent.connect(false /* validated */);



        final NetworkCapabilities cellNc = new NetworkCapabilities()

                .addTransportType(TRANSPORT_CELLULAR)

                .addCapability(NET_CAPABILITY_INTERNET)

                .addCapability(NET_CAPABILITY_NOT_CONGESTED)

                .setLinkDownstreamBandwidthKbps(10);

        final NetworkCapabilities wifiNc = new NetworkCapabilities()

                .addTransportType(TRANSPORT_WIFI)

                .addCapability(NET_CAPABILITY_INTERNET)

                .addCapability(NET_CAPABILITY_NOT_METERED)

                .addCapability(NET_CAPABILITY_NOT_ROAMING)

                .addCapability(NET_CAPABILITY_NOT_CONGESTED)

                .addCapability(NET_CAPABILITY_NOT_SUSPENDED)

                .setLinkUpstreamBandwidthKbps(20);

        mCellNetworkAgent.setNetworkCapabilities(cellNc, true /* sendToConnectivityService */);

        mWiFiNetworkAgent.setNetworkCapabilities(wifiNc, true /* sendToConnectivityService */);

        waitForIdle();



        final Network mobile = mCellNetworkAgent.getNetwork();

        final Network wifi = mWiFiNetworkAgent.getNetwork();



        final NetworkCapabilities caps = new NetworkCapabilities();



        mService.applyUnderlyingCapabilities(new Network[]{}, caps, false);

        assertTrue(caps.hasTransport(TRANSPORT_VPN));

        assertFalse(caps.hasTransport(TRANSPORT_CELLULAR));

        assertFalse(caps.hasTransport(TRANSPORT_WIFI));

        assertEquals(LINK_BANDWIDTH_UNSPECIFIED, caps.getLinkDownstreamBandwidthKbps());

        assertEquals(LINK_BANDWIDTH_UNSPECIFIED, caps.getLinkUpstreamBandwidthKbps());

        assertFalse(caps.hasCapability(NET_CAPABILITY_NOT_METERED));

        assertTrue(caps.hasCapability(NET_CAPABILITY_NOT_ROAMING));

        assertTrue(caps.hasCapability(NET_CAPABILITY_NOT_CONGESTED));

        assertTrue(caps.hasCapability(NET_CAPABILITY_NOT_SUSPENDED));



        NetworkCapabilities otherCaps = new NetworkCapabilities(caps);

        final boolean notDeclaredMetered = false;

        mService.applyUnderlyingCapabilities(new Network[]{null}, otherCaps, notDeclaredMetered);

        assertEquals(caps, otherCaps);



        mService.applyUnderlyingCapabilities(new Network[]{mobile}, caps, notDeclaredMetered);

        assertTrue(caps.hasTransport(TRANSPORT_VPN));

        assertTrue(caps.hasTransport(TRANSPORT_CELLULAR));

        assertFalse(caps.hasTransport(TRANSPORT_WIFI));

        assertEquals(10, caps.getLinkDownstreamBandwidthKbps());

        assertEquals(LINK_BANDWIDTH_UNSPECIFIED, caps.getLinkUpstreamBandwidthKbps());

        assertFalse(caps.hasCapability(NET_CAPABILITY_NOT_METERED));

        assertFalse(caps.hasCapability(NET_CAPABILITY_NOT_ROAMING));

        assertTrue(caps.hasCapability(NET_CAPABILITY_NOT_CONGESTED));

        assertFalse(caps.hasCapability(NET_CAPABILITY_NOT_SUSPENDED));



        mService.applyUnderlyingCapabilities(new Network[]{wifi}, caps, notDeclaredMetered);

        assertTrue(caps.hasTransport(TRANSPORT_VPN));

        assertFalse(caps.hasTransport(TRANSPORT_CELLULAR));

        assertTrue(caps.hasTransport(TRANSPORT_WIFI));

        assertEquals(LINK_BANDWIDTH_UNSPECIFIED, caps.getLinkDownstreamBandwidthKbps());

        assertEquals(20, caps.getLinkUpstreamBandwidthKbps());

        assertTrue(caps.hasCapability(NET_CAPABILITY_NOT_METERED));

        assertTrue(caps.hasCapability(NET_CAPABILITY_NOT_ROAMING));

        assertTrue(caps.hasCapability(NET_CAPABILITY_NOT_CONGESTED));

        assertTrue(caps.hasCapability(NET_CAPABILITY_NOT_SUSPENDED));



        final boolean isDeclaredMetered = true;

        mService.applyUnderlyingCapabilities(new Network[]{wifi}, caps, isDeclaredMetered);

        assertTrue(caps.hasTransport(TRANSPORT_VPN));

        assertFalse(caps.hasTransport(TRANSPORT_CELLULAR));

        assertTrue(caps.hasTransport(TRANSPORT_WIFI));

        assertEquals(LINK_BANDWIDTH_UNSPECIFIED, caps.getLinkDownstreamBandwidthKbps());

        assertEquals(20, caps.getLinkUpstreamBandwidthKbps());

        assertFalse(caps.hasCapability(NET_CAPABILITY_NOT_METERED));

        assertTrue(caps.hasCapability(NET_CAPABILITY_NOT_ROAMING));

        assertTrue(caps.hasCapability(NET_CAPABILITY_NOT_CONGESTED));

        assertTrue(caps.hasCapability(NET_CAPABILITY_NOT_SUSPENDED));



        mService.applyUnderlyingCapabilities(new Network[]{mobile, wifi}, caps, notDeclaredMetered);

        assertTrue(caps.hasTransport(TRANSPORT_VPN));

        assertTrue(caps.hasTransport(TRANSPORT_CELLULAR));

        assertTrue(caps.hasTransport(TRANSPORT_WIFI));

        assertEquals(10, caps.getLinkDownstreamBandwidthKbps());

        assertEquals(20, caps.getLinkUpstreamBandwidthKbps());

        assertFalse(caps.hasCapability(NET_CAPABILITY_NOT_METERED));

        assertFalse(caps.hasCapability(NET_CAPABILITY_NOT_ROAMING));

        assertTrue(caps.hasCapability(NET_CAPABILITY_NOT_CONGESTED));

        assertTrue(caps.hasCapability(NET_CAPABILITY_NOT_SUSPENDED));



        otherCaps = new NetworkCapabilities(caps);

        mService.applyUnderlyingCapabilities(new Network[]{null, mobile, null, wifi},

                otherCaps, notDeclaredMetered);

        assertEquals(otherCaps, caps);

    }



    @Test

    public void testVpnConnectDisconnectUnderlyingNetwork() throws Exception {

        final TestNetworkCallback callback = new TestNetworkCallback();
@@ -5947,17 +6046,28 @@ public class ConnectivityServiceTest { 
                && caps.hasTransport(TRANSPORT_VPN)

                && caps.hasTransport(TRANSPORT_WIFI));



        // Change the VPN's capabilities somehow (specifically, disconnect wifi).

        mWiFiNetworkAgent.disconnect();

        callback.expectCallback(CallbackEntry.LOST, mWiFiNetworkAgent);

        callback.expectCapabilitiesThat(mMockVpn, (caps)

                -> caps.getUids().size() == 2

                && caps.getUids().contains(new UidRange(uid, uid))

                && caps.getUids().contains(UidRange.createForUser(restrictedUserId))

                && caps.hasTransport(TRANSPORT_VPN)

                && !caps.hasTransport(TRANSPORT_WIFI));



        // Send a USER_REMOVED broadcast and expect to lose the UID range for the restricted user.

        final Intent removedIntent = new Intent(ACTION_USER_REMOVED);

        removedIntent.putExtra(Intent.EXTRA_USER_HANDLE, restrictedUserId);

        handler.post(() -> mServiceContext.sendBroadcast(removedIntent));



        // Expect that the VPN gains the UID range for the restricted user.

        // Expect that the VPN gains the UID range for the restricted user, and that the capability

        // change made just before that (i.e., loss of TRANSPORT_WIFI) is preserved.

        callback.expectCapabilitiesThat(mMockVpn, (caps)

                -> caps.getUids().size() == 1

                && caps.getUids().contains(new UidRange(uid, uid))

                && caps.hasTransport(TRANSPORT_VPN)

                && caps.hasTransport(TRANSPORT_WIFI));

                && !caps.hasTransport(TRANSPORT_WIFI));

    }



    @Test

tests/net/java/com/android/server/connectivity/VpnTest.java

+0 −105

File changed.

Preview size limit exceeded, changes collapsed.