Merge branch 'no-dns-fallback' into 'master'

No dns fallback

See merge request leap/bitmask_android!99

4 files changed, 28 insertions, 11 deletions

diff --git a/app/src/test/java/se/leap/bitmaskclient/ProviderTest.java b/app/src/test/java/se/leap/bitmaskclient/ProviderTest.java
index c4b8f65e..0f9d358e 100644
--- a/app/src/test/java/se/leap/bitmaskclient/ProviderTest.java
+++ b/app/src/test/java/se/leap/bitmaskclient/ProviderTest.java
@@ -53,6 +53,8 @@ public class ProviderTest {
                 "https://pt.demo.bitmask.net",
                 null,
                 null,
+                null,
+                null,
                 "ptdemo.bitmask.eip-service.json");
         assertTrue(p1.supportsPluggableTransports());
     }
@@ -63,6 +65,8 @@ public class ProviderTest {
                 null,
                 null,
                 null,
+                null,
+                null,
                 "eip-service-two-gateways.json");
         assertFalse(p1.supportsPluggableTransports());
     }
diff --git a/app/src/test/java/se/leap/bitmaskclient/eip/GatewaysManagerTest.java b/app/src/test/java/se/leap/bitmaskclient/eip/GatewaysManagerTest.java
index b37b3474..417c4bfc 100644
--- a/app/src/test/java/se/leap/bitmaskclient/eip/GatewaysManagerTest.java
+++ b/app/src/test/java/se/leap/bitmaskclient/eip/GatewaysManagerTest.java
@@ -107,7 +107,7 @@ public class GatewaysManagerTest {
 
     @Test
     public void testGatewayManagerFromCurrentProvider_misconfiguredProvider_noGateways() throws IOException, NullPointerException {
-        Provider provider = getProvider(null, null, null, "ptdemo_misconfigured_gateway.json");
+        Provider provider = getProvider(null, null, null, null, null, "ptdemo_misconfigured_gateway.json");
         MockHelper.mockProviderObserver(provider);
         GatewaysManager gatewaysManager = new GatewaysManager(mockContext);
         assertEquals(0, gatewaysManager.size());
@@ -115,7 +115,7 @@ public class GatewaysManagerTest {
 
     @Test
     public void testGatewayManagerFromCurrentProvider_threeGateways() {
-        Provider provider = getProvider(null, null, null, "ptdemo_three_mixed_gateways.json");
+        Provider provider = getProvider(null, null, null,null, null, "ptdemo_three_mixed_gateways.json");
         MockHelper.mockProviderObserver(provider);
         GatewaysManager gatewaysManager = new GatewaysManager(mockContext);
         assertEquals(3, gatewaysManager.size());
@@ -123,7 +123,7 @@ public class GatewaysManagerTest {
 
     @Test
     public void TestGetPosition_VpnProfileExtistingObfs4_returnPositionZero() throws JSONException, ConfigParser.ConfigParseError, IOException {
-        Provider provider = getProvider(null, null, null, "ptdemo_three_mixed_gateways.json");
+        Provider provider = getProvider(null, null, null, null, null, "ptdemo_three_mixed_gateways.json");
         JSONObject eipServiceJson = provider.getEipServiceJson();
         JSONObject gateway1 = eipServiceJson.getJSONArray(GATEWAYS).getJSONObject(0);
         MockHelper.mockProviderObserver(provider);
@@ -140,7 +140,7 @@ public class GatewaysManagerTest {
 
     @Test
     public void TestGetPosition_VpnProfileExtistingOpenvpn_returnPositionZero() throws JSONException, ConfigParser.ConfigParseError, IOException {
-        Provider provider = getProvider(null, null, null, "ptdemo_three_mixed_gateways.json");
+        Provider provider = getProvider(null, null, null, null, null, "ptdemo_three_mixed_gateways.json");
         JSONObject eipServiceJson = provider.getEipServiceJson();
         JSONObject gateway1 = eipServiceJson.getJSONArray(GATEWAYS).getJSONObject(0);
         MockHelper.mockProviderObserver(provider);
@@ -157,7 +157,7 @@ public class GatewaysManagerTest {
 
     @Test
     public void TestGetPosition_VpnProfileDifferentIp_returnMinusOne() throws JSONException, ConfigParser.ConfigParseError, IOException {
-        Provider provider = getProvider(null, null, null, "ptdemo_three_mixed_gateways.json");
+        Provider provider = getProvider(null, null, null, null, null, "ptdemo_three_mixed_gateways.json");
         JSONObject eipServiceJson = provider.getEipServiceJson();
         JSONObject gateway1 = eipServiceJson.getJSONArray(GATEWAYS).getJSONObject(0);
         MockHelper.mockProviderObserver(provider);
@@ -174,7 +174,7 @@ public class GatewaysManagerTest {
 
     @Test
     public void TestGetPosition_VpnProfileMoscow_returnOne() throws JSONException, ConfigParser.ConfigParseError, IOException {
-        Provider provider = getProvider(null, null, null, "ptdemo_three_mixed_gateways.json");
+        Provider provider = getProvider(null, null, null, null, null, "ptdemo_three_mixed_gateways.json");
         JSONObject eipServiceJson = provider.getEipServiceJson();
         JSONObject gateway1 = eipServiceJson.getJSONArray(GATEWAYS).getJSONObject(1);
         MockHelper.mockProviderObserver(provider);
@@ -191,7 +191,7 @@ public class GatewaysManagerTest {
 
     @Test
     public void TestSelectN_selectFirstObfs4Connection_returnThirdGateway() throws JSONException, ConfigParser.ConfigParseError, IOException {
-        Provider provider = getProvider(null, null, null, "ptdemo_two_openvpn_one_pt_gateways.json");
+        Provider provider = getProvider(null, null, null, null, null, "ptdemo_two_openvpn_one_pt_gateways.json");
         JSONObject eipServiceJson = provider.getEipServiceJson();
         JSONObject gateway3 = eipServiceJson.getJSONArray(GATEWAYS).getJSONObject(2);
 
diff --git a/app/src/test/java/se/leap/bitmaskclient/eip/ProviderApiManagerTest.java b/app/src/test/java/se/leap/bitmaskclient/eip/ProviderApiManagerTest.java
index dde0601d..753a9474 100644
--- a/app/src/test/java/se/leap/bitmaskclient/eip/ProviderApiManagerTest.java
+++ b/app/src/test/java/se/leap/bitmaskclient/eip/ProviderApiManagerTest.java
@@ -269,7 +269,7 @@ public class ProviderApiManagerTest {
 
     @Test
     public void test_handleIntentSetupProvider_preseededProviderAndCA_outdatedCertificate() throws IOException, CertificateEncodingException, NoSuchAlgorithmException, JSONException {
-        Provider provider = getProvider(null ,"outdated_cert.pem", null, null);
+        Provider provider = getProvider(null ,null, null, "outdated_cert.pem", null, null);
         mockProviderApiConnector(NO_ERROR);
         providerApiManager = new ProviderApiManager(mockPreferences, mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
 
@@ -386,7 +386,7 @@ public class ProviderApiManagerTest {
     @Test
     public void test_handleIntentSetupProvider_outdatedPreseededProviderAndCA_successfulConfiguration() throws IOException, CertificateEncodingException, NoSuchAlgorithmException, JSONException {
 
-        Provider provider = getProvider(null, null, "riseup_net_outdated_config.json", null);
+        Provider provider = getProvider(null, null, null, null, "riseup_net_outdated_config.json", null);
 
         mockFingerprintForCertificate(" a5244308a1374709a9afce95e3ae47c1b44bc2398c0a70ccbf8b3a8a97f29494");
         mockProviderApiConnector(NO_ERROR);
diff --git a/app/src/test/java/se/leap/bitmaskclient/testutils/MockHelper.java b/app/src/test/java/se/leap/bitmaskclient/testutils/MockHelper.java
index 481c87cb..c0fc6531 100644
--- a/app/src/test/java/se/leap/bitmaskclient/testutils/MockHelper.java
+++ b/app/src/test/java/se/leap/bitmaskclient/testutils/MockHelper.java
@@ -21,6 +21,7 @@ import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.UnknownHostException;
 import java.security.NoSuchAlgorithmException;
 import java.security.cert.CertificateEncodingException;
 import java.security.cert.X509Certificate;
@@ -398,6 +399,9 @@ public class MockHelper {
                         return providerFromPrefs.getDefinition().toString();
                     case Provider.CA_CERT_FINGERPRINT:
                         return providerFromPrefs.getCaCertFingerprint();
+                    case Provider.CA_CERT:
+                        return providerFromPrefs.getCaCert();
+
                 }
                 return null;
             }
@@ -434,14 +438,23 @@ public class MockHelper {
         BackendMockProvider.provideBackendResponsesFor(errorCase);
     }
 
-    public static OkHttpClientGenerator mockClientGenerator() {
+    public static OkHttpClientGenerator mockClientGenerator(boolean resolveDNS) throws UnknownHostException {
         OkHttpClientGenerator mockClientGenerator = mock(OkHttpClientGenerator.class);
-        OkHttpClient mockedOkHttpClient = mock(OkHttpClient.class);
+        OkHttpClient mockedOkHttpClient = mock(OkHttpClient.class, RETURNS_DEEP_STUBS);
         when(mockClientGenerator.initCommercialCAHttpClient(any(JSONObject.class))).thenReturn(mockedOkHttpClient);
         when(mockClientGenerator.initSelfSignedCAHttpClient(anyString(), any(JSONObject.class))).thenReturn(mockedOkHttpClient);
+        if (resolveDNS) {
+            when(mockedOkHttpClient.dns().lookup(anyString())).thenReturn(new ArrayList<>());
+        } else {
+            when(mockedOkHttpClient.dns().lookup(anyString())).thenThrow(new UnknownHostException());
+        }
         return mockClientGenerator;
     }
 
+    public static OkHttpClientGenerator mockClientGenerator() throws UnknownHostException {
+        return mockClientGenerator(true);
+    }
+
     public static Resources mockResources(InputStream inputStream) throws IOException, JSONException {
         Resources mockedResources = mock(Resources.class, RETURNS_DEEP_STUBS);
         JSONObject errorMessages = new JSONObject(TestSetupHelper.getInputAsString(inputStream));