X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Ftrust%2Fcredential.py;h=c0907bc6898a6163173d3496c2d4b19723a03d75;hb=19b290fd744e0b21cd9833bcd0bab4b09d0ae88f;hp=46205eada4e96c0ea547e200072b0c5f358decc0;hpb=27374b2d7b991402275293df81935f7cbe510307;p=sfa.git diff --git a/sfa/trust/credential.py b/sfa/trust/credential.py index 46205ead..c0907bc6 100644 --- a/sfa/trust/credential.py +++ b/sfa/trust/credential.py @@ -26,64 +26,92 @@ # Credentials are signed XML files that assign a subject gid privileges to an object gid ## -### $Id$ -### $URL$ - import os +from types import StringTypes import datetime -from xml.dom.minidom import Document, parseString +from StringIO import StringIO from tempfile import mkstemp -from sfa.trust.certificate import Keypair -from sfa.trust.credential_legacy import CredentialLegacy -from sfa.trust.rights import * -from sfa.trust.gid import * -from sfa.util.faults import * +from xml.dom.minidom import Document, parseString +from lxml import etree +from sfa.util.faults import * from sfa.util.sfalogging import logger -from dateutil.parser import parse - - +from sfa.util.sfatime import utcparse +from sfa.trust.certificate import Keypair +from sfa.trust.credential_legacy import CredentialLegacy +from sfa.trust.rights import Right, Rights, determine_rights +from sfa.trust.gid import GID +from sfa.util.xrn import urn_to_hrn -# Two years, in seconds -DEFAULT_CREDENTIAL_LIFETIME = 60 * 60 * 24 * 365 * 2 +# 2 weeks, in seconds +DEFAULT_CREDENTIAL_LIFETIME = 86400 * 14 # TODO: # . make privs match between PG and PL # . Need to add support for other types of credentials, e.g. tickets - +# . add namespaces to signed-credential element? signature_template = \ ''' - - - - + + + + - - - - - - - - - - - - + + + + + + + + + + + + ''' +# PG formats the template (whitespace) slightly differently. +# Note that they don't include the xmlns in the template, but add it later. +# Otherwise the two are equivalent. +#signature_template_as_in_pg = \ +#''' +# +# +# +# +# +# +# +# +# +# +# +# +# +# +# +# +# +# +# +# +# +# +#''' + ## # Convert a string into a bool - +# used to convert an xsd:boolean to a Python boolean def str2bool(str): - if str.lower() in ['yes','true','1']: + if str.lower() in ['true','1']: return True return False @@ -171,6 +199,21 @@ class Signature(object): # not be changed else the signature is no longer valid. So, once # you have loaded an existing signed credential, do not call encode() or sign() on it. +def filter_creds_by_caller(creds, caller_hrn): + """ + Returns a list of creds who's gid caller matches the + specified caller hrn + """ + if not isinstance(creds, list): creds = [creds] + caller_creds = [] + for cred in creds: + try: + tmp_cred = Credential(string=cred) + if tmp_cred.get_gid_caller().get_hrn() == caller_hrn: + caller_creds.append(cred) + except: pass + return caller_creds + class Credential(object): ## @@ -242,10 +285,9 @@ class Credential(object): self.gidObject = legacy.get_gid_object() lifetime = legacy.get_lifetime() if not lifetime: - # Default to two years - self.set_lifetime(DEFAULT_CREDENTIAL_LIFETIME) + self.set_expiration(datetime.datetime.utcnow() + datetime.timedelta(seconds=DEFAULT_CREDENTIAL_LIFETIME)) else: - self.set_lifetime(int(lifetime)) + self.set_expiration(int(lifetime)) self.lifeTime = legacy.get_lifetime() self.set_privileges(legacy.get_privileges()) self.get_privileges().delegate_all_privileges(legacy.get_delegate()) @@ -300,43 +342,49 @@ class Credential(object): self.decode() return self.gidObject + + ## - # set the lifetime of this credential - # - # @param lifetime lifetime of credential - # . if lifeTime is a datetime object, it is used for the expiration time - # . if lifeTime is an integer value, it is considered the number of seconds - # remaining before expiration - - def set_lifetime(self, lifeTime): - if isinstance(lifeTime, int): - self.expiration = datetime.timedelta(seconds=lifeTime) + datetime.datetime.utcnow() + # Expiration: an absolute UTC time of expiration (as either an int or string or datetime) + # + def set_expiration(self, expiration): + if isinstance(expiration, (int,float)): + self.expiration = datetime.datetime.fromtimestamp(expiration) + elif isinstance (expiration, datetime.datetime): + self.expiration = expiration + elif isinstance (expiration, StringTypes): + self.expiration = utcparse (expiration) else: - self.expiration = lifeTime + logger.error ("unexpected input type in Credential.set_expiration") ## - # get the lifetime of the credential (in datetime format) - - def get_lifetime(self): + # get the lifetime of the credential (always in datetime format) + # + def get_expiration(self): if not self.expiration: self.decode() + # at this point self.expiration is normalized as a datetime - DON'T call utcparse again return self.expiration + ## + # For legacy sake + def get_lifetime(self): + return self.get_expiration() ## # set the privileges # - # @param privs either a comma-separated list of privileges of a RightList object + # @param privs either a comma-separated list of privileges of a Rights object def set_privileges(self, privs): if isinstance(privs, str): - self.privileges = RightList(string = privs) + self.privileges = Rights(string = privs) else: self.privileges = privs ## - # return the privileges as a RightList object + # return the privileges as a Rights object def get_privileges(self): if not self.privileges: @@ -370,6 +418,17 @@ class Credential(object): # Create the XML document doc = Document() signed_cred = doc.createElement("signed-credential") + +# PG adds these. It would be nice to be consistent. +# But it's kind of odd for PL to use PG schemas that talk +# about tickets, and the PG CM policies. +# Note the careful addition of attributes from the parent below... + signed_cred.setAttribute("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance") +# signed_cred.setAttribute("xsinoNamespaceSchemaLocation", "http://www.protogeni.net/resources/credential/credential.xsd") +# signed_cred.setAttribute("xsi:schemaLocation", "http://www.protogeni.net/resources/credential/ext/policy/1 http://www.protogeni.net/resources/credential/ext/policy/1/policy.xsd") + signed_cred.setAttribute("xsi:noNamespaceSchemaLocation", "http://www.planet-lab.org/resources/sfa/credential.xsd") + signed_cred.setAttribute("xsi:schemaLocation", "http://www.planet-lab.org/resources/sfa/ext/policy/1 http://www.planet-lab.org/resources/sfa/ext/policy.xsd") + doc.appendChild(signed_cred) # Fill in the bit @@ -384,7 +443,7 @@ class Credential(object): append_sub(doc, cred, "target_urn", self.gidObject.get_urn()) append_sub(doc, cred, "uuid", "") if not self.expiration: - self.set_lifetime(DEFAULT_CREDENTIAL_LIFETIME) + self.set_expiration(datetime.datetime.utcnow() + datetime.timedelta(seconds=DEFAULT_CREDENTIAL_LIFETIME)) self.expiration = self.expiration.replace(microsecond=0) append_sub(doc, cred, "expires", self.expiration.isoformat()) privileges = doc.createElement("privileges") @@ -401,11 +460,34 @@ class Credential(object): # Add the parent credential if it exists if self.parent: sdoc = parseString(self.parent.get_xml()) + # If the root node is a signed-credential (it should be), then + # get all its attributes and attach those to our signed_cred + # node. + # Specifically, PG adds attributes for namespaces (which is reasonable), + # and we need to include those again here or else their signature + # no longer matches on the credential. + # We expect three of these, but here we copy them all: +# signed_cred.setAttribute("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance") +# signed_cred.setAttribute("xsinoNamespaceSchemaLocation", "http://www.protogeni.net/resources/credential/credential.xsd") +# signed_cred.setAttribute("xsi:schemaLocation", "http://www.protogeni.net/resources/credential/ext/policy/1 http://www.protogeni.net/resources/credential/ext/policy/1/policy.xsd") + parentRoot = sdoc.documentElement + if parentRoot.tagName == "signed-credential" and parentRoot.hasAttributes(): + for attrIx in range(0, parentRoot.attributes.length): + attr = parentRoot.attributes.item(attrIx) + # returns the old attribute of same name that was + # on the credential + # Below throws InUse exception if we forgot to clone the attribute first + oldAttr = signed_cred.setAttributeNode(attr.cloneNode(True)) + if oldAttr and oldAttr.value != attr.value: + msg = "Delegating cred from owner %s to %s over %s replaced attribute %s value %s with %s" % (self.parent.gidCaller.get_urn(), self.gidCaller.get_urn(), self.gidObject.get_urn(), oldAttr.name, oldAttr.value, attr.value) + logger.error(msg) + raise CredentialNotVerifiable("Can't encode new valid delegated credential: %s" % msg) + p_cred = doc.importNode(sdoc.getElementsByTagName("credential")[0], True) p = doc.createElement("parent") p.appendChild(p_cred) cred.appendChild(p) - + # done handling parent credential # Create the tag signatures = doc.createElement("signatures") @@ -567,22 +649,24 @@ class Credential(object): self.set_refid(cred.getAttribute("xml:id")) - self.set_lifetime(parse(getTextNode(cred, "expires"))) + self.set_expiration(utcparse(getTextNode(cred, "expires"))) self.gidCaller = GID(string=getTextNode(cred, "owner_gid")) self.gidObject = GID(string=getTextNode(cred, "target_gid")) # Process privileges privs = cred.getElementsByTagName("privileges")[0] - rlist = RightList() + rlist = Rights() for priv in privs.getElementsByTagName("privilege"): kind = getTextNode(priv, "name") deleg = str2bool(getTextNode(priv, "can_delegate")) if kind == '*': - # Convert * into the default privileges for the credential's type + # Convert * into the default privileges for the credential's type + # Each inherits the delegatability from the * above _ , type = urn_to_hrn(self.gidObject.get_urn()) - rl = rlist.determine_rights(type, self.gidObject.get_urn()) + rl = determine_rights(type, self.gidObject.get_urn()) for r in rl.rights: + r.delegate = deleg rlist.add(r) else: rlist.add(Right(kind.strip(), deleg)) @@ -610,6 +694,10 @@ class Credential(object): # Verify # trusted_certs: A list of trusted GID filenames (not GID objects!) # Chaining is not supported within the GIDs by xmlsec1. + # + # trusted_certs_required: Should usually be true. Set False means an + # empty list of trusted_certs would still let this method pass. + # It just skips xmlsec1 verification et al. Only used by some utils # # Verify that: # . All of the signatures are valid and that the issuers trace back @@ -632,22 +720,39 @@ class Credential(object): # must be done elsewhere # # @param trusted_certs: The certificates of trusted CA certificates - def verify(self, trusted_certs): + def verify(self, trusted_certs=None, schema=None, trusted_certs_required=True): if not self.xml: - self.decode() + self.decode() + + # validate against RelaxNG schema + if not self.legacy: + if schema and os.path.exists(schema): + tree = etree.parse(StringIO(self.xml)) + schema_doc = etree.parse(schema) + xmlschema = etree.XMLSchema(schema_doc) + if not xmlschema.validate(tree): + error = xmlschema.error_log.last_error + message = "%s (line %s)" % (error.message, error.line) + raise CredentialNotVerifiable(message) + + if trusted_certs_required and trusted_certs is None: + trusted_certs = [] # trusted_cert_objects = [GID(filename=f) for f in trusted_certs] trusted_cert_objects = [] ok_trusted_certs = [] - for f in trusted_certs: - try: - # Failures here include unreadable files - # or non PEM files - trusted_cert_objects.append(GID(filename=f)) - ok_trusted_certs.append(f) - except Exception, exc: - logger.error("Failed to load trusted cert from %s: %r", f, exc) - trusted_certs = ok_trusted_certs + # If caller explicitly passed in None that means skip cert chain validation. + # Strange and not typical + if trusted_certs is not None: + for f in trusted_certs: + try: + # Failures here include unreadable files + # or non PEM files + trusted_cert_objects.append(GID(filename=f)) + ok_trusted_certs.append(f) + except Exception, exc: + logger.error("Failed to load trusted cert from %s: %r", f, exc) + trusted_certs = ok_trusted_certs # Use legacy verification if this is a legacy credential if self.legacy: @@ -659,17 +764,21 @@ class Credential(object): return True # make sure it is not expired - if self.get_lifetime() < datetime.datetime.utcnow(): + if self.get_expiration() < datetime.datetime.utcnow(): raise CredentialNotVerifiable("Credential expired at %s" % self.expiration.isoformat()) # Verify the signatures filename = self.save_to_random_tmp_file() - cert_args = " ".join(['--trusted-pem %s' % x for x in trusted_certs]) + if trusted_certs is not None: + cert_args = " ".join(['--trusted-pem %s' % x for x in trusted_certs]) - # Verify the gids of this cred and of its parents - for cur_cred in self.get_credential_list(): - cur_cred.get_gid_object().verify_chain(trusted_cert_objects) - cur_cred.get_gid_caller().verify_chain(trusted_cert_objects) + # If caller explicitly passed in None that means skip cert chain validation. + # Strange and not typical + if trusted_certs is not None: + # Verify the gids of this cred and of its parents + for cur_cred in self.get_credential_list(): + cur_cred.get_gid_object().verify_chain(trusted_cert_objects) + cur_cred.get_gid_caller().verify_chain(trusted_cert_objects) refs = [] refs.append("Sig_%s" % self.get_refid()) @@ -679,10 +788,24 @@ class Credential(object): refs.append("Sig_%s" % ref) for ref in refs: + # If caller explicitly passed in None that means skip xmlsec1 validation. + # Strange and not typical + if trusted_certs is None: + break + +# print "Doing %s --verify --node-id '%s' %s %s 2>&1" % \ +# (self.xmlsec_path, ref, cert_args, filename) verified = os.popen('%s --verify --node-id "%s" %s %s 2>&1' \ % (self.xmlsec_path, ref, cert_args, filename)).read() if not verified.strip().startswith("OK"): - raise CredentialNotVerifiable("xmlsec1 error verifying cert: " + verified) + # xmlsec errors have a msg= which is the interesting bit. + mstart = verified.find("msg=") + msg = "" + if mstart > -1 and len(verified) > 4: + mstart = mstart + 4 + mend = verified.find('\\', mstart) + msg = verified[mstart:mend] + raise CredentialNotVerifiable("xmlsec1 error verifying cred using Signature ID %s: %s %s" % (ref, msg, verified.strip())) os.remove(filename) # Verify the parents (delegation) @@ -729,7 +852,7 @@ class Credential(object): # Maybe should be (hrn, type) = urn_to_hrn(root_cred_signer.get_urn()) root_cred_signer_type = root_cred_signer.get_type() if (root_cred_signer_type == 'authority'): - #logger.debug('Cred signer is an authority') + #sfa_logger.debug('Cred signer is an authority') # signer is an authority, see if target is in authority's domain hrn = root_cred_signer.get_hrn() if root_target_gid.get_hrn().startswith(hrn): @@ -757,8 +880,8 @@ class Credential(object): # make sure the rights given to the child are a subset of the # parents rights (and check delegate bits) if not parent_cred.get_privileges().is_superset(self.get_privileges()): - raise ChildRightsNotSubsetOfParent( - self.parent.get_privileges().save_to_string() + " " + + raise ChildRightsNotSubsetOfParent(("Parent cred ref %s rights " % self.parent.get_refid()) + + self.parent.get_privileges().save_to_string() + (" not superset of delegated cred ref %s rights " % self.get_refid()) + self.get_privileges().save_to_string()) # make sure my target gid is the same as the parent's @@ -767,7 +890,7 @@ class Credential(object): raise CredentialNotVerifiable("Target gid not equal between parent and child") # make sure my expiry time is <= my parent's - if not parent_cred.get_lifetime() >= self.get_lifetime(): + if not parent_cred.get_expiration() >= self.get_expiration(): raise CredentialNotVerifiable("Delegated credential expires after parent") # make sure my signer is the parent's caller @@ -780,7 +903,7 @@ class Credential(object): parent_cred.verify_parent(parent_cred.parent) - def delegate(self, delegee_gidfile, keyfile): + def delegate(self, delegee_gidfile, caller_keyfile, caller_gidfile): """ Return a delegated copy of this credential, delegated to the specified gid's user. @@ -792,44 +915,58 @@ class Credential(object): # the hrn of the user who will be delegated to delegee_gid = GID(filename=delegee_gidfile) delegee_hrn = delegee_gid.get_hrn() - - user_key = Keypair(filename=keyfile) - user_hrn = self.get_gid_caller().get_hrn() + + #user_key = Keypair(filename=keyfile) + #user_hrn = self.get_gid_caller().get_hrn() subject_string = "%s delegated to %s" % (object_hrn, delegee_hrn) dcred = Credential(subject=subject_string) dcred.set_gid_caller(delegee_gid) dcred.set_gid_object(object_gid) - privs = self.get_privileges() + dcred.set_parent(self) + dcred.set_expiration(self.get_expiration()) dcred.set_privileges(self.get_privileges()) dcred.get_privileges().delegate_all_privileges(True) - dcred.set_issuer_keys(keyfile, delegee_gidfile) - dcred.set_parent(self) + #dcred.set_issuer_keys(keyfile, delegee_gidfile) + dcred.set_issuer_keys(caller_keyfile, caller_gidfile) dcred.encode() dcred.sign() - return dcred + return dcred + + # only informative + def get_filename(self): + return getattr(self,'filename',None) + ## # Dump the contents of a credential to stdout in human-readable format # # @param dump_parents If true, also dump the parent certificates + def dump (self, *args, **kwargs): + print self.dump_string(*args, **kwargs) - def dump(self, dump_parents=False): - print "CREDENTIAL", self.get_subject() - - print " privs:", self.get_privileges().save_to_string() - print " gidCaller:" + def dump_string(self, dump_parents=False): + result="" + result += "CREDENTIAL %s\n" % self.get_subject() + filename=self.get_filename() + if filename: result += "Filename %s\n"%filename + result += " privs: %s\n" % self.get_privileges().save_to_string() gidCaller = self.get_gid_caller() if gidCaller: - gidCaller.dump(8, dump_parents) + result += " gidCaller:\n" + result += gidCaller.dump_string(8, dump_parents) + + if self.get_signature(): + print " gidIssuer:" + self.get_signature().get_issuer_gid().dump(8, dump_parents) - print " gidObject:" gidObject = self.get_gid_object() if gidObject: - gidObject.dump(8, dump_parents) - + result += " gidObject:\n" + result += gidObject.dump_string(8, dump_parents) if self.parent and dump_parents: - print "PARENT", - self.parent.dump_parents() + result += "\nPARENT" + result += self.parent.dump_string(True) + return result