From 283e7531d551521dc48efa9b010127ff54316326 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Thu, 4 Jul 2019 16:44:35 +0200 Subject: create one vpnprofile per transport per gateway. implement basis to switch between obfs4 and plain openvpn connections --- .../test/resources/ptdemo.bitmask.eip-service.json | 4 +- .../resources/ptdemo_pt_tcp_udp.eip-service.json | 2 +- .../resources/ptdemo_pt_udp_tcp.eip-service.json | 2 +- .../resources/ptdemo_three_mixed_gateways.json | 133 +++++++++++++++++++++ 4 files changed, 137 insertions(+), 4 deletions(-) create mode 100644 app/src/test/resources/ptdemo_three_mixed_gateways.json (limited to 'app/src/test/resources') diff --git a/app/src/test/resources/ptdemo.bitmask.eip-service.json b/app/src/test/resources/ptdemo.bitmask.eip-service.json index 38146a40..e5ede239 100644 --- a/app/src/test/resources/ptdemo.bitmask.eip-service.json +++ b/app/src/test/resources/ptdemo.bitmask.eip-service.json @@ -15,7 +15,7 @@ "23049" ], "options": { - "cert": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", + "cert": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX1", "iat-mode": "0" } }, @@ -60,5 +60,5 @@ "verb" : "3" }, "serial":2, - "version":2 + "version":3 } \ No newline at end of file diff --git a/app/src/test/resources/ptdemo_pt_tcp_udp.eip-service.json b/app/src/test/resources/ptdemo_pt_tcp_udp.eip-service.json index 4337547b..f39a1597 100644 --- a/app/src/test/resources/ptdemo_pt_tcp_udp.eip-service.json +++ b/app/src/test/resources/ptdemo_pt_tcp_udp.eip-service.json @@ -61,5 +61,5 @@ "verb" : "3" }, "serial":2, - "version":2 + "version":3 } \ No newline at end of file diff --git a/app/src/test/resources/ptdemo_pt_udp_tcp.eip-service.json b/app/src/test/resources/ptdemo_pt_udp_tcp.eip-service.json index 4161fced..71c9857a 100644 --- a/app/src/test/resources/ptdemo_pt_udp_tcp.eip-service.json +++ b/app/src/test/resources/ptdemo_pt_udp_tcp.eip-service.json @@ -61,5 +61,5 @@ "verb" : "3" }, "serial":2, - "version":2 + "version":3 } \ No newline at end of file diff --git a/app/src/test/resources/ptdemo_three_mixed_gateways.json b/app/src/test/resources/ptdemo_three_mixed_gateways.json new file mode 100644 index 00000000..f81da6b3 --- /dev/null +++ b/app/src/test/resources/ptdemo_three_mixed_gateways.json @@ -0,0 +1,133 @@ +{ + "gateways":[ + { + "capabilities":{ + "adblock":false, + "filter_dns":false, + "limited":false, + "transport":[ + { + "type":"obfs4", + "protocols":[ + "tcp" + ], + "ports":[ + "23049" + ], + "options": { + "cert": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX1", + "iat-mode": "0" + } + }, + { + "type":"openvpn", + "protocols":[ + "tcp" + ], + "ports":[ + "1195" + ] + } + ], + "user_ips":false + }, + "host":"pt.demo.bitmask.net", + "ip_address":"37.218.247.60", + "location":"Amsterdam" + }, + { + "capabilities":{ + "adblock":false, + "filter_dns":false, + "limited":false, + "transport":[ + { + "type":"obfs4", + "protocols":[ + "tcp" + ], + "ports":[ + "443" + ], + "options": { + "cert": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX2", + "iat-mode": "0" + } + }, + { + "type":"openvpn", + "protocols":[ + "tcp" + ], + "ports":[ + "1195" + ] + } + ], + "user_ips":false + }, + "host":"moscow.bitmask.net", + "ip_address":"3.21.247.89", + "location":"moscow" + }, + { + "capabilities":{ + "adblock":false, + "filter_dns":false, + "limited":false, + "transport":[ + { + "type":"openvpn", + "protocols":[ + "tcp", + "udp" + ], + "ports":[ + "1195" + ] + } + ], + "user_ips":false + }, + "host":"manila.bitmask.net", + "ip_address":"37.12.247.10", + "location":"manila" + } + ], + "locations":{ + "Amsterdam":{ + "country_code":"NL", + "hemisphere":"N", + "name":"Amsterdam", + "timezone":"-1" + }, + "moscow": { + "country_code": "RU", + "hemisphere": "N", + "name": "Moscow", + "timezone": "+3" + }, + "manila": { + "country_code": "PH", + "hemisphere": "N", + "name": "Manila", + "timezone": "+8" + } + }, + "openvpn_configuration":{ + "auth":"SHA1", + "cipher":"AES-256-CBC", + "keepalive":"10 30", + "tls-cipher":"DHE-RSA-AES128-SHA", + "tun-ipv6":true, + "dev" : "tun", + "sndbuf" : "0", + "rcvbuf" : "0", + "nobind" : true, + "persist-key" : true, + "key-direction" : "1", + "verb" : "3" + }, + "serial":2, + "version":3 +} \ No newline at end of file -- cgit v1.2.3