From 11cd3b15c71ee22f2818d810a17c213123e8c248 Mon Sep 17 00:00:00 2001 From: Scott Cantor Date: Wed, 11 Jul 2007 03:59:29 +0000 Subject: [PATCH] Parameterize config namespace for message plugins. --- saml/SAMLConfig.h | 4 ++-- saml/binding/impl/MessageDecoder.cpp | 14 +++++++------- saml/binding/impl/MessageEncoder.cpp | 16 ++++++++-------- saml/saml1/binding/impl/SAML1ArtifactDecoder.cpp | 6 +++--- saml/saml1/binding/impl/SAML1ArtifactEncoder.cpp | 6 +++--- saml/saml1/binding/impl/SAML1POSTDecoder.cpp | 6 +++--- saml/saml1/binding/impl/SAML1POSTEncoder.cpp | 10 +++++----- saml/saml1/binding/impl/SAML1SOAPDecoder.cpp | 6 +++--- saml/saml1/binding/impl/SAML1SOAPEncoder.cpp | 6 +++--- saml/saml2/binding/impl/SAML2ArtifactDecoder.cpp | 6 +++--- saml/saml2/binding/impl/SAML2ArtifactEncoder.cpp | 12 ++++++------ saml/saml2/binding/impl/SAML2POSTDecoder.cpp | 6 +++--- saml/saml2/binding/impl/SAML2POSTEncoder.cpp | 14 +++++++------- saml/saml2/binding/impl/SAML2RedirectDecoder.cpp | 6 +++--- saml/saml2/binding/impl/SAML2RedirectEncoder.cpp | 6 +++--- saml/saml2/binding/impl/SAML2SOAPDecoder.cpp | 8 +++----- saml/saml2/binding/impl/SAML2SOAPEncoder.cpp | 8 +++----- samltest/saml1/binding/SAML1ArtifactTest.h | 8 ++++++-- samltest/saml1/binding/SAML1POSTTest.h | 6 ++++-- samltest/saml2/binding/SAML2ArtifactTest.h | 8 ++++++-- samltest/saml2/binding/SAML2POSTTest.h | 12 ++++++++---- samltest/saml2/binding/SAML2RedirectTest.h | 8 ++++++-- 22 files changed, 98 insertions(+), 84 deletions(-) diff --git a/saml/SAMLConfig.h b/saml/SAMLConfig.h index 91a0598..e36640e 100644 --- a/saml/SAMLConfig.h +++ b/saml/SAMLConfig.h @@ -146,10 +146,10 @@ namespace opensaml { virtual std::string hashSHA1(const char* s, bool toHex=false)=0; /** Manages factories for MessageDecoder plugins. */ - xmltooling::PluginManager MessageDecoderManager; + xmltooling::PluginManager< MessageDecoder,std::string,std::pair > MessageDecoderManager; /** Manages factories for MessageEncoder plugins. */ - xmltooling::PluginManager MessageEncoderManager; + xmltooling::PluginManager< MessageEncoder,std::string,std::pair > MessageEncoderManager; /** Manages factories for SAMLArtifact plugins. */ xmltooling::PluginManager SAMLArtifactManager; diff --git a/saml/binding/impl/MessageDecoder.cpp b/saml/binding/impl/MessageDecoder.cpp index 2620cd3..3017680 100644 --- a/saml/binding/impl/MessageDecoder.cpp +++ b/saml/binding/impl/MessageDecoder.cpp @@ -30,16 +30,16 @@ using namespace std; namespace opensaml { namespace saml1p { - SAML_DLLLOCAL PluginManager::Factory SAML1ArtifactDecoderFactory; - SAML_DLLLOCAL PluginManager::Factory SAML1POSTDecoderFactory; - SAML_DLLLOCAL PluginManager::Factory SAML1SOAPDecoderFactory; + SAML_DLLLOCAL PluginManager< MessageDecoder,string,pair >::Factory SAML1ArtifactDecoderFactory; + SAML_DLLLOCAL PluginManager< MessageDecoder,string,pair >::Factory SAML1POSTDecoderFactory; + SAML_DLLLOCAL PluginManager< MessageDecoder,string,pair >::Factory SAML1SOAPDecoderFactory; }; namespace saml2p { - SAML_DLLLOCAL PluginManager::Factory SAML2ArtifactDecoderFactory; - SAML_DLLLOCAL PluginManager::Factory SAML2POSTDecoderFactory; - SAML_DLLLOCAL PluginManager::Factory SAML2RedirectDecoderFactory; - SAML_DLLLOCAL PluginManager::Factory SAML2SOAPDecoderFactory; + SAML_DLLLOCAL PluginManager< MessageDecoder,string,pair >::Factory SAML2ArtifactDecoderFactory; + SAML_DLLLOCAL PluginManager< MessageDecoder,string,pair >::Factory SAML2POSTDecoderFactory; + SAML_DLLLOCAL PluginManager< MessageDecoder,string,pair >::Factory SAML2RedirectDecoderFactory; + SAML_DLLLOCAL PluginManager< MessageDecoder,string,pair >::Factory SAML2SOAPDecoderFactory; }; }; diff --git a/saml/binding/impl/MessageEncoder.cpp b/saml/binding/impl/MessageEncoder.cpp index 483fcd5..17fea00 100644 --- a/saml/binding/impl/MessageEncoder.cpp +++ b/saml/binding/impl/MessageEncoder.cpp @@ -34,17 +34,17 @@ using namespace std; namespace opensaml { namespace saml1p { - SAML_DLLLOCAL PluginManager::Factory SAML1ArtifactEncoderFactory; - SAML_DLLLOCAL PluginManager::Factory SAML1POSTEncoderFactory; - SAML_DLLLOCAL PluginManager::Factory SAML1SOAPEncoderFactory; + SAML_DLLLOCAL PluginManager< MessageEncoder,string,pair >::Factory SAML1ArtifactEncoderFactory; + SAML_DLLLOCAL PluginManager< MessageEncoder,string,pair >::Factory SAML1POSTEncoderFactory; + SAML_DLLLOCAL PluginManager< MessageEncoder,string,pair >::Factory SAML1SOAPEncoderFactory; }; namespace saml2p { - SAML_DLLLOCAL PluginManager::Factory SAML2ArtifactEncoderFactory; - SAML_DLLLOCAL PluginManager::Factory SAML2POSTEncoderFactory; - SAML_DLLLOCAL PluginManager::Factory SAML2POSTSimpleSignEncoderFactory; - SAML_DLLLOCAL PluginManager::Factory SAML2RedirectEncoderFactory; - SAML_DLLLOCAL PluginManager::Factory SAML2SOAPEncoderFactory; + SAML_DLLLOCAL PluginManager< MessageEncoder,string,pair >::Factory SAML2ArtifactEncoderFactory; + SAML_DLLLOCAL PluginManager< MessageEncoder,string,pair >::Factory SAML2POSTEncoderFactory; + SAML_DLLLOCAL PluginManager< MessageEncoder,string,pair >::Factory SAML2POSTSimpleSignEncoderFactory; + SAML_DLLLOCAL PluginManager< MessageEncoder,string,pair >::Factory SAML2RedirectEncoderFactory; + SAML_DLLLOCAL PluginManager< MessageEncoder,string,pair >::Factory SAML2SOAPEncoderFactory; }; }; diff --git a/saml/saml1/binding/impl/SAML1ArtifactDecoder.cpp b/saml/saml1/binding/impl/SAML1ArtifactDecoder.cpp index ee5278a..4ff0dfe 100644 --- a/saml/saml1/binding/impl/SAML1ArtifactDecoder.cpp +++ b/saml/saml1/binding/impl/SAML1ArtifactDecoder.cpp @@ -45,7 +45,7 @@ namespace opensaml { class SAML_DLLLOCAL SAML1ArtifactDecoder : public MessageDecoder { public: - SAML1ArtifactDecoder(const DOMElement* e) {} + SAML1ArtifactDecoder() {} virtual ~SAML1ArtifactDecoder() {} xmltooling::XMLObject* decode( @@ -55,9 +55,9 @@ namespace opensaml { ) const; }; - MessageDecoder* SAML_DLLLOCAL SAML1ArtifactDecoderFactory(const DOMElement* const & e) + MessageDecoder* SAML_DLLLOCAL SAML1ArtifactDecoderFactory(const pair& p) { - return new SAML1ArtifactDecoder(e); + return new SAML1ArtifactDecoder(); } }; }; diff --git a/saml/saml1/binding/impl/SAML1ArtifactEncoder.cpp b/saml/saml1/binding/impl/SAML1ArtifactEncoder.cpp index 50b395f..9ae3790 100644 --- a/saml/saml1/binding/impl/SAML1ArtifactEncoder.cpp +++ b/saml/saml1/binding/impl/SAML1ArtifactEncoder.cpp @@ -49,7 +49,7 @@ namespace opensaml { class SAML_DLLLOCAL SAML1ArtifactEncoder : public MessageEncoder { public: - SAML1ArtifactEncoder(const DOMElement* e) {} + SAML1ArtifactEncoder() {} virtual ~SAML1ArtifactEncoder() {} long encode( @@ -65,9 +65,9 @@ namespace opensaml { ) const; }; - MessageEncoder* SAML_DLLLOCAL SAML1ArtifactEncoderFactory(const DOMElement* const & e) + MessageEncoder* SAML_DLLLOCAL SAML1ArtifactEncoderFactory(const pair& p) { - return new SAML1ArtifactEncoder(e); + return new SAML1ArtifactEncoder(); } }; }; diff --git a/saml/saml1/binding/impl/SAML1POSTDecoder.cpp b/saml/saml1/binding/impl/SAML1POSTDecoder.cpp index ef39d62..b9651ab 100644 --- a/saml/saml1/binding/impl/SAML1POSTDecoder.cpp +++ b/saml/saml1/binding/impl/SAML1POSTDecoder.cpp @@ -47,7 +47,7 @@ namespace opensaml { class SAML_DLLLOCAL SAML1POSTDecoder : public MessageDecoder { public: - SAML1POSTDecoder(const DOMElement* e) {} + SAML1POSTDecoder() {} virtual ~SAML1POSTDecoder() {} xmltooling::XMLObject* decode( @@ -57,9 +57,9 @@ namespace opensaml { ) const; }; - MessageDecoder* SAML_DLLLOCAL SAML1POSTDecoderFactory(const DOMElement* const & e) + MessageDecoder* SAML_DLLLOCAL SAML1POSTDecoderFactory(const pair& p) { - return new SAML1POSTDecoder(e); + return new SAML1POSTDecoder(); } }; }; diff --git a/saml/saml1/binding/impl/SAML1POSTEncoder.cpp b/saml/saml1/binding/impl/SAML1POSTEncoder.cpp index f56ac58..b43afe0 100644 --- a/saml/saml1/binding/impl/SAML1POSTEncoder.cpp +++ b/saml/saml1/binding/impl/SAML1POSTEncoder.cpp @@ -46,7 +46,7 @@ namespace opensaml { class SAML_DLLLOCAL SAML1POSTEncoder : public MessageEncoder { public: - SAML1POSTEncoder(const DOMElement* e); + SAML1POSTEncoder(const DOMElement* e, const XMLCh* ns); virtual ~SAML1POSTEncoder() {} long encode( @@ -66,19 +66,19 @@ namespace opensaml { string m_template; }; - MessageEncoder* SAML_DLLLOCAL SAML1POSTEncoderFactory(const DOMElement* const & e) + MessageEncoder* SAML_DLLLOCAL SAML1POSTEncoderFactory(const pair& p) { - return new SAML1POSTEncoder(e); + return new SAML1POSTEncoder(p.first, p.second); } }; }; static const XMLCh _template[] = UNICODE_LITERAL_8(t,e,m,p,l,a,t,e); -SAML1POSTEncoder::SAML1POSTEncoder(const DOMElement* e) +SAML1POSTEncoder::SAML1POSTEncoder(const DOMElement* e, const XMLCh* ns) { if (e) { - auto_ptr_char t(e->getAttribute(_template)); + auto_ptr_char t(e->getAttributeNS(ns, _template)); if (t.get() && *t.get()) m_template = t.get(); } diff --git a/saml/saml1/binding/impl/SAML1SOAPDecoder.cpp b/saml/saml1/binding/impl/SAML1SOAPDecoder.cpp index f928f8b..7888824 100644 --- a/saml/saml1/binding/impl/SAML1SOAPDecoder.cpp +++ b/saml/saml1/binding/impl/SAML1SOAPDecoder.cpp @@ -42,7 +42,7 @@ namespace opensaml { class SAML_DLLLOCAL SAML1SOAPDecoder : public MessageDecoder { public: - SAML1SOAPDecoder(const DOMElement* e) {} + SAML1SOAPDecoder() {} virtual ~SAML1SOAPDecoder() {} bool isUserAgentPresent() const { @@ -56,9 +56,9 @@ namespace opensaml { ) const; }; - MessageDecoder* SAML_DLLLOCAL SAML1SOAPDecoderFactory(const DOMElement* const & e) + MessageDecoder* SAML_DLLLOCAL SAML1SOAPDecoderFactory(const pair& p) { - return new SAML1SOAPDecoder(e); + return new SAML1SOAPDecoder(); } }; }; diff --git a/saml/saml1/binding/impl/SAML1SOAPEncoder.cpp b/saml/saml1/binding/impl/SAML1SOAPEncoder.cpp index 7dc59a1..1bb42b3 100644 --- a/saml/saml1/binding/impl/SAML1SOAPEncoder.cpp +++ b/saml/saml1/binding/impl/SAML1SOAPEncoder.cpp @@ -46,7 +46,7 @@ namespace opensaml { class SAML_DLLLOCAL SAML1SOAPEncoder : public MessageEncoder { public: - SAML1SOAPEncoder(const DOMElement* e) {} + SAML1SOAPEncoder() {} virtual ~SAML1SOAPEncoder() {} bool isUserAgentPresent() const { @@ -66,9 +66,9 @@ namespace opensaml { ) const; }; - MessageEncoder* SAML_DLLLOCAL SAML1SOAPEncoderFactory(const DOMElement* const & e) + MessageEncoder* SAML_DLLLOCAL SAML1SOAPEncoderFactory(const pair& p) { - return new SAML1SOAPEncoder(e); + return new SAML1SOAPEncoder(); } }; }; diff --git a/saml/saml2/binding/impl/SAML2ArtifactDecoder.cpp b/saml/saml2/binding/impl/SAML2ArtifactDecoder.cpp index 17a22ec..c5f8c6f 100644 --- a/saml/saml2/binding/impl/SAML2ArtifactDecoder.cpp +++ b/saml/saml2/binding/impl/SAML2ArtifactDecoder.cpp @@ -46,7 +46,7 @@ namespace opensaml { class SAML_DLLLOCAL SAML2ArtifactDecoder : public MessageDecoder { public: - SAML2ArtifactDecoder(const DOMElement* e) {} + SAML2ArtifactDecoder() {} virtual ~SAML2ArtifactDecoder() {} xmltooling::XMLObject* decode( @@ -56,9 +56,9 @@ namespace opensaml { ) const; }; - MessageDecoder* SAML_DLLLOCAL SAML2ArtifactDecoderFactory(const DOMElement* const & e) + MessageDecoder* SAML_DLLLOCAL SAML2ArtifactDecoderFactory(const pair& p) { - return new SAML2ArtifactDecoder(e); + return new SAML2ArtifactDecoder(); } }; }; diff --git a/saml/saml2/binding/impl/SAML2ArtifactEncoder.cpp b/saml/saml2/binding/impl/SAML2ArtifactEncoder.cpp index 797b58d..7480aec 100644 --- a/saml/saml2/binding/impl/SAML2ArtifactEncoder.cpp +++ b/saml/saml2/binding/impl/SAML2ArtifactEncoder.cpp @@ -49,7 +49,7 @@ namespace opensaml { class SAML_DLLLOCAL SAML2ArtifactEncoder : public MessageEncoder { public: - SAML2ArtifactEncoder(const DOMElement* e); + SAML2ArtifactEncoder(const DOMElement* e, const XMLCh* ns); virtual ~SAML2ArtifactEncoder() {} long encode( @@ -69,9 +69,9 @@ namespace opensaml { string m_template; }; - MessageEncoder* SAML_DLLLOCAL SAML2ArtifactEncoderFactory(const DOMElement* const & e) + MessageEncoder* SAML_DLLLOCAL SAML2ArtifactEncoderFactory(const pair& p) { - return new SAML2ArtifactEncoder(e); + return new SAML2ArtifactEncoder(p.first, p.second); } }; @@ -79,13 +79,13 @@ namespace opensaml { static const XMLCh postArtifact[] = UNICODE_LITERAL_12(p,o,s,t,A,r,t,i,f,a,c,t); }; -SAML2ArtifactEncoder::SAML2ArtifactEncoder(const DOMElement* e) : m_post(false) +SAML2ArtifactEncoder::SAML2ArtifactEncoder(const DOMElement* e, const XMLCh* ns) : m_post(false) { if (e) { - const XMLCh* flag = e->getAttribute(postArtifact); + const XMLCh* flag = e->getAttributeNS(ns, postArtifact); m_post = (flag && (*flag==chLatin_t || *flag==chDigit_1)); if (m_post) { - auto_ptr_char t(e->getAttribute(_template)); + auto_ptr_char t(e->getAttributeNS(ns, _template)); if (t.get() && *t.get()) m_template = t.get(); } diff --git a/saml/saml2/binding/impl/SAML2POSTDecoder.cpp b/saml/saml2/binding/impl/SAML2POSTDecoder.cpp index 988aa0f..db218a0 100644 --- a/saml/saml2/binding/impl/SAML2POSTDecoder.cpp +++ b/saml/saml2/binding/impl/SAML2POSTDecoder.cpp @@ -46,7 +46,7 @@ namespace opensaml { class SAML_DLLLOCAL SAML2POSTDecoder : public MessageDecoder { public: - SAML2POSTDecoder(const DOMElement* e) {} + SAML2POSTDecoder() {} virtual ~SAML2POSTDecoder() {} xmltooling::XMLObject* decode( @@ -56,9 +56,9 @@ namespace opensaml { ) const; }; - MessageDecoder* SAML_DLLLOCAL SAML2POSTDecoderFactory(const DOMElement* const & e) + MessageDecoder* SAML_DLLLOCAL SAML2POSTDecoderFactory(const pair& p) { - return new SAML2POSTDecoder(e); + return new SAML2POSTDecoder(); } }; }; diff --git a/saml/saml2/binding/impl/SAML2POSTEncoder.cpp b/saml/saml2/binding/impl/SAML2POSTEncoder.cpp index 2e45daf..662d52f 100644 --- a/saml/saml2/binding/impl/SAML2POSTEncoder.cpp +++ b/saml/saml2/binding/impl/SAML2POSTEncoder.cpp @@ -46,7 +46,7 @@ namespace opensaml { class SAML_DLLLOCAL SAML2POSTEncoder : public MessageEncoder { public: - SAML2POSTEncoder(const DOMElement* e, bool simple=false); + SAML2POSTEncoder(const DOMElement* e, const XMLCh* ns, bool simple=false); virtual ~SAML2POSTEncoder() {} long encode( @@ -66,24 +66,24 @@ namespace opensaml { bool m_simple; }; - MessageEncoder* SAML_DLLLOCAL SAML2POSTEncoderFactory(const DOMElement* const & e) + MessageEncoder* SAML_DLLLOCAL SAML2POSTEncoderFactory(const pair& p) { - return new SAML2POSTEncoder(e, false); + return new SAML2POSTEncoder(p.first, p.second, false); } - MessageEncoder* SAML_DLLLOCAL SAML2POSTSimpleSignEncoderFactory(const DOMElement* const & e) + MessageEncoder* SAML_DLLLOCAL SAML2POSTSimpleSignEncoderFactory(const pair& p) { - return new SAML2POSTEncoder(e, true); + return new SAML2POSTEncoder(p.first, p.second, true); } }; }; static const XMLCh _template[] = UNICODE_LITERAL_8(t,e,m,p,l,a,t,e); -SAML2POSTEncoder::SAML2POSTEncoder(const DOMElement* e, bool simple) : m_simple(simple) +SAML2POSTEncoder::SAML2POSTEncoder(const DOMElement* e, const XMLCh* ns, bool simple) : m_simple(simple) { if (e) { - auto_ptr_char t(e->getAttribute(_template)); + auto_ptr_char t(e->getAttributeNS(ns, _template)); if (t.get() && *t.get()) m_template = t.get(); } diff --git a/saml/saml2/binding/impl/SAML2RedirectDecoder.cpp b/saml/saml2/binding/impl/SAML2RedirectDecoder.cpp index 5927613..f325044 100644 --- a/saml/saml2/binding/impl/SAML2RedirectDecoder.cpp +++ b/saml/saml2/binding/impl/SAML2RedirectDecoder.cpp @@ -48,7 +48,7 @@ namespace opensaml { class SAML_DLLLOCAL SAML2RedirectDecoder : public MessageDecoder { public: - SAML2RedirectDecoder(const DOMElement* e) {} + SAML2RedirectDecoder() {} virtual ~SAML2RedirectDecoder() {} xmltooling::XMLObject* decode( @@ -58,9 +58,9 @@ namespace opensaml { ) const; }; - MessageDecoder* SAML_DLLLOCAL SAML2RedirectDecoderFactory(const DOMElement* const & e) + MessageDecoder* SAML_DLLLOCAL SAML2RedirectDecoderFactory(const pair& p) { - return new SAML2RedirectDecoder(e); + return new SAML2RedirectDecoder(); } }; }; diff --git a/saml/saml2/binding/impl/SAML2RedirectEncoder.cpp b/saml/saml2/binding/impl/SAML2RedirectEncoder.cpp index 4026e82..937f8ea 100644 --- a/saml/saml2/binding/impl/SAML2RedirectEncoder.cpp +++ b/saml/saml2/binding/impl/SAML2RedirectEncoder.cpp @@ -47,7 +47,7 @@ namespace opensaml { class SAML_DLLLOCAL SAML2RedirectEncoder : public MessageEncoder { public: - SAML2RedirectEncoder(const DOMElement* e) {} + SAML2RedirectEncoder() {} virtual ~SAML2RedirectEncoder() {} bool isCompact() const { @@ -67,9 +67,9 @@ namespace opensaml { ) const; }; - MessageEncoder* SAML_DLLLOCAL SAML2RedirectEncoderFactory(const DOMElement* const & e) + MessageEncoder* SAML_DLLLOCAL SAML2RedirectEncoderFactory(const pair& p) { - return new SAML2RedirectEncoder(e); + return new SAML2RedirectEncoder(); } }; }; diff --git a/saml/saml2/binding/impl/SAML2SOAPDecoder.cpp b/saml/saml2/binding/impl/SAML2SOAPDecoder.cpp index 2d9d22f..ee4695e 100644 --- a/saml/saml2/binding/impl/SAML2SOAPDecoder.cpp +++ b/saml/saml2/binding/impl/SAML2SOAPDecoder.cpp @@ -42,7 +42,7 @@ namespace opensaml { class SAML_DLLLOCAL SAML2SOAPDecoder : public MessageDecoder { public: - SAML2SOAPDecoder(const DOMElement* e); + SAML2SOAPDecoder() {} virtual ~SAML2SOAPDecoder() {} bool isUserAgentPresent() const { @@ -56,15 +56,13 @@ namespace opensaml { ) const; }; - MessageDecoder* SAML_DLLLOCAL SAML2SOAPDecoderFactory(const DOMElement* const & e) + MessageDecoder* SAML_DLLLOCAL SAML2SOAPDecoderFactory(const pair& p) { - return new SAML2SOAPDecoder(e); + return new SAML2SOAPDecoder(); } }; }; -SAML2SOAPDecoder::SAML2SOAPDecoder(const DOMElement* e) {} - XMLObject* SAML2SOAPDecoder::decode( string& relayState, const GenericRequest& genericRequest, diff --git a/saml/saml2/binding/impl/SAML2SOAPEncoder.cpp b/saml/saml2/binding/impl/SAML2SOAPEncoder.cpp index bd82eeb..1924ec0 100644 --- a/saml/saml2/binding/impl/SAML2SOAPEncoder.cpp +++ b/saml/saml2/binding/impl/SAML2SOAPEncoder.cpp @@ -46,7 +46,7 @@ namespace opensaml { class SAML_DLLLOCAL SAML2SOAPEncoder : public MessageEncoder { public: - SAML2SOAPEncoder(const DOMElement* e); + SAML2SOAPEncoder() {} virtual ~SAML2SOAPEncoder() {} bool isUserAgentPresent() const { @@ -66,15 +66,13 @@ namespace opensaml { ) const; }; - MessageEncoder* SAML_DLLLOCAL SAML2SOAPEncoderFactory(const DOMElement* const & e) + MessageEncoder* SAML_DLLLOCAL SAML2SOAPEncoderFactory(const pair& p) { - return new SAML2SOAPEncoder(e); + return new SAML2SOAPEncoder(); } }; }; -SAML2SOAPEncoder::SAML2SOAPEncoder(const DOMElement* e) {} - long SAML2SOAPEncoder::encode( GenericResponse& genericResponse, XMLObject* xmlObject, diff --git a/samltest/saml1/binding/SAML1ArtifactTest.h b/samltest/saml1/binding/SAML1ArtifactTest.h index 6f628a3..8503a64 100644 --- a/samltest/saml1/binding/SAML1ArtifactTest.h +++ b/samltest/saml1/binding/SAML1ArtifactTest.h @@ -59,7 +59,9 @@ public: // Encode message. auto_ptr encoder( - SAMLConfig::getConfig().MessageEncoderManager.newPlugin(samlconstants::SAML1_PROFILE_BROWSER_ARTIFACT, NULL) + SAMLConfig::getConfig().MessageEncoderManager.newPlugin( + samlconstants::SAML1_PROFILE_BROWSER_ARTIFACT, pair(NULL,NULL) + ) ); Locker locker(m_metadata); encoder->encode( @@ -70,7 +72,9 @@ public: // Decode message. string relayState; auto_ptr decoder( - SAMLConfig::getConfig().MessageDecoderManager.newPlugin(samlconstants::SAML1_PROFILE_BROWSER_ARTIFACT, NULL) + SAMLConfig::getConfig().MessageDecoderManager.newPlugin( + samlconstants::SAML1_PROFILE_BROWSER_ARTIFACT, pair(NULL,NULL) + ) ); decoder->setArtifactResolver(this); auto_ptr response(dynamic_cast(decoder->decode(relayState,*this,policy))); diff --git a/samltest/saml1/binding/SAML1POSTTest.h b/samltest/saml1/binding/SAML1POSTTest.h index 7a89c92..6b8230d 100644 --- a/samltest/saml1/binding/SAML1POSTTest.h +++ b/samltest/saml1/binding/SAML1POSTTest.h @@ -67,7 +67,7 @@ public: encoder_config->getDocumentElement()->setAttributeNS(NULL,lit2.get(),lit3.get()); auto_ptr encoder( SAMLConfig::getConfig().MessageEncoderManager.newPlugin( - samlconstants::SAML1_PROFILE_BROWSER_POST, encoder_config->getDocumentElement() + samlconstants::SAML1_PROFILE_BROWSER_POST, pair(encoder_config->getDocumentElement(),NULL) ) ); @@ -80,7 +80,9 @@ public: // Decode message. string relayState; auto_ptr decoder( - SAMLConfig::getConfig().MessageDecoderManager.newPlugin(samlconstants::SAML1_PROFILE_BROWSER_POST, NULL) + SAMLConfig::getConfig().MessageDecoderManager.newPlugin( + samlconstants::SAML1_PROFILE_BROWSER_POST, pair(NULL,NULL) + ) ); auto_ptr response(dynamic_cast(decoder->decode(relayState,*this,policy))); diff --git a/samltest/saml2/binding/SAML2ArtifactTest.h b/samltest/saml2/binding/SAML2ArtifactTest.h index 05d832c..9482d40 100644 --- a/samltest/saml2/binding/SAML2ArtifactTest.h +++ b/samltest/saml2/binding/SAML2ArtifactTest.h @@ -61,7 +61,9 @@ public: // Encode message. auto_ptr encoder( - SAMLConfig::getConfig().MessageEncoderManager.newPlugin(samlconstants::SAML20_BINDING_HTTP_ARTIFACT, NULL) + SAMLConfig::getConfig().MessageEncoderManager.newPlugin( + samlconstants::SAML20_BINDING_HTTP_ARTIFACT, pair(NULL,NULL) + ) ); Locker locker(m_metadata); encoder->encode( @@ -72,7 +74,9 @@ public: // Decode message. string relayState; auto_ptr decoder( - SAMLConfig::getConfig().MessageDecoderManager.newPlugin(samlconstants::SAML20_BINDING_HTTP_ARTIFACT, NULL) + SAMLConfig::getConfig().MessageDecoderManager.newPlugin( + samlconstants::SAML20_BINDING_HTTP_ARTIFACT, pair(NULL,NULL) + ) ); decoder->setArtifactResolver(this); auto_ptr response(dynamic_cast(decoder->decode(relayState,*this,policy))); diff --git a/samltest/saml2/binding/SAML2POSTTest.h b/samltest/saml2/binding/SAML2POSTTest.h index 7d4cf7d..c2998df 100644 --- a/samltest/saml2/binding/SAML2POSTTest.h +++ b/samltest/saml2/binding/SAML2POSTTest.h @@ -67,7 +67,7 @@ public: encoder_config->getDocumentElement()->setAttributeNS(NULL,lit2.get(),lit3.get()); auto_ptr encoder( SAMLConfig::getConfig().MessageEncoderManager.newPlugin( - samlconstants::SAML20_BINDING_HTTP_POST, encoder_config->getDocumentElement() + samlconstants::SAML20_BINDING_HTTP_POST, pair(encoder_config->getDocumentElement(), NULL) ) ); Locker locker(m_metadata); @@ -79,7 +79,9 @@ public: // Decode message. string relayState; auto_ptr decoder( - SAMLConfig::getConfig().MessageDecoderManager.newPlugin(samlconstants::SAML20_BINDING_HTTP_POST, NULL) + SAMLConfig::getConfig().MessageDecoderManager.newPlugin( + samlconstants::SAML20_BINDING_HTTP_POST, pair(NULL,NULL) + ) ); auto_ptr response(dynamic_cast(decoder->decode(relayState,*this,policy))); @@ -137,7 +139,7 @@ public: encoder_config->getDocumentElement()->setAttributeNS(NULL,lit2.get(),lit3.get()); auto_ptr encoder( SAMLConfig::getConfig().MessageEncoderManager.newPlugin( - samlconstants::SAML20_BINDING_HTTP_POST_SIMPLESIGN, encoder_config->getDocumentElement() + samlconstants::SAML20_BINDING_HTTP_POST_SIMPLESIGN, pair(encoder_config->getDocumentElement(),NULL) ) ); Locker locker(m_metadata); @@ -149,7 +151,9 @@ public: // Decode message. string relayState; auto_ptr decoder( - SAMLConfig::getConfig().MessageDecoderManager.newPlugin(samlconstants::SAML20_BINDING_HTTP_POST_SIMPLESIGN, NULL) + SAMLConfig::getConfig().MessageDecoderManager.newPlugin( + samlconstants::SAML20_BINDING_HTTP_POST_SIMPLESIGN, pair(NULL,NULL) + ) ); auto_ptr response(dynamic_cast(decoder->decode(relayState,*this,policy))); diff --git a/samltest/saml2/binding/SAML2RedirectTest.h b/samltest/saml2/binding/SAML2RedirectTest.h index 4eae178..cab8d6a 100644 --- a/samltest/saml2/binding/SAML2RedirectTest.h +++ b/samltest/saml2/binding/SAML2RedirectTest.h @@ -58,7 +58,9 @@ public: // Encode message. auto_ptr encoder( - SAMLConfig::getConfig().MessageEncoderManager.newPlugin(samlconstants::SAML20_BINDING_HTTP_REDIRECT, NULL) + SAMLConfig::getConfig().MessageEncoderManager.newPlugin( + samlconstants::SAML20_BINDING_HTTP_REDIRECT, pair(NULL,NULL) + ) ); Locker locker(m_metadata); encoder->encode( @@ -69,7 +71,9 @@ public: // Decode message. string relayState; auto_ptr decoder( - SAMLConfig::getConfig().MessageDecoderManager.newPlugin(samlconstants::SAML20_BINDING_HTTP_REDIRECT, NULL) + SAMLConfig::getConfig().MessageDecoderManager.newPlugin( + samlconstants::SAML20_BINDING_HTTP_REDIRECT, pair(NULL,NULL) + ) ); auto_ptr response(dynamic_cast(decoder->decode(relayState,*this,policy))); -- 2.1.4