#include "Application.h"
#include "ServiceProvider.h"
#include "SessionCache.h"
-#include "attribute/Attribute.h"
+#include "attribute/SimpleAttribute.h"
#include "attribute/filtering/AttributeFilter.h"
#include "attribute/filtering/BasicFilteringContext.h"
#include "attribute/resolver/AttributeExtractor.h"
#include <saml/saml2/metadata/Metadata.h>
#include <saml/saml2/metadata/MetadataCredentialCriteria.h>
#include <saml/saml2/metadata/MetadataProvider.h>
+#include <xmltooling/XMLToolingConfig.h>
#include <xmltooling/util/NDC.h>
+#include <xmltooling/util/URLEncoder.h>
#include <xmltooling/util/XMLHelper.h>
#include <xercesc/util/XMLUniDefs.hpp>
}
private:
- bool SAML1Query(QueryContext& ctx) const;
- bool SAML2Query(QueryContext& ctx) const;
+ void SAML1Query(QueryContext& ctx) const;
+ void SAML2Query(QueryContext& ctx) const;
Category& m_log;
string m_policyId;
bool m_subjectMatch;
vector<AttributeDesignator*> m_SAML1Designators;
vector<saml2::Attribute*> m_SAML2Designators;
+ vector<string> m_exceptionId;
};
AttributeResolver* SHIBSP_DLLLOCAL QueryResolverFactory(const DOMElement* const & e)
return new QueryResolver(e);
}
+ static const XMLCh exceptionId[] = UNICODE_LITERAL_11(e,x,c,e,p,t,i,o,n,I,d);
static const XMLCh policyId[] = UNICODE_LITERAL_8(p,o,l,i,c,y,I,d);
static const XMLCh subjectMatch[] = UNICODE_LITERAL_12(s,u,b,j,e,c,t,M,a,t,c,h);
};
}
child = XMLHelper::getNextSiblingElement(child);
}
+
+ string exid(XMLHelper::getAttrString(e, nullptr, exceptionId));
+ if (!exid.empty())
+ m_exceptionId.push_back(exid);
}
-bool QueryResolver::SAML1Query(QueryContext& ctx) const
+void QueryResolver::SAML1Query(QueryContext& ctx) const
{
#ifdef _DEBUG
xmltooling::NDC ndc("query");
find_if(ctx.getEntityDescriptor()->getAttributeAuthorityDescriptors(), isValidForProtocol(ctx.getProtocol()));
if (!AA) {
m_log.warn("no SAML 1.%d AttributeAuthority role found in metadata", version);
- return false;
+ return;
}
const Application& application = ctx.getApplication();
if (!response) {
m_log.error("unable to obtain a SAML response from attribute authority");
- return false;
+ throw BindingException("Unable to obtain a SAML response from attribute authority.");
}
else if (!response->getStatus() || !response->getStatus()->getStatusCode() || response->getStatus()->getStatusCode()->getValue()==nullptr ||
*(response->getStatus()->getStatusCode()->getValue()) != saml1p::StatusCode::SUCCESS) {
delete response;
m_log.error("attribute authority returned a SAML error");
- return true;
+ throw FatalProfileException("Attribute authority returned a SAML error.");
}
const vector<saml1::Assertion*>& assertions = const_cast<const saml1p::Response*>(response)->getAssertions();
if (assertions.empty()) {
delete response;
m_log.warn("response from attribute authority was empty");
- return true;
+ return;
}
- else if (assertions.size()>1)
+ else if (assertions.size()>1) {
m_log.warn("simple resolver only supports one assertion in the query response");
+ }
auto_ptr<saml1p::Response> wrapper(response);
saml1::Assertion* newtoken = assertions.front();
pair<bool,bool> signedAssertions = relyingParty->getBool("requireSignedAssertions");
if (!newtoken->getSignature() && signedAssertions.first && signedAssertions.second) {
m_log.error("assertion unsigned, rejecting it based on signedAssertions policy");
- return true;
+ throw SecurityPolicyException("Rejected unsigned assertion based on local policy.");
}
try {
}
catch (exception& ex) {
m_log.error("assertion failed policy validation: %s", ex.what());
- return true;
+ throw;
}
newtoken->detach();
m_log.error("caught exception extracting/filtering attributes from query result: %s", ex.what());
for_each(ctx.getResolvedAttributes().begin(), ctx.getResolvedAttributes().end(), xmltooling::cleanup<shibsp::Attribute>());
ctx.getResolvedAttributes().clear();
+ throw;
}
-
- return true;
}
-bool QueryResolver::SAML2Query(QueryContext& ctx) const
+void QueryResolver::SAML2Query(QueryContext& ctx) const
{
#ifdef _DEBUG
xmltooling::NDC ndc("query");
find_if(ctx.getEntityDescriptor()->getAttributeAuthorityDescriptors(), isValidForProtocol(samlconstants::SAML20P_NS));
if (!AA) {
m_log.warn("no SAML 2 AttributeAuthority role found in metadata");
- return false;
+ return;
}
const Application& application = ctx.getApplication();
if (!srt) {
m_log.error("unable to obtain a SAML response from attribute authority");
- return false;
+ throw BindingException("Unable to obtain a SAML response from attribute authority.");
}
auto_ptr<saml2p::StatusResponseType> wrapper(srt);
saml2p::Response* response = dynamic_cast<saml2p::Response*>(srt);
if (!response) {
m_log.error("message was not a samlp:Response");
- return true;
+ throw FatalProfileException("Attribute authority returned an unrecognized message.");
}
else if (!response->getStatus() || !response->getStatus()->getStatusCode() ||
!XMLString::equals(response->getStatus()->getStatusCode()->getValue(), saml2p::StatusCode::SUCCESS)) {
m_log.error("attribute authority returned a SAML error");
- return true;
+ throw FatalProfileException("Attribute authority returned a SAML error.");
}
saml2::Assertion* newtoken = nullptr;
const vector<saml2::EncryptedAssertion*>& encassertions = const_cast<const saml2p::Response*>(response)->getEncryptedAssertions();
if (encassertions.empty()) {
m_log.warn("response from attribute authority was empty");
- return true;
+ return;
}
else if (encassertions.size() > 1) {
m_log.warn("simple resolver only supports one assertion in the query response");
CredentialResolver* cr=application.getCredentialResolver();
if (!cr) {
m_log.warn("found encrypted assertion, but no CredentialResolver was available");
- return true;
+ throw FatalProfileException("Assertion was encrypted, but no decryption credentials are available.");
}
// Attempt to decrypt it.
tokenwrapper.release();
if (m_log.isDebugEnabled())
m_log.debugStream() << "decrypted Assertion: " << *newtoken << logging::eol;
+ // Free the Response now, so we know this is a stand-alone token later.
+ delete wrapper.release();
}
}
catch (exception& ex) {
m_log.error(ex.what());
- }
- if (newtoken) {
- // Free the Response now, so we know this is a stand-alone token later.
- delete wrapper.release();
- }
- else {
- // Nothing decrypted, should already be logged.
- return true;
+ throw;
}
}
else {
m_log.error("assertion unsigned, rejecting it based on signedAssertions policy");
if (!wrapper.get())
delete newtoken;
- return true;
+ throw SecurityPolicyException("Rejected unsigned assertion based on local policy.");
}
try {
m_log.warn("ignoring Assertion without NameID in Subject");
if (!wrapper.get())
delete newtoken;
- return true;
+ return;
}
}
}
m_log.error("assertion failed policy validation: %s", ex.what());
if (!wrapper.get())
delete newtoken;
- return true;
+ throw;
}
if (wrapper.get()) {
m_log.error("caught exception extracting/filtering attributes from query result: %s", ex.what());
for_each(ctx.getResolvedAttributes().begin(), ctx.getResolvedAttributes().end(), xmltooling::cleanup<shibsp::Attribute>());
ctx.getResolvedAttributes().clear();
+ throw;
}
-
- return true;
}
void QueryResolver::resolveAttributes(ResolutionContext& ctx) const
return;
}
- if (qctx.getNameID() && qctx.getEntityDescriptor()) {
- if (XMLString::equals(qctx.getProtocol(), samlconstants::SAML20P_NS)) {
- m_log.debug("attempting SAML 2.0 attribute query");
- SAML2Query(qctx);
- }
- else if (XMLString::equals(qctx.getProtocol(), samlconstants::SAML11_PROTOCOL_ENUM) ||
- XMLString::equals(qctx.getProtocol(), samlconstants::SAML10_PROTOCOL_ENUM)) {
- m_log.debug("attempting SAML 1.x attribute query");
- SAML1Query(qctx);
+ try {
+ if (qctx.getNameID() && qctx.getEntityDescriptor()) {
+ if (XMLString::equals(qctx.getProtocol(), samlconstants::SAML20P_NS)) {
+ m_log.debug("attempting SAML 2.0 attribute query");
+ SAML2Query(qctx);
+ }
+ else if (XMLString::equals(qctx.getProtocol(), samlconstants::SAML11_PROTOCOL_ENUM) ||
+ XMLString::equals(qctx.getProtocol(), samlconstants::SAML10_PROTOCOL_ENUM)) {
+ m_log.debug("attempting SAML 1.x attribute query");
+ SAML1Query(qctx);
+ }
+ else {
+ m_log.info("SSO protocol does not allow for attribute query");
+ }
}
else {
- m_log.info("SSO protocol does not allow for attribute query");
+ m_log.warn("can't attempt attribute query, either no NameID or no metadata to use");
}
}
- else {
- m_log.warn("can't attempt attribute query, either no NameID or no metadata to use");
+ catch (exception& ex) {
+ // Already logged.
+ if (!m_exceptionId.empty()) {
+ SimpleAttribute* attr = new SimpleAttribute(m_exceptionId);
+ attr->getValues().push_back(XMLToolingConfig::getConfig().getURLEncoder()->encode(ex.what()));
+ qctx.getResolvedAttributes().push_back(attr);
+ }
}
}
#include "ServiceProvider.h"
#include "SessionCache.h"
#include "attribute/NameIDAttribute.h"
+#include "attribute/SimpleAttribute.h"
#include "attribute/filtering/AttributeFilter.h"
#include "attribute/filtering/BasicFilteringContext.h"
#include "attribute/resolver/AttributeExtractor.h"
#include <xmltooling/XMLToolingConfig.h>
#include <xmltooling/security/TrustEngine.h>
#include <xmltooling/util/NDC.h>
+#include <xmltooling/util/URLEncoder.h>
#include <xmltooling/util/XMLHelper.h>
#include <xercesc/util/XMLUniDefs.hpp>
}
private:
- bool doQuery(SimpleAggregationContext& ctx, const char* entityID, const NameID* name) const;
+ void doQuery(SimpleAggregationContext& ctx, const char* entityID, const NameID* name) const;
Category& m_log;
string m_policyId;
TrustEngine* m_trust;
vector<saml2::Attribute*> m_designators;
vector< pair<string,bool> > m_sources;
+ vector<string> m_exceptionId;
};
AttributeResolver* SHIBSP_DLLLOCAL SimpleAggregationResolverFactory(const DOMElement* const & e)
static const XMLCh attributeId[] = UNICODE_LITERAL_11(a,t,t,r,i,b,u,t,e,I,d);
static const XMLCh Entity[] = UNICODE_LITERAL_6(E,n,t,i,t,y);
static const XMLCh EntityReference[] = UNICODE_LITERAL_15(E,n,t,i,t,y,R,e,f,e,r,e,n,c,e);
+ static const XMLCh exceptionId[] = UNICODE_LITERAL_11(e,x,c,e,p,t,i,o,n,I,d);
static const XMLCh format[] = UNICODE_LITERAL_6(f,o,r,m,a,t);
static const XMLCh _MetadataProvider[] = UNICODE_LITERAL_16(M,e,t,a,d,a,t,a,P,r,o,v,i,d,e,r);
static const XMLCh policyId[] = UNICODE_LITERAL_8(p,o,l,i,c,y,I,d);
m_format = aid;
}
+ string exid(XMLHelper::getAttrString(e, nullptr, exceptionId));
+ if (!exid.empty())
+ m_exceptionId.push_back(exid);
+
DOMElement* child = XMLHelper::getFirstChildElement(e, _MetadataProvider);
if (child) {
string t(XMLHelper::getAttrString(child, nullptr, _type));
}
}
-bool SimpleAggregationResolver::doQuery(SimpleAggregationContext& ctx, const char* entityID, const NameID* name) const
+void SimpleAggregationResolver::doQuery(SimpleAggregationContext& ctx, const char* entityID, const NameID* name) const
{
#ifdef _DEBUG
xmltooling::NDC ndc("doQuery");
(m_metadata ? m_metadata : application.getMetadataProvider())->getEntityDescriptor(mc);
if (!mdresult.first) {
m_log.warn("unable to locate metadata for provider (%s)", entityID);
- return false;
+ return;
}
else if (!(AA=dynamic_cast<const AttributeAuthorityDescriptor*>(mdresult.second))) {
m_log.warn("no SAML 2 AttributeAuthority role found in metadata for (%s)", entityID);
- return false;
+ return;
}
const PropertySet* relyingParty = application.getRelyingParty(mdresult.first);
if (!srt) {
m_log.error("unable to obtain a SAML response from attribute authority (%s)", entityID);
- return false;
+ throw BindingException("Unable to obtain a SAML response from attribute authority.");
}
auto_ptr<saml2p::StatusResponseType> wrapper(srt);
saml2p::Response* response = dynamic_cast<saml2p::Response*>(srt);
if (!response) {
m_log.error("message was not a samlp:Response");
- return true;
+ throw FatalProfileException("Attribute authority returned an unrecognized message.");
}
else if (!response->getStatus() || !response->getStatus()->getStatusCode() ||
!XMLString::equals(response->getStatus()->getStatusCode()->getValue(), saml2p::StatusCode::SUCCESS)) {
m_log.error("attribute authority (%s) returned a SAML error", entityID);
- return true;
+ throw FatalProfileException("Attribute authority returned a SAML error.");
}
saml2::Assertion* newtoken = nullptr;
const_cast<const saml2p::Response*>(response)->getEncryptedAssertions();
if (encassertions.empty()) {
m_log.warn("response from attribute authority was empty");
- return true;
+ return;
}
else if (encassertions.size() > 1) {
m_log.warn("simple resolver only supports one assertion in the query response");
CredentialResolver* cr=application.getCredentialResolver();
if (!cr) {
m_log.warn("found encrypted assertion, but no CredentialResolver was available");
- return true;
+ throw FatalProfileException("Assertion was encrypted, but no decryption credentials are available.");
}
// Attempt to decrypt it.
tokenwrapper.release();
if (m_log.isDebugEnabled())
m_log.debugStream() << "decrypted Assertion: " << *newtoken << logging::eol;
+ // Free the Response now, so we know this is a stand-alone token later.
+ delete wrapper.release();
}
}
catch (exception& ex) {
m_log.error(ex.what());
- }
- if (newtoken) {
- // Free the Response now, so we know this is a stand-alone token later.
- delete wrapper.release();
- }
- else {
- // Nothing decrypted, should already be logged.
- return true;
+ throw;
}
}
else {
m_log.error("assertion unsigned, rejecting it based on signedAssertions policy");
if (!wrapper.get())
delete newtoken;
- return true;
+ throw SecurityPolicyException("Rejected unsigned assertion based on local policy.");
}
try {
m_log.warn("ignoring Assertion without NameID in Subject");
if (!wrapper.get())
delete newtoken;
- return true;
+ return;
}
}
}
m_log.error("assertion failed policy validation: %s", ex.what());
if (!wrapper.get())
delete newtoken;
- return true;
+ throw;
}
if (wrapper.get()) {
m_log.error("caught exception extracting/filtering attributes from query result: %s", ex.what());
for_each(ctx.getResolvedAttributes().begin(), ctx.getResolvedAttributes().end(), xmltooling::cleanup<shibsp::Attribute>());
ctx.getResolvedAttributes().clear();
+ throw;
}
-
- return true;
}
void SimpleAggregationResolver::resolveAttributes(ResolutionContext& ctx) const
if (qctx.getEntityID())
history.insert(qctx.getEntityID());
+ // Prepare to track exceptions.
+ SimpleAttribute* exceptAttr = nullptr;
+ if (!m_exceptionId.empty()) {
+ exceptAttr = new SimpleAttribute(m_exceptionId);
+ }
+ auto_ptr<Attribute> exceptWrapper(exceptAttr);
+
// We have a master loop over all the possible sources of material.
for (vector< pair<string,bool> >::const_iterator source = m_sources.begin(); source != m_sources.end(); ++source) {
if (source->second) {
// A literal entityID to query.
if (history.count(source->first) == 0) {
m_log.debug("issuing SAML query to (%s)", source->first.c_str());
- doQuery(qctx, source->first.c_str(), n ? n : qctx.getNameID());
+ try {
+ doQuery(qctx, source->first.c_str(), n ? n : qctx.getNameID());
+ }
+ catch (exception& ex) {
+ if (exceptAttr)
+ exceptAttr->getValues().push_back(XMLToolingConfig::getConfig().getURLEncoder()->encode(ex.what()));
+ }
history.insert(source->first);
}
else {
for (vector<string>::const_iterator link = links.begin(); link != links.end(); ++link) {
if (history.count(*link) == 0) {
m_log.debug("issuing SAML query to (%s)", link->c_str());
- doQuery(qctx, link->c_str(), n ? n : qctx.getNameID());
+ try {
+ doQuery(qctx, link->c_str(), n ? n : qctx.getNameID());
+ }
+ catch (exception& ex) {
+ if (exceptAttr)
+ exceptAttr->getValues().push_back(XMLToolingConfig::getConfig().getURLEncoder()->encode(ex.what()));
+ }
history.insert(*link);
}
else {
for (vector<string>::const_iterator link = links.begin(); link != links.end(); ++link) {
if (history.count(*link) == 0) {
m_log.debug("issuing SAML query to (%s)", link->c_str());
- doQuery(qctx, link->c_str(), n ? n : qctx.getNameID());
+ try {
+ doQuery(qctx, link->c_str(), n ? n : qctx.getNameID());
+ }
+ catch (exception& ex) {
+ if (exceptAttr)
+ exceptAttr->getValues().push_back(XMLToolingConfig::getConfig().getURLEncoder()->encode(ex.what()));
+ }
history.insert(*link);
}
else {
}
}
}
+
+ if (exceptAttr) {
+ qctx.getResolvedAttributes().push_back(exceptWrapper.release());
+ }
}
projects / shibboleth / sp.git / commitdiff