projects
/
shibboleth
/
cpp-opensaml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
https://issues.shibboleth.net/jira/browse/SSPCPP-255
[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
75401c9
..
80626f5
100644
(file)
--- a/
saml/saml2/binding/impl/SAML2ArtifactEncoder.cpp
+++ b/
saml/saml2/binding/impl/SAML2ArtifactEncoder.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright 2001-200
7
Internet2
+ * Copyright 2001-200
9
Internet2
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-17,7
+17,7
@@
/**
* SAML2ArtifactEncoder.cpp
*
/**
* SAML2ArtifactEncoder.cpp
*
- * SAML 2.0 HTTP-Artifact binding message encoder
+ * SAML 2.0 HTTP-Artifact binding message encoder
.
*/
#include "internal.h"
*/
#include "internal.h"
@@
-27,12
+27,16
@@
#include "saml2/binding/SAML2Artifact.h"
#include "saml2/core/Protocols.h"
#include "saml2/metadata/Metadata.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 <xmltooling/logging.h>
#include <fstream>
#include <sstream>
#include <xmltooling/logging.h>
+#include <xmltooling/XMLToolingConfig.h>
#include <xmltooling/io/HTTPResponse.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>
#include <xmltooling/util/TemplateEngine.h>
#include <xmltooling/util/URLEncoder.h>
@@
-86,8
+90,10
@@
SAML2ArtifactEncoder::SAML2ArtifactEncoder(const DOMElement* e, const XMLCh* ns)
m_post = (flag && (*flag==chLatin_t || *flag==chDigit_1));
if (m_post) {
auto_ptr_char t(e->getAttributeNS(ns, _template));
m_post = (flag && (*flag==chLatin_t || *flag==chDigit_1));
if (m_post) {
auto_ptr_char t(e->getAttributeNS(ns, _template));
- if (t.get() && *t.get())
+ if (t.get() && *t.get())
{
m_template = t.get();
m_template = t.get();
+ XMLToolingConfig::getConfig().getPathResolver()->resolve(m_template, PathResolver::XMLTOOLING_CFG_FILE);
+ }
}
}
}
}
}
}
@@
-108,14
+114,14
@@
long SAML2ArtifactEncoder::encode(
xmltooling::NDC ndc("encode");
#endif
Category& log = Category::getInstance(SAML_LOGCAT".MessageEncoder.SAML2Artifact");
xmltooling::NDC ndc("encode");
#endif
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.");
@@
-162,6
+168,9
@@
long SAML2ArtifactEncoder::encode(
xmlObject->marshall((DOMDocument*)NULL,&sigs,credential);
}
}
xmlObject->marshall((DOMDocument*)NULL,&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");
@@
-184,6
+193,7
@@
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()));
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()));
@@
-195,6
+205,9
@@
long SAML2ArtifactEncoder::encode(
stringstream s;
engine->run(infile, s, params);
httpResponse->setContentType("text/html");
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);
}
}