X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Ftrust%2Fcredential.py;h=01542a0431b1fc4250ee1d63f3861e4aa4174620;hb=4986fe8b86a26b532b96674531569bbc70d7d7ac;hp=9ccf18fae3e7a08bb6fad7e3a277c79f6615beea;hpb=3353d88a6b96e2bc33d1dcec16d15d845d7df40b;p=sfa.git diff --git a/sfa/trust/credential.py b/sfa/trust/credential.py index 9ccf18fa..01542a04 100644 --- a/sfa/trust/credential.py +++ b/sfa/trust/credential.py @@ -272,11 +272,13 @@ class Credential(object): if os.path.isfile(path + '/' + 'xmlsec1'): self.xmlsec_path = path + '/' + 'xmlsec1' break + if not self.xmlsec_path: + logger.warn("Could not locate binary for xmlsec1 - SFA will be unable to sign stuff !!") def get_subject(self): if not self.gidObject: self.decode() - return self.gidObject.get_printable_subject() + return self.gidObject.get_subject() # sounds like this should be __repr__ instead ?? def get_summary_tostring(self): @@ -1035,7 +1037,7 @@ class Credential(object): print self.dump_string(*args, **kwargs) - def dump_string(self, dump_parents=False): + def dump_string(self, dump_parents=False, show_xml=False): result="" result += "CREDENTIAL %s\n" % self.get_subject() filename=self.get_filename() @@ -1059,4 +1061,16 @@ class Credential(object): result += "\nPARENT" result += self.parent.dump_string(True) + if show_xml: + try: + tree = etree.parse(StringIO(self.xml)) + aside = etree.tostring(tree, pretty_print=True) + result += "\nXML\n" + result += aside + result += "\nEnd XML\n" + except: + import traceback + print "exc. Credential.dump_string / XML" + traceback.print_exc() + return result