From db1e1a2045a2e6456d54765be3cf95186ce987f7 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Fri, 24 May 2019 18:01:03 +0200 Subject: squashed commit for Pluggable Transports * implement handling of different provider API version (v1 and v2) * detect provider's obfs support * shapeshifter-dispatcher installation * necessary changes to control shapeshifter-dispatcher from Bitmask * route openvpn traffic over shapeshifter-dispatcher --- .../custom/assets/ptdemo.bitmask.eip-service.json | 64 ++++++++++++++++++++++ app/src/custom/assets/ptdemo.bitmask.net.json | 41 ++++++++++++++ app/src/custom/assets/ptdemo.bitmask.secrets.json | 5 ++ 3 files changed, 110 insertions(+) create mode 100644 app/src/custom/assets/ptdemo.bitmask.eip-service.json create mode 100644 app/src/custom/assets/ptdemo.bitmask.net.json create mode 100644 app/src/custom/assets/ptdemo.bitmask.secrets.json (limited to 'app/src/custom') diff --git a/app/src/custom/assets/ptdemo.bitmask.eip-service.json b/app/src/custom/assets/ptdemo.bitmask.eip-service.json new file mode 100644 index 00000000..22bcb605 --- /dev/null +++ b/app/src/custom/assets/ptdemo.bitmask.eip-service.json @@ -0,0 +1,64 @@ +{ + "gateways":[ + { + "capabilities":{ + "adblock":false, + "filter_dns":false, + "limited":false, + "transport":[ + { + "type":"obfs4", + "protocols":[ + "tcp" + ], + "ports":[ + "23049" + ], + "options": { + "cert": "2p8QUt36lBAJxj2x8XLj5NYOuenqi6w7RUr88LIcZVSgADXipj1tMs9mzLKzgDMbx02ERA", + "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" + } + ], + "locations":{ + "Amsterdam":{ + "country_code":"NL", + "hemisphere":"N", + "name":"Amsterdam", + "timezone":"-1" + } + }, + "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, + "comp-lzo" : true, + "key-direction" : "1", + "verb" : "3" + }, + "serial":2, + "version":2 +} \ No newline at end of file diff --git a/app/src/custom/assets/ptdemo.bitmask.net.json b/app/src/custom/assets/ptdemo.bitmask.net.json new file mode 100644 index 00000000..ff6a9620 --- /dev/null +++ b/app/src/custom/assets/ptdemo.bitmask.net.json @@ -0,0 +1,41 @@ +{ + "api_uri": "https://api.demo.bitmask.net:4430", + "api_version": "1", + "ca_cert_fingerprint": "SHA256: 0f17c033115f6b76ff67871872303ff65034efe7dd1b910062ca323eb4da5c7e", + "ca_cert_uri": "https://demo.bitmask.net/ca.crt", + "default_language": "en", + "description": { + "el": "demo.bitmask.net allows you to test the Bitmask application. User accounts may be periodically deleted.", + "en": "demo.bitmask.net allows you to test the Bitmask application. User accounts may be periodically deleted.", + "es": "demo.bitmask.net allows you to test the Bitmask application. User accounts may be periodically deleted." + }, + "domain": "demo.bitmask.net", + "enrollment_policy": "open", + "languages": [ + "de", + "en" + ], + "name": { + "de": "Bitmask Pluggable Transports", + "en": "Bitmask Pluggable Transports" + }, + "service": { + "allow_anonymous": true, + "allow_free": true, + "allow_limited_bandwidth": false, + "allow_paid": false, + "allow_registration": true, + "allow_unlimited_bandwidth": true, + "bandwidth_limit": 102400, + "default_service_level": 1, + "levels": { + "1": { + "description": "Please donate.", + "name": "free" + } + } + }, + "services": [ + "openvpn" + ] +} \ No newline at end of file diff --git a/app/src/custom/assets/ptdemo.bitmask.secrets.json b/app/src/custom/assets/ptdemo.bitmask.secrets.json new file mode 100644 index 00000000..4f81b16b --- /dev/null +++ b/app/src/custom/assets/ptdemo.bitmask.secrets.json @@ -0,0 +1,5 @@ +{ + "ca_cert":"-----BEGIN CERTIFICATE-----\nMIID9zCCAt+gAwIBAgIJAN0nU8cxAj3EMA0GCSqGSIb3DQEBCwUAMFoxCzAJBgNV\nBAsTAlBUMRswGQYDVQQDExJjaG9sbGEuYml0bWFzay5uZXQxCzAJBgNVBCkTAlBU\nMSEwHwYJKoZIhvcNAQkBFhJrd2Fkcm9uYXV0QGxlYXAuc2UwHhcNMTkwMjE5MDk0\nMDQ4WhcNMjAwMjE5MDk0MDQ4WjBaMQswCQYDVQQLEwJQVDEbMBkGA1UEAxMSY2hv\nbGxhLmJpdG1hc2submV0MQswCQYDVQQpEwJQVDEhMB8GCSqGSIb3DQEJARYSa3dh\nZHJvbmF1dEBsZWFwLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA\ny3mhthCb6tunc4HWsX4UWgBld7H6WSOmJHOCEBjy4WZUTI9/AWA/j9pwf1WD8HKV\nxCND2Cg1j1Xc3wfTt0wJTbBPO7/chDpNlStW1KpcbiZPfkIumkqq5XNUTjOrleEm\neqqCtPvqVUyuYnGlE5dWIO3i9w1/cxhx6vi8zlsCoS1VWPdCDJvMW+9jPBL+kFe4\nF7k12lGy8t29/i4/mbzLkjAV0ZfR+S0w2hWZ1jXvzJdJQ+PP9L63hVxHQ5sUSDn9\n3SWUV7y39rHwXZdlttOE0aswvvfPlqrbD7n42mhlgySkpvXyMBkBrwIh5TnGXZ/B\nTtkPjnYCaiRXseZGrNnWhwIDAQABo4G/MIG8MB0GA1UdDgQWBBQKWWxEDacg7JAg\nuu4OJn2ZCLt69DCBjAYDVR0jBIGEMIGBgBQKWWxEDacg7JAguu4OJn2ZCLt69KFe\npFwwWjELMAkGA1UECxMCUFQxGzAZBgNVBAMTEmNob2xsYS5iaXRtYXNrLm5ldDEL\nMAkGA1UEKRMCUFQxITAfBgkqhkiG9w0BCQEWEmt3YWRyb25hdXRAbGVhcC5zZYIJ\nAN0nU8cxAj3EMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAJ2L7xwP\nkushZPh1l3hpfs/Em0j18oSEkvsPnm8C/o7MSqWR8zN4ehJBzUdjl7HGZGNL+AEO\nO57TDRyQ6MOATnG3DIi+6mud+XjKIPnKK3+ZeB/+UIeScB7PmiDdlXlM27s+d2mK\nEszgtBnzvI3+NRi8ub3IaeYqKnsEWNki/wJFx04fWqvjQXbGsJfWgwJi9jpJm2BT\nJ9gztPM4Hz1pTEWLqNxjyKmq9uMj8itGIiKWwbMXCuCk096U9UXM/fzs5LsL3bC7\n2oZ61s2Z2Z2BWObEMhtl8PgKX08t6ljhKBTN1l6O8VvyNwB45z8x+XEKw8SMDCeB\nS7HFRYge19Wm5hA=\n-----END CERTIFICATE-----\n", + "cert":"-----BEGIN CERTIFICATE-----\nMIIC6jCCAdICCQDcV1xCQ6eNYDANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQLEwJQ\nVDEbMBkGA1UEAxMSY2hvbGxhLmJpdG1hc2submV0MQswCQYDVQQpEwJQVDEhMB8G\nCSqGSIb3DQEJARYSa3dhZHJvbmF1dEBsZWFwLnNlMB4XDTE5MDIxOTEwMTUxOVoX\nDTIxMTIxMDEwMTUxOVowFDESMBAGA1UEAwwJVU5MSU1JVEVEMIIBIjANBgkqhkiG\n9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmm4WGL3Rf9keZU8AIfBPoDZ81t747UkBeW5y\nskTixdcw8ryP11Lx2LdN6C2srYN1U6ss8qq0FnQDCZK7+kP5fr3qgR8OI+nrbgaP\nBwcpX3S5E1LK2ho9NUp9wDkZgD7oX3GhvEOrTdGGLSS9DdnUEyZqR6WhQ4MyKbQY\nbRJdslnXyrVW0ZR2XzcSXe8SfPhgmTj1b/rQfPdZ+C8FuuTbb+AWHV7sLlPfcx3/\nahk9bZ42/nhU1v1l1k7stKJLpK426/CpP1tzpbwKClPodntdIGgnyJk/QSTheIN+\nOjeB1MJ8VglQ/RRxnhZf4BF2UVq32SQAY+hY6WiUDDtIljkhmQIDAQABMA0GCSqG\nSIb3DQEBCwUAA4IBAQAo6BGmPdqeqkIMtrxE+NpvVIdInAw1weOKdnOcI0vVcWDF\nZ6gm7VAlb6DVN52JqOAkafrwzIMLH2/7AyQ9pHpL5pf8php9yzwLWjtWW1HO2R61\nS0RAdSJbpoksRKR0BBd7mOjqMLfU7a9mnXBMT/DFyOexX94UIcj+f8kuJZDziURN\nPIoHgxX14synhgKFZ7Xae9F3l/B48QWilrMqKXvgk09LJDEJ1jem7rYZ/9pwKXmx\nkMMk/vsCmUpd4bJFBK4RLeieUG6NBAaxz8IHha4J+8PyKjHs4GnIFtrFKv313g2b\niStrXOHaFBslotZEJsRKYV++/z6ttBbExKx2M+9V\n-----END CERTIFICATE-----\n", + "Constants.PROVIDER_PRIVATE_KEY":"-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAmm4WGL3Rf9keZU8AIfBPoDZ81t747UkBeW5yskTixdcw8ryP\n11Lx2LdN6C2srYN1U6ss8qq0FnQDCZK7+kP5fr3qgR8OI+nrbgaPBwcpX3S5E1LK\n2ho9NUp9wDkZgD7oX3GhvEOrTdGGLSS9DdnUEyZqR6WhQ4MyKbQYbRJdslnXyrVW\n0ZR2XzcSXe8SfPhgmTj1b/rQfPdZ+C8FuuTbb+AWHV7sLlPfcx3/ahk9bZ42/nhU\n1v1l1k7stKJLpK426/CpP1tzpbwKClPodntdIGgnyJk/QSTheIN+OjeB1MJ8VglQ\n/RRxnhZf4BF2UVq32SQAY+hY6WiUDDtIljkhmQIDAQABAoIBAQCZ4iLgqp2NMTRJ\nrUwrhYRC2KjTkEIqaLowX6+pFl2G2STsbJtE7GEUG6xlNMZB7KHIKuVSNmnXiejQ\n7EemXX/LHMIFwoVboie4bo6taSR/+xbFO5XpeYYOiVj/Z6aSlZ0GJnwM1r1ngOac\nK2S73ZinMHttQ42LcbtVtSE15rw5ECNG7I0LF1SUOntorWPFh/wO6o2qDHEMoo/2\nvWc4C9TT79md2dTGs/jQql5sVwiKu+1EQdIY4ihmZ6eA3dww7Irk0KUVgt/2X0Al\nBlLvwGkDZxUAl91/7eLj5P+nKS8FzDSxmQQsz8hBUljWDJTJ3kQx5A0IzS9HTb98\nDuZELQ+RAoGBAMvMVsoJ2XtC3Q8TIjvxEqt1qD43MIgDSqAGCNnkcICuNlMbdxZu\nqoHB6ray1e6ydQKlvwtcehADLK1UCvQHQ2UqFfOy4/gTadBVYnGVu9/RNHlXXbQY\nNbyKRr2IuMBTBgCFyabSqbOZiWsrWoA3eVpbf1OmnBxnrv6OOz/AgecFAoGBAMH8\nhw9d7CHKskVLMmW9L20Roewq9rN1IgQu1ZAkg73EPGfG4iD5AVyTjlnM+HBKrTx7\n4ezLLN2EAswXCpyR2qbZx8KNCws/uHp1GGII3Vd7QVZcE5YC7nd/9lugI0HCe63Y\nl3uimjvN8xW0F/vPlUTDLCsTccBHI7FzbBsHDmyFAoGACMwYTv5f2fdH7Zeo2aeN\nY8NfcNgXCzgBJ6k7BpTa2mMqyymbWWeLirBhPmO34mbnsCaReZ8TUc+hRRYkpuYN\nXbeUXQGy34mO/sRAzKBnDMFOH5LK47RL1Yiuhw3406yBzNH5o27ijnMpQGwNqw05\n+tGKTIUbpgo/vpNLMXRQ5zUCgYAgKO53NLn+DC2r4UCUr12adm7iyWim7cda7CzJ\nvdP9dPgSuF0q3D1GjMvvxVR2wVqhCWS2LiTdAJK6JSPEO0YFnVtJvLpU/hZmbt1A\n+3k+lJeLaq5wk0HXm+ZK4GyX7Vc1xg+vFpD9UzJ2qanEPHDhun2rEoksOF8Jfzov\n7OaORQKBgHGPL8kp2v0IVwkY2a6Llr8i0HBBHNtgF/hgqP0qGO2u3F6Yi4Ly6Mng\n/odnAGV5KZIlis/MaDvPP4MohCgwuDq96V4yUQcG6iQlJa++p6owj5TUXMSdsYTi\n6IJ+tJLLlHg59oxhBBCKORxres2ht3d0gw12N52OvdoIg/bUbW0m\n-----END RSA PRIVATE KEY-----" +} \ No newline at end of file -- cgit v1.2.3