summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/src/test/java/se/leap/bitmaskclient/eip/GatewaysManagerTest.java35
-rw-r--r--app/src/test/resources/v4/riseup_eipservice_for_geoip_v4.json156
-rw-r--r--app/src/test/resources/v4/riseup_geoip_v4.json14
3 files changed, 201 insertions, 4 deletions
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 6056f764..69c54db9 100644
--- a/app/src/test/java/se/leap/bitmaskclient/eip/GatewaysManagerTest.java
+++ b/app/src/test/java/se/leap/bitmaskclient/eip/GatewaysManagerTest.java
@@ -233,6 +233,41 @@ public class GatewaysManagerTest {
}
+ @Test
+ public void testSelectN_selectFromCity_returnsGatewaysInPresortedOrder() {
+ Provider provider = getProvider(null, null, null, null, null, null, "v4/riseup_eipservice_for_geoip_v4.json", "v4/riseup_geoip_v4.json");
+
+ MockHelper.mockProviderObserver(provider);
+ //use openvpn, not pluggable transports
+ mockStatic(PreferenceHelper.class);
+ when(PreferenceHelper.getUsePluggableTransports(any(Context.class))).thenReturn(false);
+ when(PreferenceHelper.getPreferredCity(any(Context.class))).thenReturn("Paris");
+ GatewaysManager gatewaysManager = new GatewaysManager(mockContext);
+
+ assertEquals("mouette.riseup.net", gatewaysManager.select(0).getHost());
+ assertEquals("hoatzin.riseup.net", gatewaysManager.select(1).getHost());
+ assertEquals("zarapito.riseup.net", gatewaysManager.select(2).getHost());
+ }
+
+ @Test
+ public void testSelectN_selectFromCityWithTimezoneCalculation_returnsRandomizedGatewaysOfSelectedCity() {
+ Provider provider = getProvider(null, null, null, null, null, null, "v4/riseup_eipservice_for_geoip_v4.json", null);
+
+ provider.setGeoIpJson(new JSONObject());
+ MockHelper.mockProviderObserver(provider);
+ //use openvpn, not pluggable transports
+ mockStatic(PreferenceHelper.class);
+ when(PreferenceHelper.getUsePluggableTransports(any(Context.class))).thenReturn(false);
+ when(PreferenceHelper.getPreferredCity(any(Context.class))).thenReturn("Paris");
+ GatewaysManager gatewaysManager = new GatewaysManager(mockContext);
+
+ assertEquals("Paris", gatewaysManager.select(0).getName());
+ assertEquals("Paris", gatewaysManager.select(1).getName());
+ assertEquals("Paris", gatewaysManager.select(2).getName());
+ assertEquals(null, gatewaysManager.select(3));
+ }
+
+
private String getJsonStringFor(String filename) throws IOException {
return TestSetupHelper.getInputAsString(getClass().getClassLoader().getResourceAsStream(filename));
}
diff --git a/app/src/test/resources/v4/riseup_eipservice_for_geoip_v4.json b/app/src/test/resources/v4/riseup_eipservice_for_geoip_v4.json
new file mode 100644
index 00000000..b8fa8bbf
--- /dev/null
+++ b/app/src/test/resources/v4/riseup_eipservice_for_geoip_v4.json
@@ -0,0 +1,156 @@
+{
+ "gateways": [
+ {
+ "capabilities": {
+ "adblock": false,
+ "filter_dns": false,
+ "limited": false,
+ "transport":[
+ {
+ "type":"openvpn",
+ "protocols":[
+ "tcp"
+ ],
+ "ports":[
+ "443"
+ ]
+ }
+ ],
+ "user_ips": false
+ },
+ "host": "zarapito.riseup.net",
+ "ip_address": "212.129.62.247",
+ "location": "paris"
+ },
+ {
+ "capabilities": {
+ "adblock": false,
+ "filter_dns": false,
+ "limited": false,
+ "transport":[
+ {
+ "type":"openvpn",
+ "protocols":[
+ "tcp"
+ ],
+ "ports":[
+ "443"
+ ]
+ }
+ ],
+ "user_ips": false
+ },
+ "host": "hoatzin.riseup.net",
+ "ip_address": "212.83.143.67",
+ "location": "paris"
+ },
+ {
+ "capabilities": {
+ "adblock": false,
+ "filter_dns": false,
+ "limited": false,
+ "transport":[
+ {
+ "type":"openvpn",
+ "protocols":[
+ "tcp"
+ ],
+ "ports":[
+ "443"
+ ]
+ }
+ ],
+ "user_ips": false
+ },
+ "host": "mouette.riseup.net",
+ "ip_address": "163.172.126.44",
+ "location": "paris"
+ },
+ {
+ "capabilities": {
+ "adblock": false,
+ "filter_dns": false,
+ "limited": false,
+ "transport":[
+ {
+ "type":"openvpn",
+ "protocols":[
+ "tcp"
+ ],
+ "ports":[
+ "443"
+ ]
+ }
+ ],
+ "user_ips": false
+ },
+ "host": "redshank.riseup.net",
+ "ip_address": "212.83.165.160",
+ "location": "amsterdam"
+ },
+ {
+ "capabilities": {
+ "adblock": false,
+ "filter_dns": false,
+ "limited": false,
+ "transport":[
+ {
+ "type":"obfs4",
+ "protocols":[
+ "tcp"
+ ],
+ "ports":[
+ "23042"
+ ],
+ "options": {
+ "cert": "48F/JNm/LKYt7zkDmPHXcw5f3Jqgwg/3OBRrqW14Yj87ATZ4KyAZRV7np4RhCXGSJHgoCQ",
+ "iatMode": "0"
+ }
+ },
+ {
+ "type":"openvpn",
+ "protocols":[
+ "tcp"
+ ],
+ "ports":[
+ "443"
+ ]
+ }
+ ],
+ "user_ips": false
+ },
+ "host": "yal.riseup.net",
+ "ip_address": "199.58.83.10",
+ "location": "montreal"
+ }
+ ],
+ "locations": {
+ "amsterdam": {
+ "country_code": "NL",
+ "hemisphere": "N",
+ "name": "Amsterdam",
+ "timezone": "+2"
+ },
+ "montreal": {
+ "country_code": "CA",
+ "hemisphere": "N",
+ "name": "Montreal",
+ "timezone": "-5"
+ },
+ "paris": {
+ "country_code": "FR",
+ "hemisphere": "N",
+ "name": "Paris",
+ "timezone": "+2"
+ }
+ },
+ "openvpn_configuration": {
+ "auth": "SHA1",
+ "cipher": "AES-128-CBC",
+ "keepalive": "10 30",
+ "tls-cipher": "DHE-RSA-AES128-SHA",
+ "tun-ipv6": true
+ },
+ "serial": 3,
+ "version": 3
+}
diff --git a/app/src/test/resources/v4/riseup_geoip_v4.json b/app/src/test/resources/v4/riseup_geoip_v4.json
index 439d6ffb..c95a9e6d 100644
--- a/app/src/test/resources/v4/riseup_geoip_v4.json
+++ b/app/src/test/resources/v4/riseup_geoip_v4.json
@@ -7,8 +7,9 @@
"gateways":[
"mouette.riseup.net",
"hoatzin.riseup.net",
- "zarapito.riseup.net",
- "redshank.riseup.net"
+ "yal.riseup.net",
+ "redshank.riseup.net",
+ "zarapito.riseup.net"
],
"sortedGateways": [
{
@@ -22,8 +23,13 @@
"overload": false
},
{
- "host": "zarapito.riseup.net",
- "fullness": 0.57,
+ "host": "yal.riseup.net",
+ "fullness": 0.59,
+ "overload": false
+ },
+ {
+ "host": "redshank.riseup.net",
+ "fullness": 0.8,
"overload": false
},
{