X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Ftrust%2Fgid.py;h=3f903d98c9a0e6171643e106f910fc27fcd75ad8;hb=06768bd605e5d47fadfc90a35c74e30f267226a5;hp=94240cdd48ef49109bb2f4f56f6f91f98974780d;hpb=ba2aaa438f939a4b5c697052e37b1c3218901319;p=sfa.git diff --git a/sfa/trust/gid.py b/sfa/trust/gid.py index 94240cdd..3f903d98 100644 --- a/sfa/trust/gid.py +++ b/sfa/trust/gid.py @@ -25,12 +25,16 @@ # descendant of the certificate class. ## -import xmlrpclib +from __future__ import print_function + import uuid -from sfa.util.sfalogging import sfa_logger from sfa.trust.certificate import Certificate -from sfa.util.xrn import hrn_to_urn, urn_to_hrn + +from sfa.util.faults import GidInvalidParentHrn, GidParentHrn +from sfa.util.xrn import hrn_to_urn, urn_to_hrn, hrn_authfor_hrn +from sfa.util.sfalogging import logger +from sfa.util.py23 import xmlrpc_client ## # Create a new uuid. Returns the UUID as a string. @@ -64,10 +68,6 @@ def create_uuid(): class GID(Certificate): - uuid = None - hrn = None - urn = None - ## # Create a new GID object # @@ -75,12 +75,19 @@ class GID(Certificate): # @param subject If subject!=None, create the X509 cert and set the subject name # @param string If string!=None, load the GID from a string # @param filename If filename!=None, load the GID from a file + # @param lifeDays life of GID in days - default is 1825==5 years + # @param email Email address to put in subjectAltName - default is None + + def __init__(self, create=False, subject=None, string=None, filename=None, + uuid=None, hrn=None, urn=None, lifeDays=1825, email=None): + self.uuid = None + self.hrn = None + self.urn = None + self.email = None # for adding to the SubjectAltName + Certificate.__init__(self, lifeDays, create, subject, string, filename) - def __init__(self, create=False, subject=None, string=None, filename=None, uuid=None, hrn=None, urn=None): - - Certificate.__init__(self, create, subject, string, filename) if subject: - sfa_logger().debug("Creating GID for subject: %s" % subject) + logger.debug("Creating GID for subject: %s" % subject) if uuid: self.uuid = int(uuid) if hrn: @@ -90,6 +97,10 @@ class GID(Certificate): self.urn = urn self.hrn, type = urn_to_hrn(urn) + if email: + logger.debug("Creating GID for subject using email: %s" % email) + self.set_email(email) + def set_uuid(self, uuid): if isinstance(uuid, str): self.uuid = int(uuid) @@ -118,6 +129,15 @@ class GID(Certificate): self.decode() return self.urn + # Will be stuffed into subjectAltName + def set_email(self, email): + self.email = email + + def get_email(self): + if not self.email: + self.decode() + return self.email + def get_type(self): if not self.urn: self.decode() @@ -140,9 +160,10 @@ class GID(Certificate): if self.uuid: str += ", " + "URI:" + uuid.UUID(int=self.uuid).urn - self.set_data(str, 'subjectAltName') + if self.email: + str += ", " + "email:" + self.email - + self.set_data(str, 'subjectAltName') ## @@ -155,7 +176,7 @@ class GID(Certificate): dict = {} if data: if data.lower().startswith('uri:http://'): - dict = xmlrpclib.loads(data[11:])[0][0] + dict = xmlrpc_client.loads(data[11:])[0][0] else: spl = data.split(', ') for val in spl: @@ -163,10 +184,15 @@ class GID(Certificate): dict['uuid'] = uuid.UUID(val[4:]).int elif val.lower().startswith('uri:urn:publicid:idn+'): dict['urn'] = val[4:] + elif val.lower().startswith('email:'): + # FIXME: Ensure there isn't cruft in that address... + # EG look for email:copy,.... + dict['email'] = val[6:] self.uuid = dict.get("uuid", None) self.urn = dict.get("urn", None) - self.hrn = dict.get("hrn", None) + self.hrn = dict.get("hrn", None) + self.email = dict.get("email", None) if self.urn: self.hrn = urn_to_hrn(self.urn)[0] @@ -177,13 +203,15 @@ class GID(Certificate): # @param dump_parents If true, also dump the parents of the GID def dump(self, *args, **kwargs): - print self.dump_string(*args,**kwargs) + print(self.dump_string(*args,**kwargs)) def dump_string(self, indent=0, dump_parents=False): - result="GID\n" + result=" "*(indent-2) + "GID\n" result += " "*indent + "hrn:" + str(self.get_hrn()) +"\n" result += " "*indent + "urn:" + str(self.get_urn()) +"\n" result += " "*indent + "uuid:" + str(self.get_uuid()) + "\n" + if self.get_email() is not None: + result += " "*indent + "email:" + str(self.get_email()) + "\n" filename=self.get_filename() if filename: result += "Filename %s\n"%filename @@ -196,7 +224,7 @@ class GID(Certificate): # Verify the chain of authenticity of the GID. First perform the checks # of the certificate class (verifying that each parent signs the child, # etc). In addition, GIDs also confirm that the parent's HRN is a prefix - # of the child's HRN. + # of the child's HRN, and the parent is of type 'authority'. # # Verifying these prefixes prevents a rogue authority from signing a GID # for a principal that is not a member of that authority. For example, @@ -208,8 +236,21 @@ class GID(Certificate): if self.parent: # make sure the parent's hrn is a prefix of the child's hrn - if not self.get_hrn().startswith(self.parent.get_hrn()): - raise GidParentHrn("This cert HRN %s doesnt start with parent HRN %s" % (self.get_hrn(), self.parent.get_hrn())) + if not hrn_authfor_hrn(self.parent.get_hrn(), self.get_hrn()): + raise GidParentHrn( + "This cert HRN {} isn't in the namespace for parent HRN {}" + .format(self.get_hrn(), self.parent.get_hrn())) + + # Parent must also be an authority (of some type) to sign a GID + # There are multiple types of authority - accept them all here + if not self.parent.get_type().find('authority') == 0: + raise GidInvalidParentHrn( + "This cert {}'s parent {} is not an authority (is a %{})" + .format(self.get_hrn(), self.parent.get_hrn(), self.parent.get_type())) + + # Then recurse up the chain - ensure the parent is a trusted + # root or is in the namespace of a trusted root + self.parent.verify_chain(trusted_certs) else: # make sure that the trusted root's hrn is a prefix of the child's trusted_gid = GID(string=trusted_root.save_to_string()) @@ -218,7 +259,13 @@ class GID(Certificate): #if trusted_type == 'authority': # trusted_hrn = trusted_hrn[:trusted_hrn.rindex('.')] cur_hrn = self.get_hrn() - if not self.get_hrn().startswith(trusted_hrn): - raise GidParentHrn("Trusted roots HRN %s isnt start of this cert %s" % (trusted_hrn, cur_hrn)) + if not hrn_authfor_hrn(trusted_hrn, cur_hrn): + raise GidParentHrn( + "Trusted root with HRN {} isn't a namespace authority for this cert: {}" + .format(trusted_hrn, cur_hrn)) - return + # There are multiple types of authority - accept them all here + if not trusted_type.find('authority') == 0: + raise GidInvalidParentHrn( + "This cert {}'s trusted root signer {} is not an authority (is a {})" + .format(self.get_hrn(), trusted_hrn, trusted_type))