X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fplc%2Fapi.py;h=79555c45868e2b620e2f76367b0815c240392d29;hb=04ee37a509b179c89d2584458bbe0d69db5b7c9c;hp=ded4fadac270f29fca7c91cd4931d6e5924adcc1;hpb=58400da1b7ddd534c4034ead294b430d6af00916;p=sfa.git diff --git a/sfa/plc/api.py b/sfa/plc/api.py index ded4fada..79555c45 100644 --- a/sfa/plc/api.py +++ b/sfa/plc/api.py @@ -10,6 +10,9 @@ import os import traceback import string import xmlrpclib + +import sfa.util.sfalogging +import sfa.util.xmlrpcprotocol as xmlrpcprotocol from sfa.trust.auth import Auth from sfa.util.config import * from sfa.util.faults import * @@ -20,9 +23,50 @@ from sfa.trust.certificate import * from sfa.util.namespace import * from sfa.util.api import * from sfa.util.nodemanager import NodeManager -from sfa.util.sfalogging import * +try: + from collections import defaultdict +except: + class defaultdict(dict): + def __init__(self, default_factory=None, *a, **kw): + if (default_factory is not None and + not hasattr(default_factory, '__call__')): + raise TypeError('first argument must be callable') + dict.__init__(self, *a, **kw) + self.default_factory = default_factory + def __getitem__(self, key): + try: + return dict.__getitem__(self, key) + except KeyError: + return self.__missing__(key) + def __missing__(self, key): + if self.default_factory is None: + raise KeyError(key) + self[key] = value = self.default_factory() + return value + def __reduce__(self): + if self.default_factory is None: + args = tuple() + else: + args = self.default_factory, + return type(self), args, None, None, self.items() + def copy(self): + return self.__copy__() + def __copy__(self): + return type(self)(self.default_factory, self) + def __deepcopy__(self, memo): + import copy + return type(self)(self.default_factory, + copy.deepcopy(self.items())) + def __repr__(self): + return 'defaultdict(%s, %s)' % (self.default_factory, + dict.__repr__(self)) +## end of http://code.activestate.com/recipes/523034/ }}} def list_to_dict(recs, key): + """ + convert a list of dictionaries into a dictionary keyed on the + specified dictionary key + """ keys = [rec[key] for rec in recs] return dict(zip(keys, recs)) @@ -32,14 +76,14 @@ class SfaAPI(BaseAPI): import sfa.methods methods = sfa.methods.all - def __init__(self, config = "/etc/sfa/sfa_config.py", encoding = "utf-8", methods='sfa.methods', \ - peer_cert = None, interface = None, key_file = None, cert_file = None): + def __init__(self, config = "/etc/sfa/sfa_config.py", encoding = "utf-8", + methods='sfa.methods', peer_cert = None, interface = None, + key_file = None, cert_file = None, cache = None): BaseAPI.__init__(self, config=config, encoding=encoding, methods=methods, \ peer_cert=peer_cert, interface=interface, key_file=key_file, \ - cert_file=cert_file) + cert_file=cert_file, cache=cache) self.encoding = encoding - from sfa.util.table import SfaTable self.SfaTable = SfaTable # Better just be documenting the API @@ -57,38 +101,51 @@ class SfaAPI(BaseAPI): self.credential = None # Initialize the PLC shell only if SFA wraps a myPLC rspec_type = self.config.get_aggregate_type() - if (rspec_type == 'pl' or rspec_type == 'vini'): + if (rspec_type == 'pl' or rspec_type == 'vini' or rspec_type == 'eucalyptus'): self.plshell = self.getPLCShell() self.plshell_version = "4.3" self.hrn = self.config.SFA_INTERFACE_HRN self.time_format = "%Y-%m-%d %H:%M:%S" - self.logger=get_sfa_logger() + self.logger=sfa.util.sfalogging.logger def getPLCShell(self): self.plauth = {'Username': self.config.SFA_PLC_USER, 'AuthMethod': 'password', 'AuthString': self.config.SFA_PLC_PASSWORD} - try: sys.path.append(os.path.dirname(os.path.realpath("/usr/bin/plcsh"))) self.plshell_type = 'direct' import PLC.Shell shell = PLC.Shell.Shell(globals = globals()) - return shell - except ImportError: + except: self.plshell_type = 'xmlrpc' - # connect via xmlrpc url = self.config.SFA_PLC_URL shell = xmlrpclib.Server(url, verbose = 0, allow_none = True) - return shell + + return shell def getCredential(self): + """ + Retrun a valid credential for this interface. + """ if self.interface in ['registry']: return self.getCredentialFromLocalRegistry() else: return self.getCredentialFromRegistry() - + + def getDelegatedCredential(self, creds): + """ + Attempt to find a credential delegated to us in + the specified list of creds. + """ + if creds and not isinstance(creds, list): + creds = [creds] + delegated_creds = filter_creds_by_caller(creds,self.hrn) + if not delegated_creds: + return None + return delegated_creds[0] + def getCredentialFromRegistry(self): """ Get our credential from a remote registry @@ -136,8 +193,8 @@ class SfaAPI(BaseAPI): new_cred = Credential(subject = object_gid.get_subject()) new_cred.set_gid_caller(object_gid) new_cred.set_gid_object(object_gid) - new_cred.set_issuer(key=auth_info.get_pkey_object(), subject=auth_hrn) - new_cred.set_pubkey(object_gid.get_pubkey()) + new_cred.set_issuer_keys(auth_info.get_privkey_filename(), auth_info.get_gid_filename()) + r1 = determine_rights(type, hrn) new_cred.set_privileges(r1) @@ -269,7 +326,7 @@ class SfaAPI(BaseAPI): # fill record info for record in records: - # records with pointer==-1 do not have plc info associated with them. + # records with pointer==-1 do not have plc info. # for example, the top level authority records which are # authorities, but not PL "sites" if record['pointer'] == -1: @@ -364,25 +421,56 @@ class SfaAPI(BaseAPI): return records def fill_record_sfa_info(self, records): + + def startswith(prefix, values): + return [value for value in values if value.startswith(prefix)] + # get person ids - has_authority = False - has_slice = False person_ids = [] + site_ids = [] for record in records: - if record['type'] == 'authority': - has_authority = True person_ids.extend(record.get("person_ids", [])) + site_ids.extend(record.get("site_ids", [])) + if 'site_id' in record: + site_ids.append(record['site_id']) + + # get all pis from the sites we've encountered + # and store them in a dictionary keyed on site_id + site_pis = {} + if site_ids: + pi_filter = {'|roles': ['pi'], '|site_ids': site_ids} + pi_list = self.plshell.GetPersons(self.plauth, pi_filter, ['person_id', 'site_ids']) + for pi in pi_list: + # we will need the pi's hrns also + person_ids.append(pi['person_id']) + + # we also need to keep track of the sites these pis + # belong to + for site_id in pi['site_ids']: + if site_id in site_pis: + site_pis[site_id].append(pi) + else: + site_pis[site_id] = [pi] + + # get sfa records for all records associated with these records. + # we'll replace pl ids (person_ids) with hrns from the sfa records + # we obtain - # get sfa info + # get the sfa records table = self.SfaTable() person_list, persons = [], {} - pl_person_list, pl_persons = [], {} person_list = table.find({'type': 'user', 'pointer': person_ids}) - persons = list_to_dict(person_list, 'pointer') - if has_authority: - pl_person_list = self.plshell.GetPersons(self.plauth, person_ids, ['person_id', 'roles']) - pl_persons = list_to_dict(pl_person_list, 'person_id') - + # create a hrns keyed on the sfa record's pointer. + # Its possible for multiple records to have the same pointer so + # the dict's value will be a list of hrns. + persons = defaultdict(list) + for person in person_list: + persons[person['pointer']].append(person) + + # get the pl records + pl_person_list, pl_persons = [], {} + pl_person_list = self.plshell.GetPersons(self.plauth, person_ids, ['person_id', 'roles']) + pl_persons = list_to_dict(pl_person_list, 'person_id') # fill sfa info for record in records: @@ -392,28 +480,38 @@ class SfaAPI(BaseAPI): sfa_info = {} type = record['type'] if (type == "slice"): - researchers = [persons[person_id]['hrn'] for person_id in record['person_ids'] \ - if person_id in persons] - sfa_info['researcher'] = researchers - + # all slice users are researchers + record['PI'] = [] + record['researcher'] = [] + for person_id in record['person_ids']: + hrns = [person['hrn'] for person in persons[person_id]] + record['researcher'].extend(hrns) + + # pis at the slice's site + pl_pis = site_pis[record['site_id']] + pi_ids = [pi['person_id'] for pi in pl_pis] + for person_id in pi_ids: + hrns = [person['hrn'] for person in persons[person_id]] + record['PI'].extend(hrns) + record['geni_urn'] = hrn_to_urn(record['hrn'], 'slice') + record['geni_creator'] = record['PI'] + elif (type == "authority"): - pis, techs, admins = [], [], [] + record['PI'] = [] + record['operator'] = [] + record['owner'] = [] for pointer in record['person_ids']: if pointer not in persons or pointer not in pl_persons: # this means there is not sfa or pl record for this user continue - hrn = persons[pointer]['hrn'] + hrns = [person['hrn'] for person in persons[pointer]] roles = pl_persons[pointer]['roles'] if 'pi' in roles: - pis.append(hrn) + record['PI'].extend(hrns) if 'tech' in roles: - techs.append(hrn) + record['operator'].extend(hrns) if 'admin' in roles: - admins.append(hrn) - - sfa_info['PI'] = pis - sfa_info['operator'] = techs - sfa_info['owner'] = admins + record['owner'].extend(hrns) # xxx TODO: OrganizationName elif (type == "node"): sfa_info['dns'] = record.get("hostname", "") @@ -421,6 +519,8 @@ class SfaAPI(BaseAPI): elif (type == "user"): sfa_info['email'] = record.get("email", "") + sfa_info['geni_urn'] = hrn_to_urn(record['hrn'], 'user') + sfa_info['geni_certificate'] = record['gid'] # xxx TODO: PostalAddress, Phone record.update(sfa_info) @@ -507,3 +607,73 @@ class ComponentAPI(BaseAPI): return True else: return False + + def get_registry(self): + addr, port = self.config.SFA_REGISTRY_HOST, self.config.SFA_REGISTRY_PORT + url = "http://%(addr)s:%(port)s" % locals() + server = xmlrpcprotocol.get_server(url, self.key_file, self.cert_file) + return server + + def get_node_key(self): + # this call requires no authentication, + # so we can generate a random keypair here + subject="component" + (kfd, keyfile) = tempfile.mkstemp() + (cfd, certfile) = tempfile.mkstemp() + key = Keypair(create=True) + key.save_to_file(keyfile) + cert = Certificate(subject=subject) + cert.set_issuer(key=key, subject=subject) + cert.set_pubkey(key) + cert.sign() + cert.save_to_file(certfile) + registry = self.get_registry() + # the registry will scp the key onto the node + registry.get_key() + + def getCredential(self): + """ + Get our credential from a remote registry + """ + path = self.config.SFA_DATA_DIR + config_dir = self.config.config_path + cred_filename = path + os.sep + 'node.cred' + try: + credential = Credential(filename = cred_filename) + return credential.save_to_string(save_parents=True) + except IOError: + node_pkey_file = config_dir + os.sep + "node.key" + node_gid_file = config_dir + os.sep + "node.gid" + cert_filename = path + os.sep + 'server.cert' + if not os.path.exists(node_pkey_file) or \ + not os.path.exists(node_gid_file): + self.get_node_key() + + # get node's hrn + gid = GID(filename=node_gid_file) + hrn = gid.get_hrn() + # get credential from registry + cert_str = Certificate(filename=cert_filename).save_to_string(save_parents=True) + registry = self.get_registry() + cred = registry.get_self_credential(cert_str, 'node', hrn) + Credential(string=cred).save_to_file(credfile, save_parents=True) + + return cred + + def clean_key_cred(self): + """ + remove the existing keypair and cred and generate new ones + """ + files = ["server.key", "server.cert", "node.cred"] + for f in files: + filepath = KEYDIR + os.sep + f + if os.path.isfile(filepath): + os.unlink(f) + + # install the new key pair + # get_credential will take care of generating the new keypair + # and credential + self.get_node_key() + self.getCredential() + +