projects
/
shibboleth
/
cpp-opensaml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SSPCPP-616 - clean up concatenated string literals
[shibboleth/cpp-opensaml.git]
/
saml
/
saml2
/
binding
/
impl
/
SAML2ArtifactEncoder.cpp
diff --git
a/saml/saml2/binding/impl/SAML2ArtifactEncoder.cpp
b/saml/saml2/binding/impl/SAML2ArtifactEncoder.cpp
index
f142132
..
51e2528
100644
(file)
--- a/
saml/saml2/binding/impl/SAML2ArtifactEncoder.cpp
+++ b/
saml/saml2/binding/impl/SAML2ArtifactEncoder.cpp
@@
-1,45
+1,55
@@
-/*
- * 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.
*
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * 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
*
*
- * 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.
+ * 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.
*/
/**
* SAML2ArtifactEncoder.cpp
*
*/
/**
* SAML2ArtifactEncoder.cpp
*
- * SAML 2.0 HTTP-Artifact binding message encoder
+ * SAML 2.0 HTTP-Artifact binding message encoder
.
*/
#include "internal.h"
#include "exceptions.h"
#include "binding/ArtifactMap.h"
*/
#include "internal.h"
#include "exceptions.h"
#include "binding/ArtifactMap.h"
-#include "binding/HTTPResponse.h"
#include "binding/MessageEncoder.h"
#include "saml2/binding/SAML2Artifact.h"
#include "saml2/core/Protocols.h"
#include "binding/MessageEncoder.h"
#include "saml2/binding/SAML2Artifact.h"
#include "saml2/core/Protocols.h"
+#include "saml2/metadata/Metadata.h"
+#include "signature/ContentReference.h"
#include <fstream>
#include <sstream>
#include <fstream>
#include <sstream>
-#include <log4cpp/Category.hh>
+#include <xmltooling/logging.h>
+#include <xmltooling/XMLToolingConfig.h>
+#include <xmltooling/io/HTTPResponse.h>
+#include <xmltooling/signature/Signature.h>
#include <xmltooling/util/NDC.h>
#include <xmltooling/util/NDC.h>
+#include <xmltooling/util/PathResolver.h>
#include <xmltooling/util/TemplateEngine.h>
#include <xmltooling/util/URLEncoder.h>
using namespace opensaml::saml2p;
#include <xmltooling/util/TemplateEngine.h>
#include <xmltooling/util/URLEncoder.h>
using namespace opensaml::saml2p;
+using namespace opensaml::saml2md;
using namespace opensaml;
using namespace xmlsignature;
using namespace opensaml;
using namespace xmlsignature;
+using namespace xmltooling::logging;
using namespace xmltooling;
using namespace xmltooling;
-using namespace log4cpp;
using namespace std;
namespace opensaml {
using namespace std;
namespace opensaml {
@@
-47,84
+57,95
@@
namespace opensaml {
class SAML_DLLLOCAL SAML2ArtifactEncoder : public MessageEncoder
{
public:
class SAML_DLLLOCAL SAML2ArtifactEncoder : public MessageEncoder
{
public:
- SAML2ArtifactEncoder(const DOMElement* e);
+ SAML2ArtifactEncoder(const DOMElement* e
, const XMLCh* ns
);
virtual ~SAML2ArtifactEncoder() {}
virtual ~SAML2ArtifactEncoder() {}
-
+
+ const XMLCh* getProtocolFamily() const {
+ return samlconstants::SAML20P_NS;
+ }
+
long encode(
GenericResponse& genericResponse,
long encode(
GenericResponse& genericResponse,
-
xmltooling::
XMLObject* xmlObject,
+ XMLObject* xmlObject,
const char* destination,
const char* destination,
- const char* recipientID=NULL,
- const char* relayState=NULL,
- const xmltooling::CredentialResolver* credResolver=NULL,
- const XMLCh* sigAlgorithm=NULL
+ const EntityDescriptor* recipient=nullptr,
+ const char* relayState=nullptr,
+ const ArtifactGenerator* artifactGenerator=nullptr,
+ const Credential* credential=nullptr,
+ const XMLCh* signatureAlg=nullptr,
+ const XMLCh* digestAlg=nullptr
) const;
private:
) const;
private:
- st
d::string m_template;
+ st
ring m_template;
};
};
- MessageEncoder* SAML_DLLLOCAL SAML2ArtifactEncoderFactory(const
DOMElement* const & e
)
+ MessageEncoder* SAML_DLLLOCAL SAML2ArtifactEncoderFactory(const
pair<const DOMElement*,const XMLCh*>& p
)
{
{
- return new SAML2ArtifactEncoder(
e
);
+ return new SAML2ArtifactEncoder(
p.first, p.second
);
}
};
}
};
-};
-static const XMLCh _template[] = UNICODE_LITERAL_8(t,e,m,p,l,a,t,e);
+ static const XMLCh _template[] = UNICODE_LITERAL_8(t,e,m,p,l,a,t,e);
+ static const XMLCh postArtifact[] = UNICODE_LITERAL_12(p,o,s,t,A,r,t,i,f,a,c,t);
+};
-SAML2ArtifactEncoder::SAML2ArtifactEncoder(const DOMElement* e)
+SAML2ArtifactEncoder::SAML2ArtifactEncoder(const DOMElement* e
, const XMLCh* ns
)
{
{
- if (
e
) {
-
auto_ptr_char t(e->getAttributeNS(NULL, _template)
);
- if (
t.get
())
-
m_template = t.get(
);
+ if (
XMLHelper::getAttrBool(e, false, postArtifact, ns)
) {
+
m_template = XMLHelper::getAttrString(e, "bindingTemplate.html", _template, ns
);
+ if (
!m_template.empty
())
+
XMLToolingConfig::getConfig().getPathResolver()->resolve(m_template, PathResolver::XMLTOOLING_CFG_FILE
);
}
}
long SAML2ArtifactEncoder::encode(
GenericResponse& genericResponse,
}
}
long SAML2ArtifactEncoder::encode(
GenericResponse& genericResponse,
-
xmltooling::
XMLObject* xmlObject,
+ XMLObject* xmlObject,
const char* destination,
const char* destination,
- const
char* recipientID
,
+ const
EntityDescriptor* recipient
,
const char* relayState,
const char* relayState,
- const CredentialResolver* credResolver,
- const XMLCh* sigAlgorithm
+ const ArtifactGenerator* artifactGenerator,
+ const Credential* credential,
+ const XMLCh* signatureAlg,
+ const XMLCh* digestAlg
) const
{
#ifdef _DEBUG
xmltooling::NDC ndc("encode");
#endif
) const
{
#ifdef _DEBUG
xmltooling::NDC ndc("encode");
#endif
- Category& log = Category::getInstance(SAML_LOGCAT".MessageEncoder.SAML2Artifact");
-
+ Category& log = Category::getInstance(SAML_LOGCAT ".MessageEncoder.SAML2Artifact");
log.debug("validating input");
log.debug("validating input");
+ if (!destination)
+ throw BindingException("Encoding response requires a destination.");
HTTPResponse* httpResponse=dynamic_cast<HTTPResponse*>(&genericResponse);
if (!httpResponse)
throw BindingException("Unable to cast response interface to HTTPResponse type.");
if (relayState && strlen(relayState)>80)
throw BindingException("RelayState cannot exceed 80 bytes in length.");
HTTPResponse* httpResponse=dynamic_cast<HTTPResponse*>(&genericResponse);
if (!httpResponse)
throw BindingException("Unable to cast response interface to HTTPResponse type.");
if (relayState && strlen(relayState)>80)
throw BindingException("RelayState cannot exceed 80 bytes in length.");
-
if (xmlObject->getParent())
throw BindingException("Cannot encode XML content with parent.");
if (xmlObject->getParent())
throw BindingException("Cannot encode XML content with parent.");
- StatusResponseType* response =
NULL
;
+ StatusResponseType* response =
nullptr
;
RequestAbstractType* request = dynamic_cast<RequestAbstractType*>(xmlObject);
RequestAbstractType* request = dynamic_cast<RequestAbstractType*>(xmlObject);
- if (!request)
+ if (!request)
{
response = dynamic_cast<StatusResponseType*>(xmlObject);
response = dynamic_cast<StatusResponseType*>(xmlObject);
- if (!response)
- throw BindingException("XML content for SAML 2.0 HTTP-Artifact Encoder must be a SAML 2.0 protocol message.");
+ if (!response)
+ throw BindingException("XML content for SAML 2.0 HTTP-Artifact Encoder must be a SAML 2.0 protocol message.");
+ }
ArtifactMap* mapper = SAMLConfig::getConfig().getArtifactMap();
if (!mapper)
throw BindingException("SAML 2.0 HTTP-Artifact Encoder requires ArtifactMap be set in configuration.");
// Obtain a fresh artifact.
ArtifactMap* mapper = SAMLConfig::getConfig().getArtifactMap();
if (!mapper)
throw BindingException("SAML 2.0 HTTP-Artifact Encoder requires ArtifactMap be set in configuration.");
// Obtain a fresh artifact.
- if (!
m_
artifactGenerator)
+ if (!artifactGenerator)
throw BindingException("SAML 2.0 HTTP-Artifact Encoder requires an ArtifactGenerator instance.");
throw BindingException("SAML 2.0 HTTP-Artifact Encoder requires an ArtifactGenerator instance.");
- log.debug("obtaining new artifact for relying party (%s)", recipientID ? recipientID : "unknown");
- auto_ptr<SAMLArtifact> artifact(m_artifactGenerator->generateSAML2Artifact(recipientID));
+ auto_ptr_char recipientID(recipient ? recipient->getEntityID() : nullptr);
+ log.debug("obtaining new artifact for relying party (%s)", recipientID.get() ? recipientID.get() : "unknown");
+ auto_ptr<SAMLArtifact> artifact(artifactGenerator->generateSAML2Artifact(recipient));
- if (cred
Resolver
) {
+ if (cred
ential
) {
// Signature based on native XML signing.
if (request ? request->getSignature() : response->getSignature()) {
log.debug("message already signed, skipping signature operation");
// Signature based on native XML signing.
if (request ? request->getSignature() : response->getSignature()) {
log.debug("message already signed, skipping signature operation");
@@
-133,20
+154,28
@@
long SAML2ArtifactEncoder::encode(
log.debug("signing the message");
// Build a Signature.
log.debug("signing the message");
// Build a Signature.
- Signature* sig = buildSignature(credResolver, sigAlgorithm);
-
- // Append Signature.
+ Signature* sig = SignatureBuilder::buildSignature();
request ? request->setSignature(sig) : response->setSignature(sig);
request ? request->setSignature(sig) : response->setSignature(sig);
-
+ if (signatureAlg)
+ sig->setSignatureAlgorithm(signatureAlg);
+ if (digestAlg) {
+ opensaml::ContentReference* cr = dynamic_cast<opensaml::ContentReference*>(sig->getContentReference());
+ if (cr)
+ cr->setDigestAlgorithm(digestAlg);
+ }
+
// Sign response while marshalling.
vector<Signature*> sigs(1,sig);
// Sign response while marshalling.
vector<Signature*> sigs(1,sig);
- xmlObject->marshall((DOMDocument*)
NULL,&sigs
);
+ xmlObject->marshall((DOMDocument*)
nullptr,&sigs,credential
);
}
}
}
}
+
+ if (log.isDebugEnabled())
+ log.debugStream() << "marshalled message:" << logging::eol << *xmlObject << logging::eol;
// Store the message. Last step in storage will be to delete the XML.
log.debug("storing artifact and content in map");
// Store the message. Last step in storage will be to delete the XML.
log.debug("storing artifact and content in map");
- mapper->storeContent(xmlObject, artifact.get(), recipientID);
+ mapper->storeContent(xmlObject, artifact.get(), recipientID
.get()
);
if (m_template.empty()) {
// Generate redirect.
if (m_template.empty()) {
// Generate redirect.
@@
-154,7
+183,7
@@
long SAML2ArtifactEncoder::encode(
loc += (strchr(destination,'?') ? '&' : '?');
const URLEncoder* escaper = XMLToolingConfig::getConfig().getURLEncoder();
loc = loc + "SAMLart=" + escaper->encode(artifact->encode().c_str());
loc += (strchr(destination,'?') ? '&' : '?');
const URLEncoder* escaper = XMLToolingConfig::getConfig().getURLEncoder();
loc = loc + "SAMLart=" + escaper->encode(artifact->encode().c_str());
- if (relayState)
+ if (relayState
&& *relayState
)
loc = loc + "&RelayState=" + escaper->encode(relayState);
log.debug("message encoded, sending redirect to client");
return httpResponse->sendRedirect(loc.c_str());
loc = loc + "&RelayState=" + escaper->encode(relayState);
log.debug("message encoded, sending redirect to client");
return httpResponse->sendRedirect(loc.c_str());
@@
-165,17
+194,21
@@
long SAML2ArtifactEncoder::encode(
TemplateEngine* engine = XMLToolingConfig::getConfig().getTemplateEngine();
if (!engine)
throw BindingException("Encoding artifact using POST requires a TemplateEngine instance.");
TemplateEngine* engine = XMLToolingConfig::getConfig().getTemplateEngine();
if (!engine)
throw BindingException("Encoding artifact using POST requires a TemplateEngine instance.");
+ HTTPResponse::sanitizeURL(destination);
ifstream infile(m_template.c_str());
if (!infile)
throw BindingException("Failed to open HTML template for POST response ($1).", params(1,m_template.c_str()));
TemplateEngine::TemplateParameters params;
params.m_map["action"] = destination;
params.m_map["SAMLart"] = artifact->encode();
ifstream infile(m_template.c_str());
if (!infile)
throw BindingException("Failed to open HTML template for POST response ($1).", params(1,m_template.c_str()));
TemplateEngine::TemplateParameters params;
params.m_map["action"] = destination;
params.m_map["SAMLart"] = artifact->encode();
- if (relayState)
+ if (relayState
&& *relayState
)
params.m_map["RelayState"] = relayState;
stringstream s;
engine->run(infile, s, params);
httpResponse->setContentType("text/html");
params.m_map["RelayState"] = relayState;
stringstream s;
engine->run(infile, s, params);
httpResponse->setContentType("text/html");
+ httpResponse->setResponseHeader("Expires", "01-Jan-1997 12:00:00 GMT");
+ httpResponse->setResponseHeader("Cache-Control", "no-cache, no-store, must-revalidate, private");
+ httpResponse->setResponseHeader("Pragma", "no-cache");
return httpResponse->sendResponse(s);
}
}
return httpResponse->sendResponse(s);
}
}