#include <xercesc/util/XMLUniDefs.hpp>
#ifndef SHIBSP_LITE
-# include <shibsp/attribute/Attribute.h>
-# include <shibsp/attribute/filtering/AttributeFilter.h>
-# include <shibsp/attribute/filtering/BasicFilteringContext.h>
-# include <shibsp/attribute/resolver/AttributeExtractor.h>
# include <shibsp/attribute/resolver/ResolutionContext.h>
# include <saml/SAMLConfig.h>
# include <saml/saml1/core/Assertions.h>
# include <saml/saml2/core/Assertions.h>
# include <saml/saml2/metadata/Metadata.h>
# include <saml/saml2/metadata/EndpointManager.h>
+# include <saml/saml2/profile/AssertionValidator.h>
# include <xmltooling/impl/AnyElement.h>
# include <xmltooling/validation/ValidatorSuite.h>
using namespace opensaml::saml2md;
+# ifndef min
+# define min(a,b) (((a) < (b)) ? (a) : (b))
+# endif
#endif
using namespace shibsp;
using namespace opensaml;
virtual ~ADFSDecoder() {}
XMLObject* decode(string& relayState, const GenericRequest& genericRequest, SecurityPolicy& policy) const;
- };
- MessageDecoder* ADFSDecoderFactory(const pair<const DOMElement*,const XMLCh*>& p)
- {
- return new ADFSDecoder();
- }
-
- class SHIBSP_DLLLOCAL ADFSMessageRule : public SecurityPolicyRule
- {
- public:
- ADFSMessageRule(const DOMElement* e) : m_protocol(WSFED_NS) {}
- virtual ~ADFSMessageRule() {}
-
- const char* getType() const {
- return "ADFSMessage";
+ protected:
+ void extractMessageDetails(
+ const XMLObject& message, const GenericRequest& req, const XMLCh* protocol, SecurityPolicy& policy
+ ) const {
}
- void evaluate(const XMLObject& message, const GenericRequest* request, const XMLCh* protocol, SecurityPolicy& policy) const;
-
- auto_ptr_XMLCh m_protocol;
};
- SecurityPolicyRule* ADFSMessageRuleFactory(const DOMElement* const & e)
+ MessageDecoder* ADFSDecoderFactory(const pair<const DOMElement*,const XMLCh*>& p)
{
- return new ADFSMessageRule(e);
+ return new ADFSDecoder();
}
#endif
{
public:
ADFSSessionInitiator(const DOMElement* e, const char* appId)
- : AbstractHandler(e, Category::getInstance(SHIBSP_LOGCAT".SessionInitiator")), m_appId(appId), m_binding(WSFED_NS) {
+ : AbstractHandler(e, Category::getInstance(SHIBSP_LOGCAT".SessionInitiator.ADFS")), m_appId(appId), m_binding(WSFED_NS) {
// If Location isn't set, defer address registration until the setParent call.
pair<bool,const char*> loc = getString("Location");
if (loc.first) {
}
void receive(DDF& in, ostream& out);
- pair<bool,long> run(SPRequest& request, const char* entityID=NULL, bool isHandler=true) const;
+ pair<bool,long> run(SPRequest& request, string& entityID, bool isHandler=true) const;
private:
pair<bool,long> doRequest(
HTTPResponse& httpResponse,
const char* entityID,
const char* acsLocation,
+ const char* authnContextClassRef,
string& relayState
) const;
string m_appId;
ADFSConsumer(const DOMElement* e, const char* appId)
: shibsp::AssertionConsumerService(e, appId, Category::getInstance(SHIBSP_LOGCAT".SSO.ADFS"))
#ifndef SHIBSP_LITE
- ,m_messageRule(e)
+ ,m_protocol(WSFED_NS)
#endif
{}
virtual ~ADFSConsumer() {}
- private:
#ifndef SHIBSP_LITE
- string implementProtocol(
+ void generateMetadata(SPSSODescriptor& role, const char* handlerURL) const {
+ AssertionConsumerService::generateMetadata(role, handlerURL);
+ role.addSupport(m_protocol.get());
+ }
+
+ auto_ptr_XMLCh m_protocol;
+
+ private:
+ void implementProtocol(
const Application& application,
const HTTPRequest& httpRequest,
+ HTTPResponse& httpResponse,
SecurityPolicy& policy,
const PropertySet* settings,
const XMLObject& xmlObject
) const;
- ADFSMessageRule m_messageRule;
#endif
};
- class SHIBSP_DLLLOCAL ADFSLogoutInitiator : public AbstractHandler, public LogoutHandler
+ class SHIBSP_DLLLOCAL ADFSLogoutInitiator : public AbstractHandler, public RemotedHandler
{
public:
ADFSLogoutInitiator(const DOMElement* e, const char* appId)
- : AbstractHandler(e, Category::getInstance(SHIBSP_LOGCAT".SessionInitiator")), m_appId(appId), m_binding(WSFED_NS) {
+ : AbstractHandler(e, Category::getInstance(SHIBSP_LOGCAT".LogoutInitiator.ADFS")), m_appId(appId), m_binding(WSFED_NS) {
// If Location isn't set, defer address registration until the setParent call.
pair<bool,const char*> loc = getString("Location");
if (loc.first) {
void receive(DDF& in, ostream& out);
pair<bool,long> run(SPRequest& request, bool isHandler=true) const;
+#ifndef SHIBSP_LITE
+ const char* getType() const {
+ return "LogoutInitiator";
+ }
+#endif
+
private:
- pair<bool,long> doRequest(
- const Application& application, const char* requestURL, Session* session, HTTPResponse& httpResponse
- ) const;
+ pair<bool,long> doRequest(const Application& application, const char* entityID, HTTPResponse& httpResponse) const;
string m_appId;
auto_ptr_XMLCh m_binding;
pair<bool,long> run(SPRequest& request, bool isHandler=true) const;
+#ifndef SHIBSP_LITE
+ void generateMetadata(SPSSODescriptor& role, const char* handlerURL) const {
+ m_login.generateMetadata(role, handlerURL);
+ const char* loc = getString("Location").second;
+ string hurl(handlerURL);
+ if (*loc != '/')
+ hurl += '/';
+ hurl += loc;
+ auto_ptr_XMLCh widen(hurl.c_str());
+ SingleLogoutService* ep = SingleLogoutServiceBuilder::buildSingleLogoutService();
+ ep->setLocation(widen.get());
+ ep->setBinding(m_login.m_protocol.get());
+ role.getSingleLogoutServices().push_back(ep);
+ }
+
+ const char* getType() const {
+ return m_login.getType();
+ }
+#endif
+
private:
ADFSConsumer m_login;
};
conf.AssertionConsumerServiceManager.registerFactory(WSFED_NS, ADFSLogoutFactory);
#ifndef SHIBSP_LITE
SAMLConfig::getConfig().MessageDecoderManager.registerFactory(WSFED_NS, ADFSDecoderFactory);
- SAMLConfig::getConfig().SecurityPolicyRuleManager.registerFactory("ADFSMessage", ADFSMessageRuleFactory);
XMLObjectBuilder::registerBuilder(QName(WSTRUST_NS,"RequestedSecurityToken"), new AnyElementBuilder());
XMLObjectBuilder::registerBuilder(QName(WSTRUST_NS,"RequestSecurityTokenResponse"), new AnyElementBuilder());
#endif
conf.AssertionConsumerServiceManager.deregisterFactory(WSFED_NS);
#ifndef SHIBSP_LITE
SAMLConfig::getConfig().MessageDecoderManager.deregisterFactory(WSFED_NS);
- SAMLConfig::getConfig().SecurityPolicyRuleManager.deregisterFactory("ADFSMessage");
#endif
*/
}
-pair<bool,long> ADFSSessionInitiator::run(SPRequest& request, const char* entityID, bool isHandler) const
+pair<bool,long> ADFSSessionInitiator::run(SPRequest& request, string& entityID, bool isHandler) const
{
// We have to know the IdP to function.
- if (!entityID || !*entityID)
- return make_pair(false,0);
+ if (entityID.empty())
+ return make_pair(false,0L);
string target;
const Handler* ACS=NULL;
const char* option;
+ pair<bool,const char*> acClass;
const Application& app=request.getApplication();
if (isHandler) {
// Since we're passing the ACS by value, we need to compute the return URL,
// so we'll need the target resource for real.
- recoverRelayState(request.getApplication(), request, target, false);
+ recoverRelayState(request.getApplication(), request, request, target, false);
+
+ if (acClass.second = request.getParameter("authnContextClassRef"))
+ acClass.first = true;
+ else
+ acClass = getString("authnContextClassRef");
}
else {
// We're running as a "virtual handler" from within the filter.
// The target resource is the current one and everything else is defaulted.
target=request.getRequestURL();
+
+ const PropertySet* settings = request.getRequestSettings().first;
+ acClass = settings->getString("authnContextClassRef");
+ if (!acClass.first)
+ acClass = getString("authnContextClassRef");
}
// Since we're not passing by index, we need to fully compute the return URL.
- if (!ACS) {
- // Get all the ADFS endpoints.
- const vector<const Handler*>& handlers = app.getAssertionConsumerServicesByBinding(m_binding.get());
-
- // Index comes from request, or default set in the handler, or we just pick the first endpoint.
- pair<bool,unsigned int> index = make_pair(false,0);
- if (isHandler) {
- option = request.getParameter("acsIndex");
- if (option)
- index = make_pair(true, atoi(option));
- }
- if (!index.first)
- index = getUnsignedInt("defaultACSIndex");
- if (index.first) {
- for (vector<const Handler*>::const_iterator h = handlers.begin(); !ACS && h!=handlers.end(); ++h) {
- if (index.second == (*h)->getUnsignedInt("index").second)
- ACS = *h;
- }
- }
- else if (!handlers.empty()) {
- ACS = handlers.front();
+ // Get all the ADFS endpoints.
+ const vector<const Handler*>& handlers = app.getAssertionConsumerServicesByBinding(m_binding.get());
+
+ // Index comes from request, or default set in the handler, or we just pick the first endpoint.
+ pair<bool,unsigned int> index(false,0);
+ if (isHandler) {
+ option = request.getParameter("acsIndex");
+ if (option)
+ index = pair<bool,unsigned int>(true, atoi(option));
+ }
+ if (!index.first)
+ index = getUnsignedInt("defaultACSIndex");
+ if (index.first) {
+ for (vector<const Handler*>::const_iterator h = handlers.begin(); !ACS && h!=handlers.end(); ++h) {
+ if (index.second == (*h)->getUnsignedInt("index").second)
+ ACS = *h;
}
}
+ else if (!handlers.empty()) {
+ ACS = handlers.front();
+ }
if (!ACS)
throw ConfigurationException("Unable to locate ADFS response endpoint.");
target = option;
}
- m_log.debug("attempting to initiate session using ADFS with provider (%s)", entityID);
+ m_log.debug("attempting to initiate session using ADFS with provider (%s)", entityID.c_str());
if (SPConfig::getConfig().isEnabled(SPConfig::OutOfProcess))
- return doRequest(app, request, entityID, ACSloc.c_str(), target);
+ return doRequest(app, request, entityID.c_str(), ACSloc.c_str(), (acClass.first ? acClass.second : NULL), target);
// Remote the call.
DDF out,in = DDF(m_address.c_str()).structure();
DDFJanitor jin(in), jout(out);
in.addmember("application_id").string(app.getId());
- in.addmember("entity_id").string(entityID);
+ in.addmember("entity_id").string(entityID.c_str());
in.addmember("acsLocation").string(ACSloc.c_str());
if (!target.empty())
in.addmember("RelayState").string(target.c_str());
+ if (acClass.first)
+ in.addmember("authnContextClassRef").string(acClass.second);
// Remote the processing.
out = request.getServiceProvider().getListenerService()->send(in);
// Since we're remoted, the result should either be a throw, which we pass on,
// a false/0 return, which we just return as an empty structure, or a response/redirect,
// which we capture in the facade and send back.
- doRequest(*app, *http.get(), entityID, acsLocation, relayState);
+ doRequest(*app, *http.get(), entityID, acsLocation, in["authnContextClassRef"].string(), relayState);
out << ret;
}
HTTPResponse& httpResponse,
const char* entityID,
const char* acsLocation,
+ const char* authnContextClassRef,
string& relayState
) const
{
// Use metadata to invoke the SSO service directly.
MetadataProvider* m=app.getMetadataProvider();
Locker locker(m);
- const EntityDescriptor* entity=m->getEntityDescriptor(entityID);
- if (!entity) {
- m_log.error("unable to locate metadata for provider (%s)", entityID);
- throw MetadataException("Unable to locate metadata for identity provider ($entityID)",
- namedparams(1, "entityID", entityID));
- }
- const IDPSSODescriptor* role=entity->getIDPSSODescriptor(m_binding.get());
- if (!role) {
- m_log.error("unable to locate ADFS-aware identity provider role for provider (%s)", entityID);
- return make_pair(false,0);
- }
- const EndpointType* ep=EndpointManager<SingleSignOnService>(role->getSingleSignOnServices()).getByBinding(m_binding.get());
+ MetadataProvider::Criteria mc(entityID, &IDPSSODescriptor::ELEMENT_QNAME, m_binding.get());
+ pair<const EntityDescriptor*,const RoleDescriptor*> entity=m->getEntityDescriptor(mc);
+ if (!entity.first) {
+ m_log.warn("unable to locate metadata for provider (%s)", entityID);
+ throw MetadataException("Unable to locate metadata for identity provider ($entityID)", namedparams(1, "entityID", entityID));
+ }
+ else if (!entity.second) {
+ m_log.warn("unable to locate ADFS-aware identity provider role for provider (%s)", entityID);
+ if (getParent())
+ return make_pair(false,0L);
+ throw MetadataException("Unable to locate ADFS-aware identity provider role for provider ($entityID)", namedparams(1, "entityID", entityID));
+ }
+ const EndpointType* ep = EndpointManager<SingleSignOnService>(
+ dynamic_cast<const IDPSSODescriptor*>(entity.second)->getSingleSignOnServices()
+ ).getByBinding(m_binding.get());
if (!ep) {
- m_log.error("unable to locate compatible SSO service for provider (%s)", entityID);
- return make_pair(false,0);
+ m_log.warn("unable to locate compatible SSO service for provider (%s)", entityID);
+ if (getParent())
+ return make_pair(false,0L);
+ throw MetadataException("Unable to locate compatible SSO service for provider ($entityID)", namedparams(1, "entityID", entityID));
}
preserveRelayState(app, httpResponse, relayState);
string req=string(dest.get()) + (strchr(dest.get(),'?') ? '&' : '?') + "wa=wsignin1.0&wreply=" + urlenc->encode(acsLocation) +
"&wct=" + urlenc->encode(timebuf) + "&wtrealm=" + urlenc->encode(app.getString("entityID").second);
+ if (authnContextClassRef)
+ req += "&wauth=" + urlenc->encode(authnContextClassRef);
if (!relayState.empty())
req += "&wctx=" + urlenc->encode(relayState.c_str());
return make_pair(true, httpResponse.sendRedirect(req.c_str()));
#else
- return make_pair(false,0);
+ return make_pair(false,0L);
#endif
}
return xmlObject.release();
}
-void ADFSMessageRule::evaluate(const XMLObject& message, const GenericRequest* request, const XMLCh* protocol, SecurityPolicy& policy) const
-{
- Category& log=Category::getInstance(SHIBSP_LOGCAT".SecurityPolicyRule.ADFSMessage");
-
- if (!XMLString::equals(protocol, m_protocol.get()))
- return;
-
- const QName& q = message.getElementQName();
- if (!XMLString::equals(q.getNamespaceURI(), samlconstants::SAML1_NS) ||
- !XMLString::equals(q.getLocalPart(), saml1::Assertion::LOCAL_NAME))
- return;
-
- try {
- const saml1::Assertion& token = dynamic_cast<const saml1::Assertion&>(message);
- policy.setMessageID(token.getAssertionID());
- policy.setIssueInstant(token.getIssueInstantEpoch());
-
- log.debug("extracting issuer from message");
-
- policy.setIssuer(token.getIssuer());
-
- if (log.isDebugEnabled()) {
- auto_ptr_char iname(token.getIssuer());
- 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()) {
- log.debug("searching metadata for message issuer...");
- const EntityDescriptor* entity = policy.getMetadataProvider()->getEntityDescriptor(token.getIssuer());
- if (!entity) {
- auto_ptr_char temp(token.getIssuer());
- log.warn("no metadata found, can't establish identity of issuer (%s)", temp.get());
- return;
- }
-
- log.debug("matched message issuer against metadata, searching for applicable role...");
- const RoleDescriptor* roledesc=entity->getRoleDescriptor(*policy.getRole(), m_protocol.get());
- if (!roledesc) {
- log.warn("unable to find compatible role (%s) in metadata", policy.getRole()->toString().c_str());
- return;
- }
- policy.setIssuerMetadata(roledesc);
- }
- }
- catch (bad_cast&) {
- // Just trap it.
- log.warn("caught a bad_cast while examining message");
- }
-}
-
-string ADFSConsumer::implementProtocol(
+void ADFSConsumer::implementProtocol(
const Application& application,
const HTTPRequest& httpRequest,
+ HTTPResponse& httpResponse,
SecurityPolicy& policy,
const PropertySet* settings,
const XMLObject& xmlObject
response = dynamic_cast<const ElementProxy*>(response->getUnknownXMLObjects().front());
if (!response || !response->hasChildren())
throw FatalProfileException("Token wrapper element did not contain a security token.");
- const saml1::Assertion* token = dynamic_cast<const saml1::Assertion*>(response->getUnknownXMLObjects().front());
+ const Assertion* token = dynamic_cast<const Assertion*>(response->getUnknownXMLObjects().front());
if (!token || !token->getSignature())
- throw FatalProfileException("Incoming message did not contain a signed SAML 1.1 assertion.");
+ throw FatalProfileException("Incoming message did not contain a signed SAML assertion.");
- // Run the policy over the assertion. Handles issuer consistency, replay, freshness,
- // and signature verification, assuming the relevant rules are configured.
- policy.getRules().insert(policy.getRules().begin(), &m_messageRule);
- policy.evaluate(*token, NULL, m_messageRule.m_protocol.get());
+ // Extract message and issuer details from assertion.
+ extractMessageDetails(*token, m_protocol.get(), policy);
+
+ // Run the policy over the assertion. Handles replay, freshness, and
+ // signature verification, assuming the relevant rules are configured.
+ policy.evaluate(*token);
// If no security is in place now, we kick it.
- if (!policy.isSecure())
+ if (!policy.isAuthenticated())
throw SecurityPolicyException("Unable to establish security of incoming assertion.");
- // Now do profile and core semantic validation to ensure we can use it for SSO.
- // Profile validator.
time_t now = time(NULL);
- saml1::AssertionValidator ssoValidator(application.getAudiences(), now);
- ssoValidator.validateAssertion(*token);
- if (!token->getConditions() || !token->getConditions()->getNotBefore() || !token->getConditions()->getNotOnOrAfter())
- throw FatalProfileException("Assertion did not contain time conditions.");
- else if (token->getAuthenticationStatements().empty())
- throw FatalProfileException("Assertion did not contain an authentication statement.");
-
- // With ADFS, we only have one token, but we need to put it in a vector.
- vector<const Assertion*> tokens(1,token);
- const saml1::AuthenticationStatement* ssoStatement=token->getAuthenticationStatements().front();
-
- // Address checking.
- saml1::SubjectLocality* locality = ssoStatement->getSubjectLocality();
- if (locality && locality->getIPAddress()) {
- auto_ptr_char ip(locality->getIPAddress());
- checkAddress(application, httpRequest, ip.get());
- }
+
+ const PropertySet* sessionProps = application.getPropertySet("Sessions");
+ const EntityDescriptor* entity = policy.getIssuerMetadata() ? dynamic_cast<const EntityDescriptor*>(policy.getIssuerMetadata()->getParent()) : NULL;
- m_log.debug("ADFS profile processing completed successfully");
+ saml1::NameIdentifier* saml1name=NULL;
+ saml2::NameID* saml2name=NULL;
+ const XMLCh* authMethod=NULL;
+ const XMLCh* authInstant=NULL;
+ time_t sessionExp = 0;
+
+ const saml1::Assertion* saml1token = dynamic_cast<const saml1::Assertion*>(token);
+ if (saml1token) {
+ // Now do profile and core semantic validation to ensure we can use it for SSO.
+ saml1::AssertionValidator ssoValidator(application.getRelyingParty(entity)->getXMLString("entityID").second, application.getAudiences(), now);
+ ssoValidator.validateAssertion(*saml1token);
+ if (!saml1token->getConditions() || !saml1token->getConditions()->getNotBefore() || !saml1token->getConditions()->getNotOnOrAfter())
+ throw FatalProfileException("Assertion did not contain time conditions.");
+ else if (saml1token->getAuthenticationStatements().empty())
+ throw FatalProfileException("Assertion did not contain an authentication statement.");
+
+ // authnskew allows rejection of SSO if AuthnInstant is too old.
+ pair<bool,unsigned int> authnskew = sessionProps ? sessionProps->getUnsignedInt("maxTimeSinceAuthn") : pair<bool,unsigned int>(false,0);
+
+ const saml1::AuthenticationStatement* ssoStatement=saml1token->getAuthenticationStatements().front();
+ if (authnskew.first && authnskew.second &&
+ ssoStatement->getAuthenticationInstant() && (now - ssoStatement->getAuthenticationInstantEpoch() > authnskew.second))
+ throw FatalProfileException("The gap between now and the time you logged into your identity provider exceeds the limit.");
+
+ // Address checking.
+ saml1::SubjectLocality* locality = ssoStatement->getSubjectLocality();
+ if (locality && locality->getIPAddress()) {
+ auto_ptr_char ip(locality->getIPAddress());
+ checkAddress(application, httpRequest, ip.get());
+ }
- saml1::NameIdentifier* n = ssoStatement->getSubject()->getNameIdentifier();
+ saml1name = ssoStatement->getSubject()->getNameIdentifier();
+ authMethod = ssoStatement->getAuthenticationMethod();
+ if (ssoStatement->getAuthenticationInstant())
+ authInstant = ssoStatement->getAuthenticationInstant()->getRawData();
- // Now we have to extract the authentication details for attribute and session setup.
+ // Session expiration.
+ pair<bool,unsigned int> lifetime = sessionProps ? sessionProps->getUnsignedInt("lifetime") : pair<bool,unsigned int>(true,28800);
+ if (!lifetime.first || lifetime.second == 0)
+ lifetime.second = 28800;
+ sessionExp = now + lifetime.second;
+ }
+ else {
+ const saml2::Assertion* saml2token = dynamic_cast<const saml2::Assertion*>(token);
+ if (!saml2token)
+ throw FatalProfileException("Incoming message did not contain a recognized type of SAML assertion.");
+
+ // Now do profile and core semantic validation to ensure we can use it for SSO.
+ saml2::AssertionValidator ssoValidator(application.getRelyingParty(entity)->getXMLString("entityID").second, application.getAudiences(), now);
+ ssoValidator.validateAssertion(*saml2token);
+ if (!saml2token->getConditions() || !saml2token->getConditions()->getNotBefore() || !saml2token->getConditions()->getNotOnOrAfter())
+ throw FatalProfileException("Assertion did not contain time conditions.");
+ else if (saml2token->getAuthnStatements().empty())
+ throw FatalProfileException("Assertion did not contain an authentication statement.");
+
+ // authnskew allows rejection of SSO if AuthnInstant is too old.
+ pair<bool,unsigned int> authnskew = sessionProps ? sessionProps->getUnsignedInt("maxTimeSinceAuthn") : pair<bool,unsigned int>(false,0);
+
+ const saml2::AuthnStatement* ssoStatement=saml2token->getAuthnStatements().front();
+ if (authnskew.first && authnskew.second &&
+ ssoStatement->getAuthnInstant() && (now - ssoStatement->getAuthnInstantEpoch() > authnskew.second))
+ throw FatalProfileException("The gap between now and the time you logged into your identity provider exceeds the limit.");
+
+ // Address checking.
+ saml2::SubjectLocality* locality = ssoStatement->getSubjectLocality();
+ if (locality && locality->getAddress()) {
+ auto_ptr_char ip(locality->getAddress());
+ checkAddress(application, httpRequest, ip.get());
+ }
- // Session expiration for ADFS is purely SP-driven, and the method is mapped to a ctx class.
- const PropertySet* sessionProps = application.getPropertySet("Sessions");
- pair<bool,unsigned int> lifetime = sessionProps ? sessionProps->getUnsignedInt("lifetime") : pair<bool,unsigned int>(true,28800);
- if (!lifetime.first || lifetime.second == 0)
- lifetime.second = 28800;
+ saml2name = saml2token->getSubject() ? saml2token->getSubject()->getNameID() : NULL;
+ if (ssoStatement->getAuthnContext() && ssoStatement->getAuthnContext()->getAuthnContextClassRef())
+ authMethod = ssoStatement->getAuthnContext()->getAuthnContextClassRef()->getReference();
+ if (ssoStatement->getAuthnInstant())
+ authInstant = ssoStatement->getAuthnInstant()->getRawData();
+
+ // Session expiration for SAML 2.0 is jointly IdP- and SP-driven.
+ sessionExp = ssoStatement->getSessionNotOnOrAfter() ? ssoStatement->getSessionNotOnOrAfterEpoch() : 0;
+ pair<bool,unsigned int> lifetime = sessionProps ? sessionProps->getUnsignedInt("lifetime") : pair<bool,unsigned int>(true,28800);
+ if (!lifetime.first || lifetime.second == 0)
+ lifetime.second = 28800;
+ if (sessionExp == 0)
+ sessionExp = now + lifetime.second; // IdP says nothing, calulate based on SP.
+ else
+ sessionExp = min(sessionExp, now + lifetime.second); // Use the lowest.
+ }
+
+ m_log.debug("ADFS profile processing completed successfully");
// We've successfully "accepted" the SSO token.
// To complete processing, we need to extract and resolve attributes and then create the session.
- vector<Attribute*> resolvedAttributes;
- AttributeExtractor* extractor = application.getAttributeExtractor();
- if (extractor) {
- m_log.debug("extracting pushed attributes...");
- Locker extlocker(extractor);
- if (n) {
- try {
- extractor->extractAttributes(application, policy.getIssuerMetadata(), *n, resolvedAttributes);
- }
- catch (exception& ex) {
- m_log.error("caught exception extracting attributes: %s", ex.what());
- }
- }
- try {
- extractor->extractAttributes(application, policy.getIssuerMetadata(), *token, resolvedAttributes);
- }
- catch (exception& ex) {
- m_log.error("caught exception extracting attributes: %s", ex.what());
- }
- AttributeFilter* filter = application.getAttributeFilter();
- if (filter && !resolvedAttributes.empty()) {
- BasicFilteringContext fc(application, resolvedAttributes, policy.getIssuerMetadata(), ssoStatement->getAuthenticationMethod());
- Locker filtlocker(filter);
- try {
- filter->filterAttributes(fc, resolvedAttributes);
- }
- catch (exception& ex) {
- m_log.error("caught exception filtering attributes: %s", ex.what());
- m_log.error("dumping extracted attributes due to filtering exception");
- for_each(resolvedAttributes.begin(), resolvedAttributes.end(), xmltooling::cleanup<shibsp::Attribute>());
- resolvedAttributes.clear();
- }
- }
- }
-
- // Normalize the SAML 1.x NameIdentifier...
- auto_ptr<saml2::NameID> nameid(n ? saml2::NameIDBuilder::buildNameID() : NULL);
- if (n) {
- nameid->setName(n->getName());
- nameid->setFormat(n->getFormat());
- nameid->setNameQualifier(n->getNameQualifier());
+ // Normalize a SAML 1.x NameIdentifier...
+ auto_ptr<saml2::NameID> nameid(saml1name ? saml2::NameIDBuilder::buildNameID() : NULL);
+ if (saml1name) {
+ nameid->setName(saml1name->getName());
+ nameid->setFormat(saml1name->getFormat());
+ nameid->setNameQualifier(saml1name->getNameQualifier());
}
- const EntityDescriptor* issuerMetadata =
- policy.getIssuerMetadata() ? dynamic_cast<const EntityDescriptor*>(policy.getIssuerMetadata()->getParent()) : NULL;
+ // The context will handle deleting attributes and new tokens.
+ vector<const Assertion*> tokens(1,token);
auto_ptr<ResolutionContext> ctx(
resolveAttributes(
application,
- issuerMetadata,
- m_messageRule.m_protocol.get(),
- nameid.get(),
- ssoStatement->getAuthenticationMethod(),
+ policy.getIssuerMetadata(),
+ m_protocol.get(),
+ saml1name,
+ (saml1name ? nameid.get() : saml2name),
+ authMethod,
NULL,
- &tokens,
- &resolvedAttributes
+ &tokens
)
);
if (ctx.get()) {
// Copy over any new tokens, but leave them in the context for cleanup.
tokens.insert(tokens.end(), ctx->getResolvedAssertions().begin(), ctx->getResolvedAssertions().end());
-
- // Copy over new attributes, and transfer ownership.
- resolvedAttributes.insert(resolvedAttributes.end(), ctx->getResolvedAttributes().begin(), ctx->getResolvedAttributes().end());
- ctx->getResolvedAttributes().clear();
}
- try {
- string key = application.getServiceProvider().getSessionCache()->insert(
- now + lifetime.second,
- application,
- httpRequest.getRemoteAddr().c_str(),
- issuerMetadata,
- m_messageRule.m_protocol.get(),
- nameid.get(),
- ssoStatement->getAuthenticationInstant() ? ssoStatement->getAuthenticationInstant()->getRawData() : NULL,
- NULL,
- ssoStatement->getAuthenticationMethod(),
- NULL,
- &tokens,
- &resolvedAttributes
- );
- for_each(resolvedAttributes.begin(), resolvedAttributes.end(), xmltooling::cleanup<shibsp::Attribute>());
- return key;
- }
- catch (exception&) {
- for_each(resolvedAttributes.begin(), resolvedAttributes.end(), xmltooling::cleanup<shibsp::Attribute>());
- throw;
- }
+ application.getServiceProvider().getSessionCache()->insert(
+ application,
+ httpRequest,
+ httpResponse,
+ sessionExp,
+ entity,
+ m_protocol.get(),
+ (saml1name ? nameid.get() : saml2name),
+ authInstant,
+ NULL,
+ authMethod,
+ NULL,
+ &tokens,
+ ctx.get() ? &ctx->getResolvedAttributes() : NULL
+ );
}
#endif
pair<bool,long> ADFSLogoutInitiator::run(SPRequest& request, bool isHandler) const
{
- // Defer to base class for front-channel loop first.
- pair<bool,long> ret = LogoutHandler::run(request, isHandler);
- if (ret.first)
- return ret;
-
- // At this point we know the front-channel is handled.
- // We need the session to do any other work.
+ // Normally we'd do notifications and session clearage here, but ADFS logout
+ // is missing the needed request/response features, so we have to rely on
+ // the IdP half to notify us back about the logout and do the work there.
+ // Basically we have no way to tell in the Logout receiving handler whether
+ // we initiated the logout or not.
Session* session = NULL;
try {
session = request.getSession(false, true, false); // don't cache it and ignore all checks
if (!session)
- return make_pair(false,0);
+ return make_pair(false,0L);
- // We only handle SAML 2.0 sessions.
- if (!XMLString::equals(session->getProtocol(), WSFED_NS)) {
+ // We only handle ADFS sessions.
+ if (!XMLString::equals(session->getProtocol(), WSFED_NS) || !session->getEntityID()) {
session->unlock();
- return make_pair(false,0);
+ return make_pair(false,0L);
}
}
catch (exception& ex) {
m_log.error("error accessing current session: %s", ex.what());
- return make_pair(false,0);
+ return make_pair(false,0L);
}
+ string entityID(session->getEntityID());
+ session->unlock();
+
if (SPConfig::getConfig().isEnabled(SPConfig::OutOfProcess)) {
// When out of process, we run natively.
- return doRequest(request.getApplication(), request.getRequestURL(), session, request);
+ return doRequest(request.getApplication(), entityID.c_str(), request);
}
else {
// When not out of process, we remote the request.
- Locker locker(session);
+ Locker locker(session, false);
DDF out,in(m_address.c_str());
DDFJanitor jin(in), jout(out);
in.addmember("application_id").string(request.getApplication().getId());
- in.addmember("session_id").string(session->getID());
- in.addmember("url").string(request.getRequestURL());
+ in.addmember("entity_id").string(entityID.c_str());
out=request.getServiceProvider().getListenerService()->send(in);
return unwrap(request, out);
}
DDFJanitor jout(ret);
auto_ptr<HTTPResponse> resp(getResponse(ret));
- Session* session = NULL;
- try {
- session = app->getServiceProvider().getSessionCache()->find(in["session_id"].string(), *app, NULL, NULL);
- }
- catch (exception& ex) {
- m_log.error("error accessing current session: %s", ex.what());
- }
+ // Since we're remoted, the result should either be a throw, which we pass on,
+ // a false/0 return, which we just return as an empty structure, or a response/redirect,
+ // which we capture in the facade and send back.
+ doRequest(*app, in["entity_id"].string(), *resp.get());
- // With no session, we just skip the request and let it fall through to an empty struct return.
- if (session) {
- if (session->getEntityID()) {
- // Since we're remoted, the result should either be a throw, which we pass on,
- // a false/0 return, which we just return as an empty structure, or a response/redirect,
- // which we capture in the facade and send back.
- doRequest(*app, in["url"].string(), session, *resp.get());
- }
- else {
- m_log.error("no issuing entityID found in session");
- session->unlock();
- session = NULL;
- app->getServiceProvider().getSessionCache()->remove(in["session_id"].string(), *app);
- }
- }
out << ret;
#else
throw ConfigurationException("Cannot perform logout using lite version of shibsp library.");
#endif
}
-pair<bool,long> ADFSLogoutInitiator::doRequest(
- const Application& application, const char* requestURL, Session* session, HTTPResponse& response
- ) const
+pair<bool,long> ADFSLogoutInitiator::doRequest(const Application& application, const char* entityID, HTTPResponse& response) const
{
- string entityID(session->getEntityID());
- vector<string> sessions(1, session->getID());
-
- // Do back channel notification.
- if (!notifyBackChannel(application, requestURL, sessions, false)) {
- session->unlock();
- application.getServiceProvider().getSessionCache()->remove(sessions.front().c_str(), application);
- return sendLogoutPage(application, response, true, "Partial logout failure.");
- }
-
- session->unlock();
- application.getServiceProvider().getSessionCache()->remove(sessions.front().c_str(), application);
-
#ifndef SHIBSP_LITE
try {
- // With a session in hand, we can create a request message, if we can find a compatible endpoint.
- Locker metadataLocker(application.getMetadataProvider());
- const EntityDescriptor* entity = application.getMetadataProvider()->getEntityDescriptor(entityID.c_str());
- if (!entity) {
- throw MetadataException(
- "Unable to locate metadata for identity provider ($entityID)",
- namedparams(1, "entityID", entityID.c_str())
- );
- }
- const IDPSSODescriptor* role = entity->getIDPSSODescriptor(m_binding.get());
- if (!role) {
- throw MetadataException(
- "Unable to locate ADFS IdP role for identity provider ($entityID).",
- namedparams(1, "entityID", entityID.c_str())
- );
- }
+ if (!entityID)
+ throw ConfigurationException("Missing entityID parameter.");
- const EndpointType* ep = EndpointManager<SingleLogoutService>(role->getSingleLogoutServices()).getByBinding(m_binding.get());
+ // With a session in hand, we can create a request message, if we can find a compatible endpoint.
+ MetadataProvider* m=application.getMetadataProvider();
+ Locker locker(m);
+ MetadataProvider::Criteria mc(entityID, &IDPSSODescriptor::ELEMENT_QNAME, m_binding.get());
+ pair<const EntityDescriptor*,const RoleDescriptor*> entity=m->getEntityDescriptor(mc);
+ if (!entity.first)
+ throw MetadataException("Unable to locate metadata for identity provider ($entityID)", namedparams(1, "entityID", entityID));
+ else if (!entity.second)
+ throw MetadataException("Unable to locate ADFS IdP role for identity provider ($entityID).", namedparams(1, "entityID", entityID));
+
+ const EndpointType* ep = EndpointManager<SingleLogoutService>(
+ dynamic_cast<const IDPSSODescriptor*>(entity.second)->getSingleLogoutServices()
+ ).getByBinding(m_binding.get());
if (!ep) {
throw MetadataException(
"Unable to locate ADFS single logout service for identity provider ($entityID).",
- namedparams(1, "entityID", entityID.c_str())
+ namedparams(1, "entityID", entityID)
);
}
m_log.error("error issuing ADFS logout request: %s", ex.what());
}
- return make_pair(false,0);
+ return make_pair(false,0L);
#else
throw ConfigurationException("Cannot perform logout using lite version of shibsp library.");
#endif
param = request.getParameter("wreply");
const Application& app = request.getApplication();
- // Get the session_id.
- pair<string,const char*> shib_cookie = app.getCookieNameProps("_shibsession_");
- const char* session_id = request.getCookie(shib_cookie.first.c_str());
-
if (!returning) {
// Pass control to the first front channel notification point, if any.
map<string,string> parammap;
}
// Best effort on back channel and to remove the user agent's session.
- if (session_id) {
+ string session_id = app.getServiceProvider().getSessionCache()->active(app, request);
+ if (!session_id.empty()) {
vector<string> sessions(1,session_id);
notifyBackChannel(app, request.getRequestURL(), sessions, false);
try {
- app.getServiceProvider().getSessionCache()->remove(session_id, app);
+ app.getServiceProvider().getSessionCache()->remove(app, request, &request);
}
catch (exception& ex) {
- m_log.error("error removing session (%s): %s", session_id, ex.what());
+ m_log.error("error removing session (%s): %s", session_id.c_str(), ex.what());
}
}
if (param)
return make_pair(true, request.sendRedirect(param));
- return sendLogoutPage(app, request, false, "Logout complete.");
+ return sendLogoutPage(app, request, request, false, "Logout complete.");
}
projects / shibboleth / sp.git / blobdiff