Merged trust engines back into a unified version, made metadata roles a "KeyInfoSource".

[shibboleth/cpp-opensaml.git] / samltest / binding.h

diff --git a/samltest/binding.h b/samltest/binding.h
index 4e7117e..b412be8 100644 (file)
--- a/samltest/binding.h
+++ b/samltest/binding.h
@@ -22,10 +22,11 @@
 #include <saml/binding/MessageDecoder.h>\r
 #include <saml/binding/MessageEncoder.h>\r
 #include <saml/binding/URLEncoder.h>\r
+#include <saml/saml2/metadata/Metadata.h>\r
 #include <saml/saml2/metadata/MetadataProvider.h>\r
-#include <saml/security/TrustEngine.h>\r
+#include <xmltooling/security/TrustEngine.h>\r
 \r
-using namespace saml2md;\r
+using namespace opensaml::saml2md;\r
 using namespace xmlsignature;\r
 \r
 class SAMLBindingBaseTestCase : public HTTPRequest, public HTTPResponse\r
@@ -33,7 +34,7 @@ class SAMLBindingBaseTestCase : public HTTPRequest, public HTTPResponse
 protected:\r
     CredentialResolver* m_creds; \r
     MetadataProvider* m_metadata;\r
-    opensaml::TrustEngine* m_trust;\r
+    TrustEngine* m_trust;\r
     map<string,string> m_fields;\r
     map<string,string> m_headers;\r
     string m_method,m_url,m_query;\r
@@ -75,12 +76,11 @@ public:
                 FILESYSTEM_CREDENTIAL_RESOLVER,doc2->getDocumentElement()\r
                 );\r
                 \r
-            m_trust = SAMLConfig::getConfig().TrustEngineManager.newPlugin(EXPLICIT_KEY_SAMLTRUSTENGINE, NULL);\r
+            m_trust = XMLToolingConfig::getConfig().TrustEngineManager.newPlugin(EXPLICIT_KEY_TRUSTENGINE, NULL);\r
 \r
             m_rules.push_back(SAMLConfig::getConfig().SecurityPolicyRuleManager.newPlugin(MESSAGEFLOW_POLICY_RULE,NULL));\r
-            m_rules.push_back(SAMLConfig::getConfig().SecurityPolicyRuleManager.newPlugin(MESSAGEROUTING_POLICY_RULE,NULL));\r
-            m_rules.push_back(SAMLConfig::getConfig().SecurityPolicyRuleManager.newPlugin(MESSAGESIGNING_POLICY_RULE,NULL));\r
             m_rules.push_back(SAMLConfig::getConfig().SecurityPolicyRuleManager.newPlugin(SIMPLESIGNING_POLICY_RULE,NULL));\r
+            m_rules.push_back(SAMLConfig::getConfig().SecurityPolicyRuleManager.newPlugin(XMLSIGNING_POLICY_RULE,NULL));\r
         }\r
         catch (XMLToolingException& ex) {\r
             TS_TRACE(ex.what());\r
@@ -92,6 +92,7 @@ public:
     \r
     void tearDown() {\r
         for_each(m_rules.begin(), m_rules.end(), xmltooling::cleanup<SecurityPolicyRule>());\r
+        m_rules.clear();\r
         delete m_creds;\r
         delete m_metadata;\r
         delete m_trust;\r
@@ -237,6 +238,14 @@ public:
         return decoded;\r
     }\r
     \r
+    long sendResponse(std::istream& inputStream) {\r
+        return sendResponse(inputStream, HTTPResponse::SAML_HTTP_STATUS_OK);\r
+    }\r
+\r
+    long sendError(std::istream& inputStream) {\r
+        return sendResponse(inputStream, HTTPResponse::SAML_HTTP_STATUS_ERROR);\r
+    }\r
+\r
     long sendResponse(std::istream& inputStream, long status) {\r
         m_method="POST";\r
         string page,line;\r