bundles/users/metadata.py

@@ -20,7 +20,7 @@ def authorized_users(metadata):
         users[name] = {
             'authorized_keys': set(),
         }
-        for authorized_user in config.get('authorized_users', set()):
+        for authorized_user in config.get('authorized_users', []):
             authorized_user_name, authorized_user_node = authorized_user.split('@')
             users[name]['authorized_keys'].add(
                 repo.get_node(authorized_user_node).metadata.get(f'users/{authorized_user_name}/pubkey')

bundles/wireguard/metadata.py

@@ -116,7 +116,7 @@ def peer_keys(metadata):
     for peer_name in metadata.get('wireguard/peers', {}):
         peer_node = repo.get_node(peer_name)
         
-        first, second = sorted([node.metadata.get('id'), peer_node.metadata.get('id')])
+        first, second = sorted([node.name, peer_name])
         psk = repo.vault.random_bytes_as_base64_for(f'{first} wireguard {second}')
         
         pubkey = repo.libs.keys.get_pubkey_from_privkey(