From 3e464015ec6a888589c896c246fc8a1a11d1eae4 Mon Sep 17 00:00:00 2001 From: Roland Hedberg Date: Tue, 27 Aug 2013 10:57:59 +0200 Subject: [PATCH] Added some more logging info --- src/saml2test/tool.py | 14 ++++++++++---- src/sp_test/__init__.py | 8 +++++--- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/saml2test/tool.py b/src/saml2test/tool.py index 3888344..a6a62b4 100644 --- a/src/saml2test/tool.py +++ b/src/saml2test/tool.py @@ -23,7 +23,7 @@ class Conversation(object): :ivar response: The received HTTP messages :ivar protocol_response: List of the received protocol messages """ - + def __init__(self, client, config, interaction, check_factory=None, msg_factory=None, features=None, verbose=False, expect_exception=None): @@ -165,13 +165,17 @@ class Conversation(object): _spec = self.interaction.pick_interaction(_base, content) except InteractionNeeded: self.position = url + cnt = content.replace("\n", '').replace("\t", '').replace("\r", + '') logger.error("URL: %s" % url) - logger.error("Page Content: %s" % content) + logger.error("Page Content: %s" % cnt) raise except KeyError: self.position = url + cnt = content.replace("\n", '').replace("\t", '').replace("\r", + '') logger.error("URL: %s" % url) - logger.error("Page Content: %s" % content) + logger.error("Page Content: %s" % cnt) self.err_check("interaction-needed") if _spec == _last_action: @@ -270,8 +274,10 @@ class Conversation(object): try: self.do_query() except InteractionNeeded: + cnt = self.last_content.replace("\n", '').replace( + "\t", '').replace("\r", '') self.test_output.append({"status": INTERACTION, - "message": self.last_content, + "message": cnt, "id": "exception", "name": "interaction needed", "url": self.position}) diff --git a/src/sp_test/__init__.py b/src/sp_test/__init__.py index e131fed..8974ebe 100644 --- a/src/sp_test/__init__.py +++ b/src/sp_test/__init__.py @@ -73,13 +73,15 @@ class Client(object): self._parser.add_argument( "-l", dest="list", action="store_true", help="List all the test flows as a JSON object") - self._parser.add_argument("-c", dest="idpconfig", default="idp_conf", + self._parser.add_argument("-c", dest="config", default="config", help="Configuration file for the IdP") self._parser.add_argument( "-P", dest="configpath", default=".", help="Path to the configuration file for the IdP") self._parser.add_argument("-t", dest="testpackage", help="Module describing tests") + self._parser.add_argument("-Y", dest="pysamllog", action='store_true', + help="Print PySAML2 logs") self._parser.add_argument("oper", nargs="?", help="Which test to run") self.interactions = None @@ -97,7 +99,7 @@ class Client(object): def idp_configure(self, metadata_construction=False): sys.path.insert(0, self.args.configpath) - mod = import_module(self.args.idpconfig) + mod = import_module(self.args.config) self.idp_config = IdPConfig().load(mod.CONFIG, metadata_construction) self.idp = Server(config=self.idp_config) @@ -215,7 +217,7 @@ class Client(object): self.idp_configure() metadata = MetadataStore(SCHEMA, self.idp_config.attribute_converters, - self.idp_config.xmlsec_binary) + self.idp_config) info = _jc["metadata"].encode("utf-8") md = MetaData(SCHEMA, self.idp_config.attribute_converters, info) md.load()