X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fserver%2Finterface.py;h=05034795e8bb65cebcfb1b549edf97a3e541aa57;hb=f3d825457ff4881b8c9658967f8ed159a01dfcaa;hp=d6dc5c449699bef04127714b536e2cf5958792b2;hpb=b55a7407c2efd19af26c8165a56435ad5fc50389;p=sfa.git diff --git a/sfa/server/interface.py b/sfa/server/interface.py index d6dc5c44..05034795 100644 --- a/sfa/server/interface.py +++ b/sfa/server/interface.py @@ -3,13 +3,13 @@ ### $URL: https://svn.planet-lab.org/svn/sfa/trunk/sfa/server/interface.py $ # - from sfa.util.faults import * from sfa.util.storage import * from sfa.util.namespace import * from sfa.trust.gid import GID from sfa.util.table import SfaTable from sfa.util.record import SfaRecord +import traceback import sfa.util.xmlrpcprotocol as xmlrpcprotocol import sfa.util.soapprotocol as soapprotocol @@ -46,10 +46,9 @@ class Interfaces(dict): # defined by the class default_dict = {} - # allowed types - types = ['sa', 'ma'] + types = ['authority'] - def __init__(self, api, conf_file, type): + def __init__(self, api, conf_file, type='authority'): if type not in self.types: raise SfaInfaildArgument('Invalid type %s: must be in %s' % (type, self.types)) dict.__init__(self, {}) @@ -58,11 +57,13 @@ class Interfaces(dict): # load config file self.interface_info = XmlStorage(conf_file, self.default_dict) self.interface_info.load() - self.interfaces = self.interface_info.values()[0].values()[0] - if not isinstance(self.interfaces, list): - self.interfaces = [self.interfaces] - # get connections - self.update(self.get_connections(self.interfaces)) + interfaces = self.interface_info.values()[0].values()[0] + if not isinstance(interfaces, list): + interfaces = [self.interfaces] + self.interfaces = {} + for interface in interfaces: + self.interfaces[interface['hrn']] = interface + def sync_interfaces(self): """ @@ -75,19 +76,19 @@ class Interfaces(dict): # are any missing gids, request a new one from the peer registry. gids_current = self.api.auth.trusted_cert_list hrns_current = [gid.get_hrn() for gid in gids_current] - hrns_expected = [interface['hrn'] for interface in self.interfaces] + hrns_expected = self.interfaces.keys() new_hrns = set(hrns_expected).difference(hrns_current) - self.get_peer_gids(new_hrns) - + gids = self.get_peer_gids(new_hrns) # update the local db records for these registries - self.update_db_records(self.type) + self.update_db_records(self.type, gids) def get_peer_gids(self, new_hrns): """ Install trusted gids from the specified interfaces. """ + peer_gids = [] if not new_hrns: - return + return peer_gids trusted_certs_dir = self.api.config.get_trustedroots_dir() for new_hrn in new_hrns: # the gid for this interface should already be installed @@ -95,42 +96,49 @@ class Interfaces(dict): continue try: # get gid from the registry - interface = self.get_connections(self.interfaces[new_hrn])[new_hrn] + interface_info = self.interfaces[new_hrn] + interface = self[new_hrn] trusted_gids = interface.get_trusted_certs() - # default message - message = "interface: %s\tunable to install trusted gid for %s" % \ - (self.api.interface, new_hrn) if trusted_gids: # the gid we want shoudl be the first one in the list, # but lets make sure for trusted_gid in trusted_gids: + # default message + message = "interface: %s\t" % (self.api.interface) + message += "unable to install trusted gid for %s" % \ + (new_hrn) gid = GID(string=trusted_gids[0]) + peer_gids.append(gid) if gid.get_hrn() == new_hrn: gid_filename = os.path.join(trusted_certs_dir, '%s.gid' % new_hrn) gid.save_to_file(gid_filename, save_parents=True) message = "interface: %s\tinstalled trusted gid for %s" % \ (self.api.interface, new_hrn) - # log the message - self.api.logger.info(message) + # log the message + self.api.logger.info(message) except: message = "interface: %s\tunable to install trusted gid for %s" % \ (self.api.interface, new_hrn) self.api.logger.info(message) + traceback.print_exc() # reload the trusted certs list self.api.auth.load_trusted_certs() + return peer_gids - def update_db_records(self, type): + def update_db_records(self, type, gids): """ Make sure there is a record in the local db for allowed registries defined in the config file (registries.xml). Removes old records from the db. """ + if not gids: + return # get hrns we expect to find # ignore records for local interfaces ignore_interfaces = [self.api.config.SFA_INTERFACE_HRN] - hrns_expected = [interface['hrn'] for interface in self.interfaces \ - if interface['hrn'] not in ignore_interfaces] + hrns_expected = [gid.get_hrn() for gid in gids \ + if gid.get_hrn() not in ignore_interfaces] # get hrns that actually exist in the db table = SfaTable() @@ -143,28 +151,27 @@ class Interfaces(dict): table.remove(record) # add new records - for hrn in hrns_expected: + for gid in gids: + hrn = gid.get_hrn() if hrn not in hrns_found: record = { 'hrn': hrn, 'type': type, 'pointer': -1, 'authority': get_authority(hrn), + 'gid': gid.save_to_string(save_parents=True), } record = SfaRecord(dict=record) table.insert(record) - - def get_connections(self, interfaces): + def get_connections(self): """ read connection details for the trusted peer registries from file return a dictionary of connections keyed on interface hrn. """ connections = {} required_fields = self.default_fields.keys() - if not isinstance(interfaces, list): - interfaces = [interfaces] - for interface in interfaces: + for interface in self.interfaces.values(): # make sure the required fields are present and not null if not all([interface.get(key) for key in required_fields]): continue