summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/src/test/java/se/leap/bitmaskclient/ConfigHelperTest.java6
-rw-r--r--app/src/test/java/se/leap/bitmaskclient/eip/ProviderApiManagerTest.java8
-rw-r--r--app/src/test/resources/private_rsa_key.pem24
-rw-r--r--app/src/test/resources/riseup.net.vpn_cert.pem23
4 files changed, 57 insertions, 4 deletions
diff --git a/app/src/test/java/se/leap/bitmaskclient/ConfigHelperTest.java b/app/src/test/java/se/leap/bitmaskclient/ConfigHelperTest.java
index 84f38086..2c7848bc 100644
--- a/app/src/test/java/se/leap/bitmaskclient/ConfigHelperTest.java
+++ b/app/src/test/java/se/leap/bitmaskclient/ConfigHelperTest.java
@@ -10,6 +10,9 @@ import se.leap.bitmaskclient.testutils.MockSharedPreferences;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static se.leap.bitmaskclient.Constants.PROVIDER_CONFIGURED;
+import static se.leap.bitmaskclient.Constants.PROVIDER_EIP_DEFINITION;
+import static se.leap.bitmaskclient.Constants.PROVIDER_PRIVATE_KEY;
+import static se.leap.bitmaskclient.Constants.PROVIDER_VPN_CERTIFICATE;
import static se.leap.bitmaskclient.testutils.TestSetupHelper.getInputAsString;
/**
@@ -48,6 +51,9 @@ public class ConfigHelperTest {
.putString(Provider.KEY, getInputAsString(getClass().getClassLoader().getResourceAsStream("riseup.net.json")))
.putString(Provider.MAIN_URL, "https://riseup.net")
.putString(Provider.CA_CERT, getInputAsString(getClass().getClassLoader().getResourceAsStream("riseup.net.pem")))
+ .putString(PROVIDER_EIP_DEFINITION, getInputAsString(getClass().getClassLoader().getResourceAsStream("eip-service-two-gateways.json")))
+ .putString(PROVIDER_VPN_CERTIFICATE, getInputAsString(getClass().getClassLoader().getResourceAsStream("riseup.net.vpn_cert.pem")))
+ .putString(PROVIDER_PRIVATE_KEY, getInputAsString(getClass().getClassLoader().getResourceAsStream("private_rsa_key.pem")))
.apply();
Provider provider = ConfigHelper.getSavedProviderFromSharedPreferences(mockPreferences);
assertTrue(provider.isConfigured());
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 0121f7aa..4842d170 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 {
Bundle expectedResult = mockBundle();
expectedResult.putBoolean(BROADCAST_RESULT_KEY, false);
- expectedResult.putString(ERRORS, "{\"errorId\":\"ERROR_INVALID_VPN_CERTIFICATE\",\"errors\":\"Stored provider certificate is expired. You can either update Bitmask (recommended) or update the provider certificate using a commercial CA certificate.\"}");
+ expectedResult.putString(ERRORS, "{\"errorId\":\"ERROR_INVALID_CERTIFICATE\",\"errors\":\"Stored provider certificate is expired. You can either update Bitmask (recommended) or update the provider certificate using a commercial CA certificate.\"}");
expectedResult.putParcelable(PROVIDER_KEY, provider);
Intent providerApiCommand = mockIntent();
@@ -292,7 +292,7 @@ public class ProviderApiManagerTest {
Bundle expectedResult = mockBundle();
expectedResult.putBoolean(BROADCAST_RESULT_KEY, false);
- expectedResult.putString(ERRORS, "{\"errorId\":\"ERROR_INVALID_VPN_CERTIFICATE\",\"errors\":\"Stored provider certificate is expired. You can either update Bitmask (recommended) or update the provider certificate using a commercial CA certificate.\"}");
+ expectedResult.putString(ERRORS, "{\"errorId\":\"ERROR_INVALID_CERTIFICATE\",\"errors\":\"Stored provider certificate is expired. You can either update Bitmask (recommended) or update the provider certificate using a commercial CA certificate.\"}");
expectedResult.putParcelable(PROVIDER_KEY, provider);
Intent providerApiCommand = mockIntent();
@@ -315,7 +315,7 @@ public class ProviderApiManagerTest {
providerApiManager = new ProviderApiManager(mockPreferences, mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
Bundle expectedResult = mockBundle();
expectedResult.putBoolean(BROADCAST_RESULT_KEY, false);
- expectedResult.putString(ERRORS, "{\"errorId\":\"ERROR_INVALID_VPN_CERTIFICATE\",\"errors\":\"Stored provider certificate is invalid. You can either update Bitmask (recommended) or update the provider certificate using a commercial CA certificate.\"}");
+ expectedResult.putString(ERRORS, "{\"errorId\":\"ERROR_INVALID_CERTIFICATE\",\"errors\":\"Stored provider certificate is invalid. You can either update Bitmask (recommended) or update the provider certificate using a commercial CA certificate.\"}");
expectedResult.putParcelable(PROVIDER_KEY, provider);
Intent providerApiCommand = mockIntent();
@@ -340,7 +340,7 @@ public class ProviderApiManagerTest {
Bundle expectedResult = mockBundle();
expectedResult.putBoolean(BROADCAST_RESULT_KEY, false);
- expectedResult.putString(ERRORS, "{\"errorId\":\"ERROR_INVALID_VPN_CERTIFICATE\",\"errors\":\"Stored provider certificate is invalid. You can either update Bitmask (recommended) or update the provider certificate using a commercial CA certificate.\"}");
+ expectedResult.putString(ERRORS, "{\"errorId\":\"ERROR_INVALID_CERTIFICATE\",\"errors\":\"Stored provider certificate is invalid. You can either update Bitmask (recommended) or update the provider certificate using a commercial CA certificate.\"}");
expectedResult.putParcelable(PROVIDER_KEY, provider);
Intent providerApiCommand = mockIntent();
diff --git a/app/src/test/resources/private_rsa_key.pem b/app/src/test/resources/private_rsa_key.pem
new file mode 100644
index 00000000..dd60e663
--- /dev/null
+++ b/app/src/test/resources/private_rsa_key.pem
@@ -0,0 +1,24 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDKIkAutGIS7YIMdOGlSmjme7Zi
+PX/Py+MVSe6rnl36gh2d5yXuzA0+8LYD/GdYboVc8clriP0Y1EQZ+KkIGjWRvWOFIyPSQzIKaz10
+93mw3FUrgSubysRaqscs3T81YCHO+7ffJK97eqOP9HKW3Q4oDlcuWPG9HgP1Vq6qhXS1AHNryp+a
+LoLmjiUyhBoDYOAyy3x2vMMMGXJ2XzWwbFwC15mgGf2L0+nCVyy0OymQay7b9x1KEn0eKSwLNlwP
+aVxanDS5lKfdyDBqUmcGmnVSZTlYcy0l1rMJswa9l0+tkyJZ4G6vtsTcvJaZGyK1uGoJsrVsajXN
+sOgfPv7dXBALAgMBAAECggEAYQjCMOmNLzLvPFWbwQKQixyWeGC3i6R/9cdRGPfke46c8yF0t0cj
+kLRzXER9xBkCUpULsWDIx3OW4bTaSDZ0wurc7Jvq5VQ2oIPMs+rdc0bCaCkRKy/SxQe4p9PqNRBa
+CogSQ7/Tsf40qLWbkMq7sgT4Wxp9qeDP26XqIZgBZ6XeVNvVetEKliFwmaaaDpnN5drTww3uxigG
+me+hwgy/ZxCWWq+Hs+B8lNttvMsVtGckEBYJE3lspeLHcKaiNYUHQtkCG5kuczZPKAF9ieeBG2F6
+sGl5UEJAUmkvRcCBgL6kqARGEqHfhTHEKo/GjEpC88Qn9ZFDP6QVcnHq2EFxuQKBgQDm6cJEkQDR
+nwzQtjeln90IqbQslvXvg7zXTnYWRQKW5B5FUk1q5h1xmNHCsA98dkTY5pIOTfk9dKiyF9wJ5s2x
+uiIHbpUZ7fFCbVcvSvaVt6JvY2nTJQaYbbJg17QrhJQdnekcI/h8zfUwrUof6hBAj2OfR+Ua3bPj
+3ZO2IlWRHwKBgQDgGBINXtdYzb32IKIPEpOqGdfrV3vBVE+D+UZ3JdZSpCnk20VdQ9B0llRurVEt
+A0LvCgmlP2eAdHoxIOlfHqV5NBCl1JXes73AJkvJU35ad4fiWEZXT94zY7TMBUgnEjgnVfXjvHXW
+BCyJ8PWkn/RMawbS0aJRml4VN83S1NFHlQKBgF5U/qTuK8x20lBtMDx8G1sPoOhaX2wSgFHg3sLo
+PE+SL3+YSMIz8bFXgdGsBReOZT/Kqb4oQnrFrqjasGxnGn7RkFdC6KxoFRhS/Lv4PtYY58Xjcfbs
++E3K+oUveY4RokSbHwD8/OVXaiQRlueEwlDtgwAt6b1Y9sVO3qoYSqZ3AoGATrvmS9BQtSDEZ1+b
+0NPkEdW2qTc5gfmPXn0MpvwiSzLmjUQFIPmcmfnffGtko/4LXFUYgni+csF51R0NIaBw3x7N4pXI
+elCIkKRj6D5vnHV2xq3hOPgUx9V2RmBss12RYTCwje0/MYyR4X1JsSeJ+/d2lEeXUjh8adQLetHP
+HekCgYBsGFUmm2G3CdXArGRk2vJimqmUdYOBezaYoQrAb8iw7trpQ+s2tIzAeeSmT6tGo7mmFdAe
+Sa96iH5R4cEMXKAJy7ik8Dj/vl5G77xcBiPOcz2K61jf5PySeXp2TsK8DEzjmRKuNKv/Fw1bZ6JF
+tvMXYGoy6YumMdJykQ1pwq00cw==
+-----END RSA PRIVATE KEY----- \ No newline at end of file
diff --git a/app/src/test/resources/riseup.net.vpn_cert.pem b/app/src/test/resources/riseup.net.vpn_cert.pem
new file mode 100644
index 00000000..e3040033
--- /dev/null
+++ b/app/src/test/resources/riseup.net.vpn_cert.pem
@@ -0,0 +1,23 @@
+-----BEGIN CERTIFICATE-----
+MIIEmzCCAoOgAwIBAgIQUX5qjwlLDM2OyZ7TduhvrDANBgkqhkiG9w0BAQsFADB1MRgwFgYDVQQK
+DA9SaXNldXAgTmV0d29ya3MxGzAZBgNVBAsMEmh0dHBzOi8vcmlzZXVwLm5ldDE8MDoGA1UEAwwz
+UmlzZXVwIE5ldHdvcmtzIFJvb3QgQ0EgKGNsaWVudCBjZXJ0aWZpY2F0ZXMgb25seSEpMB4XDTE4
+MDExODAwMDAwMFoXDTE4MDQxODAwMDAwMFowLTErMCkGA1UEAwwiVU5MSU1JVEVENjh4amVsMGZx
+MnRzbmk0MGlxanQyZTYwbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMoiQC60YhLt
+ggx04aVKaOZ7tmI9f8/L4xVJ7queXfqCHZ3nJe7MDT7wtgP8Z1huhVzxyWuI/RjURBn4qQgaNZG9
+Y4UjI9JDMgprPXT3ebDcVSuBK5vKxFqqxyzdPzVgIc77t98kr3t6o4/0cpbdDigOVy5Y8b0eA/VW
+rqqFdLUAc2vKn5ouguaOJTKEGgNg4DLLfHa8wwwZcnZfNbBsXALXmaAZ/YvT6cJXLLQ7KZBrLtv3
+HUoSfR4pLAs2XA9pXFqcNLmUp93IMGpSZwaadVJlOVhzLSXWswmzBr2XT62TIlngbq+2xNy8lpkb
+IrW4agmytWxqNc2w6B8+/t1cEAsCAwEAAaNvMG0wHQYDVR0OBBYEFOBLKoWXxcC2gmWZFwcgtk9b
+gH8qMAsGA1UdDwQEAwIHgDATBgNVHSUEDDAKBggrBgEFBQcDAjAJBgNVHRMEAjAAMB8GA1UdIwQY
+MBaAFBf0G9XlKgEBTWuiXTYKKQmWZYBGMA0GCSqGSIb3DQEBCwUAA4ICAQCDZBLGPg5XjIMbOOiE
+mlo45Es0ch0ojDrTQC/FOQQQjeHoyRrFF0qrDb5te/QAJQ5a+gxZkXpgBhwz/l6I4rUoWw5KNCoC
+bfb1wqpVkgHbZyBaUcxq/sxr8LkqLN95wbICXoRSQyJefMMhHn0k0UaFT6Sd5QRQG5dmWC6K296X
+/FnOwJOWESHYDYr7t6Clnk8eIQH3xc0YEVjDYB7aenc6NuYB5haCXTzoS67xC3RqOIujy2aYkQbn
+V7PB+g257WmTvhCoVXW8dks0uhQrot6MCqdlWTd1nwUGB15Lpdgtpt2PUOET9hUtUN86LBw/BZNO
+JV95z5LNr/uV72P46Lh6iWTQiCBjFPd3XVMANlFlXQaJi+zjX1xmJBg12RoCGlAtL/8YuxlZqdU6
+Vw9ceuZpQJ2nqaRwi9kAeTW57PfvaMpBQHi2OrwIwWIehzkbpbHqQzCubF5S5ENf+uaYbaR3m+nF
+Xq4UDxRgLhZfGIvHubwz5A9nzjpvJ0xw7LT/zaMKy85e9/l6rRlMIE8aA50+KYZK7s93xv6AKyYW
+qhyHJVIoYyB/vB639MudvhnN7n36mZhg3W0Zd4thQBx4rLrNK0ZD0Pfk6J+Lzd6KYgIKB0Xp0YYx
+mDwpp4uhUA1hmxisiFjf5121jdSDyP7/abZK+3udOalShfdWE41zfbThhw==
+-----END CERTIFICATE----- \ No newline at end of file