Skip to content

Commit

Permalink
All: Update to 4.2.0 and format
Browse files Browse the repository at this point in the history
  • Loading branch information
@jwijenbergh
jwijenbergh committed Dec 8, 2023
1 parent 98dd2b7 commit 8dfbdd9
Show file tree
Hide file tree
Showing 6 changed files with 46 additions and 31 deletions.
9 changes: 9 additions & 0 deletions CHANGES.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
# 4.2.0 (2023-12-08)

* Implement expiry notifications according to spec (Fixes: #534)
* Connection info counts up/down before revealed (Fixes: #531)
* Implement validity timer according to spec
* Move protocol info to connection info details instead of connection info title
* Bump eduvpn-common to 1.2.0
* Log unhandled exceptions

# 4.1.99.0 (2023-10-25)
Pre-release for 4.2.0:

Expand Down
2 changes: 1 addition & 1 deletion eduvpn/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "4.1.99.0"
__version__ = "4.2.0"
8 changes: 6 additions & 2 deletions eduvpn/ui/ui.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,9 @@ def setup(self, builder: Builder, application: Type["EduVpnGtkApplication"]) ->
self.connection_status_image = builder.get_object("connectionStatusImage")
self.connection_status_label = builder.get_object("connectionStatusLabel")
self.connection_session_label = builder.get_object("connectionSessionLabel")
self.connection_info_duration_text = builder.get_object("connectionInfoDurationText")
self.connection_info_duration_text = builder.get_object(
"connectionInfoDurationText"
)
self.connection_switch = builder.get_object("connectionSwitch")
self.connection_info_expander = builder.get_object("connectionInfoExpander")
self.connection_info_downloaded = builder.get_object(
Expand Down Expand Up @@ -987,7 +989,9 @@ def start_validity_renew(self, server_info) -> None:
"update-validity",
)
self.connection_renew_thread_cancel = run_periodically(
run_in_glib_thread(partial(self.update_connection_renew, server_info.expire_time)),
run_in_glib_thread(
partial(self.update_connection_renew, server_info.expire_time)
),
UPDATE_RENEW_INTERVAL,
"update-renew",
)
Expand Down
2 changes: 1 addition & 1 deletion make_release.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ set -e

# change these to your liking
BRANCH=master
IS_PRERELEASE=true
IS_PRERELEASE=false
REPO="eduvpn/python-eduvpn-client"

# make a fresh clone
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

from setuptools import setup, find_packages

__version__ = "4.1.99.0"
__version__ = "4.2.0"

with open("README.md", "r", encoding="utf-8") as fh:
long_description = fh.read()
Expand Down
54 changes: 28 additions & 26 deletions tests/mock_config.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,36 +160,38 @@
"""

mock_config_dict = {
'auth': 'SHA256',
'ca': '\n-----BEGIN CERTIFICATE-----\nMIIFJDCCAwygAwIBAgIJAJ1NwjmG+n/3MA0GCSqGSIb3DQEBCwUAMBExDzANBgNV\nBgNVBAMTBlZQTiBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALOW\nZak2nNf7uZ1+XaoR78gkBHqszXlaFdPByC2bQn0vrsGurUHTXO843MDfsckbeNEE\n8ZrqXnNnqaojP90UkGIXbXLl7U8kborvKF/gQm6gsk3O0obhTVDdEj3kYKFGxmqu\nQHJo3C2amro4wVIv/BhXzIv6oP11Va/6FcwAYj8disNcxJgXWSUdARrEIC3PME58\nLd+a2jvXL/m8xBp+qVThvfmq2Pak1olhbgDueUSsQYiQZMq2rX3/1f+SInxZt3kJ\nBAMTBlZQTiBDQTAeFw0xNzAyMjcxNDA5NTJaFw0yMjAyMjcxNDA5NTJaMBExDzAN\n0LWOOSBzGwYnjfGmm/JzM06jHq+vyfrFwl28uNuCVRwJpvmjJC8+O8TYFgOrx8Oe\nQ7gbC+Wrx1Nv/u2j59ofTPk2R5oNdrYt3h5YVv0WocHmiYb+CzdwxBvyZ50Uy1+x\n0XEZpfYV4x6m1/8sEqYANx+5U+3KXZznUXlevyLqgS5tn3hGuxwRuxb5AifwRRmF\nz5wSVuDilCGnzNGyqJvP4rKAlGakQx8nyFIsdMsa7OpQVd4n+ex5HhfMlSa7Bvpj\nDK+8p3ynd11jihCkFAzOqldBN2hR1gCjx2b52zLk0vzTyyiCEebqb9hqKf+jb3/j\nFyE9gzlm2uR9rvvyVKnsDnuCb5vsnWdPTUvBov6tAgMBAAGjfzB9MB0GA1UdDgQW\nBBTmp4VYXwUkBWl7cK4WspgpaIyI8zBBBgNVHSMEOjA4gBTmp4VYXwUkBWl7cK4W\n8CKV1gYtjPBc6OOMNYyXfXlu0qtkLljV/Pdt4hxUNyyptPvJgP8xLg+z+RoZZmxV\nspgpaIyI86EVpBMwETEPMA0GA1UEAxMGVlBOIENBggkAnU3COYb6f/cwDAYDVR0T\nbifEWHPpbS1RceRBzk+QUNjRmQrT+hCdzpHro8SdbaPg7eRG7HvC5zi6tvxLirn/\n0ThsnRb5xWkDYQ2BXponBTnFRyYaiaXyEuJTAvfbF51R3ycy03tl4v15UtzW/Spa\nn1CqNVHH+vinqSo1cXV17b9PFcfohA2n86tDwkqOC+0fPX3KO2v8ALANxNYEunzW\nxWPQM0wTgoXuUpOx8/UkGYVxOnwy9uHtL4HS1+5tyTjKv5Ld8NktDPiNvSHTV8zt\nBAUwAwEB/zALBgNVHQ8EBAMCAQYwDQYJKoZIhvcNAQELBQADggIBACIReoZBwxA+\nS5sb3PokhBktJxEy8MzamAwuJEpiLikYPUJvoNI1XzH9JJR6cI1rfGtABb8GCikA\n9KxDmz8SBuJVjYuWA/d0DlLAAhUiq+gIkuh1YaC6dhjUxhQAxMe/WW38KHV9BlrR\nWrnstYLLSuVkwLmg5h+ltra2rqqyRTYX66+eKF8gj4p/xP0JAiAsBSLKztuSodce\nrhYC3Jy9EQ0MBP0oujwdOLSLMoGqM4xZPiMmsELgOVoeX5ypk2DPpWwNeOYVsDrV\nb2VJ/qPt0tfQjGIEYba34wNAsmuI/WLjayKVHz6zwG1nueG+9/JHVW1lYOv3iwXe\nPRTJkpeEl44pu4vsvU/XyAoUijFwwuazzbqLTNwc7h7kM7Vq/beCyN3HkyW44sla\nnIYUto+cPuPcEEuvyVeOT6UjzKgnLbmY\n-----END CERTIFICATE-----\n',
'cert': '\n-----BEGIN CERTIFICATE-----\nMIIFSjCCAzKgAwIBAgIBXzANBgkqhkiG9w0BAQsFADARMQ8wDQYDVQQDDAZWUE4g\nQ0EwHhcNMTgwNzIwMTQwMTUxWhcNMTkwMTE2MTQwMTUxWjArMSkwJwYDVQQDDCA5\nZjQzOTUzZjYzNzEyMTIxMzBkMmY4ZDY1YmFkODY5NDCCAiIwDQYJKoZIhvcNAQEB\nBQADggIPADCCAgoCggIBAMlxDDud9y8mxKWQjxkXUWcyaVdWEbw8GGdkZJA5SAgM\nXvQ2uIggKgQ7fZoptsRyWBeJQFi0F4IuwGICaJhLwPgCtd5okt2WpQEvDiBKEYqZ\nXY/LfiTEclRKJG9yI7r/Z8m85Hlm/V/EbDZrWPhzk3smh1KlAYY3saJr+HsoaAcv\nRCWA3mWefux/d0tsP3EOuQu4zV+Oak75j7Kdt7AygOk29SG5SYDqSGAkOf2iO8Ez\nN3PCx/zEjWy2CAacdoIpZpxWbZM+01YIkgFLIn5h+qo8DEEkeIfB6k/gKMDd8bvF\nkeE87q5kWFTO+U9BigyPc31opNILT5Mwy1xBXt0h3tSksXOKOfwTQgpnpPABaSFN\n0Tdl7A918CfiU6Mhhrm+wT45nx+BWzl3yAEpO57oe4kJaODb0/YVbnv5aZ7Mq3Sj\nxoGhBESaY15dAWaupq8gduwhJojdpUnMwlNCvJtOSn1NxRWdBRELtN3irUxhO4Wq\nYi8esnzgCUMeBf+h2Y2hazCw1HrNTLjyHAtkJsLw9DR7s3V4juHPgWfYTcUm/NeU\nXW+EvauxxDZWUwcd3S1PjGgCArFDHRqgXnSsd+NJYeygDcNKluQGcHJokUDtSEI2\nGWRbfeueysyzqeO0mhLsLL/BLNlb7fEqEMXeZrUJ15VbCW/rckrvuwAc2pE9wOaH\nAgMBAAGjgZIwgY8wCQYDVR0TBAIwADAdBgNVHQ4EFgQUZoAk4rVSPmOlz53LUZFd\n8cmso30wQQYDVR0jBDowOIAUDdOUbUGNeDKmECUa1UNkuIPB3GWhFaQTMBExDzAN\nBgNVBAMMBlZQTiBDQYIJAIo819EOTUu+MBMGA1UdJQQMMAoGCCsGAQUFBwMCMAsG\nA1UdDwQEAwIHgDANBgkqhkiG9w0BAQsFAAOCAgEAI3pD/f7MS6NWcpJ/t4qb/aiv\n4m2rRxOxOewVbzV0lPAaazJ70kUMdVGHsiaBQsLYgTQ2korsvKuHDZ/cH6bn0WYx\nF5ZvPrTktAFS2EiFyaMYbyZT6hGCJQaUbhYV7UXD1om1epo5dPPCJrXau2AGa8Y2\n9fPXXbilUeR/Rh1xiHWDn0Vfg9hnPnHvs8Vt1OfdpCRLD27S1DL4Svj9Vv4prya+\n6MxYVi1obc7oEO8y9mVb6Wq7JyOqfldWjUOxyY9tzl5peK8HcyrPmv/LLr5DAdVe\nmACqmXgwX/L+87X+S+RBy+71yd2zZhQzg8M1NDZJbxpCzhNylhQc1FLyUnO+p8ee\neT0IjR7SZuVYaTsd+HjI3TnBXNztNHSwUmMXBsI/1qrDXC7oqPBS7bDFc65EqIXt\n7PnP2ta1posklLq1Df5vyWqCxX3yu2o90Ph+Y4yoDV6PSPmtWMzDbmfh8RzjvD7b\nyCHzrmALmkZIXTo9XLYRET1zAhRwH0zrHXhp/5ae7lD0x/f0sIJnKfpv7kRIbVhO\neQ1X9t85MOvUuVVvHh1s6aUkB3/XNso3JHmg0YQK/X19AYjU6CIgYuDFa8YCwRfP\nJo/GJNGA/Ga8EnF2dEQVPtG0haONFcsUH/CWvGxdisfEPgYgyXSPH+qLdMENWzBN\nT6AhwlmSLX1GFPpwQeI=\n-----END CERTIFICATE-----\n',
'cipher': 'AES-256-CBC',
'client': None,
'comp-lzo': None,
'dev': 'tun',
'key': '\n-----BEGIN PRIVATE KEY-----\n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\nxL2Pccm97PHvBS/J8JMzBn8y3hhT0g==\n-----END PRIVATE KEY-----\n',
'key-direction': '1',
'nobind': None,
'remote': [['internet.demo.eduvpn.nl', '1194', 'udp'],
['internet.demo.eduvpn.nl', '1194', 'tcp'],
['internet.demo.eduvpn.nl', '443', 'tcp']],
'remote-cert-tls': 'server',
'server-poll-timeout': '10',
'tls-auth': '\n#\n# 2048 bit OpenVPN static key\n#\n-----BEGIN OpenVPN Static key V1-----\nbbb4a1bc4e97ce6cfa7ea930c3bb7feb\ne1af60b6b06a6acd39c38c29d6c0197c\n85dab27a52c30d0e31b4ce80bfb61dab\n69577c09b349787b7e9336a7e655a5bc\n51c3ef467fdf867a1cc951ae6ebd995a\nba096690d73fbd8cd41ffff231c1c17e\nef022cedf84639dc04b8fb204066f31e\n484804c5535d50c428794a68ba65b432\n781c4e76285ba799cbd81bb4473b3f45\nd7b127ab548377645dd82c14fd5db3b2\n8487de31db848a1a476616ab4650a55c\ne1a42d4a8521218ac56789e3c10848e7\n8349bea907fcbc333282879306cee469\nb0b85a410294cdea5eb29ae009f98687\n8cb2f25feff977b15b3249bee779659c\n367e7c0aa4d23d8af9d948f992fbd10a\n-----END OpenVPN Static key V1-----\n',
'tls-cipher': 'TLS-ECDHE-RSA-WITH-AES-256-GCM-SHA384',
'tls-version-min': '1.2',
'verb': '3'
"auth": "SHA256",
"ca": "\n-----BEGIN CERTIFICATE-----\nMIIFJDCCAwygAwIBAgIJAJ1NwjmG+n/3MA0GCSqGSIb3DQEBCwUAMBExDzANBgNV\nBgNVBAMTBlZQTiBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALOW\nZak2nNf7uZ1+XaoR78gkBHqszXlaFdPByC2bQn0vrsGurUHTXO843MDfsckbeNEE\n8ZrqXnNnqaojP90UkGIXbXLl7U8kborvKF/gQm6gsk3O0obhTVDdEj3kYKFGxmqu\nQHJo3C2amro4wVIv/BhXzIv6oP11Va/6FcwAYj8disNcxJgXWSUdARrEIC3PME58\nLd+a2jvXL/m8xBp+qVThvfmq2Pak1olhbgDueUSsQYiQZMq2rX3/1f+SInxZt3kJ\nBAMTBlZQTiBDQTAeFw0xNzAyMjcxNDA5NTJaFw0yMjAyMjcxNDA5NTJaMBExDzAN\n0LWOOSBzGwYnjfGmm/JzM06jHq+vyfrFwl28uNuCVRwJpvmjJC8+O8TYFgOrx8Oe\nQ7gbC+Wrx1Nv/u2j59ofTPk2R5oNdrYt3h5YVv0WocHmiYb+CzdwxBvyZ50Uy1+x\n0XEZpfYV4x6m1/8sEqYANx+5U+3KXZznUXlevyLqgS5tn3hGuxwRuxb5AifwRRmF\nz5wSVuDilCGnzNGyqJvP4rKAlGakQx8nyFIsdMsa7OpQVd4n+ex5HhfMlSa7Bvpj\nDK+8p3ynd11jihCkFAzOqldBN2hR1gCjx2b52zLk0vzTyyiCEebqb9hqKf+jb3/j\nFyE9gzlm2uR9rvvyVKnsDnuCb5vsnWdPTUvBov6tAgMBAAGjfzB9MB0GA1UdDgQW\nBBTmp4VYXwUkBWl7cK4WspgpaIyI8zBBBgNVHSMEOjA4gBTmp4VYXwUkBWl7cK4W\n8CKV1gYtjPBc6OOMNYyXfXlu0qtkLljV/Pdt4hxUNyyptPvJgP8xLg+z+RoZZmxV\nspgpaIyI86EVpBMwETEPMA0GA1UEAxMGVlBOIENBggkAnU3COYb6f/cwDAYDVR0T\nbifEWHPpbS1RceRBzk+QUNjRmQrT+hCdzpHro8SdbaPg7eRG7HvC5zi6tvxLirn/\n0ThsnRb5xWkDYQ2BXponBTnFRyYaiaXyEuJTAvfbF51R3ycy03tl4v15UtzW/Spa\nn1CqNVHH+vinqSo1cXV17b9PFcfohA2n86tDwkqOC+0fPX3KO2v8ALANxNYEunzW\nxWPQM0wTgoXuUpOx8/UkGYVxOnwy9uHtL4HS1+5tyTjKv5Ld8NktDPiNvSHTV8zt\nBAUwAwEB/zALBgNVHQ8EBAMCAQYwDQYJKoZIhvcNAQELBQADggIBACIReoZBwxA+\nS5sb3PokhBktJxEy8MzamAwuJEpiLikYPUJvoNI1XzH9JJR6cI1rfGtABb8GCikA\n9KxDmz8SBuJVjYuWA/d0DlLAAhUiq+gIkuh1YaC6dhjUxhQAxMe/WW38KHV9BlrR\nWrnstYLLSuVkwLmg5h+ltra2rqqyRTYX66+eKF8gj4p/xP0JAiAsBSLKztuSodce\nrhYC3Jy9EQ0MBP0oujwdOLSLMoGqM4xZPiMmsELgOVoeX5ypk2DPpWwNeOYVsDrV\nb2VJ/qPt0tfQjGIEYba34wNAsmuI/WLjayKVHz6zwG1nueG+9/JHVW1lYOv3iwXe\nPRTJkpeEl44pu4vsvU/XyAoUijFwwuazzbqLTNwc7h7kM7Vq/beCyN3HkyW44sla\nnIYUto+cPuPcEEuvyVeOT6UjzKgnLbmY\n-----END CERTIFICATE-----\n",
"cert": "\n-----BEGIN CERTIFICATE-----\nMIIFSjCCAzKgAwIBAgIBXzANBgkqhkiG9w0BAQsFADARMQ8wDQYDVQQDDAZWUE4g\nQ0EwHhcNMTgwNzIwMTQwMTUxWhcNMTkwMTE2MTQwMTUxWjArMSkwJwYDVQQDDCA5\nZjQzOTUzZjYzNzEyMTIxMzBkMmY4ZDY1YmFkODY5NDCCAiIwDQYJKoZIhvcNAQEB\nBQADggIPADCCAgoCggIBAMlxDDud9y8mxKWQjxkXUWcyaVdWEbw8GGdkZJA5SAgM\nXvQ2uIggKgQ7fZoptsRyWBeJQFi0F4IuwGICaJhLwPgCtd5okt2WpQEvDiBKEYqZ\nXY/LfiTEclRKJG9yI7r/Z8m85Hlm/V/EbDZrWPhzk3smh1KlAYY3saJr+HsoaAcv\nRCWA3mWefux/d0tsP3EOuQu4zV+Oak75j7Kdt7AygOk29SG5SYDqSGAkOf2iO8Ez\nN3PCx/zEjWy2CAacdoIpZpxWbZM+01YIkgFLIn5h+qo8DEEkeIfB6k/gKMDd8bvF\nkeE87q5kWFTO+U9BigyPc31opNILT5Mwy1xBXt0h3tSksXOKOfwTQgpnpPABaSFN\n0Tdl7A918CfiU6Mhhrm+wT45nx+BWzl3yAEpO57oe4kJaODb0/YVbnv5aZ7Mq3Sj\nxoGhBESaY15dAWaupq8gduwhJojdpUnMwlNCvJtOSn1NxRWdBRELtN3irUxhO4Wq\nYi8esnzgCUMeBf+h2Y2hazCw1HrNTLjyHAtkJsLw9DR7s3V4juHPgWfYTcUm/NeU\nXW+EvauxxDZWUwcd3S1PjGgCArFDHRqgXnSsd+NJYeygDcNKluQGcHJokUDtSEI2\nGWRbfeueysyzqeO0mhLsLL/BLNlb7fEqEMXeZrUJ15VbCW/rckrvuwAc2pE9wOaH\nAgMBAAGjgZIwgY8wCQYDVR0TBAIwADAdBgNVHQ4EFgQUZoAk4rVSPmOlz53LUZFd\n8cmso30wQQYDVR0jBDowOIAUDdOUbUGNeDKmECUa1UNkuIPB3GWhFaQTMBExDzAN\nBgNVBAMMBlZQTiBDQYIJAIo819EOTUu+MBMGA1UdJQQMMAoGCCsGAQUFBwMCMAsG\nA1UdDwQEAwIHgDANBgkqhkiG9w0BAQsFAAOCAgEAI3pD/f7MS6NWcpJ/t4qb/aiv\n4m2rRxOxOewVbzV0lPAaazJ70kUMdVGHsiaBQsLYgTQ2korsvKuHDZ/cH6bn0WYx\nF5ZvPrTktAFS2EiFyaMYbyZT6hGCJQaUbhYV7UXD1om1epo5dPPCJrXau2AGa8Y2\n9fPXXbilUeR/Rh1xiHWDn0Vfg9hnPnHvs8Vt1OfdpCRLD27S1DL4Svj9Vv4prya+\n6MxYVi1obc7oEO8y9mVb6Wq7JyOqfldWjUOxyY9tzl5peK8HcyrPmv/LLr5DAdVe\nmACqmXgwX/L+87X+S+RBy+71yd2zZhQzg8M1NDZJbxpCzhNylhQc1FLyUnO+p8ee\neT0IjR7SZuVYaTsd+HjI3TnBXNztNHSwUmMXBsI/1qrDXC7oqPBS7bDFc65EqIXt\n7PnP2ta1posklLq1Df5vyWqCxX3yu2o90Ph+Y4yoDV6PSPmtWMzDbmfh8RzjvD7b\nyCHzrmALmkZIXTo9XLYRET1zAhRwH0zrHXhp/5ae7lD0x/f0sIJnKfpv7kRIbVhO\neQ1X9t85MOvUuVVvHh1s6aUkB3/XNso3JHmg0YQK/X19AYjU6CIgYuDFa8YCwRfP\nJo/GJNGA/Ga8EnF2dEQVPtG0haONFcsUH/CWvGxdisfEPgYgyXSPH+qLdMENWzBN\nT6AhwlmSLX1GFPpwQeI=\n-----END CERTIFICATE-----\n",
"cipher": "AES-256-CBC",
"client": None,
"comp-lzo": None,
"dev": "tun",
"key": "\n-----BEGIN PRIVATE KEY-----\n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\nxL2Pccm97PHvBS/J8JMzBn8y3hhT0g==\n-----END PRIVATE KEY-----\n",
"key-direction": "1",
"nobind": None,
"remote": [
["internet.demo.eduvpn.nl", "1194", "udp"],
["internet.demo.eduvpn.nl", "1194", "tcp"],
["internet.demo.eduvpn.nl", "443", "tcp"],
],
"remote-cert-tls": "server",
"server-poll-timeout": "10",
"tls-auth": "\n#\n# 2048 bit OpenVPN static key\n#\n-----BEGIN OpenVPN Static key V1-----\nbbb4a1bc4e97ce6cfa7ea930c3bb7feb\ne1af60b6b06a6acd39c38c29d6c0197c\n85dab27a52c30d0e31b4ce80bfb61dab\n69577c09b349787b7e9336a7e655a5bc\n51c3ef467fdf867a1cc951ae6ebd995a\nba096690d73fbd8cd41ffff231c1c17e\nef022cedf84639dc04b8fb204066f31e\n484804c5535d50c428794a68ba65b432\n781c4e76285ba799cbd81bb4473b3f45\nd7b127ab548377645dd82c14fd5db3b2\n8487de31db848a1a476616ab4650a55c\ne1a42d4a8521218ac56789e3c10848e7\n8349bea907fcbc333282879306cee469\nb0b85a410294cdea5eb29ae009f98687\n8cb2f25feff977b15b3249bee779659c\n367e7c0aa4d23d8af9d948f992fbd10a\n-----END OpenVPN Static key V1-----\n",
"tls-cipher": "TLS-ECDHE-RSA-WITH-AES-256-GCM-SHA384",
"tls-version-min": "1.2",
"verb": "3",
}

mock_server = {
'server_type': 'secure_internet',
'base_url': 'https://eduvpn.bogus/',
'country_code': 'NL',
'support_contact': ['mailto:[email protected]']
"server_type": "secure_internet",
"base_url": "https://eduvpn.bogus/",
"country_code": "NL",
"support_contact": ["mailto:[email protected]"],
}

mock_org = {
'display_name': {'nl': 'bogus', 'en': 'bogus'},
'org_id': 'http://idp.mock.bogus/adfs/services/trust',
'secure_internet_home': 'https://idp.mock.bogus/'
"display_name": {"nl": "bogus", "en": "bogus"},
"org_id": "http://idp.mock.bogus/adfs/services/trust",
"secure_internet_home": "https://idp.mock.bogus/",
}

0 comments on commit 8dfbdd9

Please sign in to comment.