nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-04-29 10:10:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

wireguard: Ensure tests work without latest network manager

Browse Source 
Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
This commit is contained in:
Sunil Mohan Adapa 2020-01-14 19:01:12 -08:00 committed by James Valleroy
parent 43ad12c563
commit 642d44aced
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
plinth/modules/wireguard/utils.py
View File

@ -29,21 +29,21 @@ from plinth.utils import import_from_gi
nm = import_from_gi('NM', '1.0') nm = import_from_gi('NM', '1.0')
IP_TEMPLATE = '10.84.0.{}' IP_TEMPLATE = '10.84.0.{}'
WIREGUARD_SETTING = nm.SETTING_WIREGUARD_SETTING_NAME
def get_nm_info(): def get_nm_info():
"""Get information from network manager.""" """Get information from network manager."""
setting_name = nm.SETTING_WIREGUARD_SETTING_NAME
client = network.get_nm_client() client = network.get_nm_client()
connections = {} connections = {}
for connection in client.get_connections(): for connection in client.get_connections():
if connection.get_connection_type() != WIREGUARD_SETTING: if connection.get_connection_type() != setting_name:
continue continue
settings = connection.get_setting_by_name(WIREGUARD_SETTING) settings = connection.get_setting_by_name(setting_name)
secrets = connection.get_secrets(WIREGUARD_SETTING) secrets = connection.get_secrets(setting_name)
connection.update_secrets(WIREGUARD_SETTING, secrets) connection.update_secrets(setting_name, secrets)
info = {} info = {}
info['interface'] = connection.get_interface_name() info['interface'] = connection.get_interface_name()
@ -158,11 +158,12 @@ def edit_server(interface, settings):
def setup_server(): def setup_server():
"""Setup a server connection that clients can connect to.""" """Setup a server connection that clients can connect to."""
setting_name = nm.SETTING_WIREGUARD_SETTING_NAME
private_key = _generate_private_key() private_key = _generate_private_key()
settings = { settings = {
'common': { 'common': {
'name': 'WireGuard-Server-wg0', 'name': 'WireGuard-Server-wg0',
'type': WIREGUARD_SETTING, 'type': setting_name,
'zone': 'internal', 'zone': 'internal',
'interface': 'wg0' 'interface': 'wg0'
}, },
@ -202,6 +203,7 @@ def _get_next_available_ip_address(settings):
def _server_connection(): def _server_connection():
"""Return a server connection. Create one if necessary.""" """Return a server connection. Create one if necessary."""
setting_name = nm.SETTING_WIREGUARD_SETTING_NAME
connection = network.get_connection_by_interface_name('wg0') connection = network.get_connection_by_interface_name('wg0')
if not connection: if not connection:
setup_server() setup_server()
@ -219,16 +221,17 @@ def _server_connection():
# Retrieve secrets so that when the connection is changed, secrets are # Retrieve secrets so that when the connection is changed, secrets are
# preserved properly. # preserved properly.
secrets = connection.get_secrets(WIREGUARD_SETTING) secrets = connection.get_secrets(setting_name)
connection.update_secrets(WIREGUARD_SETTING, secrets) connection.update_secrets(setting_name, secrets)
return connection return connection
def add_client(public_key): def add_client(public_key):
"""Add a permission for a client to connect our server.""" """Add a permission for a client to connect our server."""
setting_name = nm.SETTING_WIREGUARD_SETTING_NAME
connection = _server_connection() connection = _server_connection()
settings = connection.get_setting_by_name(WIREGUARD_SETTING) settings = connection.get_setting_by_name(setting_name)
peer, _ = settings.get_peer_by_public_key(public_key) peer, _ = settings.get_peer_by_public_key(public_key)
if peer: if peer:
raise ValueError('Peer with public key already exists') raise ValueError('Peer with public key already exists')
@ -243,8 +246,9 @@ def add_client(public_key):
def remove_client(public_key): def remove_client(public_key):
"""Remove permission for a client to connect our server.""" """Remove permission for a client to connect our server."""
setting_name = nm.SETTING_WIREGUARD_SETTING_NAME
connection = _server_connection() connection = _server_connection()
settings = connection.get_setting_by_name(WIREGUARD_SETTING) settings = connection.get_setting_by_name(setting_name)
peer, peer_index = settings.get_peer_by_public_key(public_key) peer, peer_index = settings.get_peer_by_public_key(public_key)
if not peer: if not peer:
raise KeyError('Client not found') raise KeyError('Client not found')