fix error messages

diff --git a/sfa/trust/credential.py b/sfa/trust/credential.py
index d9d3972..cdc632a 100644 (file)
--- a/sfa/trust/credential.py
+++ b/sfa/trust/credential.py
@@ -696,6 +696,12 @@ class Credential(object):
     def decode(self):
         if not self.xml:
             return
     def decode(self):
         if not self.xml:
             return

+
+        doc = None
+        try:
+            doc = parseString(self.xml)
+        except ExpatError,e:
+            raise CredentialNotVerifiable("Malformed credential")

         doc = parseString(self.xml)
         sigs = []
         signed_cred = doc.getElementsByTagName("signed-credential")
         doc = parseString(self.xml)
         sigs = []
         signed_cred = doc.getElementsByTagName("signed-credential")

diff --git a/sfa/util/faults.py b/sfa/util/faults.py
index 1a4e92e..f1d5cfd 100644 (file)
--- a/sfa/util/faults.py
+++ b/sfa/util/faults.py
@@ -329,7 +329,7 @@ class InvalidXML(SfaFault):
     def __init__(self, value, extra = None):
         self.value = value
         faultString = "Invalid XML Document: %(value)s" % locals()
     def __init__(self, value, extra = None):
         self.value = value
         faultString = "Invalid XML Document: %(value)s" % locals()

-        SfaFault.__init__(self, GENICODE.ERROR, faultString, extra)
+        SfaFault.__init__(self, GENICODE.BADARGS, faultString, extra)

     def __str__(self):
         return repr(self.value)
 
     def __str__(self):
         return repr(self.value)
 


@@ -341,10 +341,13 @@ class AccountNotEnabled(SfaFault):
         return repr(self.value)
 
 class CredentialNotVerifiable(SfaFault):
         return repr(self.value)
 
 class CredentialNotVerifiable(SfaFault):

-    def __init__(self, value, extra = None):
+    def __init__(self, value=None, extra = None):

         self.value = value
         self.value = value

-        faultString = "Unable to verify credential: %(value)s, " %locals()
-        SfaFault.__init__(self, GENICODE.ERROR, faultString, extra)
+        faultString = "Unable to verify credential" %locals()
+        if value:
+            faultString += ": %s" % value
+        faultString += ", " 
+        SfaFault.__init__(self, GENICODE.BADARGS, faultString, extra)

     def __str__(self):
         return repr(self.value)
 
     def __str__(self):
         return repr(self.value)