#include "saml2/metadata/MetadataProvider.h"
#include "util/SAMLConstants.h"
-#include <log4cpp/Category.hh>
+#include <xmltooling/logging.h>
using namespace opensaml::saml2md;
using namespace opensaml::saml2p;
using namespace opensaml::saml2;
using namespace opensaml;
+using namespace xmltooling::logging;
using namespace xmltooling;
-using namespace log4cpp;
using namespace std;
namespace opensaml {
const QName& q = message.getElementQName();
policy.setMessageQName(&q);
- if (!XMLString::equals(q.getNamespaceURI(), samlconstants::SAML20P_NS)) {
- log.debug("not a SAML 2.0 protocol message");
+ if (!XMLString::equals(q.getNamespaceURI(), samlconstants::SAML20P_NS)&&
+ !XMLString::equals(q.getNamespaceURI(), samlconstants::SAML20_NS)) {
return;
}
policy.setIssueInstant(samlRoot.getIssueInstantEpoch());
log.debug("extracting issuer from message");
- Issuer* issuer = samlRoot.getIssuer();
- if (issuer && issuer->getName()) {
- auto_ptr<Issuer> copy(issuer->cloneIssuer());
- policy.setIssuer(copy.get());
- copy.release();
+ const Issuer* issuer = samlRoot.getIssuer();
+ if (issuer) {
+ policy.setIssuer(issuer);
}
else if (XMLString::equals(q.getLocalPart(), Response::LOCAL_NAME)) {
// No issuer in the message, so we have to try the Response approach.
const vector<saml2::Assertion*>& assertions = dynamic_cast<const Response&>(samlRoot).getAssertions();
if (!assertions.empty()) {
issuer = assertions.front()->getIssuer();
- if (issuer && issuer->getName()) {
- auto_ptr<Issuer> copy(issuer->cloneIssuer());
- policy.setIssuer(copy.get());
- copy.release();
- }
+ if (issuer)
+ policy.setIssuer(issuer);
}
}
- if (!policy.getIssuer()) {
+ if (!issuer) {
log.warn("issuer identity not extracted");
return;
}
if (log.isDebugEnabled()) {
- auto_ptr_char iname(policy.getIssuer()->getName());
+ auto_ptr_char iname(issuer->getName());
log.debug("message from (%s)", iname.get());
}
+ if (policy.getIssuerMetadata()) {
+ log.debug("metadata for issuer already set, leaving in place");
+ return;
+ }
+
if (policy.getMetadataProvider() && policy.getRole()) {
- if (policy.getIssuer()->getFormat() && !XMLString::equals(policy.getIssuer()->getFormat(), saml2::NameIDType::ENTITY)) {
+ if (issuer->getFormat() && !XMLString::equals(issuer->getFormat(), NameIDType::ENTITY)) {
log.warn("non-system entity issuer, skipping metadata lookup");
return;
}
log.debug("searching metadata for message issuer...");
- const EntityDescriptor* entity = policy.getMetadataProvider()->getEntityDescriptor(policy.getIssuer()->getName());
+ const EntityDescriptor* entity = policy.getMetadataProvider()->getEntityDescriptor(issuer->getName());
if (!entity) {
- auto_ptr_char temp(policy.getIssuer()->getName());
+ auto_ptr_char temp(issuer->getName());
log.warn("no metadata found, can't establish identity of issuer (%s)", temp.get());
return;
}