#include "attribute/resolver/AttributeExtractor.h"
#include <saml/saml1/core/Assertions.h>
-#include <saml/saml2/core/Assertions.h>
+#include <saml/saml2/core/Protocols.h>
#include <saml/saml2/metadata/Metadata.h>
#include <xmltooling/util/DateTime.h>
#include <xmltooling/util/XMLHelper.h>
m_sessionIndex,
m_sessionNotOnOrAfter,
m_subjectAddress,
- m_subjectDNS;
+ m_subjectDNS,
+ m_consent;
};
#if defined (_MSC_VER)
m_sessionIndex(XMLHelper::getAttrString(e, nullptr, AuthnStatement::SESSIONINDEX_ATTRIB_NAME)),
m_sessionNotOnOrAfter(XMLHelper::getAttrString(e, nullptr, AuthnStatement::SESSIONNOTONORAFTER_ATTRIB_NAME)),
m_subjectAddress(XMLHelper::getAttrString(e, nullptr, saml2::SubjectLocality::ADDRESS_ATTRIB_NAME)),
- m_subjectDNS(XMLHelper::getAttrString(e, nullptr, saml2::SubjectLocality::DNSNAME_ATTRIB_NAME))
+ m_subjectDNS(XMLHelper::getAttrString(e, nullptr, saml2::SubjectLocality::DNSNAME_ATTRIB_NAME)),
+ m_consent(XMLHelper::getAttrString(e, nullptr, saml2p::StatusResponseType::CONSENT_ATTRIB_NAME))
{
}
const Application& application, const RoleDescriptor* issuer, const XMLObject& xmlObject, vector<shibsp::Attribute*>& attributes
) const
{
+ const saml2p::StatusResponseType* srt = dynamic_cast<const saml2p::StatusResponseType*>(&xmlObject);
+ if (srt) {
+ // Consent
+ if (!m_consent.empty() && srt->getConsent()) {
+ auto_ptr_char temp(srt->getConsent());
+ if (temp.get() && *temp.get()) {
+ auto_ptr<SimpleAttribute> consent(new SimpleAttribute(vector<string>(1, m_consent)));
+ consent->getValues().push_back(temp.get());
+ attributes.push_back(consent.get());
+ consent.release();
+ }
+ }
+ return;
+ }
+
const saml2::Assertion* saml2assertion = dynamic_cast<const saml2::Assertion*>(&xmlObject);
if (saml2assertion) {
// Issuer
if (!m_issuer.empty()) {
const Issuer* i = saml2assertion->getIssuer();
if (i && (!i->getFormat() || !*(i->getFormat()) || XMLString::equals(i->getFormat(), NameIDType::ENTITY))) {
- auto_ptr<SimpleAttribute> issuer(new SimpleAttribute(vector<string>(1, m_issuer)));
auto_ptr_char temp(i->getName());
- if (temp.get()) {
+ if (temp.get() && *temp.get()) {
+ auto_ptr<SimpleAttribute> issuer(new SimpleAttribute(vector<string>(1, m_issuer)));
issuer->getValues().push_back(temp.get());
- attributes.push_back(issuer.release());
+ attributes.push_back(issuer.get());
+ issuer.release();
}
}
}
// NotOnOrAfter
if (!m_notOnOrAfter.empty() && saml2assertion->getConditions() && saml2assertion->getConditions()->getNotOnOrAfter()) {
- auto_ptr<SimpleAttribute> notonorafter(new SimpleAttribute(vector<string>(1, m_notOnOrAfter)));
auto_ptr_char temp(saml2assertion->getConditions()->getNotOnOrAfter()->getRawData());
if (temp.get()) {
+ auto_ptr<SimpleAttribute> notonorafter(new SimpleAttribute(vector<string>(1, m_notOnOrAfter)));
notonorafter->getValues().push_back(temp.get());
- attributes.push_back(notonorafter.release());
+ attributes.push_back(notonorafter.get());
+ notonorafter.release();
}
}
+
+ return;
}
- else {
- const AuthnStatement* saml2statement = dynamic_cast<const AuthnStatement*>(&xmlObject);
- if (saml2statement) {
- // AuthnInstant
- if (!m_authnInstant.empty() && saml2statement->getAuthnInstant()) {
+
+ const AuthnStatement* saml2statement = dynamic_cast<const AuthnStatement*>(&xmlObject);
+ if (saml2statement) {
+ // AuthnInstant
+ if (!m_authnInstant.empty() && saml2statement->getAuthnInstant()) {
+ auto_ptr_char temp(saml2statement->getAuthnInstant()->getRawData());
+ if (temp.get()) {
auto_ptr<SimpleAttribute> authninstant(new SimpleAttribute(vector<string>(1, m_authnInstant)));
- auto_ptr_char temp(saml2statement->getAuthnInstant()->getRawData());
- if (temp.get()) {
- authninstant->getValues().push_back(temp.get());
- attributes.push_back(authninstant.release());
- }
+ authninstant->getValues().push_back(temp.get());
+ attributes.push_back(authninstant.get());
+ authninstant.release();
}
+ }
- // SessionIndex
- if (!m_sessionIndex.empty() && saml2statement->getSessionIndex() && *(saml2statement->getSessionIndex())) {
+ // SessionIndex
+ if (!m_sessionIndex.empty() && saml2statement->getSessionIndex() && *(saml2statement->getSessionIndex())) {
+ auto_ptr_char temp(saml2statement->getSessionIndex());
+ if (temp.get()) {
auto_ptr<SimpleAttribute> sessionindex(new SimpleAttribute(vector<string>(1, m_sessionIndex)));
- auto_ptr_char temp(saml2statement->getSessionIndex());
- if (temp.get()) {
- sessionindex->getValues().push_back(temp.get());
- attributes.push_back(sessionindex.release());
- }
+ sessionindex->getValues().push_back(temp.get());
+ attributes.push_back(sessionindex.get());
+ sessionindex.release();
}
+ }
- // SessionNotOnOrAfter
- if (!m_sessionNotOnOrAfter.empty() && saml2statement->getSessionNotOnOrAfter()) {
+ // SessionNotOnOrAfter
+ if (!m_sessionNotOnOrAfter.empty() && saml2statement->getSessionNotOnOrAfter()) {
+ auto_ptr_char temp(saml2statement->getSessionNotOnOrAfter()->getRawData());
+ if (temp.get()) {
auto_ptr<SimpleAttribute> sessionnotonorafter(new SimpleAttribute(vector<string>(1, m_sessionNotOnOrAfter)));
- auto_ptr_char temp(saml2statement->getSessionNotOnOrAfter()->getRawData());
- if (temp.get()) {
- sessionnotonorafter->getValues().push_back(temp.get());
- attributes.push_back(sessionnotonorafter.release());
- }
+ sessionnotonorafter->getValues().push_back(temp.get());
+ attributes.push_back(sessionnotonorafter.get());
+ sessionnotonorafter.release();
}
+ }
- if (saml2statement->getSubjectLocality()) {
- const saml2::SubjectLocality* locality = saml2statement->getSubjectLocality();
- // Address
- if (!m_subjectAddress.empty() && locality->getAddress() && *(locality->getAddress())) {
+ if (saml2statement->getSubjectLocality()) {
+ const saml2::SubjectLocality* locality = saml2statement->getSubjectLocality();
+ // Address
+ if (!m_subjectAddress.empty() && locality->getAddress() && *(locality->getAddress())) {
+ auto_ptr_char temp(locality->getAddress());
+ if (temp.get()) {
auto_ptr<SimpleAttribute> address(new SimpleAttribute(vector<string>(1, m_subjectAddress)));
- auto_ptr_char temp(locality->getAddress());
- if (temp.get()) {
- address->getValues().push_back(temp.get());
- attributes.push_back(address.release());
- }
+ address->getValues().push_back(temp.get());
+ attributes.push_back(address.get());
+ address.release();
}
+ }
- // DNSName
- if (!m_subjectDNS.empty() && locality->getDNSName() && *(locality->getDNSName())) {
+ // DNSName
+ if (!m_subjectDNS.empty() && locality->getDNSName() && *(locality->getDNSName())) {
+ auto_ptr_char temp(locality->getDNSName());
+ if (temp.get()) {
auto_ptr<SimpleAttribute> dns(new SimpleAttribute(vector<string>(1, m_subjectDNS)));
- auto_ptr_char temp(locality->getDNSName());
- if (temp.get()) {
- dns->getValues().push_back(temp.get());
- attributes.push_back(dns.release());
- }
+ dns->getValues().push_back(temp.get());
+ attributes.push_back(dns.get());
+ dns.release();
}
}
+ }
- if (saml2statement->getAuthnContext()) {
- const AuthnContext* ac = saml2statement->getAuthnContext();
- // AuthnContextClassRef
- if (!m_authnClass.empty() && ac->getAuthnContextClassRef() && ac->getAuthnContextClassRef()->getReference()) {
+ if (saml2statement->getAuthnContext()) {
+ const AuthnContext* ac = saml2statement->getAuthnContext();
+ // AuthnContextClassRef
+ if (!m_authnClass.empty() && ac->getAuthnContextClassRef() && ac->getAuthnContextClassRef()->getReference()) {
+ auto_ptr_char temp(ac->getAuthnContextClassRef()->getReference());
+ if (temp.get()) {
auto_ptr<SimpleAttribute> classref(new SimpleAttribute(vector<string>(1, m_authnClass)));
- auto_ptr_char temp(ac->getAuthnContextClassRef()->getReference());
- if (temp.get()) {
- classref->getValues().push_back(temp.get());
- attributes.push_back(classref.release());
- }
+ classref->getValues().push_back(temp.get());
+ attributes.push_back(classref.get());
+ classref.release();
}
+ }
- // AuthnContextDeclRef
- if (!m_authnDecl.empty() && ac->getAuthnContextDeclRef() && ac->getAuthnContextDeclRef()->getReference()) {
+ // AuthnContextDeclRef
+ if (!m_authnDecl.empty() && ac->getAuthnContextDeclRef() && ac->getAuthnContextDeclRef()->getReference()) {
+ auto_ptr_char temp(ac->getAuthnContextDeclRef()->getReference());
+ if (temp.get()) {
auto_ptr<SimpleAttribute> declref(new SimpleAttribute(vector<string>(1, m_authnDecl)));
- auto_ptr_char temp(ac->getAuthnContextDeclRef()->getReference());
- if (temp.get()) {
- declref->getValues().push_back(temp.get());
- attributes.push_back(declref.release());
- }
+ declref->getValues().push_back(temp.get());
+ attributes.push_back(declref.get());
+ declref.release();
}
+ }
- // AuthenticatingAuthority
- if (!m_authnAuthority.empty() && !ac->getAuthenticatingAuthoritys().empty()) {
- auto_ptr<SimpleAttribute> attr(new SimpleAttribute(vector<string>(1, m_authnAuthority)));
-
const vector<AuthenticatingAuthority*>& authorities = ac->getAuthenticatingAuthoritys();
-
for (vector<AuthenticatingAuthority*>::const_iterator a = authorities.begin(); a != authorities.end(); ++a) {
- auto_ptr_char temp((*a)->getID());
- if (temp.get())
- attr->getValues().push_back(temp.get());
- }
- if (attr->valueCount() > 0) {
- attributes.push_back(attr.release());
- }
+ // AuthenticatingAuthority
+ if (!m_authnAuthority.empty() && !ac->getAuthenticatingAuthoritys().empty()) {
+ auto_ptr<SimpleAttribute> attr(new SimpleAttribute(vector<string>(1, m_authnAuthority)));
+ const vector<AuthenticatingAuthority*>& authorities = ac->getAuthenticatingAuthoritys();
+ for (vector<AuthenticatingAuthority*>::const_iterator a = authorities.begin(); a != authorities.end(); ++a) {
+ auto_ptr_char temp((*a)->getID());
+ if (temp.get())
+ attr->getValues().push_back(temp.get());
+ }
+ if (attr->valueCount() > 0) {
+ attributes.push_back(attr.get());
+ attr.release();
}
}
}
- else {
- const saml1::Assertion* saml1assertion = dynamic_cast<const saml1::Assertion*>(&xmlObject);
- if (saml1assertion) {
- // Issuer
- if (!m_issuer.empty()) {
- if (saml1assertion->getIssuer() && *(saml1assertion->getIssuer())) {
- auto_ptr<SimpleAttribute> issuer(new SimpleAttribute(vector<string>(1, m_issuer)));
- auto_ptr_char temp(saml1assertion->getIssuer());
- if (temp.get()) {
- issuer->getValues().push_back(temp.get());
- attributes.push_back(issuer.release());
- }
- }
+
+ return;
+ }
+
+ const saml1::Assertion* saml1assertion = dynamic_cast<const saml1::Assertion*>(&xmlObject);
+ if (saml1assertion) {
+ // Issuer
+ if (!m_issuer.empty()) {
+ if (saml1assertion->getIssuer() && *(saml1assertion->getIssuer())) {
+ auto_ptr_char temp(saml1assertion->getIssuer());
+ if (temp.get()) {
+ auto_ptr<SimpleAttribute> issuer(new SimpleAttribute(vector<string>(1, m_issuer)));
+ issuer->getValues().push_back(temp.get());
+ attributes.push_back(issuer.get());
+ issuer.release();
}
+ }
+ }
+
+ // NotOnOrAfter
+ if (!m_notOnOrAfter.empty() && saml1assertion->getConditions() && saml1assertion->getConditions()->getNotOnOrAfter()) {
+ auto_ptr_char temp(saml1assertion->getConditions()->getNotOnOrAfter()->getRawData());
+ if (temp.get()) {
+ auto_ptr<SimpleAttribute> notonorafter(new SimpleAttribute(vector<string>(1, m_notOnOrAfter)));
+ notonorafter->getValues().push_back(temp.get());
+ attributes.push_back(notonorafter.get());
+ notonorafter.release();
+ }
+ }
+
+ return;
+ }
- // NotOnOrAfter
- if (!m_notOnOrAfter.empty() && saml1assertion->getConditions() && saml1assertion->getConditions()->getNotOnOrAfter()) {
- auto_ptr<SimpleAttribute> notonorafter(new SimpleAttribute(vector<string>(1, m_notOnOrAfter)));
- auto_ptr_char temp(saml1assertion->getConditions()->getNotOnOrAfter()->getRawData());
- if (temp.get()) {
- notonorafter->getValues().push_back(temp.get());
- attributes.push_back(notonorafter.release());
- }
+ const AuthenticationStatement* saml1statement = dynamic_cast<const AuthenticationStatement*>(&xmlObject);
+ if (saml1statement) {
+ // AuthnInstant
+ if (!m_authnInstant.empty() && saml1statement->getAuthenticationInstant()) {
+ auto_ptr_char temp(saml1statement->getAuthenticationInstant()->getRawData());
+ if (temp.get()) {
+ auto_ptr<SimpleAttribute> authninstant(new SimpleAttribute(vector<string>(1, m_authnInstant)));
+ authninstant->getValues().push_back(temp.get());
+ attributes.push_back(authninstant.get());
+ authninstant.release();
+ }
+ }
+
+ // AuthenticationMethod
+ if (!m_authnClass.empty() && saml1statement->getAuthenticationMethod() && *(saml1statement->getAuthenticationMethod())) {
+ auto_ptr_char temp(saml1statement->getAuthenticationMethod());
+ if (temp.get()) {
+ auto_ptr<SimpleAttribute> authnmethod(new SimpleAttribute(vector<string>(1, m_authnClass)));
+ authnmethod->getValues().push_back(temp.get());
+ attributes.push_back(authnmethod.get());
+ authnmethod.release();
+ }
+ }
+
+ if (saml1statement->getSubjectLocality()) {
+ const saml1::SubjectLocality* locality = saml1statement->getSubjectLocality();
+ // IPAddress
+ if (!m_subjectAddress.empty() && locality->getIPAddress() && *(locality->getIPAddress())) {
+ auto_ptr_char temp(locality->getIPAddress());
+ if (temp.get()) {
+ auto_ptr<SimpleAttribute> address(new SimpleAttribute(vector<string>(1, m_subjectAddress)));
+ address->getValues().push_back(temp.get());
+ attributes.push_back(address.get());
+ address.release();
}
}
- else {
- const AuthenticationStatement* saml1statement = dynamic_cast<const AuthenticationStatement*>(&xmlObject);
- if (saml1statement) {
- // AuthnInstant
- if (!m_authnInstant.empty() && saml1statement->getAuthenticationInstant()) {
- auto_ptr<SimpleAttribute> authninstant(new SimpleAttribute(vector<string>(1, m_authnInstant)));
- auto_ptr_char temp(saml1statement->getAuthenticationInstant()->getRawData());
- if (temp.get()) {
- authninstant->getValues().push_back(temp.get());
- attributes.push_back(authninstant.release());
- }
- }
-
- // AuthenticationMethod
- if (!m_authnClass.empty() && saml1statement->getAuthenticationMethod() && *(saml1statement->getAuthenticationMethod())) {
- auto_ptr<SimpleAttribute> authnmethod(new SimpleAttribute(vector<string>(1, m_authnClass)));
- auto_ptr_char temp(saml1statement->getAuthenticationMethod());
- if (temp.get()) {
- authnmethod->getValues().push_back(temp.get());
- attributes.push_back(authnmethod.release());
- }
- }
-
- if (saml1statement->getSubjectLocality()) {
- const saml1::SubjectLocality* locality = saml1statement->getSubjectLocality();
- // IPAddress
- if (!m_subjectAddress.empty() && locality->getIPAddress() && *(locality->getIPAddress())) {
- auto_ptr<SimpleAttribute> address(new SimpleAttribute(vector<string>(1, m_subjectAddress)));
- auto_ptr_char temp(locality->getIPAddress());
- if (temp.get()) {
- address->getValues().push_back(temp.get());
- attributes.push_back(address.release());
- }
- }
-
- // DNSAddress
- if (!m_subjectDNS.empty() && locality->getDNSAddress() && *(locality->getDNSAddress())) {
- auto_ptr<SimpleAttribute> dns(new SimpleAttribute(vector<string>(1, m_subjectDNS)));
- auto_ptr_char temp(locality->getDNSAddress());
- if (temp.get()) {
- dns->getValues().push_back(temp.get());
- attributes.push_back(dns.release());
- }
- }
- }
+
+ // DNSAddress
+ if (!m_subjectDNS.empty() && locality->getDNSAddress() && *(locality->getDNSAddress())) {
+ auto_ptr_char temp(locality->getDNSAddress());
+ if (temp.get()) {
+ auto_ptr<SimpleAttribute> dns(new SimpleAttribute(vector<string>(1, m_subjectDNS)));
+ dns->getValues().push_back(temp.get());
+ attributes.push_back(dns.get());
+ dns.release();
}
}
}
attributes.push_back(m_subjectAddress);
if (!m_subjectDNS.empty())
attributes.push_back(m_subjectDNS);
+ if (!m_consent.empty())
+ attributes.push_back(m_consent);
}
projects / shibboleth / sp.git / blobdiff