Xerces 3 revisions.

[shibboleth/cpp-opensaml.git] / saml / binding / impl / SimpleSigningRule.cpp

diff --git a/saml/binding/impl/SimpleSigningRule.cpp b/saml/binding/impl/SimpleSigningRule.cpp
index 5d52df9..4974d05 100644 (file)
--- a/saml/binding/impl/SimpleSigningRule.cpp
+++ b/saml/binding/impl/SimpleSigningRule.cpp
@@ -28,15 +28,15 @@
 #include "saml2/metadata/MetadataCredentialCriteria.h"
 #include "saml2/metadata/MetadataProvider.h"
 
-#include <log4cpp/Category.hh>
 #include <xercesc/util/Base64.hpp>
+#include <xmltooling/logging.h>
 #include <xmltooling/io/HTTPRequest.h>
 #include <xmltooling/security/SignatureTrustEngine.h>
 
 using namespace opensaml::saml2md;
 using namespace opensaml;
+using namespace xmltooling::logging;
 using namespace xmltooling;
-using namespace log4cpp;
 using namespace std;
 
 using xmlsignature::KeyInfo;
@@ -49,13 +49,16 @@ namespace opensaml {
         SimpleSigningRule(const DOMElement* e);
         virtual ~SimpleSigningRule() {}
         
-        void evaluate(const xmltooling::XMLObject& message, const GenericRequest* request, SecurityPolicy& policy) const;
+        const char* getType() const {
+            return SIMPLESIGNING_POLICY_RULE;
+        }
+        void evaluate(const XMLObject& message, const GenericRequest* request, SecurityPolicy& policy) const;
 
     private:
         // Appends a raw parameter=value pair to the string.
         static bool appendParameter(string& s, const char* data, const char* name);
 
-        bool m_errorsFatal;
+        bool m_errorFatal;
     };
 
     SecurityPolicyRule* SAML_DLLLOCAL SimpleSigningRuleFactory(const DOMElement* const & e)
@@ -63,7 +66,7 @@ namespace opensaml {
         return new SimpleSigningRule(e);
     }
 
-    static const XMLCh errorsFatal[] = UNICODE_LITERAL_11(e,r,r,o,r,s,F,a,t,a,l);
+    static const XMLCh errorFatal[] = UNICODE_LITERAL_10(e,r,r,o,r,F,a,t,a,l);
 };
 
 bool SimpleSigningRule::appendParameter(string& s, const char* data, const char* name)
@@ -81,11 +84,11 @@ bool SimpleSigningRule::appendParameter(string& s, const char* data, const char*
     return true;
 }
 
-SimpleSigningRule::SimpleSigningRule(const DOMElement* e) : m_errorsFatal(false)
+SimpleSigningRule::SimpleSigningRule(const DOMElement* e) : m_errorFatal(false)
 {
     if (e) {
-        const XMLCh* flag = e->getAttributeNS(NULL, errorsFatal);
-        m_errorsFatal = (flag && (*flag==chLatin_t || *flag==chDigit_1)); 
+        const XMLCh* flag = e->getAttributeNS(NULL, errorFatal);
+        m_errorFatal = (flag && (*flag==chLatin_t || *flag==chDigit_1)); 
     }
 }
 
@@ -143,7 +146,7 @@ void SimpleSigningRule::evaluate(const XMLObject& message, const GenericRequest*
         // Serializing the XMLObject doesn't guarantee the signature will verify (this is
         // why XMLSignature exists, and why this isn't really "simpler").
 
-        unsigned int x;
+        xsecsize_t x;
         pch = httpRequest->getParameter("SAMLRequest");
         if (pch) {
             XMLByte* decoded=Base64::decode(reinterpret_cast<const XMLByte*>(pch),&x);
@@ -152,7 +155,11 @@ void SimpleSigningRule::evaluate(const XMLObject& message, const GenericRequest*
                 return;
             }
             input = string("SAMLRequest=") + reinterpret_cast<const char*>(decoded);
+#ifdef OPENSAML_XERCESC_HAS_XMLBYTE_RELEASE
             XMLString::release(&decoded);
+#else
+            XMLString::release((char**)&decoded);
+#endif
         }
         else {
             pch = httpRequest->getParameter("SAMLResponse");
@@ -162,7 +169,11 @@ void SimpleSigningRule::evaluate(const XMLObject& message, const GenericRequest*
                 return;
             }
             input = string("SAMLResponse=") + reinterpret_cast<const char*>(decoded);
+#ifdef OPENSAML_XERCESC_HAS_XMLBYTE_RELEASE
             XMLString::release(&decoded);
+#else
+            XMLString::release((char**)&decoded);
+#endif
         }
 
         pch = httpRequest->getParameter("RelayState");
@@ -175,17 +186,29 @@ void SimpleSigningRule::evaluate(const XMLObject& message, const GenericRequest*
     KeyInfo* keyInfo=NULL;
     pch = request->getParameter("KeyInfo");
     if (pch) {
-        try {
-            istringstream kstrm(pch);
-            DOMDocument* doc = XMLToolingConfig::getConfig().getParser().parse(kstrm);
-            XercesJanitor<DOMDocument> janitor(doc);
-            XMLObject* kxml = XMLObjectBuilder::buildOneFromElement(doc->getDocumentElement(), true);
-            janitor.release();
-            if (!(keyInfo=dynamic_cast<KeyInfo*>(kxml)))
-                delete kxml;
+        xsecsize_t x;
+        XMLByte* decoded=Base64::decode(reinterpret_cast<const XMLByte*>(pch),&x);
+        if (decoded) {
+            try {
+                istringstream kstrm((char*)decoded);
+                DOMDocument* doc = XMLToolingConfig::getConfig().getParser().parse(kstrm);
+                XercesJanitor<DOMDocument> janitor(doc);
+                XMLObject* kxml = XMLObjectBuilder::buildOneFromElement(doc->getDocumentElement(), true);
+                janitor.release();
+                if (!(keyInfo=dynamic_cast<KeyInfo*>(kxml)))
+                    delete kxml;
+            }
+            catch (XMLToolingException& ex) {
+                log.warn("Failed to load KeyInfo from message: %s", ex.what());
+            }
+#ifdef OPENSAML_XERCESC_HAS_XMLBYTE_RELEASE
+            XMLString::release(&decoded);
+#else
+            XMLString::release((char**)&decoded);
+#endif
         }
-        catch (XMLToolingException& ex) {
-            log.warn("Failed to load KeyInfo from message: %s", ex.what());
+        else {
+            log.warn("Failed to load KeyInfo from message: Unable to decode base64-encoded KeyInfo.");
         }
     }
     
@@ -198,11 +221,11 @@ void SimpleSigningRule::evaluate(const XMLObject& message, const GenericRequest*
 
     if (!sigtrust->validate(alg.get(), signature, keyInfo, input.c_str(), input.length(), *(policy.getMetadataProvider()), &cc)) {
         log.error("unable to verify message signature with supplied trust engine");
-        if (m_errorsFatal)
-            throw SignatureException("Message was signed, but signature could not be verified.");
+        if (m_errorFatal)
+            throw SecurityPolicyException("Message was signed, but signature could not be verified.");
         return;
     }
 
     log.debug("signature verified against message issuer");
-    policy.setSecure(true);
+    policy.setAuthenticated(true);
 }