Merge branch '1980-catch-security-exceptions-from-connectivity-manager' into 'master'

Catch SecurityExceptions from all ConnectivityManager calls

Closes #1980

See merge request briar/briar!1634

bramble-android/src/main/java/org/briarproject/bramble/network/AndroidNetworkManager.java

@@ -11,6 +11,8 @@ import android.net.LinkAddress;
 import android.net.LinkProperties;
 import android.net.Network;
 import android.net.NetworkInfo;
+import android.net.wifi.WifiInfo;
+import android.net.wifi.WifiManager;
 
 import org.briarproject.bramble.api.event.EventBus;
 import org.briarproject.bramble.api.event.EventExecutor;
@@ -38,6 +40,7 @@ import javax.annotation.Nullable;
 import javax.inject.Inject;
 
 import static android.content.Context.CONNECTIVITY_SERVICE;
+import static android.content.Context.WIFI_SERVICE;
 import static android.content.Intent.ACTION_SCREEN_OFF;
 import static android.content.Intent.ACTION_SCREEN_ON;
 import static android.net.ConnectivityManager.CONNECTIVITY_ACTION;
@@ -111,6 +114,8 @@ class AndroidNetworkManager implements NetworkManager, Service {
 
 	@Override
 	public NetworkStatus getNetworkStatus() {
+		// https://issuetracker.google.com/issues/175055271
+		try {
 			NetworkInfo net = connectivityManager.getActiveNetworkInfo();
 			boolean connected = net != null && net.isConnected();
 			boolean wifi = false, ipv6Only = false;
@@ -120,6 +125,26 @@ class AndroidNetworkManager implements NetworkManager, Service {
 				else ipv6Only = areAllAvailableNetworksIpv6Only();
 			}
 			return new NetworkStatus(connected, wifi, ipv6Only);
+		} catch (SecurityException e) {
+			logException(LOG, WARNING, e);
+			// Without the ConnectivityManager we can't detect whether we have
+			// internet access. Assume we do, which is probably less harmful
+			// than assuming we don't. Likewise, assume the connection is
+			// IPv6-only. Fall back to the WifiManager to detect whether we
+			// have a wifi connection.
+			LOG.info("ConnectivityManager is broken, guessing connectivity");
+			boolean connected = true, wifi = false, ipv6Only = true;
+			WifiManager wm = (WifiManager) app.getSystemService(WIFI_SERVICE);
+			if (wm != null) {
+				WifiInfo info = wm.getConnectionInfo();
+				if (info != null && info.getIpAddress() != 0) {
+					LOG.info("Connected to wifi");
+					wifi = true;
+					ipv6Only = false;
+				}
+			}
+			return new NetworkStatus(connected, wifi, ipv6Only);
+		}
 	}
 
 	/**
@@ -130,6 +155,8 @@ class AndroidNetworkManager implements NetworkManager, Service {
 	 */
 	@TargetApi(23)
 	private boolean isActiveNetworkIpv6Only() {
+		// https://issuetracker.google.com/issues/175055271
+		try {
 			Network net = connectivityManager.getActiveNetwork();
 			if (net == null) {
 				LOG.info("No active network");
@@ -147,6 +174,10 @@ class AndroidNetworkManager implements NetworkManager, Service {
 				if (!addr.isMulticastAddress()) hasIpv6Unicast = true;
 			}
 			return hasIpv6Unicast;
+		} catch (SecurityException e) {
+			logException(LOG, WARNING, e);
+			return false;
+		}
 	}
 
 	/**

bramble-android/src/main/java/org/briarproject/bramble/plugin/tcp/AndroidLanTcpPlugin.java

@@ -175,17 +175,25 @@ class AndroidLanTcpPlugin extends LanTcpPlugin {
 	@TargetApi(21)
 	@Nullable
 	private InetAddress getWifiClientIpv6Address() {
+		// https://issuetracker.google.com/issues/175055271
+		try {
 			for (Network net : connectivityManager.getAllNetworks()) {
 				NetworkCapabilities caps =
 						connectivityManager.getNetworkCapabilities(net);
-			if (caps == null || !caps.hasTransport(TRANSPORT_WIFI)) continue;
+				if (caps == null || !caps.hasTransport(TRANSPORT_WIFI)) {
-			LinkProperties props = connectivityManager.getLinkProperties(net);
+					continue;
+				}
+				LinkProperties props =
+						connectivityManager.getLinkProperties(net);
 				if (props == null) continue;
 				for (LinkAddress linkAddress : props.getLinkAddresses()) {
 					InetAddress addr = linkAddress.getAddress();
 					if (isIpv6LinkLocalAddress(addr)) return addr;
 				}
 			}
+		} catch (SecurityException e) {
+			logException(LOG, WARNING, e);
+		}
 		return null;
 	}
 
@@ -227,6 +235,8 @@ class AndroidLanTcpPlugin extends LanTcpPlugin {
 	// network's socket factory may try to connect via another network
 	private SocketFactory getSocketFactory() {
 		if (SDK_INT < 21) return SocketFactory.getDefault();
+		// https://issuetracker.google.com/issues/175055271
+		try {
 			for (Network net : connectivityManager.getAllNetworks()) {
 				NetworkCapabilities caps =
 						connectivityManager.getNetworkCapabilities(net);
@@ -234,6 +244,9 @@ class AndroidLanTcpPlugin extends LanTcpPlugin {
 					return net.getSocketFactory();
 				}
 			}
+		} catch (SecurityException e) {
+			logException(LOG, WARNING, e);
+		}
 		LOG.warning("Could not find suitable socket factory");
 		return SocketFactory.getDefault();
 	}

briar-android/src/main/java/org/briarproject/briar/android/reporting/BriarReportCollector.java

@@ -198,6 +198,8 @@ class BriarReportCollector {
 	private ReportItem getConnectivity() {
 		MultiReportInfo connectivityInfo = new MultiReportInfo();
 
+		// https://issuetracker.google.com/issues/175055271
+		try {
 			// Is mobile data available?
 			ConnectivityManager cm = requireNonNull(
 					getSystemService(ctx, ConnectivityManager.class));
@@ -231,16 +233,19 @@ class BriarReportCollector {
 			boolean wifiAvailable = wifi != null && wifi.isAvailable();
 			connectivityInfo.add("WifiAvailable", wifiAvailable);
 
+			// Is wifi connected?
+			boolean wifiConnected = wifi != null && wifi.isConnected();
+			connectivityInfo.add("WifiConnected", wifiConnected);
+		} catch (SecurityException e) {
+			connectivityInfo.add("ConnectivityManagerException", e.toString());
+		}
+
 		// Is wifi enabled?
 		WifiManager wm = getSystemService(ctx, WifiManager.class);
 		boolean wifiEnabled = wm != null &&
 				wm.getWifiState() == WIFI_STATE_ENABLED;
 		connectivityInfo.add("WifiEnabled", wifiEnabled);
 
-		// Is wifi connected?
-		boolean wifiConnected = wifi != null && wifi.isConnected();
-		connectivityInfo.add("WifiConnected", wifiConnected);
-
 		// Is wifi direct supported?
 		boolean wifiDirect = ctx.getSystemService(WIFI_P2P_SERVICE) != null;
 		connectivityInfo.add("WiFiDirectSupported", wifiDirect);