-/*
- * Copyright 2001-2006 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.
*/
/**
* SAML1SOAPDecoder.cpp
*
- * SAML 1.x SOAP binding message decoder
+ * SAML 1.x SOAP binding message decoder.
*/
#include "internal.h"
#include "exceptions.h"
-#include "saml1/binding/SAML1SOAPDecoder.h"
+#include "binding/SecurityPolicy.h"
+#include "saml1/binding/SAML1MessageDecoder.h"
+#include "saml1/core/Protocols.h"
-#include <log4cpp/Category.hh>
+#include <xmltooling/logging.h>
+#include <xmltooling/XMLToolingConfig.h>
+#include <xmltooling/io/GenericRequest.h>
#include <xmltooling/soap/SOAP.h>
#include <xmltooling/util/NDC.h>
+#include <xmltooling/util/ParserPool.h>
#include <xmltooling/validation/ValidatorSuite.h>
using namespace opensaml::saml1p;
using namespace opensaml;
using namespace soap11;
+using namespace xmltooling::logging;
using namespace xmltooling;
-using namespace log4cpp;
using namespace std;
namespace opensaml {
namespace saml1p {
- MessageDecoder* SAML_DLLLOCAL SAML1SOAPDecoderFactory(const DOMElement* const & e)
+ class SAML_DLLLOCAL SAML1SOAPDecoder : public SAML1MessageDecoder
+ {
+ public:
+ SAML1SOAPDecoder() {}
+ virtual ~SAML1SOAPDecoder() {}
+
+ bool isUserAgentPresent() const {
+ return false;
+ }
+
+ xmltooling::XMLObject* decode(
+ std::string& relayState,
+ const GenericRequest& genericRequest,
+ SecurityPolicy& policy
+ ) const;
+ };
+
+ MessageDecoder* SAML_DLLLOCAL SAML1SOAPDecoderFactory(const pair<const DOMElement*,const XMLCh*>& p)
{
- return new SAML1SOAPDecoder(e);
+ return new SAML1SOAPDecoder();
}
};
};
-SAML1SOAPDecoder::SAML1SOAPDecoder(const DOMElement* e) {}
-
XMLObject* SAML1SOAPDecoder::decode(
string& relayState,
const GenericRequest& genericRequest,
#ifdef _DEBUG
xmltooling::NDC ndc("decode");
#endif
- Category& log = Category::getInstance(SAML_LOGCAT".MessageDecoder.SAML1SOAP");
+ Category& log = Category::getInstance(SAML_LOGCAT ".MessageDecoder.SAML1SOAP");
log.debug("validating input");
string s = genericRequest.getContentType();
- if (s != "text/xml") {
- log.warn("ignoring incorrect Content Type (%s)", s.c_str() ? s.c_str() : "none");
- return NULL;
+ if (s.find("text/xml") == string::npos) {
+ log.warn("ignoring incorrect content type (%s)", s.c_str() ? s.c_str() : "none");
+ throw BindingException("Invalid content type for SOAP message.");
}
const char* data = genericRequest.getRequestBody();
- if (!data) {
- log.warn("empty request body");
- return NULL;
- }
+ if (!data)
+ throw BindingException("SOAP message had an empty request body.");
+ log.debug("received message:\n%s", data);
istringstream is(data);
// Parse and bind the document into an XMLObject.
- DOMDocument* doc = (m_validate ? XMLToolingConfig::getConfig().getValidatingParser()
+ DOMDocument* doc = (policy.getValidating() ? XMLToolingConfig::getConfig().getValidatingParser()
: XMLToolingConfig::getConfig().getParser()).parse(is);
XercesJanitor<DOMDocument> janitor(doc);
auto_ptr<XMLObject> xmlObject(XMLObjectBuilder::buildOneFromElement(doc->getDocumentElement(), true));
if (!env)
throw BindingException("Decoded message was not a SOAP 1.1 Envelope.");
- if (!m_validate)
- SchemaValidators.validate(env);
+ SchemaValidators.validate(env);
Body* body = env->getBody();
if (body && body->hasChildren()) {
Request* request = dynamic_cast<Request*>(body->getUnknownXMLObjects().front());
if (request) {
// Run through the policy at two layers.
- policy.evaluate(*env, &genericRequest);
- policy.evaluate(*request, &genericRequest);
+ pair<bool,int> minor = request->getMinorVersion();
+ extractMessageDetails(
+ *env,
+ genericRequest,
+ (minor.first && minor.second==0) ? samlconstants::SAML10_PROTOCOL_ENUM : samlconstants::SAML11_PROTOCOL_ENUM,
+ policy
+ );
+ policy.evaluate(*env,&genericRequest);
+
+ // Reset, extract, and run again.
+ policy.reset(true);
+ extractMessageDetails(
+ *request,
+ genericRequest,
+ (minor.first && minor.second==0) ? samlconstants::SAML10_PROTOCOL_ENUM : samlconstants::SAML11_PROTOCOL_ENUM,
+ policy
+ );
+ policy.evaluate(*request,&genericRequest);
xmlObject.release();
body->detach(); // frees Envelope
request->detach(); // frees Body
}
}
- throw BindingException("SOAP Envelope did not contain a SAML Request.");
+ throw BindingException("SOAP Envelope did not contain a SAML 1.x Request.");
}
projects / shibboleth / cpp-opensaml.git / blobdiff