X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Ftrust%2Fgid.py;h=3f903d98c9a0e6171643e106f910fc27fcd75ad8;hb=06768bd605e5d47fadfc90a35c74e30f267226a5;hp=15ad6bffbe3411b5747f4ee5f1536f1efe28cc32;hpb=18317236953434dfa9ea41328fc21731039e55f1;p=sfa.git diff --git a/sfa/trust/gid.py b/sfa/trust/gid.py index 15ad6bff..3f903d98 100644 --- a/sfa/trust/gid.py +++ b/sfa/trust/gid.py @@ -25,14 +25,16 @@ # descendant of the certificate class. ## -import xmlrpclib +from __future__ import print_function + import uuid from sfa.trust.certificate import Certificate -from sfa.util.faults import * -from sfa.util.sfalogging import logger +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. @@ -66,10 +68,6 @@ def create_uuid(): class GID(Certificate): - uuid = None - hrn = None - urn = None - ## # Create a new GID object # @@ -78,10 +76,16 @@ class GID(Certificate): # @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 - - def __init__(self, create=False, subject=None, string=None, filename=None, uuid=None, hrn=None, urn=None, lifeDays=1825): - + # @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) + if subject: logger.debug("Creating GID for subject: %s" % subject) if uuid: @@ -93,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) @@ -121,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() @@ -143,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') ## @@ -158,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: @@ -166,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] @@ -180,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=" "*(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 @@ -212,12 +237,16 @@ class GID(Certificate): if self.parent: # make sure the parent's hrn is a prefix of the child's hrn if not hrn_authfor_hrn(self.parent.get_hrn(), self.get_hrn()): - raise GidParentHrn("This cert HRN %s isn't in the namespace for parent HRN %s" % (self.get_hrn(), self.parent.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's parent %s is not an authority (is a %s)" % (self.get_hrn(), self.parent.get_hrn(), self.parent.get_type())) + 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 @@ -231,10 +260,12 @@ class GID(Certificate): # trusted_hrn = trusted_hrn[:trusted_hrn.rindex('.')] cur_hrn = self.get_hrn() if not hrn_authfor_hrn(trusted_hrn, cur_hrn): - raise GidParentHrn("Trusted root with HRN %s isn't a namespace authority for this cert %s" % (trusted_hrn, cur_hrn)) + raise GidParentHrn( + "Trusted root with HRN {} isn't a namespace authority for this cert: {}" + .format(trusted_hrn, cur_hrn)) # There are multiple types of authority - accept them all here if not trusted_type.find('authority') == 0: - raise GidInvalidParentHrn("This cert %s's trusted root signer %s is not an authority (is a %s)" % (self.get_hrn(), trusted_hrn, trusted_type)) - - return + raise GidInvalidParentHrn( + "This cert {}'s trusted root signer {} is not an authority (is a {})" + .format(self.get_hrn(), trusted_hrn, trusted_type))