diff options
| -rw-r--r-- | branding/scripts/provider.py | 9 | ||||
| -rw-r--r-- | branding/templates/debian/compat | 1 | ||||
| -rw-r--r-- | branding/templates/debian/control-template | 17 | ||||
| -rwxr-xr-x | branding/templates/debian/rules-template | 21 | ||||
| -rw-r--r-- | docs/test-float.rst | 9 | ||||
| -rw-r--r-- | gui/providers/providers.json | 24 | ||||
| l--------- | providers/floatdemo/assets | 1 | ||||
| -rw-r--r-- | providers/floatdemo/floatdemo-ca.crt | 9 | ||||
| -rw-r--r-- | providers/vendor.conf | 19 |
9 files changed, 72 insertions, 38 deletions
diff --git a/branding/scripts/provider.py b/branding/scripts/provider.py index 22b36fd..90daa13 100644 --- a/branding/scripts/provider.py +++ b/branding/scripts/provider.py @@ -3,13 +3,12 @@ import os def getDefaultProvider(config): - if os.environ.get('VENDOR_PATH'): + provider = os.environ.get('PROVIDER') + if provider: + print('[+] Got provider {} from environment'.format(provider)) + else: print('[+] Using default provider from config file') provider = config['default']['provider'] - else: - provider = os.environ.get('PROVIDER') - if provider: - print('[+] Got provider {} from environment'.format(provider)) return provider diff --git a/branding/templates/debian/compat b/branding/templates/debian/compat deleted file mode 100644 index f599e28..0000000 --- a/branding/templates/debian/compat +++ /dev/null @@ -1 +0,0 @@ -10 diff --git a/branding/templates/debian/control-template b/branding/templates/debian/control-template index aaec638..a85b4f6 100644 --- a/branding/templates/debian/control-template +++ b/branding/templates/debian/control-template @@ -2,19 +2,20 @@ Source: ${binaryName} Section: net Priority: extra Maintainer: LEAP Encryption Access Project <debian@leap.se> -Build-Depends: debhelper (>= 10.0.0), dh-golang, golang-go (> 2:1.9), - golang-golang-x-text-dev (>= 0.3.0-2), - libgtk-3-dev, libappindicator3-dev, pkg-config -Standards-Version: 3.9.8 +Build-Depends: debhelper-compat (= 12), golang-go (>= 2:1.9), make (>=3.80), pkg-config, g++ (>= 4:4.6.3), git, + qt5-qmake, qttools5-dev-tools, qtbase5-dev, libqt5qml5, libqt5quick5, qtdeclarative5-dev +Standards-Version: 4.4.1 +Homepage: https://0xacab.org/leap/bitmask-vpn Package: ${binaryName} Architecture: any Multi-Arch: foreign -Depends: ${misc:Depends}, - openvpn, libgtk-3-0, libappindicator3-1, - policykit-1-gnome | polkit-1-auth-agent, - python3, Enhances: openvpn +Depends: ${misc:Depends}, libqt5core5a, libqt5gui5 | libqt5gui5-gles, + libqt5qml5, libqt5widgets5, libstdc++6, + qml-module-qtquick2, qml-module-qtquick-controls2, qml-module-qtquick-dialogs, + qml-module-qtquick-extras, qml-module-qt-labs-platform, + openvpn, policykit-1-gnome | polkit-1-auth-agent, python3 Description: Easy, fast, and secure VPN service from ${name}. This package is a custom build of the new Bitmask VPN client, preconfigured to use the ${providerURL} provider. diff --git a/branding/templates/debian/rules-template b/branding/templates/debian/rules-template index 9f765ab..bb2c1a0 100755 --- a/branding/templates/debian/rules-template +++ b/branding/templates/debian/rules-template @@ -32,20 +32,17 @@ APPNAME = ${binaryName} override_dh_auto_test: override_dh_auto_build: - mkdir -p /tmp/gocache - rm -rf src/0xacab.org/leap/bitmask-vpn/tools/transifex - rm -rf obj-$(DEB_BUILD_GNU_TYPE)/src/0xacab.org/leap/bitmask-vpn/tools/transifex - rm -rf tools - dh_auto_build -O--buildsystem=golang -- -ldflags "-X main.version=$(VERSION)" + make build override_dh_install: + mkdir -p $(CURDIR)/debian/${APPNAME}/usr/bin mkdir -p $(CURDIR)/debian/${APPNAME}/usr/sbin - cp $(CURDIR)/helpers/bitmask-root $(CURDIR)/debian/${binaryName}/usr/sbin/ + cp $(CURDIR)/helpers/bitmask-root $(CURDIR)/debian/${APPNAME}/usr/sbin/ mkdir -p $(CURDIR)/debian/${APPNAME}/usr/share/polkit-1/actions - cp $(CURDIR)/helpers/se.leap.bitmask.policy $(CURDIR)/debian/${APPNAME}/usr/share/polkit-1/actions - rm -fr $(CURDIR)/debian/${APPNAME}/usr/share/gocode - strip $(CURDIR)/debian/${APPNAME}/usr/bin/bitmask-vpn - mv $(CURDIR)/debian/${APPNAME}/usr/bin/bitmask-vpn $(CURDIR)/debian/${APPNAME}/usr/bin/${APPNAME} - mkdir -p $(CURDIR)/debian/${APPNAME}/usr/share/${APPNAME} - cp $(CURDIR)/debian/icons/scalable/icon.svg $(CURDIR)/debian/${APPNAME}/usr/share/${APPNAME}/icon.svg + cp $(CURDIR)/helpers/se.leap.bitmask.policy $(CURDIR)/debian/${APPNAME}/usr/share/polkit-1/actions + cp build/qt/release/${APPNAME} $(CURDIR)/debian/${APPNAME}/usr/bin/${APPNAME} + strip $(CURDIR)/debian/${APPNAME}/usr/bin/${APPNAME} dh_install + +override_dh_dwz: + echo "skipping dh_dwz" diff --git a/docs/test-float.rst b/docs/test-float.rst new file mode 100644 index 0000000..b3318ec --- /dev/null +++ b/docs/test-float.rst @@ -0,0 +1,9 @@ +Testing float deployments +========================= +You can quickly brand the client for test float instances.:: + + export PROVIDER=floatdemo + make vendor && make build + build/qt/release/floatdemo-vpn + +If your test instance is not there, just add it to `providers/vendor.conf`. diff --git a/gui/providers/providers.json b/gui/providers/providers.json index b654070..2401866 100644 --- a/gui/providers/providers.json +++ b/gui/providers/providers.json @@ -1,21 +1,21 @@ { - "default": "riseup", + "default": "floatdemo", "providers": [ { - "name": "Riseup", - "applicationName": "RiseupVPN", - "binaryName": "riseup-vpn", + "name": "floatdemo", + "applicationName": "FloatDemoVPN", + "binaryName": "floatdemo-vpn", "auth": "anon", "authEmptyPass": false, - "providerURL": "riseup.net", - "tosURL": "https://riseup.net/tos", - "helpURL": "https://riseup.net/support", + "providerURL": "float.bitmask.net", + "tosURL": "https://float.bitmask.net/", + "helpURL": "https://float.bitmask.net/", "askForDonations": true, - "donateURL": "https://riseup.net/vpn/donate", - "apiURL": "https://api.black.riseup.net/", - "geolocationAPI": "https://api.black.riseup.net:9001/json", - "caCertString": "-----BEGIN CERTIFICATE-----\nMIIFjTCCA3WgAwIBAgIBATANBgkqhkiG9w0BAQ0FADBZMRgwFgYDVQQKDA9SaXNl\ndXAgTmV0d29ya3MxGzAZBgNVBAsMEmh0dHBzOi8vcmlzZXVwLm5ldDEgMB4GA1UE\nAwwXUmlzZXVwIE5ldHdvcmtzIFJvb3QgQ0EwHhcNMTQwNDI4MDAwMDAwWhcNMjQw\nNDI4MDAwMDAwWjBZMRgwFgYDVQQKDA9SaXNldXAgTmV0d29ya3MxGzAZBgNVBAsM\nEmh0dHBzOi8vcmlzZXVwLm5ldDEgMB4GA1UEAwwXUmlzZXVwIE5ldHdvcmtzIFJv\nb3QgQ0EwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC76J4ciMJ8Sg0m\nTP7DF2DT9zNe0Csk4myoMFC57rfJeqsAlJCv1XMzBmXrw8wq/9z7XHv6n/0sWU7a\n7cF2hLR33ktjwODlx7vorU39/lXLndo492ZBhXQtG1INMShyv+nlmzO6GT7ESfNE\nLliFitEzwIegpMqxCIHXFuobGSCWF4N0qLHkq/SYUMoOJ96O3hmPSl1kFDRMtWXY\niw1SEKjUvpyDJpVs3NGxeLCaA7bAWhDY5s5Yb2fA1o8ICAqhowurowJpW7n5ZuLK\n5VNTlNy6nZpkjt1QycYvNycffyPOFm/Q/RKDlvnorJIrihPkyniV3YY5cGgP+Qkx\nHUOT0uLA6LHtzfiyaOqkXwc4b0ZcQD5Vbf6Prd20Ppt6ei0zazkUPwxld3hgyw58\nm/4UIjG3PInWTNf293GngK2Bnz8Qx9e/6TueMSAn/3JBLem56E0WtmbLVjvko+LF\nPM5xA+m0BmuSJtrD1MUCXMhqYTtiOvgLBlUm5zkNxALzG+cXB28k6XikXt6MRG7q\nhzIPG38zwkooM55yy5i1YfcIi5NjMH6A+t4IJxxwb67MSb6UFOwg5kFokdONZcwj\nshczHdG9gLKSBIvrKa03Nd3W2dF9hMbRu//STcQxOailDBQCnXXfAATj9pYzdY4k\nha8VCAREGAKTDAex9oXf1yRuktES4QIDAQABo2AwXjAdBgNVHQ4EFgQUC4tdmLVu\nf9hwfK4AGliaet5KkcgwDgYDVR0PAQH/BAQDAgIEMAwGA1UdEwQFMAMBAf8wHwYD\nVR0jBBgwFoAUC4tdmLVuf9hwfK4AGliaet5KkcgwDQYJKoZIhvcNAQENBQADggIB\nAGzL+GRnYu99zFoy0bXJKOGCF5XUXP/3gIXPRDqQf5g7Cu/jYMID9dB3No4Zmf7v\nqHjiSXiS8jx1j/6/Luk6PpFbT7QYm4QLs1f4BlfZOti2KE8r7KRDPIecUsUXW6P/\n3GJAVYH/+7OjA39za9AieM7+H5BELGccGrM5wfl7JeEz8in+V2ZWDzHQO4hMkiTQ\n4ZckuaL201F68YpiItBNnJ9N5nHr1MRiGyApHmLXY/wvlrOpclh95qn+lG6/2jk7\n3AmihLOKYMlPwPakJg4PYczm3icFLgTpjV5sq2md9bRyAg3oPGfAuWHmKj2Ikqch\nTd5CHKGxEEWbGUWEMP0s1A/JHWiCbDigc4Cfxhy56CWG4q0tYtnc2GMw8OAUO6Wf\nXu5pYKNkzKSEtT/MrNJt44tTZWbKV/Pi/N2Fx36my7TgTUj7g3xcE9eF4JV2H/sg\ntsK3pwE0FEqGnT4qMFbixQmc8bGyuakr23wjMvfO7eZUxBuWYR2SkcP26sozF9PF\ntGhbZHQVGZUTVPyvwahMUEhbPGVerOW0IYpxkm0x/eaWdTc4vPpf/rIlgbAjarnJ\nUN9SaWRlWKSdP4haujnzCoJbM7dU9bjvlGZNyXEekgeT0W2qFeGGp+yyUWw8tNsp\n0BuC1b7uW/bBn/xKm319wXVDvBgZgcktMolak39V7DVO\n-----END CERTIFICATE-----", - "timeStamp": "2021-06-10 22:21:58" + "donateURL": "", + "apiURL": "https://api.float.bitmask.net:4430/", + "geolocationAPI": "https://menshen.float.bitmask.net/json", + "caCertString": "-----BEGIN CERTIFICATE-----\nMIIBQjCB6aADAgECAgEBMAoGCCqGSM49BAMCMBcxFTATBgNVBAMTDExFQVAgUm9v\ndCBDQTAeFw0yMTA0MDYxODIzMzVaFw0yNjA0MDYxODI4MzVaMBcxFTATBgNVBAMT\nDExFQVAgUm9vdCBDQTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABLiY2PRd7sct\n/d0qy0EHjP+MLA+bUOV2RjMErxZrQfok9bMAFFLza9dg0LTbsdLjved1f7ezraa1\nyTYD3i2NncWjJjAkMA4GA1UdDwEB/wQEAwICpDASBgNVHRMBAf8ECDAGAQH/AgEB\nMAoGCCqGSM49BAMCA0gAMEUCIEq2RG2egV566bOFzAL68qoOTVA3+58YYssn+Jrg\nadPSAiEAkYbYV5JLlA54lXy6XlZEmCCcVb7u/Domsk9smMQzWq4=\n-----END CERTIFICATE-----", + "timeStamp": "2021-07-07 19:38:08" } ] }
\ No newline at end of file diff --git a/providers/floatdemo/assets b/providers/floatdemo/assets new file mode 120000 index 0000000..becab2c --- /dev/null +++ b/providers/floatdemo/assets @@ -0,0 +1 @@ +../riseup/assets
\ No newline at end of file diff --git a/providers/floatdemo/floatdemo-ca.crt b/providers/floatdemo/floatdemo-ca.crt new file mode 100644 index 0000000..cf7eb48 --- /dev/null +++ b/providers/floatdemo/floatdemo-ca.crt @@ -0,0 +1,9 @@ +-----BEGIN CERTIFICATE----- +MIIBQjCB6aADAgECAgEBMAoGCCqGSM49BAMCMBcxFTATBgNVBAMTDExFQVAgUm9v +dCBDQTAeFw0yMTA0MDYxODIzMzVaFw0yNjA0MDYxODI4MzVaMBcxFTATBgNVBAMT +DExFQVAgUm9vdCBDQTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABLiY2PRd7sct +/d0qy0EHjP+MLA+bUOV2RjMErxZrQfok9bMAFFLza9dg0LTbsdLjved1f7ezraa1 +yTYD3i2NncWjJjAkMA4GA1UdDwEB/wQEAwICpDASBgNVHRMBAf8ECDAGAQH/AgEB +MAoGCCqGSM49BAMCA0gAMEUCIEq2RG2egV566bOFzAL68qoOTVA3+58YYssn+Jrg +adPSAiEAkYbYV5JLlA54lXy6XlZEmCCcVb7u/Domsk9smMQzWq4= +-----END CERTIFICATE----- diff --git a/providers/vendor.conf b/providers/vendor.conf index d9e6a25..9c2bdd7 100644 --- a/providers/vendor.conf +++ b/providers/vendor.conf @@ -61,3 +61,22 @@ helpURL = https://libraryvpn.org/ geolocationAPI = https://getmyip.vpnlib.bitmask.net/json askForDonations = false donateURL = + +[floatdemo] + +name = floatdemo +applicationName = FloatDemoVPN +binaryName = floatdemo-vpn +auth = anon + +providerURL = float.bitmask.net +apiURL = https://api.float.bitmask.net:4430/ +caURL = https://api.float.bitmask.net/ca.crt + +infoURL = https://float.bitmask.net/ +tosURL = https://float.bitmask.net/ +helpURL = https://float.bitmask.net/ + +geolocationAPI = https://menshen.float.bitmask.net/json +askForDonations = false +donateURL = |