From: Scott Cantor Date: Wed, 11 Aug 2010 19:01:39 +0000 (+0000) Subject: Roll back previous change, not going to work. X-Git-Tag: 2.4RC1~44 X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-opensaml.git;a=commitdiff_plain;h=19779e1afa0a1a75bab7fc6c2c65de7b9ddb5a79 Roll back previous change, not going to work. --- diff --git a/saml/binding/MessageDecoder.h b/saml/binding/MessageDecoder.h index ad7ad47..bbe176e 100644 --- a/saml/binding/MessageDecoder.h +++ b/saml/binding/MessageDecoder.h @@ -68,13 +68,6 @@ namespace opensaml { virtual const XMLCh* getProtocolFamily() const; /** - * Returns a shorthand name for the binding/encoding supported by the decoder. - * - * @return a short name for the binding/encoding, or nullptr - */ - virtual const char* getShortName() const; - - /** * Indicates whether a web browser or similar user agent delivered the message. * * @return true iff the message was delivered by a user agent diff --git a/saml/binding/MessageEncoder.h b/saml/binding/MessageEncoder.h index 96c30b3..095a523 100644 --- a/saml/binding/MessageEncoder.h +++ b/saml/binding/MessageEncoder.h @@ -72,13 +72,6 @@ namespace opensaml { virtual const XMLCh* getProtocolFamily() const; /** - * Returns a shorthand name for the binding/encoding supported by the encoder. - * - * @return a short name for the binding/encoding, or nullptr - */ - virtual const char* getShortName() const; - - /** * Interface to caller-supplied artifact generation mechanism. * * Generating an artifact for storage and retrieval requires knowledge of diff --git a/saml/binding/impl/MessageDecoder.cpp b/saml/binding/impl/MessageDecoder.cpp index 8c33780..4ff6c79 100644 --- a/saml/binding/impl/MessageDecoder.cpp +++ b/saml/binding/impl/MessageDecoder.cpp @@ -43,7 +43,6 @@ namespace opensaml { namespace saml2p { SAML_DLLLOCAL PluginManager< MessageDecoder,string,pair >::Factory SAML2ArtifactDecoderFactory; SAML_DLLLOCAL PluginManager< MessageDecoder,string,pair >::Factory SAML2POSTDecoderFactory; - SAML_DLLLOCAL PluginManager< MessageDecoder,string,pair >::Factory SAML2POSTSimpleSignDecoderFactory; SAML_DLLLOCAL PluginManager< MessageDecoder,string,pair >::Factory SAML2RedirectDecoderFactory; SAML_DLLLOCAL PluginManager< MessageDecoder,string,pair >::Factory SAML2SOAPDecoderFactory; SAML_DLLLOCAL PluginManager< MessageDecoder,string,pair >::Factory SAML2ECPDecoderFactory; @@ -58,7 +57,7 @@ void SAML_API opensaml::registerMessageDecoders() conf.MessageDecoderManager.registerFactory(samlconstants::SAML1_BINDING_SOAP, saml1p::SAML1SOAPDecoderFactory); conf.MessageDecoderManager.registerFactory(samlconstants::SAML20_BINDING_HTTP_ARTIFACT, saml2p::SAML2ArtifactDecoderFactory); conf.MessageDecoderManager.registerFactory(samlconstants::SAML20_BINDING_HTTP_POST, saml2p::SAML2POSTDecoderFactory); - conf.MessageDecoderManager.registerFactory(samlconstants::SAML20_BINDING_HTTP_POST_SIMPLESIGN, saml2p::SAML2POSTSimpleSignDecoderFactory); + conf.MessageDecoderManager.registerFactory(samlconstants::SAML20_BINDING_HTTP_POST_SIMPLESIGN, saml2p::SAML2POSTDecoderFactory); conf.MessageDecoderManager.registerFactory(samlconstants::SAML20_BINDING_HTTP_REDIRECT, saml2p::SAML2RedirectDecoderFactory); conf.MessageDecoderManager.registerFactory(samlconstants::SAML20_BINDING_SOAP, saml2p::SAML2SOAPDecoderFactory); conf.MessageDecoderManager.registerFactory(samlconstants::SAML20_BINDING_PAOS, saml2p::SAML2ECPDecoderFactory); @@ -80,11 +79,6 @@ const XMLCh* MessageDecoder::getProtocolFamily() const return nullptr; } -const char* MessageDecoder::getShortName() const -{ - return nullptr; -} - bool MessageDecoder::isUserAgentPresent() const { return true; diff --git a/saml/binding/impl/MessageEncoder.cpp b/saml/binding/impl/MessageEncoder.cpp index 2665f04..035ad55 100644 --- a/saml/binding/impl/MessageEncoder.cpp +++ b/saml/binding/impl/MessageEncoder.cpp @@ -76,11 +76,6 @@ const XMLCh* MessageEncoder::getProtocolFamily() const return nullptr; } -const char* MessageEncoder::getShortName() const -{ - return nullptr; -} - bool MessageEncoder::isCompact() const { return false; diff --git a/saml/saml1/binding/impl/SAML1ArtifactDecoder.cpp b/saml/saml1/binding/impl/SAML1ArtifactDecoder.cpp index 12552ad..ad6e2d9 100644 --- a/saml/saml1/binding/impl/SAML1ArtifactDecoder.cpp +++ b/saml/saml1/binding/impl/SAML1ArtifactDecoder.cpp @@ -50,10 +50,6 @@ namespace opensaml { SAML1ArtifactDecoder() {} virtual ~SAML1ArtifactDecoder() {} - const char* getShortName() const { - return "Artifact"; - } - xmltooling::XMLObject* decode( std::string& relayState, const GenericRequest& genericRequest, diff --git a/saml/saml1/binding/impl/SAML1ArtifactEncoder.cpp b/saml/saml1/binding/impl/SAML1ArtifactEncoder.cpp index 4e38da3..99c1432 100644 --- a/saml/saml1/binding/impl/SAML1ArtifactEncoder.cpp +++ b/saml/saml1/binding/impl/SAML1ArtifactEncoder.cpp @@ -56,10 +56,6 @@ namespace opensaml { return samlconstants::SAML11_PROTOCOL_ENUM; } - const char* getShortName() const { - return "Artifact"; - } - long encode( GenericResponse& genericResponse, XMLObject* xmlObject, diff --git a/saml/saml1/binding/impl/SAML1POSTDecoder.cpp b/saml/saml1/binding/impl/SAML1POSTDecoder.cpp index 2ae3d8d..0054004 100644 --- a/saml/saml1/binding/impl/SAML1POSTDecoder.cpp +++ b/saml/saml1/binding/impl/SAML1POSTDecoder.cpp @@ -55,10 +55,6 @@ namespace opensaml { SAML1POSTDecoder() {} virtual ~SAML1POSTDecoder() {} - const char* getShortName() const { - return "POST"; - } - xmltooling::XMLObject* decode( std::string& relayState, const GenericRequest& genericRequest, diff --git a/saml/saml1/binding/impl/SAML1POSTEncoder.cpp b/saml/saml1/binding/impl/SAML1POSTEncoder.cpp index 64a2511..73dc625 100644 --- a/saml/saml1/binding/impl/SAML1POSTEncoder.cpp +++ b/saml/saml1/binding/impl/SAML1POSTEncoder.cpp @@ -58,10 +58,6 @@ namespace opensaml { return samlconstants::SAML11_PROTOCOL_ENUM; } - const char* getShortName() const { - return "POST"; - } - long encode( GenericResponse& genericResponse, XMLObject* xmlObject, diff --git a/saml/saml1/binding/impl/SAML1SOAPDecoder.cpp b/saml/saml1/binding/impl/SAML1SOAPDecoder.cpp index 12be2b4..6a9e29c 100644 --- a/saml/saml1/binding/impl/SAML1SOAPDecoder.cpp +++ b/saml/saml1/binding/impl/SAML1SOAPDecoder.cpp @@ -53,10 +53,6 @@ namespace opensaml { return false; } - const char* getShortName() const { - return "SOAP"; - } - xmltooling::XMLObject* decode( std::string& relayState, const GenericRequest& genericRequest, diff --git a/saml/saml1/binding/impl/SAML1SOAPEncoder.cpp b/saml/saml1/binding/impl/SAML1SOAPEncoder.cpp index 43c96c4..4aef15f 100644 --- a/saml/saml1/binding/impl/SAML1SOAPEncoder.cpp +++ b/saml/saml1/binding/impl/SAML1SOAPEncoder.cpp @@ -54,10 +54,6 @@ namespace opensaml { return false; } - const char* getShortName() const { - return "POST"; - } - const XMLCh* getProtocolFamily() const { return samlconstants::SAML11_PROTOCOL_ENUM; } diff --git a/saml/saml2/binding/impl/SAML2ArtifactDecoder.cpp b/saml/saml2/binding/impl/SAML2ArtifactDecoder.cpp index 32ca0f4..b58d356 100644 --- a/saml/saml2/binding/impl/SAML2ArtifactDecoder.cpp +++ b/saml/saml2/binding/impl/SAML2ArtifactDecoder.cpp @@ -51,10 +51,6 @@ namespace opensaml { SAML2ArtifactDecoder() {} virtual ~SAML2ArtifactDecoder() {} - const char* getShortName() const { - return "Artifact"; - } - xmltooling::XMLObject* decode( std::string& relayState, const GenericRequest& genericRequest, diff --git a/saml/saml2/binding/impl/SAML2ArtifactEncoder.cpp b/saml/saml2/binding/impl/SAML2ArtifactEncoder.cpp index b16e9c1..138fbd2 100644 --- a/saml/saml2/binding/impl/SAML2ArtifactEncoder.cpp +++ b/saml/saml2/binding/impl/SAML2ArtifactEncoder.cpp @@ -60,10 +60,6 @@ namespace opensaml { return samlconstants::SAML20P_NS; } - const char* getShortName() const { - return "Artifact"; - } - long encode( GenericResponse& genericResponse, XMLObject* xmlObject, diff --git a/saml/saml2/binding/impl/SAML2ECPDecoder.cpp b/saml/saml2/binding/impl/SAML2ECPDecoder.cpp index 620c802..53f2210 100644 --- a/saml/saml2/binding/impl/SAML2ECPDecoder.cpp +++ b/saml/saml2/binding/impl/SAML2ECPDecoder.cpp @@ -50,10 +50,6 @@ namespace opensaml { SAML2ECPDecoder() {} virtual ~SAML2ECPDecoder() {} - const char* getShortName() const { - return "ECP"; - } - xmltooling::XMLObject* decode( std::string& relayState, const GenericRequest& genericRequest, diff --git a/saml/saml2/binding/impl/SAML2ECPEncoder.cpp b/saml/saml2/binding/impl/SAML2ECPEncoder.cpp index 103080c..36c0fce 100644 --- a/saml/saml2/binding/impl/SAML2ECPEncoder.cpp +++ b/saml/saml2/binding/impl/SAML2ECPEncoder.cpp @@ -68,10 +68,6 @@ namespace opensaml { return samlconstants::SAML20P_NS; } - const char* getShortName() const { - return "ECP"; - } - long encode( GenericResponse& genericResponse, XMLObject* xmlObject, diff --git a/saml/saml2/binding/impl/SAML2POSTDecoder.cpp b/saml/saml2/binding/impl/SAML2POSTDecoder.cpp index 64404ce..a190e69 100644 --- a/saml/saml2/binding/impl/SAML2POSTDecoder.cpp +++ b/saml/saml2/binding/impl/SAML2POSTDecoder.cpp @@ -51,33 +51,19 @@ namespace opensaml { class SAML_DLLLOCAL SAML2POSTDecoder : public SAML2MessageDecoder { public: - SAML2POSTDecoder(const DOMElement* e, const XMLCh* ns, bool simple=false) { - } - + SAML2POSTDecoder() {} virtual ~SAML2POSTDecoder() {} - const char* getShortName() const { - return m_simple ? "POST-SimpleSign" : "POST"; - } - xmltooling::XMLObject* decode( std::string& relayState, const GenericRequest& genericRequest, SecurityPolicy& policy ) const; - - private: - bool m_simple; }; - MessageDecoder* SAML_DLLLOCAL SAML2POSTDecoderFactory(const pair& p) - { - return new SAML2POSTDecoder(p.first, p.second, false); - } - - MessageDecoder* SAML_DLLLOCAL SAML2POSTSimpleSignDecoderFactory(const pair& p) + MessageDecoder* SAML_DLLLOCAL SAML2POSTDecoderFactory(const pair&) { - return new SAML2POSTDecoder(p.first, p.second, true); + return new SAML2POSTDecoder(); } }; }; diff --git a/saml/saml2/binding/impl/SAML2POSTEncoder.cpp b/saml/saml2/binding/impl/SAML2POSTEncoder.cpp index 8489888..53f08cf 100644 --- a/saml/saml2/binding/impl/SAML2POSTEncoder.cpp +++ b/saml/saml2/binding/impl/SAML2POSTEncoder.cpp @@ -60,10 +60,6 @@ namespace opensaml { return samlconstants::SAML20P_NS; } - const char* getShortName() const { - return m_simple ? "POST-SimpleSign" : "POST"; - } - long encode( GenericResponse& genericResponse, XMLObject* xmlObject, diff --git a/saml/saml2/binding/impl/SAML2RedirectDecoder.cpp b/saml/saml2/binding/impl/SAML2RedirectDecoder.cpp index d1ad87e..f81584f 100644 --- a/saml/saml2/binding/impl/SAML2RedirectDecoder.cpp +++ b/saml/saml2/binding/impl/SAML2RedirectDecoder.cpp @@ -54,10 +54,6 @@ namespace opensaml { SAML2RedirectDecoder() {} virtual ~SAML2RedirectDecoder() {} - const char* getShortName() const { - return "Redirect"; - } - xmltooling::XMLObject* decode( std::string& relayState, const GenericRequest& genericRequest, diff --git a/saml/saml2/binding/impl/SAML2RedirectEncoder.cpp b/saml/saml2/binding/impl/SAML2RedirectEncoder.cpp index 58c7a66..616d98f 100644 --- a/saml/saml2/binding/impl/SAML2RedirectEncoder.cpp +++ b/saml/saml2/binding/impl/SAML2RedirectEncoder.cpp @@ -62,10 +62,6 @@ namespace opensaml { return samlconstants::SAML20P_NS; } - const char* getShortName() const { - return "Redirect"; - } - long encode( GenericResponse& genericResponse, XMLObject* xmlObject, diff --git a/saml/saml2/binding/impl/SAML2SOAPDecoder.cpp b/saml/saml2/binding/impl/SAML2SOAPDecoder.cpp index e4e81e6..69848be 100644 --- a/saml/saml2/binding/impl/SAML2SOAPDecoder.cpp +++ b/saml/saml2/binding/impl/SAML2SOAPDecoder.cpp @@ -53,10 +53,6 @@ namespace opensaml { return false; } - const char* getShortName() const { - return "SOAP"; - } - xmltooling::XMLObject* decode( std::string& relayState, const GenericRequest& genericRequest, diff --git a/saml/saml2/binding/impl/SAML2SOAPEncoder.cpp b/saml/saml2/binding/impl/SAML2SOAPEncoder.cpp index a7b5b9c..f9a2e1c 100644 --- a/saml/saml2/binding/impl/SAML2SOAPEncoder.cpp +++ b/saml/saml2/binding/impl/SAML2SOAPEncoder.cpp @@ -58,10 +58,6 @@ namespace opensaml { return samlconstants::SAML20P_NS; } - const char* getShortName() const { - return "SOAP"; - } - long encode( GenericResponse& genericResponse, XMLObject* xmlObject,