From 21bf8ba8e782398512072a0b5b950ffdc87f3854 Mon Sep 17 00:00:00 2001 From: Benedict Wong Date: Mon, 15 Jun 2020 17:54:29 +0000 Subject: [PATCH] Verify owner of IKEv2 VPNs This change adds assertions to ensure that the owner UIDs of IKEv2 VPNs are correctly set. Bug: 150135470 Test: This Merged-In: Iabf2859c289aa86ec38aea1edcc1fb248b9d0d26 Change-Id: Iabf2859c289aa86ec38aea1edcc1fb248b9d0d26 (cherry picked from commit 30234827aa24716062a23f28b1effc59e9ef46de) --- tests/cts/net/src/android/net/cts/Ikev2VpnTest.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/cts/net/src/android/net/cts/Ikev2VpnTest.java b/tests/cts/net/src/android/net/cts/Ikev2VpnTest.java index 81dfed507a..9eab024cf0 100644 --- a/tests/cts/net/src/android/net/cts/Ikev2VpnTest.java +++ b/tests/cts/net/src/android/net/cts/Ikev2VpnTest.java @@ -16,6 +16,7 @@ package android.net.cts; +import static android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET; import static android.net.NetworkCapabilities.TRANSPORT_VPN; import static android.net.cts.util.CtsNetUtils.TestNetworkCallback; @@ -40,6 +41,7 @@ import android.net.Ikev2VpnProfile; import android.net.IpSecAlgorithm; import android.net.LinkAddress; import android.net.Network; +import android.net.NetworkCapabilities; import android.net.NetworkRequest; import android.net.ProxyInfo; import android.net.TestNetworkInterface; @@ -47,6 +49,7 @@ import android.net.TestNetworkManager; import android.net.VpnManager; import android.net.cts.util.CtsNetUtils; import android.os.Build; +import android.os.Process; import android.platform.test.annotations.AppModeFull; import androidx.test.InstrumentationRegistry; @@ -426,6 +429,11 @@ public class Ikev2VpnTest { final Network vpnNetwork = cb.currentNetwork; assertNotNull(vpnNetwork); + final NetworkCapabilities caps = sCM.getNetworkCapabilities(vpnNetwork); + assertTrue(caps.hasTransport(TRANSPORT_VPN)); + assertTrue(caps.hasCapability(NET_CAPABILITY_INTERNET)); + assertEquals(Process.myUid(), caps.getOwnerUid()); + sVpnMgr.stopProvisionedVpnProfile(); cb.waitForLost(); assertEquals(vpnNetwork, cb.lastLostNetwork);