X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=shibsp%2Fhandler%2Fimpl%2FSAML2SessionInitiator.cpp;h=d4265c38931bd714a6bd72d39e49781d87f1009d;hb=c51bfd77603cf0ddb0b5e374c35586a8435895d6;hp=f44dca2953331e92e378cb26a094f705f6fa67d4;hpb=36936e825a0e6dafbdf0127ab0e66c1eb8eabc3d;p=shibboleth%2Fcpp-sp.git diff --git a/shibsp/handler/impl/SAML2SessionInitiator.cpp b/shibsp/handler/impl/SAML2SessionInitiator.cpp index f44dca2..d4265c3 100644 --- a/shibsp/handler/impl/SAML2SessionInitiator.cpp +++ b/shibsp/handler/impl/SAML2SessionInitiator.cpp @@ -1,17 +1,21 @@ -/* - * Copyright 2001-2010 Internet2 +/** + * Licensed to the University Corporation for Advanced Internet + * Development, Inc. (UCAID) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * UCAID licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. You may obtain a copy of the + * License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific + * language governing permissions and limitations under the License. */ /** @@ -31,6 +35,9 @@ #ifndef SHIBSP_LITE # include "metadata/MetadataProviderCriteria.h" +# include +# include +# include # include # include # include @@ -45,9 +52,12 @@ using namespace opensaml::saml2md; # include #endif +#include + using namespace shibsp; using namespace opensaml; using namespace xmltooling; +using namespace boost; using namespace std; namespace shibsp { @@ -61,16 +71,9 @@ namespace shibsp { { public: SAML2SessionInitiator(const DOMElement* e, const char* appId); - virtual ~SAML2SessionInitiator() { -#ifndef SHIBSP_LITE - if (SPConfig::getConfig().isEnabled(SPConfig::OutOfProcess)) { - XMLString::release(&m_outgoing); - for_each(m_encoders.begin(), m_encoders.end(), cleanup_pair()); - delete m_requestTemplate; - delete m_ecp; - } -#endif - } + virtual ~SAML2SessionInitiator() {} + + void init(const char* location); // encapsulates actions that need to run either in the c'tor or setParent void setParent(const PropertySet* parent); void receive(DDF& in, ostream& out); @@ -81,6 +84,12 @@ namespace shibsp { return samlconstants::SAML20P_NS; } +#ifndef SHIBSP_LITE + void generateMetadata(saml2md::SPSSODescriptor& role, const char* handlerURL) const { + doGenerateMetadata(role, handlerURL); + } +#endif + private: pair doRequest( const Application& application, @@ -104,11 +113,10 @@ namespace shibsp { auto_ptr_char m_paosNS,m_ecpNS; auto_ptr_XMLCh m_paosBinding; #ifndef SHIBSP_LITE - XMLCh* m_outgoing; - vector m_bindings; - map m_encoders; - MessageEncoder* m_ecp; - AuthnRequest* m_requestTemplate; + vector m_bindings; + map< string,boost::shared_ptr > m_encoders; + scoped_ptr m_ecp; + scoped_ptr m_requestTemplate; #else bool m_ecp; #endif @@ -118,6 +126,21 @@ namespace shibsp { #pragma warning( pop ) #endif + class SHIBSP_DLLLOCAL SessionInitiatorNodeFilter : public DOMNodeFilter + { + public: +#ifdef SHIBSP_XERCESC_SHORT_ACCEPTNODE + short +#else + FilterAction +#endif + acceptNode(const DOMNode* node) const { + return FILTER_REJECT; + } + }; + + static SHIBSP_DLLLOCAL SessionInitiatorNodeFilter g_SINFilter; + SessionInitiator* SHIBSP_DLLLOCAL SAML2SessionInitiatorFactory(const pair& p) { return new SAML2SessionInitiator(p.first, p.second); @@ -126,102 +149,98 @@ namespace shibsp { }; SAML2SessionInitiator::SAML2SessionInitiator(const DOMElement* e, const char* appId) - : AbstractHandler(e, Category::getInstance(SHIBSP_LOGCAT".SessionInitiator.SAML2"), nullptr, &m_remapper), m_appId(appId), + : AbstractHandler(e, Category::getInstance(SHIBSP_LOGCAT ".SessionInitiator.SAML2"), &g_SINFilter, &m_remapper), m_appId(appId), m_paosNS(samlconstants::PAOS_NS), m_ecpNS(samlconstants::SAML20ECP_NS), m_paosBinding(samlconstants::SAML20_BINDING_PAOS) -{ - static const XMLCh ECP[] = UNICODE_LITERAL_3(E,C,P); - const XMLCh* flag = e ? e->getAttributeNS(nullptr,ECP) : nullptr; #ifdef SHIBSP_LITE - m_ecp = (flag && (*flag == chLatin_t || *flag == chDigit_1)); -#else - m_outgoing=nullptr; - m_ecp = nullptr; - m_requestTemplate=nullptr; - + ,m_ecp(false) +#endif +{ +#ifndef SHIBSP_LITE if (SPConfig::getConfig().isEnabled(SPConfig::OutOfProcess)) { // Check for a template AuthnRequest to build from. DOMElement* child = XMLHelper::getFirstChildElement(e, samlconstants::SAML20P_NS, AuthnRequest::LOCAL_NAME); if (child) - m_requestTemplate = dynamic_cast(AuthnRequestBuilder::buildOneFromElement(child)); + m_requestTemplate.reset(dynamic_cast(AuthnRequestBuilder::buildOneFromElement(child))); + } +#endif + + // If Location isn't set, defer initialization until the setParent call. + pair loc = getString("Location"); + if (loc.first) { + init(loc.second); + } + + m_supportedOptions.insert("isPassive"); +} + +void SAML2SessionInitiator::setParent(const PropertySet* parent) +{ + DOMPropertySet::setParent(parent); + pair loc = getString("Location"); + init(loc.second); +} + +void SAML2SessionInitiator::init(const char* location) +{ + if (location) { + string address = m_appId + location + "::run::SAML2SI"; + setAddress(address.c_str()); + } + else { + m_log.warn("no Location property in SAML2 SessionInitiator (or parent), can't register as remoted handler"); + } + pair flag = getBool("ECP"); +#ifdef SHIBSP_LITE + m_ecp = flag.first && flag.second; +#else + + if (SPConfig::getConfig().isEnabled(SPConfig::OutOfProcess)) { // If directed, build an ECP encoder. - if (flag && (*flag == chLatin_t || *flag == chDigit_1)) { + if (flag.first && flag.second) { try { - m_ecp = SAMLConfig::getConfig().MessageEncoderManager.newPlugin( - samlconstants::SAML20_BINDING_PAOS, pair(e,nullptr) + m_ecp.reset( + SAMLConfig::getConfig().MessageEncoderManager.newPlugin( + samlconstants::SAML20_BINDING_PAOS, pair(getElement(), nullptr) + ) ); } - catch (exception& ex) { + catch (std::exception& ex) { m_log.error("error building PAOS/ECP MessageEncoder: %s", ex.what()); } } - // Handle outgoing binding setup. - pair outgoing = getXMLString("outgoingBindings"); + string dupBindings; + pair outgoing = getString("outgoingBindings"); if (outgoing.first) { - m_outgoing = XMLString::replicate(outgoing.second); - XMLString::trim(m_outgoing); + dupBindings = outgoing.second; + trim(dupBindings); } else { // No override, so we'll install a default binding precedence. - string prec = string(samlconstants::SAML20_BINDING_HTTP_REDIRECT) + ' ' + samlconstants::SAML20_BINDING_HTTP_POST + ' ' + + dupBindings = string(samlconstants::SAML20_BINDING_HTTP_REDIRECT) + ' ' + samlconstants::SAML20_BINDING_HTTP_POST + ' ' + samlconstants::SAML20_BINDING_HTTP_POST_SIMPLESIGN + ' ' + samlconstants::SAML20_BINDING_HTTP_ARTIFACT; - m_outgoing = XMLString::transcode(prec.c_str()); } - - int pos; - XMLCh* start = m_outgoing; - while (start && *start) { - pos = XMLString::indexOf(start,chSpace); - if (pos != -1) - *(start + pos)=chNull; - m_bindings.push_back(start); + split(m_bindings, dupBindings, is_space(), algorithm::token_compress_on); + for (vector::const_iterator b = m_bindings.begin(); b != m_bindings.end(); ++b) { try { - auto_ptr_char b(start); - MessageEncoder * encoder = SAMLConfig::getConfig().MessageEncoderManager.newPlugin( - b.get(),pair(e,nullptr) + boost::shared_ptr encoder( + SAMLConfig::getConfig().MessageEncoderManager.newPlugin(*b, pair(getElement(),nullptr)) ); if (encoder->isUserAgentPresent() && XMLString::equals(getProtocolFamily(), encoder->getProtocolFamily())) { - m_encoders[start] = encoder; - m_log.debug("supporting outgoing binding (%s)", b.get()); + m_encoders[*b] = encoder; + m_log.debug("supporting outgoing binding (%s)", b->c_str()); } else { - delete encoder; - m_log.warn("skipping outgoing binding (%s), not a SAML 2.0 front-channel mechanism", b.get()); + m_log.warn("skipping outgoing binding (%s), not a SAML 2.0 front-channel mechanism", b->c_str()); } } - catch (exception& ex) { + catch (std::exception& ex) { m_log.error("error building MessageEncoder: %s", ex.what()); } - if (pos != -1) - start = start + pos + 1; - else - break; } } #endif - - // If Location isn't set, defer address registration until the setParent call. - pair loc = getString("Location"); - if (loc.first) { - string address = m_appId + loc.second + "::run::SAML2SI"; - setAddress(address.c_str()); - } - - m_supportedOptions.insert("isPassive"); -} - -void SAML2SessionInitiator::setParent(const PropertySet* parent) -{ - DOMPropertySet::setParent(parent); - pair loc = getString("Location"); - if (loc.first) { - string address = m_appId + loc.second + "::run::SAML2SI"; - setAddress(address.c_str()); - } - else { - m_log.warn("no Location property in SAML2 SessionInitiator (or parent), can't register as remoted handler"); - } } pair SAML2SessionInitiator::run(SPRequest& request, string& entityID, bool isHandler) const @@ -236,14 +255,14 @@ pair SAML2SessionInitiator::run(SPRequest& request, string& entityID, // We have to know the IdP to function unless this is ECP. if ((!ECP && entityID.empty()) || !checkCompatibility(request, isHandler)) - return make_pair(false,0L); + return make_pair(false, 0L); string target; pair prop; - const Handler* ACS=nullptr; + const Handler* ACS = nullptr; pair acClass, acComp, nidFormat, spQual; bool isPassive=false,forceAuthn=false; - const Application& app=request.getApplication(); + const Application& app = request.getApplication(); // ECP means the ACS will be by value no matter what. pair acsByIndex = ECP ? make_pair(true,false) : getBool("acsByIndex"); @@ -266,6 +285,7 @@ pair SAML2SessionInitiator::run(SPRequest& request, string& entityID, // Always need to recover target URL to compute handler below. recoverRelayState(app, request, request, target, false); + app.limitRedirect(request, target.c_str()); pair flag = getBool("isPassive", request); isPassive = (flag.first && flag.second); @@ -352,7 +372,7 @@ pair SAML2SessionInitiator::run(SPRequest& request, string& entityID, // Determine index to use. pair ix = pair(false,nullptr); - if (!strncmp(ACSloc.c_str(), "https", 5)) { + if (!strncmp(ACSloc.c_str(), "https://", 8)) { ix = ACS->getXMLString("sslIndex", shibspconstants::ASCII_SHIB2SPCONFIG_NS); if (!ix.first) ix = ACS->getXMLString("index"); @@ -425,7 +445,7 @@ pair SAML2SessionInitiator::run(SPRequest& request, string& entityID, if (acsByIndex.first && acsByIndex.second) { // Determine index to use. pair ix = pair(false,nullptr); - if (!strncmp(ACSloc.c_str(), "https", 5)) { + if (!strncmp(ACSloc.c_str(), "https://", 8)) { ix = ACS->getString("sslIndex", shibspconstants::ASCII_SHIB2SPCONFIG_NS); if (!ix.first) ix = ACS->getString("index"); @@ -479,8 +499,8 @@ pair SAML2SessionInitiator::unwrap(SPRequest& request, DDF& out) cons void SAML2SessionInitiator::receive(DDF& in, ostream& out) { // Find application. - const char* aid=in["application_id"].string(); - const Application* app=aid ? SPConfig::getConfig().getServiceProvider()->getApplication(aid) : nullptr; + const char* aid = in["application_id"].string(); + const Application* app = aid ? SPConfig::getConfig().getServiceProvider()->getApplication(aid) : nullptr; if (!app) { // Something's horribly wrong. m_log.error("couldn't find application (%s) to generate AuthnRequest", aid ? aid : "(missing)"); @@ -491,7 +511,7 @@ void SAML2SessionInitiator::receive(DDF& in, ostream& out) DDFJanitor jout(ret); // Wrap the outgoing object with a Response facade. - auto_ptr http(getResponse(ret)); + scoped_ptr http(getResponse(ret)); auto_ptr_XMLCh index(in["acsIndex"].string()); auto_ptr_XMLCh bind(in["acsBinding"].string()); @@ -503,7 +523,7 @@ void SAML2SessionInitiator::receive(DDF& in, ostream& out) // 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, nullptr, *http.get(), in["entity_id"].string(), + *app, nullptr, *http, in["entity_id"].string(), index.get(), (in["artifact"].integer() != 0), in["acsLocation"].string(), bind.get(), @@ -518,18 +538,6 @@ void SAML2SessionInitiator::receive(DDF& in, ostream& out) out << ret; } -#ifndef SHIBSP_LITE -namespace { - class _sameIdP : public binary_function - { - public: - bool operator()(const IDPEntry* entry, const XMLCh* entityID) const { - return entry ? XMLString::equals(entry->getProviderID(), entityID) : false; - } - }; -}; -#endif - pair SAML2SessionInitiator::doRequest( const Application& app, const HTTPRequest* httpRequest, @@ -557,20 +565,20 @@ pair SAML2SessionInitiator::doRequest( const MessageEncoder* encoder = nullptr; // We won't need this for ECP, but safety dictates we get the lock here. - MetadataProvider* m=app.getMetadataProvider(); + MetadataProvider* m = app.getMetadataProvider(); Locker locker(m); if (ECP) { - encoder = m_ecp; + encoder = m_ecp.get(); if (!encoder) { m_log.error("MessageEncoder for PAOS binding not available"); - return make_pair(false,0L); + return make_pair(false, 0L); } } else { // Use metadata to locate the IdP's SSO service. MetadataProviderCriteria mc(app, entityID, &IDPSSODescriptor::ELEMENT_QNAME, samlconstants::SAML20P_NS); - entity=m->getEntityDescriptor(mc); + 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)); @@ -578,31 +586,31 @@ pair SAML2SessionInitiator::doRequest( else if (!entity.second) { m_log.log(getParent() ? Priority::INFO : Priority::WARN, "unable to locate SAML 2.0 identity provider role for provider (%s)", entityID); if (getParent()) - return make_pair(false,0L); + return make_pair(false, 0L); throw MetadataException("Unable to locate SAML 2.0 identity provider role for provider ($entityID)", namedparams(1, "entityID", entityID)); } else if (artifactInbound && !SPConfig::getConfig().getArtifactResolver()->isSupported(dynamic_cast(*entity.second))) { m_log.warn("artifact binding selected for response, but identity provider lacks support"); if (getParent()) - return make_pair(false,0L); + return make_pair(false, 0L); throw MetadataException("Identity provider ($entityID) lacks SAML 2.0 artifact support.", namedparams(1, "entityID", entityID)); } // Loop over the supportable outgoing bindings. role = dynamic_cast(entity.second); - vector::const_iterator b; - for (b = m_bindings.begin(); b!=m_bindings.end(); ++b) { - if (ep=EndpointManager(role->getSingleSignOnServices()).getByBinding(*b)) { - map::const_iterator enc = m_encoders.find(*b); - if (enc!=m_encoders.end()) - encoder = enc->second; + for (vector::const_iterator b = m_bindings.begin(); b != m_bindings.end(); ++b) { + auto_ptr_XMLCh wideb(b->c_str()); + if (ep=EndpointManager(role->getSingleSignOnServices()).getByBinding(wideb.get())) { + map< string,boost::shared_ptr >::const_iterator enc = m_encoders.find(*b); + if (enc != m_encoders.end()) + encoder = enc->second.get(); break; } } if (!ep || !encoder) { m_log.warn("unable to locate compatible SSO service for provider (%s)", entityID); if (getParent()) - return make_pair(false,0L); + return make_pair(false, 0L); throw MetadataException("Unable to locate compatible SSO service for provider ($entityID)", namedparams(1, "entityID", entityID)); } } @@ -656,10 +664,17 @@ pair SAML2SessionInitiator::doRequest( } if (authnContextClassRef) { reqContext->getAuthnContextDeclRefs().clear(); - auto_ptr_XMLCh wideclass(authnContextClassRef); - AuthnContextClassRef* cref = AuthnContextClassRefBuilder::buildAuthnContextClassRef(); - cref->setReference(wideclass.get()); - reqContext->getAuthnContextClassRefs().push_back(cref); + string dup(authnContextClassRef); + trim(dup); + vector contexts; + split(contexts, dup, is_space(), algorithm::token_compress_on); + for (vector::const_iterator ac = contexts.begin(); ac != contexts.end(); ++ac) { + auto_ptr_XMLCh wideac(ac->c_str()); + auto_ptr cref(AuthnContextClassRefBuilder::buildAuthnContextClassRef()); + cref->setReference(wideac.get()); + reqContext->getAuthnContextClassRefs().push_back(cref.get()); + cref.release(); + } } if (reqContext->getAuthnContextClassRefs().empty() && reqContext->getAuthnContextDeclRefs().empty()) { @@ -672,21 +687,26 @@ pair SAML2SessionInitiator::doRequest( } pair requestDelegation = getBool("requestDelegation"); - if (requestDelegation.first && requestDelegation.second && entity.first) { - // Request delegation by including the IdP as an Audience. - // Also specify the expected session lifetime as the bound on the assertion lifetime. - const PropertySet* sessionProps = app.getPropertySet("Sessions"); - pair lifetime = sessionProps ? sessionProps->getUnsignedInt("lifetime") : pair(true,28800); - if (!lifetime.first || lifetime.second == 0) - lifetime.second = 28800; - if (!req->getConditions()) - req->setConditions(ConditionsBuilder::buildConditions()); - req->getConditions()->setNotOnOrAfter(time(nullptr) + lifetime.second + 300); - AudienceRestriction* audrest = AudienceRestrictionBuilder::buildAudienceRestriction(); - req->getConditions()->getConditions().push_back(audrest); - Audience* aud = AudienceBuilder::buildAudience(); - audrest->getAudiences().push_back(aud); - aud->setAudienceURI(entity.first->getEntityID()); + if (requestDelegation.first && requestDelegation.second) { + if (entity.first) { + // Request delegation by including the IdP as an Audience. + // Also specify the expected session lifetime as the bound on the assertion lifetime. + const PropertySet* sessionProps = app.getPropertySet("Sessions"); + pair lifetime = sessionProps ? sessionProps->getUnsignedInt("lifetime") : pair(true,28800); + if (!lifetime.first || lifetime.second == 0) + lifetime.second = 28800; + if (!req->getConditions()) + req->setConditions(ConditionsBuilder::buildConditions()); + req->getConditions()->setNotOnOrAfter(time(nullptr) + lifetime.second + 300); + AudienceRestriction* audrest = AudienceRestrictionBuilder::buildAudienceRestriction(); + req->getConditions()->getConditions().push_back(audrest); + Audience* aud = AudienceBuilder::buildAudience(); + audrest->getAudiences().push_back(aud); + aud->setAudienceURI(entity.first->getEntityID()); + } + else { + m_log.warn("requestDelegation set, but IdP unknown at request time"); + } } if (ECP && entityID) { @@ -702,13 +722,30 @@ pair SAML2SessionInitiator::doRequest( scoping->setIDPList(idplist); } VectorOf(IDPEntry) entries = idplist->getIDPEntrys(); - if (find_if(entries, bind2nd(_sameIdP(), wideid.get())) == nullptr) { + static bool (*wideequals)(const XMLCh*,const XMLCh*) = &XMLString::equals; + if (find_if(entries, boost::bind(wideequals, boost::bind(&IDPEntry::getProviderID, _1), wideid.get())) == nullptr) { IDPEntry* entry = IDPEntryBuilder::buildIDPEntry(); entry->setProviderID(wideid.get()); entries.push_back(entry); } } + XMLCh* genid = SAMLConfig::getConfig().generateIdentifier(); + req->setID(genid); + XMLString::release(&genid); + req->setIssueInstant(time(nullptr)); + + scoped_ptr ar_event(newAuthnRequestEvent(app, httpRequest)); + if (ar_event) { + auto_ptr_char b(ep ? ep->getBinding() : nullptr); + ar_event->m_binding = b.get() ? b.get() : samlconstants::SAML20_BINDING_SOAP; + auto_ptr_char prot(getProtocolFamily()); + ar_event->m_protocol = prot.get(); + ar_event->m_peer = entity.first; + ar_event->m_saml2Request = req.get(); + app.getServiceProvider().getTransactionLog()->write(*ar_event); + } + auto_ptr_char dest(ep ? ep->getLocation() : nullptr); if (httpRequest) { @@ -720,8 +757,8 @@ pair SAML2SessionInitiator::doRequest( *encoder, req.get(), relayState.c_str(), dest.get(), role, app, httpResponse, role ? role->WantAuthnRequestsSigned() : false ); req.release(); // freed by encoder - return make_pair(true,ret); + return make_pair(true, ret); #else - return make_pair(false,0L); + return make_pair(false, 0L); #endif }