X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fimporter%2Fplimporter.py;h=1e04e54ca13f59c93469073bfeede4a7146205aa;hb=1db1a879ffde8991aa95dd80142d555551655e88;hp=f8cb4a7f18ca39d1dbe56dc196377515d3556897;hpb=78467ecd9b02ec60d9572178995ed347fc917f59;p=sfa.git diff --git a/sfa/importer/plimporter.py b/sfa/importer/plimporter.py index f8cb4a7f..1e04e54c 100644 --- a/sfa/importer/plimporter.py +++ b/sfa/importer/plimporter.py @@ -20,7 +20,6 @@ import os from sfa.util.config import Config from sfa.util.xrn import Xrn, get_leaf, get_authority, hrn_to_urn -from sfa.util.plxrn import hostname_to_hrn, slicename_to_hrn, email_to_hrn, hrn_to_pl_slicename from sfa.trust.gid import create_uuid from sfa.trust.certificate import convert_public_key, Keypair @@ -28,7 +27,8 @@ from sfa.trust.certificate import convert_public_key, Keypair from sfa.storage.alchemy import dbsession from sfa.storage.model import RegRecord, RegAuthority, RegSlice, RegNode, RegUser, RegKey -from sfa.plc.plshell import PlShell +from sfa.planetlab.plshell import PlShell +from sfa.planetlab.plxrn import hostname_to_hrn, slicename_to_hrn, email_to_hrn, hrn_to_pl_slicename def _get_site_hrn(interface_hrn, site): # Hardcode 'internet2' into the hrn for sites hosting @@ -82,17 +82,20 @@ class PlImporter: def locate_by_type_pointer (self, type, pointer): return self.records_by_type_pointer.get ( (type, pointer), None) - # convenience : try to locate first based on type+pointer - # if so, the record was created already even if e.g. its hrn has changed meanwhile - # otherwise we try by type+hrn (is this truly useful ?) - def locate (self, type, hrn=None, pointer=-1): - if pointer!=-1: - attempt = self.locate_by_type_pointer (type, pointer) - if attempt : return attempt - if hrn is not None: - attempt = self.locate_by_type_hrn (type, hrn,) - if attempt : return attempt - return None + # a convenience/helper function to see if a record is already known + # a former, broken, attempt (in 2.1-9) had been made + # to try and use 'pointer' as a first, most significant attempt + # the idea being to preserve stuff as much as possible, and thus + # to avoid creating a new gid in the case of a simple hrn rename + # however this of course doesn't work as the gid depends on the hrn... + #def locate (self, type, hrn=None, pointer=-1): + # if pointer!=-1: + # attempt = self.locate_by_type_pointer (type, pointer) + # if attempt : return attempt + # if hrn is not None: + # attempt = self.locate_by_type_hrn (type, hrn,) + # if attempt : return attempt + # return None # this makes the run method a bit abtruse - out of the way def create_special_vini_record (self, interface_hrn): @@ -147,7 +150,7 @@ class PlImporter: # sites_by_login_base = dict ( [ ( site['login_base'], site ) for site in sites ] ) # Get all plc users persons = shell.GetPersons({'peer_id': None, 'enabled': True}, - ['person_id', 'email', 'key_ids', 'site_ids']) + ['person_id', 'email', 'key_ids', 'site_ids', 'role_ids']) # create a hash of persons by person_id persons_by_id = dict ( [ ( person['person_id'], person) for person in persons ] ) # Get all plc public keys @@ -155,7 +158,8 @@ class PlImporter: key_ids = [] for person in persons: key_ids.extend(person['key_ids']) - keys = shell.GetKeys( {'peer_id': None, 'key_id': key_ids} ) + keys = shell.GetKeys( {'peer_id': None, 'key_id': key_ids, + 'key_type': 'ssh'} ) # create a hash of keys by key_id keys_by_id = dict ( [ ( key['key_id'], key ) for key in keys ] ) # create a dict person_id -> [ (plc)keys ] @@ -163,7 +167,9 @@ class PlImporter: for person in persons: pubkeys = [] for key_id in person['key_ids']: - pubkeys.append(keys_by_id[key_id]) + key = keys_by_id[key_id] + if key['key_type'] == 'ssh': + pubkeys.append(key) keys_by_person_id[person['person_id']] = pubkeys # Get all plc nodes nodes = shell.GetNodes( {'peer_id': None}, ['node_id', 'hostname', 'site_id']) @@ -182,7 +188,7 @@ class PlImporter: site_hrn = _get_site_hrn(interface_hrn, site) # import if hrn is not in list of existing hrns or if the hrn exists # but its not a site record - site_record=self.locate ('authority', site_hrn, site['site_id']) + site_record=self.locate_by_type_hrn ('authority', site_hrn) if not site_record: try: urn = hrn_to_urn(site_hrn, 'authority') @@ -216,18 +222,18 @@ class PlImporter: continue site_auth = get_authority(site_hrn) site_name = site['login_base'] - hrn = hostname_to_hrn(site_auth, site_name, node['hostname']) + node_hrn = hostname_to_hrn(site_auth, site_name, node['hostname']) # xxx this sounds suspicious - if len(hrn) > 64: hrn = hrn[:64] - node_record = self.locate ( 'node', hrn , node['node_id'] ) + if len(node_hrn) > 64: node_hrn = node_hrn[:64] + node_record = self.locate_by_type_hrn ( 'node', node_hrn ) if not node_record: try: pkey = Keypair(create=True) - urn = hrn_to_urn(hrn, 'node') + urn = hrn_to_urn(node_hrn, 'node') node_gid = self.auth_hierarchy.create_gid(urn, create_uuid(), pkey) - node_record = RegNode (hrn=hrn, gid=node_gid, + node_record = RegNode (hrn=node_hrn, gid=node_gid, pointer =node['node_id'], - authority=get_authority(hrn)) + authority=get_authority(node_hrn)) node_record.just_created() dbsession.add(node_record) dbsession.commit() @@ -240,6 +246,7 @@ class PlImporter: pass node_record.stale=False + site_pis=[] # import persons for person_id in site['person_ids']: try: @@ -251,7 +258,7 @@ class PlImporter: if len(person_hrn) > 64: person_hrn = person_hrn[:64] person_urn = hrn_to_urn(person_hrn, 'user') - user_person = self.locate ( 'user', person_hrn, person['person_id']) + user_record = self.locate_by_type_hrn ( 'user', person_hrn) # return a tuple pubkey (a plc key object) and pkey (a Keypair object) def init_person_key (person, plc_keys): @@ -273,26 +280,28 @@ class PlImporter: # new person try: plc_keys = keys_by_person_id.get(person['person_id'],[]) - if not user_person: + if not user_record: (pubkey,pkey) = init_person_key (person, plc_keys ) person_gid = self.auth_hierarchy.create_gid(person_urn, create_uuid(), pkey) - user_person = RegUser (hrn=person_hrn, gid=person_gid, + person_gid.set_email(person['email']) + user_record = RegUser (hrn=person_hrn, gid=person_gid, pointer=person['person_id'], authority=get_authority(person_hrn), email=person['email']) if pubkey: - user_person.reg_keys=[RegKey (pubkey['key'], pubkey['key_id'])] + user_record.reg_keys=[RegKey (pubkey['key'], pubkey['key_id'])] else: - self.logger.warning("No key found for user %s"%user_person) - dbsession.add (user_person) + self.logger.warning("No key found for user %s"%user_record) + user_record.just_created() + dbsession.add (user_record) dbsession.commit() - self.logger.info("PlImporter: imported person: %s" % user_person) - self.remember_record ( user_person ) + self.logger.info("PlImporter: imported person: %s" % user_record) + self.remember_record ( user_record ) else: # update the record ? # if user's primary key has changed then we need to update the # users gid by forcing an update here - sfa_keys = user_person.reg_keys + sfa_keys = user_record.reg_keys def key_in_list (key,sfa_keys): for reg_key in sfa_keys: if reg_key.key==key['key']: return True @@ -306,16 +315,24 @@ class PlImporter: (pubkey,pkey) = init_person_key (person, plc_keys) person_gid = self.auth_hierarchy.create_gid(person_urn, create_uuid(), pkey) if not pubkey: - user_person.reg_keys=[] + user_record.reg_keys=[] else: - user_person.reg_keys=[ RegKey (pubkey['key'], pubkey['key_id'])] - self.logger.info("PlImporter: updated person: %s" % user_person) - user_person.email = person['email'] + user_record.reg_keys=[ RegKey (pubkey['key'], pubkey['key_id'])] + self.logger.info("PlImporter: updated person: %s" % user_record) + user_record.email = person['email'] dbsession.commit() - user_person.stale=False + user_record.stale=False + # accumulate PIs - PLCAPI has a limitation that when someone has PI role + # this is valid for all sites she is in.. + # PI is coded with role_id==20 + if 20 in person['role_ids']: + site_pis.append (user_record) except: self.logger.log_exc("PlImporter: failed to import person %d %s"%(person['person_id'],person['email'])) + # maintain the list of PIs for a given site + site_record.reg_pis = site_pis + # import slices for slice_id in site['slice_ids']: try: @@ -323,7 +340,7 @@ class PlImporter: except: self.logger.warning ("PlImporter: cannot locate slice_id %s - ignored"%slice_id) slice_hrn = slicename_to_hrn(interface_hrn, slice['name']) - slice_record = self.locate ('slice', slice_hrn, slice['slice_id']) + slice_record = self.locate_by_type_hrn ('slice', slice_hrn) if not slice_record: try: pkey = Keypair(create=True)