X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Ftrust%2Fgid.py;h=7387902d32f10cc6df370bd3c987a976dc8f9637;hb=4a9e6751f9f396f463932133b9d62fc925a99ef6;hp=bab4357e0d7f24a78a80cb9af444b766acafa75c;hpb=8ebb53ace5f9319da63a67fc644486e58a94b18f;p=sfa.git diff --git a/sfa/trust/gid.py b/sfa/trust/gid.py index bab4357e..7387902d 100644 --- a/sfa/trust/gid.py +++ b/sfa/trust/gid.py @@ -11,13 +11,13 @@ # The above copyright notice and this permission notice shall be # included in all copies or substantial portions of the Work. # -# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS +# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS # IN THE WORK. #---------------------------------------------------------------------- ## @@ -25,18 +25,21 @@ # descendant of the certificate class. ## -import xmlrpclib + + import uuid from sfa.trust.certificate import Certificate from sfa.util.faults import GidInvalidParentHrn, GidParentHrn -from sfa.util.sfalogging import logger 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. + def create_uuid(): return str(uuid.uuid4().int) @@ -52,7 +55,7 @@ def create_uuid(): # # URN is a human readable identifier of form: # "urn:publicid:IDN+toplevelauthority[:sub-auth.]*[\res. type]\ +object name" -# For example, urn:publicid:IDN+planetlab:us:arizona+user+bakers +# For example, urn:publicid:IDN+planetlab:us:arizona+user+bakers # # PUBLIC_KEY is the public key of the principal identified by the UUID/HRN. # It is a Keypair object as defined in the cert.py module. @@ -74,14 +77,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 + # @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): + 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 + 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: @@ -92,8 +97,10 @@ class GID(Certificate): if urn: self.urn = urn self.hrn, type = urn_to_hrn(urn) + if email: - self.set_email(email) + logger.debug("Creating GID for subject using email: %s" % email) + self.set_email(email) def set_uuid(self, uuid): if isinstance(uuid, str): @@ -117,11 +124,11 @@ class GID(Certificate): def set_urn(self, urn): self.urn = urn self.hrn, type = urn_to_hrn(urn) - + def get_urn(self): if not self.urn: self.decode() - return self.urn + return self.urn # Will be stuffed into subjectAltName def set_email(self, email): @@ -137,7 +144,7 @@ class GID(Certificate): self.decode() _, t = urn_to_hrn(self.urn) return t - + ## # Encode the GID fields and package them into the subject-alt-name field # of the X509 certificate. This must be called prior to signing the @@ -148,17 +155,16 @@ class GID(Certificate): urn = self.urn else: urn = hrn_to_urn(self.hrn, None) - - str = "URI:" + urn + + string = "URI:" + urn if self.uuid: - str += ", " + "URI:" + uuid.UUID(int=self.uuid).urn - - if self.email: - str += ", " + "email:" + self.email + string += ", " + "URI:" + uuid.UUID(int=self.uuid).urn - self.set_data(str, 'subjectAltName') + if self.email: + string += ", " + "email:" + self.email + self.set_data(string, 'subjectAltName') ## # Decode the subject-alt-name field of the X509 certificate into the @@ -170,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: @@ -182,7 +188,7 @@ class GID(Certificate): # 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) @@ -197,21 +203,22 @@ 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" + 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 + result += " " * indent + "email:" + str(self.get_email()) + "\n" + filename = self.get_filename() + if filename: + result += "Filename %s\n" % filename if self.parent and dump_parents: - result += " "*indent + "parent:\n" - result += self.parent.dump_string(indent+4, dump_parents) + result += " " * indent + "parent:\n" + result += self.parent.dump_string(indent + 4, dump_parents) return result ## @@ -224,19 +231,26 @@ class GID(Certificate): # for a principal that is not a member of that authority. For example, # planetlab.us.arizona cannot sign a GID for planetlab.us.princeton.foo. - def verify_chain(self, trusted_certs = None): + def verify_chain(self, trusted_certs=None): + logger.debug(10*'=' + " GID.verify_chain with {} trusted certs" + .format(len(trusted_certs))) + logger.debug("on {}".format(self.pretty_name())) # do the normal certificate verification stuff - trusted_root = Certificate.verify_chain(self, trusted_certs) - + trusted_root = Certificate.verify_chain(self, trusted_certs) + 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 @@ -246,14 +260,16 @@ class GID(Certificate): trusted_gid = GID(string=trusted_root.save_to_string()) trusted_type = trusted_gid.get_type() trusted_hrn = trusted_gid.get_hrn() - #if trusted_type == 'authority': + # if trusted_type == 'authority': # 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))