From d32ce48af6eee00cc18ad28d8e2a4ff0aa161c21 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Fri, 18 Jul 2014 15:51:31 +0200 Subject: [PATCH] dealing with reg-keys vs just keys because of the high number of occurrences of 'keys' in the code, I do a quick and dirty thing but it could probably use more care --- sfa/client/sfaadmin.py | 2 +- sfa/client/sfi.py | 2 +- sfa/managers/registry_manager.py | 24 ++++++++++++++---------- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/sfa/client/sfaadmin.py b/sfa/client/sfaadmin.py index 15004ce4..a21cb5f6 100755 --- a/sfa/client/sfaadmin.py +++ b/sfa/client/sfaadmin.py @@ -102,7 +102,7 @@ class RegistryCommands(Commands): pubkey = open(key, 'r').read() except IOError: pubkey = key - record_dict['keys'] = [pubkey] + record_dict['reg-keys'] = [pubkey] if slices: record_dict['slices'] = slices if researchers: diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py index 94045b08..dcad9dad 100644 --- a/sfa/client/sfi.py +++ b/sfa/client/sfi.py @@ -201,7 +201,7 @@ def load_record_from_opts(options): pubkey = options.key if not check_ssh_key (pubkey): raise SfaInvalidArgument(name='key',msg="Could not find file, or wrong key format") - record_dict['keys'] = [pubkey] + record_dict['reg-keys'] = [pubkey] if hasattr(options, 'slices') and options.slices: record_dict['slices'] = options.slices if hasattr(options, 'reg_researchers') and options.reg_researchers is not None: diff --git a/sfa/managers/registry_manager.py b/sfa/managers/registry_manager.py index c8ff0346..474456b1 100644 --- a/sfa/managers/registry_manager.py +++ b/sfa/managers/registry_manager.py @@ -33,7 +33,7 @@ from sqlalchemy.orm.collections import InstrumentedList # * write operations (register, update) need e.g. # 'researcher' or 'pi' to be set - reg-* are just ignored # -# the 'normalize' helper functions below aim at ironing this out +# the '_normalize_input' helper functions below aim at ironing this out # however in order to break as few code as possible we essentially make sure that *both* fields are set # upon entering the write methods (so again register and update) for legacy, as some driver code # might depend on the presence of, say, 'researcher' @@ -48,16 +48,21 @@ def _normalize_input (record, reg_key, driver_key): # and issue a warning if they were both set and different # as we're overwriting some user data here if driver_key in record: - logger.warning ("normalize_input_researcher: incoming record has both values, using reg-researchers") + logger.warning ("normalize_input: incoming record has both values, using %s"%reg_key) record[driver_key]=record[reg_key] # we only have one key set, duplicate for the other one elif driver_key in record: - logger.warning ("normalize_input_researcher: you should use '%s' instead ot '%s'"%(reg_key,driver_key)) + logger.warning ("normalize_input: you should use '%s' instead of '%s'"%(reg_key,driver_key)) record[reg_key]=record[driver_key] def normalize_input_record (record): _normalize_input (record, 'reg-researchers','researcher') _normalize_input (record, 'reg-pis','pi') + _normalize_input (record, 'reg-keys','keys') + # xxx the keys thing could use a little bit more attention: + # some parts of the code are using 'keys' while they should use 'reg-keys' + # but I run out of time for now + if 'reg-keys' in record: record['keys']=record['reg-keys'] return record class RegistryManager: @@ -357,11 +362,10 @@ class RegistryManager: if not record.gid: uuid = create_uuid() pkey = Keypair(create=True) - if getattr(record,'keys',None): - pub_key=record.keys + pub_key=record_dict.get('reg-keys',None) + if pub_key is not None: # use only first key in record - if isinstance(record.keys, types.ListType): - pub_key = record.keys[0] + if pub_key and isinstance(pub_key, types.ListType): pub_key = pub_key[0] pkey = convert_public_key(pub_key) gid_object = api.auth.hierarchy.create_gid(urn, uuid, pkey) @@ -388,9 +392,9 @@ class RegistryManager: elif isinstance (record, RegUser): # create RegKey objects for incoming keys - if hasattr(record,'keys'): - logger.debug ("creating %d keys for user %s"%(len(record.keys),record.hrn)) - record.reg_keys = [ RegKey (key) for key in record.keys ] + if hasattr(record,'reg_keys'): + logger.debug ("creating %d keys for user %s"%(len(record.reg_keys),record.hrn)) + record.reg_keys = [ RegKey (key) for key in record.reg_keys ] # update testbed-specific data if needed pointer = api.driver.register (record.__dict__, hrn, pub_key) -- 2.43.0