Merge "Set transport types to resolver" into rvc-dev am: 01cc8a3372 am: 6744129a1e (f6b199d4) · Commits · e / os / android_frameworks_base

services/core/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -127,7 +127,7 @@ java_library_static {
		"android.hardware.soundtrigger-V2.3-java",
		"android.hidl.manager-V1.2-java",
		"capture_state_listener-aidl-java",
		"dnsresolver_aidl_interface-V2-java",
		"dnsresolver_aidl_interface-V4-java",
		"netd_event_listener_interface-java",
		"overlayable_policy_aidl-java",
		],

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

+13 −1

Original line number	Diff line number	Diff line
		@@ -3339,6 +3339,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
		getNetworkPermission(networkAgent.networkCapabilities));
		}
		mDnsResolver.createNetworkCache(networkAgent.network.netId);
		mDnsManager.updateTransportsForNetwork(networkAgent.network.netId,
		networkAgent.networkCapabilities.getTransportTypes());
		return true;
		} catch (RemoteException \| ServiceSpecificException e) {
		loge("Error creating network " + networkAgent.network.netId + ": "
		@@ -6088,7 +6090,13 @@ public class ConnectivityService extends IConnectivityManager.Stub
		log("Setting DNS servers for network " + netId + " to " + dnses);
		}
		try {
		mDnsManager.setDnsConfigurationForNetwork(netId, newLp, isDefaultNetwork);
		mDnsManager.noteDnsServersForNetwork(netId, newLp);
		// TODO: netd should listen on [::1]:53 and proxy queries to the current
		// default network, and we should just set net.dns1 to ::1, not least
		// because applications attempting to use net.dns resolvers will bypass
		// the privacy protections of things like DNS-over-TLS.
		if (isDefaultNetwork) mDnsManager.setDefaultDnsSystemProperties(newLp.getDnsServers());
		mDnsManager.flushVmDnsCache();
		} catch (Exception e) {
		loge("Exception in setDnsConfigurationForNetwork: " + e);
		}
		@@ -6286,6 +6294,10 @@ public class ConnectivityService extends IConnectivityManager.Stub
		// bubble those changes through.
		updateAllVpnsCapabilities();
		}

		if (!newNc.equalsTransportTypes(prevNc)) {
		mDnsManager.updateTransportsForNetwork(nai.network.netId, newNc.getTransportTypes());
		}
		}

		/**

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

+46 −13

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ import static android.provider.Settings.Global.PRIVATE_DNS_DEFAULT_MODE;
		import static android.provider.Settings.Global.PRIVATE_DNS_MODE;
		import static android.provider.Settings.Global.PRIVATE_DNS_SPECIFIER;

		import android.annotation.NonNull;
		import android.content.ContentResolver;
		import android.content.Context;
		import android.content.Intent;
		@@ -34,6 +35,7 @@ import android.net.IDnsResolver;
		import android.net.LinkProperties;
		import android.net.Network;
		import android.net.NetworkUtils;
		import android.net.ResolverOptionsParcel;
		import android.net.ResolverParamsParcel;
		import android.net.Uri;
		import android.net.shared.PrivateDnsConfig;
		@@ -237,6 +239,8 @@ public class DnsManager {
		// TODO: Replace these Maps with SparseArrays.
		private final Map<Integer, PrivateDnsConfig> mPrivateDnsMap;
		private final Map<Integer, PrivateDnsValidationStatuses> mPrivateDnsValidationMap;
		private final Map<Integer, LinkProperties> mLinkPropertiesMap;
		private final Map<Integer, int[]> mTransportsMap;

		private int mNumDnsEntries;
		private int mSampleValidity;
		@@ -253,6 +257,8 @@ public class DnsManager {
		mSystemProperties = sp;
		mPrivateDnsMap = new HashMap<>();
		mPrivateDnsValidationMap = new HashMap<>();
		mLinkPropertiesMap = new HashMap<>();
		mTransportsMap = new HashMap<>();

		// TODO: Create and register ContentObservers to track every setting
		// used herein, posting messages to respond to changes.
		@@ -265,6 +271,8 @@ public class DnsManager {
		public void removeNetwork(Network network) {
		mPrivateDnsMap.remove(network.netId);
		mPrivateDnsValidationMap.remove(network.netId);
		mTransportsMap.remove(network.netId);
		mLinkPropertiesMap.remove(network.netId);
		}

		public PrivateDnsConfig updatePrivateDns(Network network, PrivateDnsConfig cfg) {
		@@ -304,9 +312,35 @@ public class DnsManager {
		statuses.updateStatus(update);
		}

		public void setDnsConfigurationForNetwork(
		int netId, LinkProperties lp, boolean isDefaultNetwork) {
		/**
		* When creating a new network or transport types are changed in a specific network,
		* transport types are always saved to a hashMap before update dns config.
		* When destroying network, the specific network will be removed from the hashMap.
		* The hashMap is always accessed on the same thread.
		*/
		public void updateTransportsForNetwork(int netId, @NonNull int[] transportTypes) {
		mTransportsMap.put(netId, transportTypes);
		sendDnsConfigurationForNetwork(netId);
		}

		/**
		* When {@link LinkProperties} are changed in a specific network, they are
		* always saved to a hashMap before update dns config.
		* When destroying network, the specific network will be removed from the hashMap.
		* The hashMap is always accessed on the same thread.
		*/
		public void noteDnsServersForNetwork(int netId, @NonNull LinkProperties lp) {
		mLinkPropertiesMap.put(netId, lp);
		sendDnsConfigurationForNetwork(netId);
		}

		/**
		* Send dns configuration parameters to resolver for a given network.
		*/
		public void sendDnsConfigurationForNetwork(int netId) {
		final LinkProperties lp = mLinkPropertiesMap.get(netId);
		final int[] transportTypes = mTransportsMap.get(netId);
		if (lp == null \|\| transportTypes == null) return;
		updateParametersSettings();
		final ResolverParamsParcel paramsParcel = new ResolverParamsParcel();

		@@ -319,15 +353,16 @@ public class DnsManager {
		// networks like IMS.
		final PrivateDnsConfig privateDnsCfg = mPrivateDnsMap.getOrDefault(netId,
		PRIVATE_DNS_OFF);

		final boolean useTls = privateDnsCfg.useTls;
		final boolean strictMode = privateDnsCfg.inStrictMode();

		paramsParcel.netId = netId;
		paramsParcel.sampleValiditySeconds = mSampleValidity;
		paramsParcel.successThreshold = mSuccessThreshold;
		paramsParcel.minSamples = mMinSamples;
		paramsParcel.maxSamples = mMaxSamples;
		paramsParcel.servers = NetworkUtils.makeStrings(lp.getDnsServers());
		paramsParcel.servers =
		NetworkUtils.makeStrings(lp.getDnsServers());
		paramsParcel.domains = getDomainStrings(lp.getDomains());
		paramsParcel.tlsName = strictMode ? privateDnsCfg.hostname : "";
		paramsParcel.tlsServers =
		@@ -337,6 +372,8 @@ public class DnsManager {
		.collect(Collectors.toList()))
		: useTls ? paramsParcel.servers // Opportunistic
		: new String[0]; // Off
		paramsParcel.resolverOptions = new ResolverOptionsParcel();
		paramsParcel.transportTypes = transportTypes;
		// Prepare to track the validation status of the DNS servers in the
		// resolver config when private DNS is in opportunistic or strict mode.
		if (useTls) {
		@@ -349,7 +386,7 @@ public class DnsManager {
		mPrivateDnsValidationMap.remove(netId);
		}

		Slog.d(TAG, String.format("setDnsConfigurationForNetwork(%d, %s, %s, %d, %d, %d, %d, "
		Slog.d(TAG, String.format("sendDnsConfigurationForNetwork(%d, %s, %s, %d, %d, %d, %d, "
		+ "%d, %d, %s, %s)", paramsParcel.netId, Arrays.toString(paramsParcel.servers),
		Arrays.toString(paramsParcel.domains), paramsParcel.sampleValiditySeconds,
		paramsParcel.successThreshold, paramsParcel.minSamples,
		@@ -363,13 +400,6 @@ public class DnsManager {
		Slog.e(TAG, "Error setting DNS configuration: " + e);
		return;
		}

		// TODO: netd should listen on [::1]:53 and proxy queries to the current
		// default network, and we should just set net.dns1 to ::1, not least
		// because applications attempting to use net.dns resolvers will bypass
		// the privacy protections of things like DNS-over-TLS.
		if (isDefaultNetwork) setDefaultDnsSystemProperties(lp.getDnsServers());
		flushVmDnsCache();
		}

		public void setDefaultDnsSystemProperties(Collection<InetAddress> dnses) {
		@@ -384,7 +414,10 @@ public class DnsManager {
		mNumDnsEntries = last;
		}

		private void flushVmDnsCache() {
		/**
		* Flush DNS caches and events work before boot has completed.
		*/
		public void flushVmDnsCache() {
		/*
		* Tell the VMs to toss their DNS caches
		*/

services/net/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -12,7 +12,7 @@ java_library_static {
		":services.net-sources",
		],
		static_libs: [
		"dnsresolver_aidl_interface-V2-java",
		"dnsresolver_aidl_interface-V4-java",
		"netd_aidl_interface-V3-java",
		"netlink-client",
		"networkstack-client",

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

+23 −0

Original line number	Diff line number	Diff line
		@@ -4907,6 +4907,29 @@ public class ConnectivityServiceTest {
		reset(mMockDnsResolver);
		}

		@Test
		public void testDnsConfigurationTransTypesPushed() throws Exception {
		// Clear any interactions that occur as a result of CS starting up.
		reset(mMockDnsResolver);

		final NetworkRequest request = new NetworkRequest.Builder()
		.clearCapabilities().addCapability(NET_CAPABILITY_INTERNET)
		.build();
		final TestNetworkCallback callback = new TestNetworkCallback();
		mCm.registerNetworkCallback(request, callback);

		mWiFiNetworkAgent = new TestNetworkAgentWrapper(TRANSPORT_WIFI);
		mWiFiNetworkAgent.connect(false);
		callback.expectAvailableCallbacksUnvalidated(mWiFiNetworkAgent);
		verify(mMockDnsResolver, times(1)).createNetworkCache(
		eq(mWiFiNetworkAgent.getNetwork().netId));
		verify(mMockDnsResolver, times(2)).setResolverConfiguration(
		mResolverParamsParcelCaptor.capture());
		final ResolverParamsParcel resolverParams = mResolverParamsParcelCaptor.getValue();
		assertContainsExactly(resolverParams.transportTypes, TRANSPORT_WIFI);
		reset(mMockDnsResolver);
		}

		@Test
		public void testPrivateDnsNotification() throws Exception {
		NetworkRequest request = new NetworkRequest.Builder()