Merge "Implement Ikev2VpnRunner" am: b5bb5d4ba1 (ac609b99) · Commits · e / os / android_frameworks_base

core/java/android/net/IpSecManager.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -51,7 +51,7 @@ import java.net.Socket;
		*
		* <p>Note that not all aspects of IPsec are permitted by this API. Applications may create
		* transport mode security associations and apply them to individual sockets. Applications looking
		* to create a VPN should use {@link VpnService}.
		* to create an IPsec VPN should use {@link VpnManager} and {@link Ikev2VpnProfile}.
		*
		* @see <a href="https://tools.ietf.org/html/rfc4301">RFC 4301, Security Architecture for the
		* Internet Protocol</a>

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

+9 −9

Original line number	Diff line number	Diff line
		@@ -1557,16 +1557,16 @@ public class IpSecService extends IIpSecService.Stub {
		}

		checkNotNull(callingPackage, "Null calling package cannot create IpSec tunnels");
		switch (getAppOpsManager().noteOp(TUNNEL_OP, Binder.getCallingUid(), callingPackage)) {
		case AppOpsManager.MODE_DEFAULT:
		mContext.enforceCallingOrSelfPermission(
		android.Manifest.permission.MANAGE_IPSEC_TUNNELS, "IpSecService");
		break;
		case AppOpsManager.MODE_ALLOWED:

		// OP_MANAGE_IPSEC_TUNNELS will return MODE_ERRORED by default, including for the system
		// server. If the appop is not granted, require that the caller has the MANAGE_IPSEC_TUNNELS
		// permission or is the System Server.
		if (AppOpsManager.MODE_ALLOWED == getAppOpsManager().noteOpNoThrow(
		TUNNEL_OP, Binder.getCallingUid(), callingPackage)) {
		return;
		default:
		throw new SecurityException("Request to ignore AppOps for non-legacy API");
		}
		mContext.enforceCallingOrSelfPermission(
		android.Manifest.permission.MANAGE_IPSEC_TUNNELS, "IpSecService");
		}

		private void createOrUpdateTransform(

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

+446 −26

File changed.

Preview size limit exceeded, changes collapsed.

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

0 → 100644

+390 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2020 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.server.connectivity;

		import static android.net.ConnectivityManager.NetworkCallback;
		import static android.net.ipsec.ike.SaProposal.DH_GROUP_1024_BIT_MODP;
		import static android.net.ipsec.ike.SaProposal.DH_GROUP_2048_BIT_MODP;
		import static android.net.ipsec.ike.SaProposal.ENCRYPTION_ALGORITHM_AES_CBC;
		import static android.net.ipsec.ike.SaProposal.ENCRYPTION_ALGORITHM_AES_GCM_12;
		import static android.net.ipsec.ike.SaProposal.ENCRYPTION_ALGORITHM_AES_GCM_16;
		import static android.net.ipsec.ike.SaProposal.ENCRYPTION_ALGORITHM_AES_GCM_8;
		import static android.net.ipsec.ike.SaProposal.INTEGRITY_ALGORITHM_AES_XCBC_96;
		import static android.net.ipsec.ike.SaProposal.INTEGRITY_ALGORITHM_HMAC_SHA1_96;
		import static android.net.ipsec.ike.SaProposal.INTEGRITY_ALGORITHM_HMAC_SHA2_256_128;
		import static android.net.ipsec.ike.SaProposal.INTEGRITY_ALGORITHM_HMAC_SHA2_384_192;
		import static android.net.ipsec.ike.SaProposal.INTEGRITY_ALGORITHM_HMAC_SHA2_512_256;
		import static android.net.ipsec.ike.SaProposal.KEY_LEN_AES_128;
		import static android.net.ipsec.ike.SaProposal.KEY_LEN_AES_192;
		import static android.net.ipsec.ike.SaProposal.KEY_LEN_AES_256;
		import static android.net.ipsec.ike.SaProposal.PSEUDORANDOM_FUNCTION_AES128_XCBC;
		import static android.net.ipsec.ike.SaProposal.PSEUDORANDOM_FUNCTION_HMAC_SHA1;

		import android.annotation.NonNull;
		import android.net.Ikev2VpnProfile;
		import android.net.InetAddresses;
		import android.net.IpPrefix;
		import android.net.IpSecManager.UdpEncapsulationSocket;
		import android.net.IpSecTransform;
		import android.net.Network;
		import android.net.RouteInfo;
		import android.net.eap.EapSessionConfig;
		import android.net.ipsec.ike.ChildSaProposal;
		import android.net.ipsec.ike.ChildSessionCallback;
		import android.net.ipsec.ike.ChildSessionConfiguration;
		import android.net.ipsec.ike.ChildSessionParams;
		import android.net.ipsec.ike.IkeFqdnIdentification;
		import android.net.ipsec.ike.IkeIdentification;
		import android.net.ipsec.ike.IkeIpv4AddrIdentification;
		import android.net.ipsec.ike.IkeIpv6AddrIdentification;
		import android.net.ipsec.ike.IkeKeyIdIdentification;
		import android.net.ipsec.ike.IkeRfc822AddrIdentification;
		import android.net.ipsec.ike.IkeSaProposal;
		import android.net.ipsec.ike.IkeSessionCallback;
		import android.net.ipsec.ike.IkeSessionConfiguration;
		import android.net.ipsec.ike.IkeSessionParams;
		import android.net.ipsec.ike.IkeTrafficSelector;
		import android.net.ipsec.ike.TunnelModeChildSessionParams;
		import android.net.ipsec.ike.exceptions.IkeException;
		import android.net.ipsec.ike.exceptions.IkeProtocolException;
		import android.net.util.IpRange;
		import android.system.OsConstants;
		import android.util.Log;

		import com.android.internal.net.VpnProfile;
		import com.android.internal.util.HexDump;

		import java.net.Inet4Address;
		import java.net.Inet6Address;
		import java.net.InetAddress;
		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.Collection;
		import java.util.HashSet;
		import java.util.List;

		/**
		* Utility class to build and convert IKEv2/IPsec parameters.
		*
		* @hide
		*/
		public class VpnIkev2Utils {
		static IkeSessionParams buildIkeSessionParams(
		@NonNull Ikev2VpnProfile profile, @NonNull UdpEncapsulationSocket socket) {
		// TODO(b/149356682): Update this based on new IKE API. Only numeric addresses supported
		// until then. All others throw IAE (caught by caller).
		final InetAddress serverAddr = InetAddresses.parseNumericAddress(profile.getServerAddr());
		final IkeIdentification localId = parseIkeIdentification(profile.getUserIdentity());
		final IkeIdentification remoteId = parseIkeIdentification(profile.getServerAddr());

		// TODO(b/149356682): Update this based on new IKE API.
		final IkeSessionParams.Builder ikeOptionsBuilder =
		new IkeSessionParams.Builder()
		.setServerAddress(serverAddr)
		.setUdpEncapsulationSocket(socket)
		.setLocalIdentification(localId)
		.setRemoteIdentification(remoteId);
		setIkeAuth(profile, ikeOptionsBuilder);

		for (final IkeSaProposal ikeProposal : getIkeSaProposals()) {
		ikeOptionsBuilder.addSaProposal(ikeProposal);
		}

		return ikeOptionsBuilder.build();
		}

		static ChildSessionParams buildChildSessionParams() {
		final TunnelModeChildSessionParams.Builder childOptionsBuilder =
		new TunnelModeChildSessionParams.Builder();

		for (final ChildSaProposal childProposal : getChildSaProposals()) {
		childOptionsBuilder.addSaProposal(childProposal);
		}

		childOptionsBuilder.addInternalAddressRequest(OsConstants.AF_INET);
		childOptionsBuilder.addInternalAddressRequest(OsConstants.AF_INET6);
		childOptionsBuilder.addInternalDnsServerRequest(OsConstants.AF_INET);
		childOptionsBuilder.addInternalDnsServerRequest(OsConstants.AF_INET6);

		return childOptionsBuilder.build();
		}

		private static void setIkeAuth(
		@NonNull Ikev2VpnProfile profile, @NonNull IkeSessionParams.Builder builder) {
		switch (profile.getType()) {
		case VpnProfile.TYPE_IKEV2_IPSEC_USER_PASS:
		final EapSessionConfig eapConfig =
		new EapSessionConfig.Builder()
		.setEapMsChapV2Config(profile.getUsername(), profile.getPassword())
		.build();
		builder.setAuthEap(profile.getServerRootCaCert(), eapConfig);
		break;
		case VpnProfile.TYPE_IKEV2_IPSEC_PSK:
		builder.setAuthPsk(profile.getPresharedKey());
		break;
		case VpnProfile.TYPE_IKEV2_IPSEC_RSA:
		builder.setAuthDigitalSignature(
		profile.getServerRootCaCert(),
		profile.getUserCert(),
		profile.getRsaPrivateKey());
		break;
		default:
		throw new IllegalArgumentException("Unknown auth method set");
		}
		}

		private static List<IkeSaProposal> getIkeSaProposals() {
		// TODO: filter this based on allowedAlgorithms
		final List<IkeSaProposal> proposals = new ArrayList<>();

		// Encryption Algorithms: Currently only AES_CBC is supported.
		final IkeSaProposal.Builder normalModeBuilder = new IkeSaProposal.Builder();

		// Currently only AES_CBC is supported.
		normalModeBuilder.addEncryptionAlgorithm(ENCRYPTION_ALGORITHM_AES_CBC, KEY_LEN_AES_256);
		normalModeBuilder.addEncryptionAlgorithm(ENCRYPTION_ALGORITHM_AES_CBC, KEY_LEN_AES_192);
		normalModeBuilder.addEncryptionAlgorithm(ENCRYPTION_ALGORITHM_AES_CBC, KEY_LEN_AES_128);

		// Authentication/Integrity Algorithms
		normalModeBuilder.addIntegrityAlgorithm(INTEGRITY_ALGORITHM_HMAC_SHA2_512_256);
		normalModeBuilder.addIntegrityAlgorithm(INTEGRITY_ALGORITHM_HMAC_SHA2_384_192);
		normalModeBuilder.addIntegrityAlgorithm(INTEGRITY_ALGORITHM_HMAC_SHA2_256_128);
		normalModeBuilder.addIntegrityAlgorithm(INTEGRITY_ALGORITHM_AES_XCBC_96);
		normalModeBuilder.addIntegrityAlgorithm(INTEGRITY_ALGORITHM_HMAC_SHA1_96);

		// Add AEAD options
		final IkeSaProposal.Builder aeadBuilder = new IkeSaProposal.Builder();
		aeadBuilder.addEncryptionAlgorithm(ENCRYPTION_ALGORITHM_AES_GCM_16, KEY_LEN_AES_256);
		aeadBuilder.addEncryptionAlgorithm(ENCRYPTION_ALGORITHM_AES_GCM_12, KEY_LEN_AES_256);
		aeadBuilder.addEncryptionAlgorithm(ENCRYPTION_ALGORITHM_AES_GCM_8, KEY_LEN_AES_256);
		aeadBuilder.addEncryptionAlgorithm(ENCRYPTION_ALGORITHM_AES_GCM_16, KEY_LEN_AES_192);
		aeadBuilder.addEncryptionAlgorithm(ENCRYPTION_ALGORITHM_AES_GCM_12, KEY_LEN_AES_192);
		aeadBuilder.addEncryptionAlgorithm(ENCRYPTION_ALGORITHM_AES_GCM_8, KEY_LEN_AES_192);
		aeadBuilder.addEncryptionAlgorithm(ENCRYPTION_ALGORITHM_AES_GCM_16, KEY_LEN_AES_128);
		aeadBuilder.addEncryptionAlgorithm(ENCRYPTION_ALGORITHM_AES_GCM_12, KEY_LEN_AES_128);
		aeadBuilder.addEncryptionAlgorithm(ENCRYPTION_ALGORITHM_AES_GCM_8, KEY_LEN_AES_128);

		// Add dh, prf for both builders
		for (final IkeSaProposal.Builder builder : Arrays.asList(normalModeBuilder, aeadBuilder)) {
		builder.addDhGroup(DH_GROUP_2048_BIT_MODP);
		builder.addDhGroup(DH_GROUP_1024_BIT_MODP);
		builder.addPseudorandomFunction(PSEUDORANDOM_FUNCTION_AES128_XCBC);
		builder.addPseudorandomFunction(PSEUDORANDOM_FUNCTION_HMAC_SHA1);
		}

		proposals.add(normalModeBuilder.build());
		proposals.add(aeadBuilder.build());
		return proposals;
		}

		private static List<ChildSaProposal> getChildSaProposals() {
		// TODO: filter this based on allowedAlgorithms
		final List<ChildSaProposal> proposals = new ArrayList<>();

		// Add non-AEAD options
		final ChildSaProposal.Builder normalModeBuilder = new ChildSaProposal.Builder();

		// Encryption Algorithms: Currently only AES_CBC is supported.
		normalModeBuilder.addEncryptionAlgorithm(ENCRYPTION_ALGORITHM_AES_CBC, KEY_LEN_AES_256);
		normalModeBuilder.addEncryptionAlgorithm(ENCRYPTION_ALGORITHM_AES_CBC, KEY_LEN_AES_192);
		normalModeBuilder.addEncryptionAlgorithm(ENCRYPTION_ALGORITHM_AES_CBC, KEY_LEN_AES_128);

		// Authentication/Integrity Algorithms
		normalModeBuilder.addIntegrityAlgorithm(INTEGRITY_ALGORITHM_HMAC_SHA2_512_256);
		normalModeBuilder.addIntegrityAlgorithm(INTEGRITY_ALGORITHM_HMAC_SHA2_384_192);
		normalModeBuilder.addIntegrityAlgorithm(INTEGRITY_ALGORITHM_HMAC_SHA2_256_128);
		normalModeBuilder.addIntegrityAlgorithm(INTEGRITY_ALGORITHM_HMAC_SHA1_96);

		// Add AEAD options
		final ChildSaProposal.Builder aeadBuilder = new ChildSaProposal.Builder();
		aeadBuilder.addEncryptionAlgorithm(ENCRYPTION_ALGORITHM_AES_GCM_16, KEY_LEN_AES_256);
		aeadBuilder.addEncryptionAlgorithm(ENCRYPTION_ALGORITHM_AES_GCM_12, KEY_LEN_AES_256);
		aeadBuilder.addEncryptionAlgorithm(ENCRYPTION_ALGORITHM_AES_GCM_8, KEY_LEN_AES_256);
		aeadBuilder.addEncryptionAlgorithm(ENCRYPTION_ALGORITHM_AES_GCM_16, KEY_LEN_AES_192);
		aeadBuilder.addEncryptionAlgorithm(ENCRYPTION_ALGORITHM_AES_GCM_12, KEY_LEN_AES_192);
		aeadBuilder.addEncryptionAlgorithm(ENCRYPTION_ALGORITHM_AES_GCM_8, KEY_LEN_AES_192);
		aeadBuilder.addEncryptionAlgorithm(ENCRYPTION_ALGORITHM_AES_GCM_16, KEY_LEN_AES_128);
		aeadBuilder.addEncryptionAlgorithm(ENCRYPTION_ALGORITHM_AES_GCM_12, KEY_LEN_AES_128);
		aeadBuilder.addEncryptionAlgorithm(ENCRYPTION_ALGORITHM_AES_GCM_8, KEY_LEN_AES_128);

		proposals.add(normalModeBuilder.build());
		proposals.add(aeadBuilder.build());
		return proposals;
		}

		static class IkeSessionCallbackImpl implements IkeSessionCallback {
		private final String mTag;
		private final Vpn.IkeV2VpnRunnerCallback mCallback;
		private final Network mNetwork;

		IkeSessionCallbackImpl(String tag, Vpn.IkeV2VpnRunnerCallback callback, Network network) {
		mTag = tag;
		mCallback = callback;
		mNetwork = network;
		}

		@Override
		public void onOpened(@NonNull IkeSessionConfiguration ikeSessionConfig) {
		Log.d(mTag, "IkeOpened for network " + mNetwork);
		// Nothing to do here.
		}

		@Override
		public void onClosed() {
		Log.d(mTag, "IkeClosed for network " + mNetwork);
		mCallback.onSessionLost(mNetwork); // Server requested session closure. Retry?
		}

		@Override
		public void onClosedExceptionally(@NonNull IkeException exception) {
		Log.d(mTag, "IkeClosedExceptionally for network " + mNetwork, exception);
		mCallback.onSessionLost(mNetwork);
		}

		@Override
		public void onError(@NonNull IkeProtocolException exception) {
		Log.d(mTag, "IkeError for network " + mNetwork, exception);
		// Non-fatal, log and continue.
		}
		}

		static class ChildSessionCallbackImpl implements ChildSessionCallback {
		private final String mTag;
		private final Vpn.IkeV2VpnRunnerCallback mCallback;
		private final Network mNetwork;

		ChildSessionCallbackImpl(String tag, Vpn.IkeV2VpnRunnerCallback callback, Network network) {
		mTag = tag;
		mCallback = callback;
		mNetwork = network;
		}

		@Override
		public void onOpened(@NonNull ChildSessionConfiguration childConfig) {
		Log.d(mTag, "ChildOpened for network " + mNetwork);
		mCallback.onChildOpened(mNetwork, childConfig);
		}

		@Override
		public void onClosed() {
		Log.d(mTag, "ChildClosed for network " + mNetwork);
		mCallback.onSessionLost(mNetwork);
		}

		@Override
		public void onClosedExceptionally(@NonNull IkeException exception) {
		Log.d(mTag, "ChildClosedExceptionally for network " + mNetwork, exception);
		mCallback.onSessionLost(mNetwork);
		}

		@Override
		public void onIpSecTransformCreated(@NonNull IpSecTransform transform, int direction) {
		Log.d(mTag, "ChildTransformCreated; Direction: " + direction + "; network " + mNetwork);
		mCallback.onChildTransformCreated(mNetwork, transform, direction);
		}

		@Override
		public void onIpSecTransformDeleted(@NonNull IpSecTransform transform, int direction) {
		// Nothing to be done; no references to the IpSecTransform are held by the
		// Ikev2VpnRunner (or this callback class), and this transform will be closed by the
		// IKE library.
		Log.d(mTag,
		"ChildTransformDeleted; Direction: " + direction + "; for network " + mNetwork);
		}
		}

		static class Ikev2VpnNetworkCallback extends NetworkCallback {
		private final String mTag;
		private final Vpn.IkeV2VpnRunnerCallback mCallback;

		Ikev2VpnNetworkCallback(String tag, Vpn.IkeV2VpnRunnerCallback callback) {
		mTag = tag;
		mCallback = callback;
		}

		@Override
		public void onAvailable(@NonNull Network network) {
		Log.d(mTag, "Starting IKEv2/IPsec session on new network: " + network);
		mCallback.onDefaultNetworkChanged(network);
		}

		@Override
		public void onLost(@NonNull Network network) {
		Log.d(mTag, "Tearing down; lost network: " + network);
		mCallback.onSessionLost(network);
		}
		}

		/**
		* Identity parsing logic using similar logic to open source implementations of IKEv2
		*
		* <p>This method does NOT support using type-prefixes (eg 'fqdn:' or 'keyid'), or ASN.1 encoded
		* identities.
		*/
		private static IkeIdentification parseIkeIdentification(@NonNull String identityStr) {
		// TODO: Add identity formatting to public API javadocs.
		if (identityStr.contains("@")) {
		if (identityStr.startsWith("@#")) {
		// KEY_ID
		final String hexStr = identityStr.substring(2);
		return new IkeKeyIdIdentification(HexDump.hexStringToByteArray(hexStr));
		} else if (identityStr.startsWith("@@")) {
		// RFC822 (USER_FQDN)
		return new IkeRfc822AddrIdentification(identityStr.substring(2));
		} else if (identityStr.startsWith("@")) {
		// FQDN
		return new IkeFqdnIdentification(identityStr.substring(1));
		} else {
		// RFC822 (USER_FQDN)
		return new IkeRfc822AddrIdentification(identityStr);
		}
		} else if (InetAddresses.isNumericAddress(identityStr)) {
		final InetAddress addr = InetAddresses.parseNumericAddress(identityStr);
		if (addr instanceof Inet4Address) {
		// IPv4
		return new IkeIpv4AddrIdentification((Inet4Address) addr);
		} else if (addr instanceof Inet6Address) {
		// IPv6
		return new IkeIpv6AddrIdentification((Inet6Address) addr);
		} else {
		throw new IllegalArgumentException("IP version not supported");
		}
		} else {
		if (identityStr.contains(":")) {
		// KEY_ID
		return new IkeKeyIdIdentification(identityStr.getBytes());
		} else {
		// FQDN
		return new IkeFqdnIdentification(identityStr);
		}
		}
		}

		static Collection<RouteInfo> getRoutesFromTrafficSelectors(
		List<IkeTrafficSelector> trafficSelectors) {
		final HashSet<RouteInfo> routes = new HashSet<>();

		for (final IkeTrafficSelector selector : trafficSelectors) {
		for (final IpPrefix prefix :
		new IpRange(selector.startingAddress, selector.endingAddress).asIpPrefixes()) {
		routes.add(new RouteInfo(prefix, null));
		}
		}

		return routes;
		}
		}

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -148,6 +148,7 @@ public class VpnTest {
		@Mock private AppOpsManager mAppOps;
		@Mock private NotificationManager mNotificationManager;
		@Mock private Vpn.SystemServices mSystemServices;
		@Mock private Vpn.Ikev2SessionCreator mIkev2SessionCreator;
		@Mock private ConnectivityManager mConnectivityManager;
		@Mock private KeyStore mKeyStore;
		private final VpnProfile mVpnProfile = new VpnProfile("key");
		@@ -867,7 +868,8 @@ public class VpnTest {
		* Mock some methods of vpn object.
		*/
		private Vpn createVpn(@UserIdInt int userId) {
		return new Vpn(Looper.myLooper(), mContext, mNetService, userId, mSystemServices);
		return new Vpn(Looper.myLooper(), mContext, mNetService,
		userId, mSystemServices, mIkev2SessionCreator);
		}

		private static void assertBlocked(Vpn vpn, int... uids) {