except:\r
pass\r
\r
-from sfa.util.faults import *\r
+from xml.parsers.expat import ExpatError\r
+\r
+from sfa.util.faults import CredentialNotVerifiable, ChildRightsNotSubsetOfParent\r
from sfa.util.sfalogging import logger\r
from sfa.util.sfatime import utcparse\r
-from sfa.trust.certificate import Keypair\r
from sfa.trust.credential_legacy import CredentialLegacy\r
from sfa.trust.rights import Right, Rights, determine_rights\r
from sfa.trust.gid import GID\r
from sfa.util.xrn import urn_to_hrn, hrn_authfor_hrn\r
\r
# 2 weeks, in seconds \r
-DEFAULT_CREDENTIAL_LIFETIME = 86400 * 14\r
+DEFAULT_CREDENTIAL_LIFETIME = 86400 * 31\r
\r
\r
# TODO:\r
logger.log_exc ("Failed to parse credential, %s"%self.xml)\r
raise\r
sig = doc.getElementsByTagName("Signature")[0]\r
- self.set_refid(sig.getAttribute("xml:id").strip("Sig_"))\r
- keyinfo = sig.getElementsByTagName("X509Data")[0]\r
- szgid = getTextNode(keyinfo, "X509Certificate")\r
- szgid = "-----BEGIN CERTIFICATE-----\n%s\n-----END CERTIFICATE-----" % szgid\r
- self.set_issuer_gid(GID(string=szgid)) \r
+ ref_id = sig.getAttribute("xml:id").strip().strip("Sig_")\r
+ # The xml:id tag is optional, and could be in a \r
+ # Reference xml:id or Reference UID sub element instead\r
+ if not ref_id or ref_id == '':\r
+ reference = sig.getElementsByTagName('Reference')[0]\r
+ ref_id = reference.getAttribute('xml:id').strip().strip('Sig_')\r
+ if not ref_id or ref_id == '':\r
+ ref_id = reference.getAttribute('URI').strip().strip('#')\r
+ self.set_refid(ref_id)\r
+ keyinfos = sig.getElementsByTagName("X509Data")\r
+ gids = None\r
+ for keyinfo in keyinfos:\r
+ certs = keyinfo.getElementsByTagName("X509Certificate")\r
+ for cert in certs:\r
+ if len(cert.childNodes) > 0:\r
+ szgid = cert.childNodes[0].nodeValue\r
+ szgid = szgid.strip()\r
+ szgid = "-----BEGIN CERTIFICATE-----\n%s\n-----END CERTIFICATE-----" % szgid\r
+ if gids is None:\r
+ gids = szgid\r
+ else:\r
+ gids += "\n" + szgid\r
+ if gids is None:\r
+ raise CredentialNotVerifiable("Malformed XML: No certificate found in signature")\r
+ self.set_issuer_gid(GID(string=gids))\r
\r
def encode(self):\r
self.xml = signature_template % (self.get_refid(), self.get_refid())\r
for cred in creds:\r
try:\r
tmp_cred = Credential(string=cred)\r
+ if tmp_cred.get_cred_type() != Credential.SFA_CREDENTIAL_TYPE:\r
+ continue\r
if tmp_cred.get_gid_caller().get_hrn() in caller_hrn_list:\r
caller_creds.append(cred)\r
except: pass\r
\r
class Credential(object):\r
\r
+ SFA_CREDENTIAL_TYPE = "geni_sfa"\r
+\r
##\r
# Create a Credential object\r
#\r
self.xml = None\r
self.refid = None\r
self.legacy = None\r
+ self.cred_type = Credential.SFA_CREDENTIAL_TYPE\r
\r
# Check if this is a legacy credential, translate it if so\r
if string or filename:\r
if os.path.isfile(path + '/' + 'xmlsec1'):\r
self.xmlsec_path = path + '/' + 'xmlsec1'\r
break\r
+ if not self.xmlsec_path:\r
+ logger.warn("Could not locate binary for xmlsec1 - SFA will be unable to sign stuff !!")\r
+\r
+ def get_cred_type(self): \r
+ return self.cred_type\r
\r
def get_subject(self):\r
if not self.gidObject:\r
self.decode()\r
- return self.gidObject.get_printable_subject()\r
+ return self.gidObject.get_subject()\r
\r
+ # sounds like this should be __repr__ instead ??\r
def get_summary_tostring(self):\r
if not self.gidObject:\r
self.decode()\r
if not self.gidObject:\r
self.decode()\r
return self.gidObject\r
-\r
-\r
\r
##\r
# Expiration: an absolute UTC time of expiration (as either an int or string or datetime)\r
if isinstance(privs, str):\r
self.privileges = Rights(string = privs)\r
else:\r
- self.privileges = privs\r
- \r
+ self.privileges = privs \r
\r
##\r
# return the privileges as a Rights object\r
# cause those schemas are identical.\r
# Also note these PG schemas talk about PG tickets and CM policies.\r
signed_cred.setAttribute("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance")\r
+ # FIXME: See v2 schema at www.geni.net/resources/credential/2/credential.xsd\r
signed_cred.setAttribute("xsi:noNamespaceSchemaLocation", "http://www.planet-lab.org/resources/sfa/credential.xsd")\r
signed_cred.setAttribute("xsi:schemaLocation", "http://www.planet-lab.org/resources/sfa/ext/policy/1 http://www.planet-lab.org/resources/sfa/ext/policy/1/policy.xsd")\r
\r
if not self.expiration:\r
self.set_expiration(datetime.datetime.utcnow() + datetime.timedelta(seconds=DEFAULT_CREDENTIAL_LIFETIME))\r
self.expiration = self.expiration.replace(microsecond=0)\r
- append_sub(doc, cred, "expires", self.expiration.isoformat())\r
+ if self.expiration.tzinfo is not None and self.expiration.tzinfo.utcoffset(self.expiration) is not None:\r
+ # TZ aware. Make sure it is UTC\r
+ self.expiration = self.expiration.astimezone(tz.tzutc())\r
+ append_sub(doc, cred, "expires", self.expiration.strftime('%Y-%m-%dT%H:%M:%SZ')) # RFC3339\r
privileges = doc.createElement("privileges")\r
cred.appendChild(privileges)\r
\r
# Below throws InUse exception if we forgot to clone the attribute first\r
oldAttr = signed_cred.setAttributeNode(attr.cloneNode(True))\r
if oldAttr and oldAttr.value != attr.value:\r
- 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)\r
+ msg = "Delegating cred from owner %s to %s over %s:\n - 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)\r
logger.warn(msg)\r
#raise CredentialNotVerifiable("Can't encode new valid delegated credential: %s" % msg)\r
\r
signatures.appendChild(ele)\r
\r
# Get the finished product\r
- self.xml = doc.toxml()\r
+ self.xml = doc.toxml("utf-8")\r
\r
\r
def save_to_random_tmp_file(self): \r
# you have loaded an existing signed credential, do not call encode() or sign() on it.\r
\r
def sign(self):\r
- if not self.issuer_privkey or not self.issuer_gid:\r
+ if not self.issuer_privkey:\r
+ logger.warn("Cannot sign credential (no private key)")\r
+ return\r
+ if not self.issuer_gid:\r
+ logger.warn("Cannot sign credential (no issuer gid)")\r
return\r
doc = parseString(self.get_xml())\r
sigs = doc.getElementsByTagName("signatures")[0]\r
sig_ele = doc.importNode(sdoc.getElementsByTagName("Signature")[0], True)\r
sigs.appendChild(sig_ele)\r
\r
- self.xml = doc.toxml()\r
+ self.xml = doc.toxml("utf-8")\r
\r
\r
# Split the issuer GID into multiple certificates if it's a chain\r
# Call out to xmlsec1 to sign it\r
ref = 'Sig_%s' % self.get_refid()\r
filename = self.save_to_random_tmp_file()\r
- signed = os.popen('%s --sign --node-id "%s" --privkey-pem %s,%s %s' \\r
- % (self.xmlsec_path, ref, self.issuer_privkey, ",".join(gid_files), filename)).read()\r
+ command='%s --sign --node-id "%s" --privkey-pem %s,%s %s' \\r
+ % (self.xmlsec_path, ref, self.issuer_privkey, ",".join(gid_files), filename)\r
+# print 'command',command\r
+ signed = os.popen(command).read()\r
os.remove(filename)\r
\r
for gid_file in gid_files:\r
# Update signatures\r
self.decode() \r
\r
- \r
+\r
##\r
# Retrieve the attributes of the credential from the XML.\r
# This is automatically called by the various get_* methods of\r
\r
self.set_refid(cred.getAttribute("xml:id"))\r
self.set_expiration(utcparse(getTextNode(cred, "expires")))\r
- self.gidCaller = GID(string=getTextNode(cred, "owner_gid"))\r
- self.gidObject = GID(string=getTextNode(cred, "target_gid")) \r
\r
+# import traceback\r
+# stack = traceback.extract_stack()\r
+\r
+ og = getTextNode(cred, "owner_gid")\r
+ # ABAC creds will have this be None and use this method\r
+# if og is None:\r
+# found = False\r
+# for frame in stack:\r
+# if 'super(ABACCredential, self).decode()' in frame:\r
+# found = True\r
+# break\r
+# if not found:\r
+# raise CredentialNotVerifiable("Malformed XML: No owner_gid found")\r
+ self.gidCaller = GID(string=og)\r
+ tg = getTextNode(cred, "target_gid")\r
+# if tg is None:\r
+# found = False\r
+# for frame in stack:\r
+# if 'super(ABACCredential, self).decode()' in frame:\r
+# found = True\r
+# break\r
+# if not found:\r
+# raise CredentialNotVerifiable("Malformed XML: No target_gid found")\r
+ self.gidObject = GID(string=tg)\r
\r
# Process privileges\r
- privs = cred.getElementsByTagName("privileges")[0]\r
rlist = Rights()\r
- for priv in privs.getElementsByTagName("privilege"):\r
- kind = getTextNode(priv, "name")\r
- deleg = str2bool(getTextNode(priv, "can_delegate"))\r
- if kind == '*':\r
- # Convert * into the default privileges for the credential's type\r
- # Each inherits the delegatability from the * above\r
- _ , type = urn_to_hrn(self.gidObject.get_urn())\r
- rl = determine_rights(type, self.gidObject.get_urn())\r
- for r in rl.rights:\r
- r.delegate = deleg\r
- rlist.add(r)\r
- else:\r
- rlist.add(Right(kind.strip(), deleg))\r
+ priv_nodes = cred.getElementsByTagName("privileges")\r
+ if len(priv_nodes) > 0:\r
+ privs = priv_nodes[0]\r
+ for priv in privs.getElementsByTagName("privilege"):\r
+ kind = getTextNode(priv, "name")\r
+ deleg = str2bool(getTextNode(priv, "can_delegate"))\r
+ if kind == '*':\r
+ # Convert * into the default privileges for the credential's type\r
+ # Each inherits the delegatability from the * above\r
+ _ , type = urn_to_hrn(self.gidObject.get_urn())\r
+ rl = determine_rights(type, self.gidObject.get_urn())\r
+ for r in rl.rights:\r
+ r.delegate = deleg\r
+ rlist.add(r)\r
+ else:\r
+ rlist.add(Right(kind.strip(), deleg))\r
self.set_privileges(rlist)\r
\r
\r
parent = cred.getElementsByTagName("parent")\r
if len(parent) > 0:\r
parent_doc = parent[0].getElementsByTagName("credential")[0]\r
- parent_xml = parent_doc.toxml()\r
+ parent_xml = parent_doc.toxml("utf-8")\r
+ if parent_xml is None or parent_xml.strip() == "":\r
+ raise CredentialNotVerifiable("Malformed XML: Had parent tag but it is empty")\r
self.parent = Credential(string=parent_xml)\r
self.updateRefID()\r
\r
# Assign the signatures to the credentials\r
for sig in sigs:\r
- Sig = Signature(string=sig.toxml())\r
+ Sig = Signature(string=sig.toxml("utf-8"))\r
\r
for cur_cred in self.get_credential_list():\r
if cur_cred.get_refid() == Sig.get_refid():\r
def verify_issuer(self, trusted_gids):\r
root_cred = self.get_credential_list()[-1]\r
root_target_gid = root_cred.get_gid_object()\r
+ if root_cred.get_signature() is None:\r
+ # malformed\r
+ raise CredentialNotVerifiable("Could not verify credential owned by %s for object %s. Cred has no signature" % (self.gidCaller.get_urn(), self.gidObject.get_urn()))\r
+\r
root_cred_signer = root_cred.get_signature().get_issuer_gid()\r
\r
# Case 1:\r
print self.dump_string(*args, **kwargs)\r
\r
\r
- def dump_string(self, dump_parents=False):\r
+ def dump_string(self, dump_parents=False, show_xml=False):\r
result=""\r
result += "CREDENTIAL %s\n" % self.get_subject()\r
filename=self.get_filename()\r
result += gidCaller.dump_string(8, dump_parents)\r
\r
if self.get_signature():\r
- print " gidIssuer:"\r
- self.get_signature().get_issuer_gid().dump(8, dump_parents)\r
+ result += " gidIssuer:\n"\r
+ result += self.get_signature().get_issuer_gid().dump_string(8, dump_parents)\r
+\r
+ if self.expiration:\r
+ result += " expiration: " + self.expiration.isoformat() + "\n"\r
\r
gidObject = self.get_gid_object()\r
if gidObject:\r
result += "\nPARENT"\r
result += self.parent.dump_string(True)\r
\r
+ if show_xml and HAVELXML:\r
+ try:\r
+ tree = etree.parse(StringIO(self.xml))\r
+ aside = etree.tostring(tree, pretty_print=True)\r
+ result += "\nXML:\n\n"\r
+ result += aside\r
+ result += "\nEnd XML\n"\r
+ except:\r
+ import traceback\r
+ print "exc. Credential.dump_string / XML"\r
+ traceback.print_exc()\r
+\r
return result\r