X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fimporter%2Fsfa-import-plc.py;h=36617bb95b4a2074e0a8455dc7911916dc04aca2;hb=862dfa7f7b8cce8c17e80c42aedd8d500ea86cb6;hp=45945343f40d4e7378efc1b46751923bd6cb85e2;hpb=cf630d87d633f3861e3ac8a50433fa29ca46a74e;p=sfa.git diff --git a/sfa/importer/sfa-import-plc.py b/sfa/importer/sfa-import-plc.py index 45945343..36617bb9 100755 --- a/sfa/importer/sfa-import-plc.py +++ b/sfa/importer/sfa-import-plc.py @@ -18,14 +18,19 @@ import os import getopt import sys -from sfa.util.xrn import get_leaf, get_authority -from sfa.util.plxrn import hostname_to_hrn, slicename_to_hrn, email_to_hrn, hrn_to_pl_slicename from sfa.util.config import Config -from sfa.util.xrn import Xrn +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 -from sfa.storage.table import SfaTable +from sfa.plc.plshell import PlShell -from sfa.importer.sfaImport import sfaImport +from sfa.storage.alchemy import dbsession +from sfa.storage.model import RegRecord, RegAuthority, RegUser, RegSlice, RegNode + +from sfa.importer.sfaImport import sfaImport, _cleanup_string def process_options(): @@ -61,56 +66,29 @@ def _get_site_hrn(interface_hrn, site): hrn = ".".join([interface_hrn, "internet2", site['login_base']]) return hrn +# one would think this code could use a call to DBSchema +# however now import s expected to be done after service creation def main(): process_options() config = Config() + sfaImporter = sfaImport() + logger=sfaImporter.logger + logger.setLevelFromOptVerbose(config.SFA_API_LOGLEVEL) if not config.SFA_REGISTRY_ENABLED: sys.exit(0) root_auth = config.SFA_REGISTRY_ROOT_AUTH interface_hrn = config.SFA_INTERFACE_HRN - keys_filename = config.config_path + os.sep + 'person_keys.py' - sfaImporter = sfaImport() - logger=sfaImporter.logger - if config.SFA_API_DEBUG: logger.setLevelDebug() - shell = sfaImporter.shell + shell = PlShell (config) + sfaImporter.create_top_level_records() - # initialize registry db table - table = SfaTable() - if not table.exists(): - table.create() - - # create root authority - sfaImporter.create_top_level_auth_records(interface_hrn) - - # create s user record for the slice manager - sfaImporter.create_sm_client_record() - - # create interface records - logger.info("Import: creating interface records") - sfaImporter.create_interface_records() - - # add local root authority's cert to trusted list - logger.info("Import: adding " + interface_hrn + " to trusted list") - authority = sfaImporter.AuthHierarchy.get_auth_info(interface_hrn) - sfaImporter.TrustedRoots.add_gid(authority.get_gid_object()) - - # special case for vini - if ".vini" in interface_hrn and interface_hrn.endswith('vini'): - # create a fake internet2 site first - i2site = {'name': 'Internet2', 'abbreviated_name': 'I2', - 'login_base': 'internet2', 'site_id': -1} - sfaImporter.import_site(interface_hrn, i2site) - # create dict of all existing sfa records existing_records = {} existing_hrns = [] key_ids = [] - person_keys = {} - results = table.find() - for result in results: - existing_records[(result['hrn'], result['type'])] = result - existing_hrns.append(result['hrn']) + for record in dbsession.query(RegRecord): + existing_records[ (record.hrn, record.type,) ] = record + existing_hrns.append(record.hrn) # Get all plc sites sites = shell.GetSites({'peer_id': None}) @@ -133,7 +111,9 @@ def main(): keys_dict[key['key_id']] = key['key'] # create a dict of person keys keyed on key_id + keys_filename = config.config_path + os.sep + 'person_keys.py' old_person_keys = load_keys(keys_filename) + person_keys = {} for person in persons: pubkeys = [] for key_id in person['key_ids']: @@ -151,16 +131,58 @@ def main(): slices_dict = {} for slice in slices: slices_dict[slice['slice_id']] = slice + + # special case for vini + if ".vini" in interface_hrn and interface_hrn.endswith('vini'): + # create a fake internet2 site first + i2site = {'name': 'Internet2', 'abbreviated_name': 'I2', + 'login_base': 'internet2', 'site_id': -1} + site_hrn = _get_site_hrn(interface_hrn, i2site) + # import if hrn is not in list of existing hrns or if the hrn exists + # but its not a site record + if site_hrn not in existing_hrns or \ + (site_hrn, 'authority') not in existing_records: + urn = hrn_to_urn(site_hrn, 'authority') + if not sfaImporter.AuthHierarchy.auth_exists(urn): + sfaImporter.AuthHierarchy.create_auth(urn) + auth_info = sfaImporter.AuthHierarchy.get_auth_info(urn) + auth_record = RegAuthority() + auth_record.type='authority' + auth_record.hrn=site_hrn + auth_record.gid=auth_info.get_gid_object() + auth_record.pointer=site['site_id'] + auth_record.authority=get_authority(site_hrn) + dbsession.add(auth_record) + dbsession.commit() + logger.info("Import: Imported authority (vini site) %s"%auth_record) + # start importing for site in sites: site_hrn = _get_site_hrn(interface_hrn, site) - logger.info("Importing site: %s" % site_hrn) # import if hrn is not in list of existing hrns or if the hrn exists # but its not a site record if site_hrn not in existing_hrns or \ (site_hrn, 'authority') not in existing_records: - sfaImporter.import_site(site_hrn, site) + try: + urn = hrn_to_urn(site_hrn, 'authority') + if not sfaImporter.AuthHierarchy.auth_exists(urn): + sfaImporter.AuthHierarchy.create_auth(urn) + auth_info = sfaImporter.AuthHierarchy.get_auth_info(urn) + auth_record = RegAuthority() + auth_record.type='authority' + auth_record.hrn=site_hrn + auth_record.gid=auth_info.get_gid_object() + auth_record.pointer=site['site_id'] + auth_record.authority=get_authority(site_hrn) + dbsession.add(auth_record) + dbsession.commit() + logger.info("Import: imported authority (site) : %s" % auth_record) + except: + # if the site import fails then there is no point in trying to import the + # site's child records (node, slices, persons), so skip them. + logger.log_exc("Import: failed to import site. Skipping child records") + continue # import node records for node_id in site['node_ids']: @@ -170,9 +192,26 @@ def main(): site_auth = get_authority(site_hrn) site_name = get_leaf(site_hrn) hrn = hostname_to_hrn(site_auth, site_name, node['hostname']) + if len(hrn) > 64: + hrn = hrn[:64] if hrn not in existing_hrns or \ (hrn, 'node') not in existing_records: - sfaImporter.import_node(hrn, node) + try: + pkey = Keypair(create=True) + urn = hrn_to_urn(hrn, 'node') + node_gid = sfaImporter.AuthHierarchy.create_gid(urn, create_uuid(), pkey) + node_record = RegNode () + node_record.type='node' + node_record.hrn=hrn + node_record.gid=node_gid + node_record.pointer =node['node_id'] + node_record.authority=get_authority(hrn) + dbsession.add(node_record) + dbsession.commit() + logger.info("Import: imported node: %s" % node_record) + except: + logger.log_exc("Import: failed to import node") + # import slices for slice_id in site['slice_ids']: @@ -180,9 +219,25 @@ def main(): continue slice = slices_dict[slice_id] hrn = slicename_to_hrn(interface_hrn, slice['name']) + #slicename = slice['name'].split("_",1)[-1] + #slicename = _cleanup_string(slicename) if hrn not in existing_hrns or \ (hrn, 'slice') not in existing_records: - sfaImporter.import_slice(site_hrn, slice) + try: + pkey = Keypair(create=True) + urn = hrn_to_urn(hrn, 'slice') + slice_gid = sfaImporter.AuthHierarchy.create_gid(urn, create_uuid(), pkey) + slice_record = RegSlice () + slice_record.type='slice' + slice_record.hrn=hrn + slice_record.gid=slice_gid + slice_record.pointer=slice['slice_id'] + slice_record.authority=get_authority(hrn) + dbsession.add(slice_record) + dbsession.commit() + logger.info("Import: imported slice: %s" % slice_record) + except: + logger.log_exc("Import: failed to import slice") # import persons for person_id in site['person_ids']: @@ -190,6 +245,11 @@ def main(): continue person = persons_dict[person_id] hrn = email_to_hrn(site_hrn, person['email']) + if len(hrn) > 64: + hrn = hrn[:64] + + # if user's primary key has changed then we need to update the + # users gid by forcing an update here old_keys = [] new_keys = [] if person_id in old_person_keys: @@ -203,8 +263,31 @@ def main(): if hrn not in existing_hrns or \ (hrn, 'user') not in existing_records or update_record: - sfaImporter.import_person(site_hrn, person) - + try: + if 'key_ids' in person and person['key_ids']: + key = new_keys[0] + try: + pkey = convert_public_key(key) + except: + logger.warn('unable to convert public key for %s' % hrn) + pkey = Keypair(create=True) + else: + # the user has no keys. Creating a random keypair for the user's gid + logger.warn("Import: person %s does not have a PL public key"%hrn) + pkey = Keypair(create=True) + urn = hrn_to_urn(hrn, 'user') + person_gid = sfaImporter.AuthHierarchy.create_gid(urn, create_uuid(), pkey) + person_record = RegUser () + person_record.type='user' + person_record.hrn=hrn + person_record.gid=person_gid + person_record.pointer=person['person_id'] + person_record.authority=get_authority(hrn) + dbsession.add (person_record) + dbsession.commit() + logger.info("Import: imported person: %s" % person_record) + except: + logger.log_exc("Import: failed to import person.") # remove stale records system_records = [interface_hrn, root_auth, interface_hrn + '.slicemanager'] @@ -213,7 +296,7 @@ def main(): continue record = existing_records[(record_hrn, type)] - if record['peer_authority']: + if record.peer_authority: continue # dont delete vini's internet2 placeholdder record @@ -227,7 +310,7 @@ def main(): if type == 'authority': for site in sites: site_hrn = interface_hrn + "." + site['login_base'] - if site_hrn == record_hrn and site['site_id'] == record['pointer']: + if site_hrn == record_hrn and site['site_id'] == record.pointer: found = True break @@ -241,7 +324,7 @@ def main(): alt_username = person['email'].split("@")[0].replace(".", "_").replace("+", "_") if username in [tmp_username, alt_username] and \ site['site_id'] in person['site_ids'] and \ - person['person_id'] == record['pointer']: + person['person_id'] == record.pointer: found = True break @@ -249,7 +332,7 @@ def main(): slicename = hrn_to_pl_slicename(record_hrn) for slice in slices: if slicename == slice['name'] and \ - slice['slice_id'] == record['pointer']: + slice['slice_id'] == record.pointer: found = True break @@ -262,16 +345,20 @@ def main(): tmp_nodename = node['hostname'] if tmp_nodename == nodename and \ node['site_id'] == site['site_id'] and \ - node['node_id'] == record['pointer']: + node['node_id'] == record.pointer: found = True break else: continue if not found: - record_object = existing_records[(record_hrn, type)] - sfaImporter.delete_record(record_hrn, type) - + try: + record_object = existing_records[(record_hrn, type)] + logger.info("Import: deleting record: %s" % record) + dbsession.delete(record_object) + dbsession.commit() + except: + logger.log_exc("Import: failded to delete record") # save pub keys logger.info('Import: saving current pub keys') save_keys(keys_filename, person_keys)