from sfa.trust.rights import *
from sfa.trust.credential import *
from sfa.util.misc import *
+from sfa.util.sfalogging import *
+from sfa.util.genitable import *
# See "2.2 Characters" in the XML specification:
#
# Replace invalid 7-bit control characters with '?'
return s.translate(xml_escape_table)
-def sfa_xmlrpclib_dump(self, value, write):
+def xmlrpclib_dump(self, value, write):
"""
xmlrpclib cannot marshal instances of subclasses of built-in
types. This function overrides xmlrpclib.Marshaller.__dump so that
f(*args)
# You can't hide from me!
-xmlrpclib.Marshaller._Marshaller__dump = sfa_xmlrpclib_dump
+xmlrpclib.Marshaller._Marshaller__dump = xmlrpclib_dump
# SOAP support is optional
try:
self.key_file = key_file
self.cert_file = cert_file
self.credential = None
- self.plshell = self.getPLCShell()
- self.plshell_version = self.getPLCShellVersion()
+
+ # Initialize the PLC shell only if SFA wraps a myPLC
+ if (self.config.get_aggregate_rspec_type() == 'pl'):
+ self.plshell = self.getPLCShell()
+ self.plshell_version = self.getPLCShellVersion()
+
self.hrn = self.config.SFA_INTERFACE_HRN
self.time_format = "%Y-%m-%d %H:%M:%S"
-
+ self.logger=get_sfa_logger()
def getPLCShell(self):
self.plauth = {'Username': self.config.SFA_PLC_USER,
'AuthMethod': 'password',
'AuthString': self.config.SFA_PLC_PASSWORD}
try:
+ self.plshell_type = 'direct'
import PLC.Shell
shell = PLC.Shell.Shell(globals = globals())
shell.AuthCheck(self.plauth)
return shell
except ImportError:
+ self.plshell_type = 'xmlrpc'
# connect via xmlrpc
url = self.config.SFA_PLC_URL
-
shell = xmlrpclib.Server(url, verbose = 0, allow_none = True)
shell.AuthCheck(self.plauth)
return shell
hrn = self.hrn
auth_hrn = self.auth.get_authority(hrn)
- if not auth_hrn:
+
+ # is this a root or sub authority
+ if not auth_hrn or hrn == self.config.SFA_INTERFACE_HRN:
auth_hrn = hrn
auth_info = self.auth.get_auth_info(auth_hrn)
- table = self.auth.get_auth_table(auth_hrn)
- records = table.resolve('*', hrn)
+ table = GeniTable()
+ records = table.findObjects(hrn)
if not records:
raise RecordNotFound
record = records[0]
- type = record.get_type()
+ type = record['type']
object_gid = record.get_gid_object()
new_cred = Credential(subject = object_gid.get_subject())
new_cred.set_gid_caller(object_gid)
@param record: record to fill in field (in/out param)
"""
- type = record.get_type()
- pointer = record.get_pointer()
+ type = record['type']
+ pointer = record['pointer']
auth_hrn = self.hrn
login_base = ''
# records with pointer==-1 do not have plc info associated with them.
record.update({})
return
- if (type in ["authority", "sa", "ma"]):
+ if (type in ["authority"]):
pl_res = self.plshell.GetSites(self.plauth, [pointer])
elif (type == "slice"):
pl_res = self.plshell.GetSlices(self.plauth, [pointer])
raise UnknownGeniType(type)
if not pl_res:
- raise PlanetLabRecordDoesNotExist(record.get_name())
+ raise PlanetLabRecordDoesNotExist(record['hrn'])
# convert ids to hrns
pl_record = pl_res[0]
record.update(pl_record)
- def lookup_users(self, auth_table, user_id_list, role="*"):
- record_list = []
- for person_id in user_id_list:
- user_records = auth_table.find("user", person_id, "pointer")
- for user_record in user_records:
- self.fill_record_info(user_record)
- user_roles = user_record.get("roles")
- if (role=="*") or (role in user_roles):
- record_list.append(user_record.get_name())
- return record_list
def fill_record_geni_info(self, record):
geni_info = {}
- type = record.get_type()
+ type = record['type']
+ table = GeniTable()
if (type == "slice"):
- auth_table = self.auth.get_auth_table(self.auth.get_authority(record.get_name()))
person_ids = record.get("person_ids", [])
- researchers = self.lookup_users(auth_table, person_ids)
+ persons = table.find({'type': 'user', 'pointer': person_ids})
+ researchers = [person['hrn'] for person in persons]
geni_info['researcher'] = researchers
elif (type == "authority"):
- auth_table = self.auth.get_auth_table(record.get_name())
person_ids = record.get("person_ids", [])
- pis = self.lookup_users(auth_table, person_ids, "pi")
- operators = self.lookup_users(auth_table, person_ids, "tech")
- owners = self.lookup_users(auth_table, person_ids, "admin")
- geni_info['pi'] = pis
- geni_info['operator'] = operators
- geni_info['owner'] = owners
+ persons = table.find({'type': 'user', 'pointer': person_ids})
+ persons_dict = {}
+ for person in persons:
+ persons_dict[person['pointer']] = person
+ pl_persons = self.plshell.GetPersons(self.plauth, person_ids, ['person_id', 'roles'])
+ pis, techs, admins = [], [], []
+ for person in pl_persons:
+ pointer = person['person_id']
+
+ if pointer not in persons_dict:
+ # this means there is not sfa record for this user
+ continue
+ hrn = persons_dict[pointer]['hrn']
+ if 'pi' in person['roles']:
+ pis.append(hrn)
+ if 'tech' in person['roles']:
+ techs.append(hrn)
+ if 'admin' in person['roles']:
+ admins.append(hrn)
+
+ geni_info['PI'] = pis
+ geni_info['operator'] = techs
+ geni_info['owner'] = admins
# xxx TODO: OrganizationName
elif (type == "node"):
# build a list of the new person ids, by looking up each person to get
# their pointer
newIdList = []
- for hrn in newList:
- auth_hrn = self.auth.get_authority(hrn)
- if not auth_hrn:
- auth_hrn = hrn
- auth_info = self.auth.get_auth_info(auth_hrn)
- table = self.auth.get_auth_table(auth_hrn)
- records = table.resolve('user', hrn)
- if records:
- userRecord = records[0]
- newIdList.append(userRecord.get_pointer())
+ table = GeniTable()
+ records = table.find({'type': 'user', 'hrn': newList})
+ for rec in records:
+ newIdList.append(rec['pointer'])
# build a list of the old person ids from the person_ids field
if oldRecord:
# add people who are in the new list, but not the oldList
for personId in newIdList:
if not (personId in oldIdList):
- print "adding id", personId, "to", record.get_name()
addFunc(self.plauth, personId, containerId)
# remove people who are in the old list, but not the new list
for personId in oldIdList:
if not (personId in newIdList):
- print "removing id", personId, "from", record.get_name()
delFunc(self.plauth, personId, containerId)
def update_membership(self, oldRecord, record):
"""
Handle an XML-RPC or SOAP request from the specified source.
"""
-
# Parse request into method name and arguments
try:
interface = xmlrpclib
data = buildSOAP(kw = {'%sResponse' % method: {'Result': result}}, encoding = self.encoding)
return data
+