From 09397e2597507624e851df20e070bb48e4b90830 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Tue, 1 Jun 2021 16:53:29 +0200 Subject: [PATCH] bundles/users: fix adding of non-admin users --- bundles/users/metadata.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bundles/users/metadata.py b/bundles/users/metadata.py index 4dd1d32..29006ff 100644 --- a/bundles/users/metadata.py +++ b/bundles/users/metadata.py @@ -20,17 +20,18 @@ def add_users_from_json(metadata): json = loads(f.read()) users = {} + metadata_users = metadata.get('users', {}) # First, add all admin users 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] = { '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 for uname, config in json.items(): - if uname not in metadata.get('users', {}): + if uname not in metadata_users: users.setdefault(uname, { 'delete': True, })