Make Settings app not use cleartext network traffic.
This CL switches the only two places which use cleartext HTTP in this app to HTTPS. It also declares in the AndroidManifest.xml that this app does not use cleartext network traffic, thus asking the platform and tools to block any such traffic from this app on best effort basis. NOTE: The only test that uses cleartext HTTP traffic is in VpnTests. This test makes cleartext HTTP requests to a third-party service which does not appear to support HTTPS. Thus, this CL temporarily relaxes the cleartext traffic policy during this test to keep it working. The correct longer-term fix for this test is to use a service that offers HTTPS. Bug: 19215516 Change-Id: Idf1ff8c66d43d77ef2114b2f1b676927844150e5
This commit is contained in:
@@ -82,7 +82,8 @@
|
||||
android:hardwareAccelerated="true"
|
||||
android:requiredForAllUsers="true"
|
||||
android:supportsRtl="true"
|
||||
android:allowBackup="false">
|
||||
android:allowBackup="false"
|
||||
android:usesCleartextTraffic="false">
|
||||
|
||||
<!-- Settings -->
|
||||
|
||||
|
@@ -754,7 +754,7 @@ public class RadioInfo extends Activity {
|
||||
HttpURLConnection urlConnection = null;
|
||||
try {
|
||||
// TODO: Hardcoded for now, make it UI configurable
|
||||
URL url = new URL("http://www.google.com");
|
||||
URL url = new URL("https://www.google.com");
|
||||
urlConnection = (HttpURLConnection) url.openConnection();
|
||||
if (urlConnection.getResponseCode() == 200) {
|
||||
mHttpClientTestResult = "Pass";
|
||||
|
@@ -396,7 +396,7 @@ public class WifiStatusTest extends Activity {
|
||||
HttpURLConnection urlConnection = null;
|
||||
try {
|
||||
// TODO: Hardcoded for now, make it UI configurable
|
||||
URL url = new URL("http://www.google.com");
|
||||
URL url = new URL("https://www.google.com");
|
||||
urlConnection = (HttpURLConnection) url.openConnection();
|
||||
if (urlConnection.getResponseCode() == 200) {
|
||||
mHttpClientTestResult = "Pass";
|
||||
|
@@ -24,6 +24,7 @@ import android.os.RemoteException;
|
||||
import android.os.ServiceManager;
|
||||
import android.security.Credentials;
|
||||
import android.security.KeyStore;
|
||||
import android.security.NetworkSecurityPolicy;
|
||||
import android.test.InstrumentationTestCase;
|
||||
import android.test.InstrumentationTestRunner;
|
||||
import android.test.suitebuilder.annotation.LargeTest;
|
||||
@@ -225,6 +226,13 @@ public class VpnTests extends InstrumentationTestCase {
|
||||
private String getIpAddress() {
|
||||
String ip = null;
|
||||
HttpURLConnection urlConnection = null;
|
||||
// TODO: Rewrite this test to use an HTTPS URL.
|
||||
// Because this test uses cleartext HTTP, the network security policy of this app needs to
|
||||
// be temporarily relaxed to permit such traffic.
|
||||
NetworkSecurityPolicy networkSecurityPolicy = NetworkSecurityPolicy.getInstance();
|
||||
boolean cleartextTrafficPermittedBeforeTest =
|
||||
networkSecurityPolicy.isCleartextTrafficPermitted();
|
||||
networkSecurityPolicy.setCleartextTrafficPermitted(true);
|
||||
try {
|
||||
URL url = new URL(EXTERNAL_SERVER);
|
||||
urlConnection = (HttpURLConnection) url.openConnection();
|
||||
@@ -248,6 +256,7 @@ public class VpnTests extends InstrumentationTestCase {
|
||||
} catch (JSONException e) {
|
||||
Log.e(TAG, "exception while creating JSONObject: " + e.toString());
|
||||
} finally {
|
||||
networkSecurityPolicy.setCleartextTrafficPermitted(cleartextTrafficPermittedBeforeTest);
|
||||
if (urlConnection != null) {
|
||||
urlConnection.disconnect();
|
||||
}
|
||||
|
Reference in New Issue
Block a user