kunsi/bundlewrap
1
0
Fork 0
Code Issues 1 Pull requests 1 Releases Activity

bundles/users: fix adding of non-admin users

Browse source
This commit is contained in:
Franzi 2021-06-01 16:53:29 +02:00
parent 47c18913ca
commit 09397e2597
Signed by: kunsi
GPG key ID: 12E3D2136B818350
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
bundles/users/metadata.py
View file

@ -20,17 +20,18 @@ def add_users_from_json(metadata):
json = loads(f.read()) json = loads(f.read())
users = {} users = {}
metadata_users = metadata.get('users', {})
# First, add all admin users # First, add all admin users
for uname, config in json.items(): for uname, config in json.items():
if config.get('is_admin', False): if config.get('is_admin', False) or uname in metadata_users:
users[uname] = { users[uname] = {
'ssh_pubkey': set(config['ssh_pubkey']), 'ssh_pubkey': set(config['ssh_pubkey']),
'is_admin': True, 'is_admin': config.get('is_admin', False),
} }
# Then, run again to get all 'to be deleted' users # Then, run again to get all 'to be deleted' users
for uname, config in json.items(): for uname, config in json.items():
if uname not in metadata.get('users', {}): if uname not in metadata_users:
users.setdefault(uname, { users.setdefault(uname, {
'delete': True, 'delete': True,
}) })