from sfa.util.faults import *
from sfa.util.api import *
from sfa.util.config import *
-from sfa.util.sfalogging import sfa_logger
+from sfa.util.sfalogging import logger
import sfa.util.xmlrpcprotocol as xmlrpcprotocol
from sfa.trust.auth import Auth
from sfa.trust.rights import Right, Rights, determine_rights
"""
# print>>sys.stderr, " \r\n \t\t 1list_to_dict : rec %s \r\n \t\t list_to_dict key %s" %(recs,key)
keys = [rec[key] for rec in recs]
- print>>sys.stderr, " \r\n \t\t list_to_dict : rec %s \r\n \t\t list_to_dict keys %s" %(recs,keys)
+ #print>>sys.stderr, " \r\n \t\t list_to_dict : rec %s \r\n \t\t list_to_dict keys %s" %(recs,keys)
return dict(zip(keys, recs))
class SfaAPI(BaseAPI):
self.users = SenslabImportUsers()
self.hrn = self.config.SFA_INTERFACE_HRN
self.time_format = "%Y-%m-%d %H:%M:%S"
- self.logger=sfa_logger()
- print >>sys.stderr, "\r\n \t\t___________PLC/API.PY __init__ STOP ",self.interface #dir(self)
+ #self.logger=sfa_logger()
+ print >>sys.stderr, "\r\n \t\t___________PSFA SENSLAN /API.PY __init__ STOP ",self.interface #dir(self)
- #def getPLCShell(self):
- #self.plauth = {'Username': self.config.SFA_PLC_USER,
- #'AuthMethod': 'password',
- #'AuthString': self.config.SFA_PLC_PASSWORD}
- #try:
- #print >>sys.stderr, "\r\n \t\t___________PLC/API.PY getPLCShell "
- #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())
- #print >>sys.stderr, "\r\n \t\t____tryshell %s \r\n type %s \r\n %s"%(shell, type(shell), dir(shell))
-
- #except:
- #self.plshell_type = 'xmlrpc'
- #print >>sys.stderr, "\r\n \t\t___________PLC/API.PY getPLCShell xmlrpc"
- #url = self.config.SFA_PLC_URL
- #shell = xmlrpclib.Server(url, verbose = 0, allow_none = True)
-
- #return shell
def getCredential(self):
"""
"""
type = 'authority'
path = self.config.SFA_DATA_DIR
+ print >>sys.stderr,"FILENAME :", self.interface, self.hrn, type, "cred"
filename = ".".join([self.interface, self.hrn, type, "cred"])
cred_filename = path + os.sep + filename
+ print>>sys.stderr, "|\r\n \r\n API.pPY getCredentialAUTHORITY cred_filename %s" %(cred_filename)
cred = None
if os.path.isfile(cred_filename):
cred = Credential(filename = cred_filename)
return cred.save_to_string(save_parents=True)
+ def get_server(self, interface, cred, timeout=30):
+ """
+ Returns a connection to the specified interface. Use the specified
+ credential to determine the caller and look for the caller's key/cert
+ in the registry hierarchy cache.
+ """
+ from sfa.trust.hierarchy import Hierarchy
+ if not isinstance(cred, Credential):
+ cred_obj = Credential(string=cred)
+ else:
+ cred_obj = cred
+ caller_gid = cred_obj.get_gid_caller()
+ hierarchy = Hierarchy()
+ auth_info = hierarchy.get_auth_info(caller_gid.get_hrn())
+ key_file = auth_info.get_privkey_filename()
+ cert_file = auth_info.get_gid_filename()
+ server = interface.get_server(key_file, cert_file, timeout)
+ return server
+
+
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 creds and not isinstance(creds, list):
+ creds = [creds]
+ delegated_creds = filter_creds_by_caller(creds, [self.hrn, self.hrn + '.slicemanager'])
if not delegated_creds:
- return None
+ return None
return delegated_creds[0]
def __getCredential(self):
Get our credential from a remote registry
"""
from sfa.server.registry import Registries
+ registries = Registries()
+ registry = registries.get_server(self.hrn, self.key_file, self.cert_file)
+ #Sandrine 24 Oct 2 commented 2 following lines
registries = Registries(self)
registry = registries[self.hrn]
+ print>>sys.stderr, " SenslabAPI.PY __getCredential registries %s self.hrn %s \t registry %s " %(registries,self.hrn,registry)
cert_string=self.cert.save_to_string(save_parents=True)
# get self credential
self_cred = registry.GetSelfCredential(cert_string, self.hrn, 'authority')
auth_hrn = hrn
auth_info = self.auth.get_auth_info(auth_hrn)
table = self.SfaTable()
+ records = table.findObjects({'hrn': hrn, 'type': 'authority+sa'})
+ #Sandrine 24 Oct 2 commented following line
records = table.findObjects(hrn)
+
if not records:
raise RecordNotFound
record = records[0]
@param record: record to fill in field (in/out param)
"""
# get ids by type
- print>>sys.stderr, "\r\n \t\t \t fill_record_pl_info : entering... \r\n"
+ #print>>sys.stderr, "\r\n \r\rn \t\t >>>>>>>>>>fill_record_pl_info records %s : "%(records)
node_ids, site_ids, slice_ids = [], [], []
person_ids, key_ids = [], []
type_map = {'node': node_ids, 'authority': site_ids,
for record in records:
for type in type_map:
- print>>sys.stderr, "\r\n \t\t \t fill_record_pl_info : type %s. record['pointer'] %s "%(type,record['pointer'])
+ #print>>sys.stderr, "\r\n \t\t \t fill_record_pl_info : type %s. record['pointer'] %s "%(type,record['pointer'])
if type == record['type']:
type_map[type].append(record['pointer'])
- print>>sys.stderr, "\r\n \t\t \t fill_record_pl_info : records %s... \r\n \t\t \t fill_record_pl_info : type_map %s"%(records,type_map)
+ #print>>sys.stderr, "\r\n \t\t \t fill_record_pl_info : records %s... \r\n \t\t \t fill_record_pl_info : type_map %s"%(records,type_map)
# get pl records
nodes, sites, slices, persons, keys = {}, {}, {}, {}, {}
if node_ids:
node_list = self.oar.GetNodes( node_ids)
- print>>sys.stderr, " \r\n \t\t\t BEFORE LIST_TO_DICT_NODES node_ids : %s" %(node_ids)
+ #print>>sys.stderr, " \r\n \t\t\t BEFORE LIST_TO_DICT_NODES node_ids : %s" %(node_ids)
nodes = list_to_dict(node_list, 'node_id')
if site_ids:
site_list = self.oar.GetSites( site_ids)
sites = list_to_dict(site_list, 'site_id')
+ #print>>sys.stderr, " \r\n \t\t\t site_ids %s sites : %s" %(site_ids,sites)
if slice_ids:
- slice_list = self.oar.GetSlices( slice_ids)
+ slice_list = self.users.GetSlices( slice_ids)
slices = list_to_dict(slice_list, 'slice_id')
if person_ids:
- print>>sys.stderr, " \r\n \t\t \t fill_record_pl_info BEFORE GetPersons person_ids: %s" %(person_ids)
+ #print>>sys.stderr, " \r\n \t\t \t fill_record_pl_info BEFORE GetPersons person_ids: %s" %(person_ids)
person_list = self.users.GetPersons( person_ids)
persons = list_to_dict(person_list, 'person_id')
- print>>sys.stderr, "\r\n fill_record_pl_info persons %s \r\n \t\t person_ids %s " %(persons, person_ids)
+ #print>>sys.stderr, "\r\n fill_record_pl_info persons %s \r\n \t\t person_ids %s " %(persons, person_ids)
for person in persons:
key_ids.extend(persons[person]['key_ids'])
- print>>sys.stderr, "\r\n key_ids %s " %(key_ids)
+ #print>>sys.stderr, "\r\n key_ids %s " %(key_ids)
pl_records = {'node': nodes, 'authority': sites,
'slice': slices, 'user': persons}
# fill in key info
if record['type'] == 'user':
if 'key_ids' not in record:
- print>>sys.stderr, " NO_KEY_IDS fill_record_pl_info key_ids record: %s" %(record)
+ #print>>sys.stderr, " NO_KEY_IDS fill_record_pl_info key_ids record: %s" %(record)
+ logger.info("user record has no 'key_ids' - need to import ?")
else:
pubkeys = [keys[key_id]['key'] for key_id in record['key_ids'] if key_id in keys]
record['keys'] = pubkeys
-
+
+ #print>>sys.stderr, "\r\n \r\rn \t\t <<<<<<<<<<<<<<<<<< fill_record_pl_info records %s : "%(records)
# fill in record hrns
records = self.fill_record_hrns(records)
-
+
return records
def fill_record_hrns(self, records):
"""
convert pl ids to hrns
"""
-
+ #print>>sys.stderr, "\r\n \r\rn \t\t \t >>>>>>>>>>>>>>>>>>>>>> fill_record_hrns records %s : "%(records)
# get ids
slice_ids, person_ids, site_ids, node_ids = [], [], [], []
for record in records:
+ #print>>sys.stderr, "\r\n \r\rn \t\t \t record %s : "%(record)
if 'site_id' in record:
site_ids.append(record['site_id'])
if 'site_ids' in records:
if site_ids:
site_list = self.oar.GetSites( site_ids, ['site_id', 'login_base'])
sites = list_to_dict(site_list, 'site_id')
- print>>sys.stderr, " \r\n \r\n \t\t ____ site_list %s \r\n \t\t____ sites %s " % (site_list,sites)
+ #print>>sys.stderr, " \r\n \r\n \t\t ____ site_list %s \r\n \t\t____ sites %s " % (site_list,sites)
if person_ids:
person_list = self.users.GetPersons( person_ids, ['person_id', 'email'])
+ #print>>sys.stderr, " \r\n \r\n \t\t____ person_lists %s " %(person_list)
persons = list_to_dict(person_list, 'person_id')
if slice_ids:
- slice_list = self.oar.GetSlices( slice_ids, ['slice_id', 'name'])
+ slice_list = self.users.GetSlices( slice_ids, ['slice_id', 'name'])
slices = list_to_dict(slice_list, 'slice_id')
if node_ids:
node_list = self.oar.GetNodes( node_ids, ['node_id', 'hostname'])
if pointer == -1:
continue
- print>>sys.stderr, " \r\n \r\n \t\t fill_record_hrns : sites %s \r\n \t\t record %s " %(sites, record)
+ #print>>sys.stderr, " \r\n \r\n \t\t fill_record_hrns : sites %s \r\n \t\t record %s " %(sites, record)
if 'site_id' in record:
site = sites[record['site_id']]
- print>>sys.stderr, " \r\n \r\n \t\t \t fill_record_hrns : sites %s \r\n \t\t\t site sites[record['site_id']] %s " %(sites,site)
+ #print>>sys.stderr, " \r\n \r\n \t\t \t fill_record_hrns : sites %s \r\n \t\t\t site sites[record['site_id']] %s " %(sites,site)
login_base = site['login_base']
record['site'] = ".".join([auth_hrn, login_base])
if 'person_ids' in record:
if person_id in persons]
usernames = [email.split('@')[0] for email in emails]
person_hrns = [".".join([auth_hrn, login_base, username]) for username in usernames]
+ #print>>sys.stderr, " \r\n \r\n \t\t ____ person_hrns : %s " %(person_hrns)
record['persons'] = person_hrns
if 'slice_ids' in record:
slicenames = [slices[slice_id]['name'] for slice_id in record['slice_ids'] \
if site_id in sites]
site_hrns = [".".join([auth_hrn, lbase]) for lbase in login_bases]
record['sites'] = site_hrns
-
+ #print>>sys.stderr, "\r\n \r\rn \t\t \t <<<<<<<<<<<<<<<<<<<<<<<< fill_record_hrns records %s : "%(records)
return records
def fill_record_sfa_info(self, records):
if 'site_id' in record:
site_ids.append(record['site_id'])
- print>>sys.stderr, "\r\n \r\n _fill_record_sfa_info ___person_ids %s \r\n \t\t site_ids %s " %(person_ids, site_ids)
+ #print>>sys.stderr, "\r\n \r\n _fill_record_sfa_info ___person_ids %s \r\n \t\t site_ids %s " %(person_ids, site_ids)
# get all pis from the sites we've encountered
# and store them in a dictionary keyed on site_id
if site_ids:
pi_filter = {'|roles': ['pi'], '|site_ids': site_ids}
pi_list = SenslabUsers.GetPersons( pi_filter, ['person_id', 'site_ids'])
- print>>sys.stderr, "\r\n \r\n _fill_record_sfa_info ___ GetPersons ['person_id', 'site_ids'] pi_ilist %s" %(pi_list)
+ #print>>sys.stderr, "\r\n \r\n _fill_record_sfa_info ___ GetPersons ['person_id', 'site_ids'] pi_ilist %s" %(pi_list)
for pi in pi_list:
# we will need the pi's hrns also
pl_person_list, pl_persons = [], {}
pl_person_list = SenslabUsers.GetPersons(person_ids, ['person_id', 'roles'])
pl_persons = list_to_dict(pl_person_list, 'person_id')
- print>>sys.stderr, "\r\n \r\n _fill_record_sfa_info ___ _list %s \r\n \t\tplshell.GetPersons ['person_id', 'roles'] pl_persons %s " %(pl_person_list, pl_persons)
+ #print>>sys.stderr, "\r\n \r\n _fill_record_sfa_info ___ _list %s \r\n \t\t SenslabUsers.GetPersons ['person_id', 'roles'] pl_persons %s \r\n records %s" %(pl_person_list, pl_persons,records)
# fill sfa info
+
for record in records:
# skip records with no pl info (top level authorities)
- if record['pointer'] == -1:
- continue
+ #Sandrine 24 oct 11 2 lines
+ #if record['pointer'] == -1:
+ #continue
sfa_info = {}
type = record['type']
if (type == "slice"):
# all slice users are researchers
+ #record['geni_urn'] = hrn_to_urn(record['hrn'], 'slice') ? besoin ou pas ?
record['PI'] = []
record['researcher'] = []
- for person_id in record['person_ids']:
+ for person_id in record.get('person_ids', []):
+ #Sandrine 24 oct 11 line
+ #for person_id in record['person_ids']:
hrns = [person['hrn'] for person in persons[person_id]]
record['researcher'].extend(hrns)
sfa_info['geni_urn'] = hrn_to_urn(record['hrn'], 'user')
sfa_info['geni_certificate'] = record['gid']
# xxx TODO: PostalAddress, Phone
+
+ #print>>sys.stderr, "\r\n \r\rn \t\t \t <<<<<<<<<<<<<<<<<<<<<<<< fill_record_sfa_info sfa_info %s \r\n record %s : "%(sfa_info,record)
record.update(sfa_info)
def fill_record_info(self, records):
Given a SFA record, fill in the PLC specific and SFA specific
fields in the record.
"""
- print >>sys.stderr, "\r\n \t\t fill_record_info %s"%(records)
+ #print >>sys.stderr, "\r\n \t\t fill_record_info %s"%(records)
if not isinstance(records, list):
records = [records]
- print >>sys.stderr, "\r\n \t\t BEFORE fill_record_pl_info %s" %(records)
+ #print >>sys.stderr, "\r\n \t\t BEFORE fill_record_pl_info %s" %(records)
self.fill_record_pl_info(records)
- print >>sys.stderr, "\r\n \t\t after fill_record_pl_info %s" %(records)
+ #print >>sys.stderr, "\r\n \t\t after fill_record_pl_info %s" %(records)
self.fill_record_sfa_info(records)
- print >>sys.stderr, "\r\n \t\t after fill_record_sfa_info"
+ #print >>sys.stderr, "\r\n \t\t after fill_record_sfa_info"
def update_membership_list(self, oldRecord, record, listName, addFunc, delFunc):
# get a list of the HRNs tht are members of the old and new records
def update_membership(self, oldRecord, record):
if record.type == "slice":
self.update_membership_list(oldRecord, record, 'researcher',
- self.plshell.AddPersonToSlice,
- self.plshell.DeletePersonFromSlice)
+ self.users.AddPersonToSlice,
+ self.users.DeletePersonFromSlice)
elif record.type == "authority":
# xxx TODO
pass
path = self.config.SFA_DATA_DIR
config_dir = self.config.config_path
cred_filename = path + os.sep + 'node.cred'
+ print>>sys.stderr, "\r\n \r\n API.pPY COMPONENT getCredential cred_filename %s" %(cred_filename)
try:
credential = Credential(filename = cred_filename)
return credential.save_to_string(save_parents=True)
git://git.onelab.eu / sfa.git / blobdiff