-/*
- * Copyright 2001-2007 Internet2
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the University Corporation for Advanced Internet
+ * Development, Inc. (UCAID) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ *
+ * UCAID licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the
+ * License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the License.
*/
/**
* SAML2POSTDecoder.cpp
*
- * SAML 2.0 HTTP POST binding message encoder
+ * SAML 2.0 HTTP POST binding message encoder.
*/
#include "internal.h"
#include "exceptions.h"
-#include "binding/MessageDecoder.h"
+#include "binding/SecurityPolicy.h"
+#include "saml2/binding/SAML2MessageDecoder.h"
#include "saml2/core/Protocols.h"
#include "saml2/metadata/Metadata.h"
#include "saml2/metadata/MetadataProvider.h"
-#include <xmltooling/logging.h>
+#include <xercesc/framework/MemBufInputSource.hpp>
+#include <xercesc/framework/Wrapper4InputSource.hpp>
#include <xercesc/util/Base64.hpp>
+#include <xmltooling/logging.h>
+#include <xmltooling/XMLToolingConfig.h>
#include <xmltooling/io/HTTPRequest.h>
#include <xmltooling/util/NDC.h>
+#include <xmltooling/util/ParserPool.h>
#include <xmltooling/validation/ValidatorSuite.h>
using namespace opensaml::saml2md;
namespace opensaml {
namespace saml2p {
- class SAML_DLLLOCAL SAML2POSTDecoder : public MessageDecoder
+ class SAML_DLLLOCAL SAML2POSTDecoder : public SAML2MessageDecoder
{
public:
SAML2POSTDecoder() {}
virtual ~SAML2POSTDecoder() {}
-
+
xmltooling::XMLObject* decode(
std::string& relayState,
const GenericRequest& genericRequest,
) const;
};
- MessageDecoder* SAML_DLLLOCAL SAML2POSTDecoderFactory(const pair<const DOMElement*,const XMLCh*>& p)
+ MessageDecoder* SAML_DLLLOCAL SAML2POSTDecoderFactory(const pair<const DOMElement*,const XMLCh*>&)
{
return new SAML2POSTDecoder();
}
#ifdef _DEBUG
xmltooling::NDC ndc("decode");
#endif
- Category& log = Category::getInstance(SAML_LOGCAT".MessageDecoder.SAML2POST");
+ Category& log = Category::getInstance(SAML_LOGCAT ".MessageDecoder.SAML2POST");
log.debug("validating input");
const HTTPRequest* httpRequest=dynamic_cast<const HTTPRequest*>(&genericRequest);
if (!msg)
msg = httpRequest->getParameter("SAMLRequest");
if (!msg)
- throw BindingException("Request missing SAMLRequest or SAMLResponse parameter.");
+ throw BindingException("Request missing SAMLRequest or SAMLResponse form parameter.");
const char* state = httpRequest->getParameter("RelayState");
if (state)
relayState = state;
relayState.erase();
// Decode the base64 into SAML.
- unsigned int x;
+ xsecsize_t x;
XMLByte* decoded=Base64::decode(reinterpret_cast<const XMLByte*>(msg),&x);
if (!decoded)
throw BindingException("Unable to decode base64 in POST binding message.");
- log.debug("decoded SAML message:\n%s", decoded);
- istringstream is(reinterpret_cast<char*>(decoded));
- XMLString::release(&decoded);
+ log.debugStream() << "decoded SAML message:\n" << decoded << logging::eol;
// Parse and bind the document into an XMLObject.
+ MemBufInputSource src(decoded, x, "SAMLMessage", true);
+ Wrapper4InputSource dsrc(&src, false);
DOMDocument* doc = (policy.getValidating() ? XMLToolingConfig::getConfig().getValidatingParser()
- : XMLToolingConfig::getConfig().getParser()).parse(is);
+ : XMLToolingConfig::getConfig().getParser()).parse(dsrc);
XercesJanitor<DOMDocument> janitor(doc);
auto_ptr<XMLObject> xmlObject(XMLObjectBuilder::buildOneFromElement(doc->getDocumentElement(), true));
janitor.release();
- saml2::RootObject* root = NULL;
- StatusResponseType* response = NULL;
+ saml2::RootObject* root = nullptr;
+ StatusResponseType* response = nullptr;
RequestAbstractType* request = dynamic_cast<RequestAbstractType*>(xmlObject.get());
if (!request) {
response = dynamic_cast<StatusResponseType*>(xmlObject.get());
root = static_cast<saml2::RootObject*>(request);
}
- if (!policy.getValidating())
- SchemaValidators.validate(xmlObject.get());
+ SchemaValidators.validate(root);
// Run through the policy.
- policy.evaluate(*root, &genericRequest, samlconstants::SAML20P_NS);
+ extractMessageDetails(*root, genericRequest, samlconstants::SAML20P_NS, policy);
+ policy.evaluate(*root, &genericRequest);
// Check destination URL.
auto_ptr_char dest(request ? request->getDestination() : response->getDestination());
log.error("signed SAML message missing Destination attribute");
throw BindingException("Signed SAML message missing Destination attribute identifying intended destination.");
}
- else if ((delim && strncmp(dest.get(), dest2, delim - dest2)) || (!delim && strcmp(dest.get(),dest2))) {
+ else if (dest.get() && *dest.get() && ((delim && strncmp(dest.get(), dest2, delim - dest2)) || (!delim && strcmp(dest.get(),dest2)))) {
log.error("POST targeted at (%s), but delivered to (%s)", dest.get(), dest2);
throw BindingException("SAML message delivered with POST to incorrect server URL.");
}
projects / shibboleth / cpp-opensaml.git / blobdiff