from geni.util.geniticket import Ticket
from geni.util.excep import *
from geni.util.misc import *
-
-from util.config import *
+from geni.util.config import *
##
# Convert geni fields to PLC fields for use when registering up updating
# Connect to a remote shell via XMLRPC
def connect_remote_shell(self):
- import remoteshell
+ from geni.util import remoteshell
self.shell = remoteshell.RemoteShell()
##
self.server.register_function(self.get_self_credential)
self.server.register_function(self.get_credential)
self.server.register_function(self.get_gid)
+ self.server.register_function(self.get_ticket)
self.server.register_function(self.register)
self.server.register_function(self.remove)
self.server.register_function(self.update)
self.fill_record_pl_info(record)
self.fill_record_geni_info(record)
+ 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\r
+ if oldRecord:\r
+ if oldRecord.pl_info == None:\r
+ oldRecord.pl_info = {}\r
+ oldList = oldRecord.get_geni_info().get(listName, [])\r
+ else:\r
+ oldList = []\r
+ newList = record.get_geni_info().get(listName, [])\r
+\r
+ # if the lists are the same, then we don't have to update anything\r
+ if (oldList == newList):\r
+ return\r
+\r
+ # build a list of the new person ids, by looking up each person to get\r
+ # their pointer\r
+ newIdList = []\r
+ for hrn in newList:\r
+ userRecord = self.resolve_raw("user", hrn)[0]\r
+ newIdList.append(userRecord.get_pointer())\r
+\r
+ # build a list of the old person ids from the person_ids field of the\r
+ # pl_info\r
+ if oldRecord:\r
+ oldIdList = oldRecord.pl_info.get("person_ids", [])\r
+ containerId = oldRecord.get_pointer()\r
+ else:\r
+ # if oldRecord==None, then we are doing a Register, instead of an\r
+ # update.\r
+ oldIdList = []\r
+ containerId = record.get_pointer()\r
+\r
+ # add people who are in the new list, but not the oldList\r
+ for personId in newIdList:\r
+ if not (personId in oldIdList):\r
+ print "adding id", personId, "to", record.get_name()\r
+ addFunc(self.pl_auth, personId, containerId)\r
+\r
+ # remove people who are in the old list, but not the new list\r
+ for personId in oldIdList:\r
+ if not (personId in newIdList):\r
+ print "removing id", personId, "from", record.get_name()\r
+ delFunc(self.pl_auth, personId, containerId)\r
+\r
+ def update_membership(self, oldRecord, record):\r
+ if record.type == "slice":\r
+ self.update_membership_list(oldRecord, record, 'researcher',\r
+ self.shell.AddPersonToSlice,\r
+ self.shell.DeletePersonFromSlice)\r
+ elif record.type == "sa":\r
+ # TODO\r
+ pass\r
+ elif record.type == "ma":\r
+ # TODO\r
+ pass
+
##
# GENI API: register
#
table.insert(record)
+ # update membership for researchers, pis, owners, operators
+ self.update_membership(None, record)
+
return record.get_gid_object().save_to_string(save_parents=True)
##
record_list = table.resolve(type, hrn)
if not record_list:
- raise RecordNotFound(name)
+ raise RecordNotFound(hrn)
record = record_list[0]
# TODO: sa, ma
return True
##
- # GENI API: Register
+ # GENI API: Update
#
# Update an object in the registry. Currently, this only updates the
# PLC information associated with the record. The Geni fields (name, type,
else:
raise UnknownGeniType(type)
+ # update membership for researchers, pis, owners, operators\r
+ self.update_membership(existing_record, record)
+
##
# List the records in an authority. The objectGID in the supplied credential
# should name the authority that will be listed.
rl.add("resolve")
rl.add("info")
elif type == "sa":
- rl.add("authority")
+ rl.add("authority,sa")
elif type == "ma":
- rl.add("authority")
+ rl.add("authority,ma")
elif type == "slice":
rl.add("refresh")
rl.add("embed")
rl = self.determine_rights(type, name)
cred.set_privileges(rl)
- cred.set_parent(self.hierarchy.get_auth_cred(auth_hrn))
+ # determine the type of credential that we want to use as a parent for
+ # this credential.
+
+ if (type == "ma") or (type == "node"):
+ auth_kind = "authority,ma"
+ else: # user, slice, sa
+ auth_kind = "authority,sa"
+
+ cred.set_parent(self.hierarchy.get_auth_cred(auth_hrn, kind=auth_kind))
cred.encode()
cred.sign()
rl = self.determine_rights(type, name)
new_cred.set_privileges(rl)
- new_cred.set_parent(self.hierarchy.get_auth_cred(auth_hrn))
+ # determine the type of credential that we want to use as a parent for
+ # this credential.
+
+ if (type == "ma") or (type == "node"):
+ auth_kind = "authority,ma"
+ else: # user, slice, sa
+ auth_kind = "authority,sa"
+
+ new_cred.set_parent(self.hierarchy.get_auth_cred(auth_hrn, kind=auth_kind))
new_cred.encode()
new_cred.sign()
return new_cred.save_to_string(save_parents=True)
+ ##
+ # GENI API: get_ticket
+ #
+ # Retrieve a ticket. This operation is currently implemented on PLC
+ # only (see SFA, engineering decisions); it is not implemented on
+ # components.
+ #
+ # The ticket is filled in with information from the PLC database. This
+ # information includes resources, and attributes such as user keys and
+ # initscripts.
+ #
+ # @param cred credential string
+ # @param name name of the slice to retrieve a ticket for
+ # @param rspec resource specification dictionary
+ #
+ # @return the string representation of a ticket object
+
+ def get_ticket(self, cred, name, rspec):
+ self.decode_authentication(cred, "getticket")
+
+ self.verify_object_belongs_to_me(name)
+
+ self.verify_object_permission(name)
+
+ # XXX much of this code looks like get_credential... are they so similar
+ # that they should be combined?
+
+ auth_hrn = get_authority(name)
+ auth_info = self.get_auth_info(auth_hrn)
+
+ records = self.resolve_raw("slice", name, must_exist=True)
+ record = records[0]
+
+ object_gid = record.get_gid_object()
+ new_ticket = Ticket(subject = object_gid.get_subject())
+ new_ticket.set_gid_caller(self.client_gid)
+ new_ticket.set_gid_object(object_gid)
+ new_ticket.set_issuer(key=auth_info.get_pkey_object(), subject=auth_hrn)
+ new_ticket.set_pubkey(object_gid.get_pubkey())
+
+ self.fill_record_info(record)
+
+ (attributes, rspec) = self.record_to_slice_info(record)
+
+ new_ticket.set_attributes(attributes)
+ new_ticket.set_rspec(rspec)
+
+ new_ticket.set_parent(AuthHierarchy.get_auth_ticket(auth_hrn))
+
+ new_ticket.encode()
+ new_ticket.sign()
+
+ return new_ticket.save_to_string(save_parents=True)
+
##
# GENI_API: Create_gid
#
git://git.onelab.eu / sfa.git / blobdiff