projects
/
shibboleth
/
cpp-opensaml.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0ac2fef
)
Switch to memory input source to allow for 16-bit data.
author
Scott Cantor
<cantor.2@osu.edu>
Wed, 16 Jan 2008 18:14:41 +0000
(18:14 +0000)
committer
Scott Cantor
<cantor.2@osu.edu>
Wed, 16 Jan 2008 18:14:41 +0000
(18:14 +0000)
saml/saml1/binding/impl/SAML1POSTDecoder.cpp
patch
|
blob
|
history
saml/saml2/binding/impl/SAML2POSTDecoder.cpp
patch
|
blob
|
history
saml/saml2/binding/impl/SAML2RedirectDecoder.cpp
patch
|
blob
|
history
diff --git
a/saml/saml1/binding/impl/SAML1POSTDecoder.cpp
b/saml/saml1/binding/impl/SAML1POSTDecoder.cpp
index
0e60ffd
..
0ce1779
100644
(file)
--- a/
saml/saml1/binding/impl/SAML1POSTDecoder.cpp
+++ b/
saml/saml1/binding/impl/SAML1POSTDecoder.cpp
@@
-28,6
+28,8
@@
#include "saml2/metadata/Metadata.h"
#include "saml2/metadata/MetadataProvider.h"
#include "saml2/metadata/Metadata.h"
#include "saml2/metadata/MetadataProvider.h"
+#include <xercesc/framework/MemBufInputSource.hpp>
+#include <xercesc/framework/Wrapper4InputSource.hpp>
#include <xercesc/util/Base64.hpp>
#include <xmltooling/logging.h>
#include <xmltooling/io/HTTPRequest.h>
#include <xercesc/util/Base64.hpp>
#include <xmltooling/logging.h>
#include <xmltooling/io/HTTPRequest.h>
@@
-87,18
+89,18
@@
XMLObject* SAML1POSTDecoder::decode(
throw BindingException("Request missing SAMLResponse or TARGET form parameters.");
relayState = TARGET;
throw BindingException("Request missing SAMLResponse or TARGET form parameters.");
relayState = TARGET;
- // Decode the base64 into
SA
ML.
+ // Decode the base64 into
X
ML.
unsigned int x;
XMLByte* decoded=Base64::decode(reinterpret_cast<const XMLByte*>(samlResponse),&x);
if (!decoded)
throw BindingException("Unable to decode base64 in POST profile response.");
unsigned int x;
XMLByte* decoded=Base64::decode(reinterpret_cast<const XMLByte*>(samlResponse),&x);
if (!decoded)
throw BindingException("Unable to decode base64 in POST profile response.");
- log.debug("decoded SAML response:\n%s", decoded);
- istringstream is(reinterpret_cast<char*>(decoded));
- XMLString::release(&decoded);
-
+ log.debugStream() << "decoded SAML response:" << logging::eol << decoded << logging::eol;
+
// Parse and bind the document into an XMLObject.
// Parse and bind the document into an XMLObject.
+ MemBufInputSource src(decoded, x, "SAMLResponse", true);
+ Wrapper4InputSource dsrc(&src, false);
DOMDocument* doc = (policy.getValidating() ? XMLToolingConfig::getConfig().getValidatingParser()
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();
XercesJanitor<DOMDocument> janitor(doc);
auto_ptr<XMLObject> xmlObject(XMLObjectBuilder::buildOneFromElement(doc->getDocumentElement(), true));
janitor.release();
diff --git
a/saml/saml2/binding/impl/SAML2POSTDecoder.cpp
b/saml/saml2/binding/impl/SAML2POSTDecoder.cpp
index
1898c4b
..
fb0342b
100644
(file)
--- a/
saml/saml2/binding/impl/SAML2POSTDecoder.cpp
+++ b/
saml/saml2/binding/impl/SAML2POSTDecoder.cpp
@@
-27,8
+27,10
@@
#include "saml2/metadata/Metadata.h"
#include "saml2/metadata/MetadataProvider.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 <xercesc/util/Base64.hpp>
+#include <xmltooling/logging.h>
#include <xmltooling/io/HTTPRequest.h>
#include <xmltooling/util/NDC.h>
#include <xmltooling/validation/ValidatorSuite.h>
#include <xmltooling/io/HTTPRequest.h>
#include <xmltooling/util/NDC.h>
#include <xmltooling/validation/ValidatorSuite.h>
@@
-96,13
+98,13
@@
XMLObject* SAML2POSTDecoder::decode(
XMLByte* decoded=Base64::decode(reinterpret_cast<const XMLByte*>(msg),&x);
if (!decoded)
throw BindingException("Unable to decode base64 in POST binding message.");
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:" << logging::eol << decoded << logging::eol;
// Parse and bind the document into an XMLObject.
// 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()
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();
XercesJanitor<DOMDocument> janitor(doc);
auto_ptr<XMLObject> xmlObject(XMLObjectBuilder::buildOneFromElement(doc->getDocumentElement(), true));
janitor.release();
diff --git
a/saml/saml2/binding/impl/SAML2RedirectDecoder.cpp
b/saml/saml2/binding/impl/SAML2RedirectDecoder.cpp
index
ff0f5f7
..
f682d2d
100644
(file)
--- a/
saml/saml2/binding/impl/SAML2RedirectDecoder.cpp
+++ b/
saml/saml2/binding/impl/SAML2RedirectDecoder.cpp
@@
-106,7
+106,7
@@
XMLObject* SAML2RedirectDecoder::decode(
// Now we have to inflate it.
stringstream s;
// Now we have to inflate it.
stringstream s;
- if (inflate(
(char*)decoded
, x, s)==0) {
+ if (inflate(
reinterpret_cast<char*>(decoded)
, x, s)==0) {
XMLString::release(&decoded);
throw BindingException("Unable to inflate Redirect binding message.");
}
XMLString::release(&decoded);
throw BindingException("Unable to inflate Redirect binding message.");
}