projects
/
shibboleth
/
cpp-opensaml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reducing header overuse, non-inlining selected methods (CPPOST-35).
[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
49c424f
..
9ac6dea
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.
@@
-30,9
+30,11
@@
#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/util/NDC.h>
#include <xmltooling/io/HTTPResponse.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>
@@
-40,8
+42,8
@@
using namespace opensaml::saml2p;
using namespace opensaml::saml2md;
using namespace opensaml;
using namespace xmlsignature;
using namespace opensaml::saml2md;
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 {
@@
-49,7
+51,7
@@
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() {}
long encode(
virtual ~SAML2ArtifactEncoder() {}
long encode(
@@
-69,9
+71,9
@@
namespace opensaml {
string m_template;
};
string 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
);
}
};
}
};
@@
-79,15
+81,17
@@
namespace opensaml {
static const XMLCh postArtifact[] = UNICODE_LITERAL_12(p,o,s,t,A,r,t,i,f,a,c,t);
};
static const XMLCh postArtifact[] = UNICODE_LITERAL_12(p,o,s,t,A,r,t,i,f,a,c,t);
};
-SAML2ArtifactEncoder::SAML2ArtifactEncoder(const DOMElement* e) : m_post(false)
+SAML2ArtifactEncoder::SAML2ArtifactEncoder(const DOMElement* e
, const XMLCh* ns
) : m_post(false)
{
if (e) {
{
if (e) {
- const XMLCh* flag = e->getAttributeNS(
NULL
, postArtifact);
+ const XMLCh* flag = e->getAttributeNS(
ns
, postArtifact);
m_post = (flag && (*flag==chLatin_t || *flag==chDigit_1));
if (m_post) {
m_post = (flag && (*flag==chLatin_t || *flag==chDigit_1));
if (m_post) {
- auto_ptr_char t(e->getAttributeNS(
NULL
, _template));
- if (t.get()
)
+ auto_ptr_char t(e->getAttributeNS(
ns
, _template));
+ if (t.get()
&& *t.get()) {
m_template = t.get();
m_template = t.get();
+ XMLToolingConfig::getConfig().getPathResolver()->resolve(m_template, PathResolver::XMLTOOLING_CFG_FILE);
+ }
}
}
}
}
}
}
@@
-162,6
+166,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");
@@
-195,6
+202,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);
}
}