From 96d5987a79042769d8dc6188bfe944c3a8165430 Mon Sep 17 00:00:00 2001 From: Scott Cantor Date: Thu, 19 Jul 2007 20:33:00 +0000 Subject: [PATCH] Untested ADFS plugin, minus logout. --- .cproject | 18 +- Makefile.am | 2 +- Shibboleth.sln | 28 +++ adfs/.gitignore | 5 + adfs/Makefile.am | 27 +++ adfs/adfs-lite.vcproj | 196 ++++++++++++++++ adfs/adfs.cpp | 593 +++++++++++++++++++++++++++++++++++++++++++++++++ adfs/adfs.rc | 109 +++++++++ adfs/adfs.vcproj | 196 ++++++++++++++++ adfs/resource.h | 15 ++ configure.ac | 4 +- schemas/Makefile.am | 1 + schemas/WS-Trust.xsd | 113 ++++++++++ schemas/catalog.xml.in | 1 + 14 files changed, 1298 insertions(+), 10 deletions(-) create mode 100644 adfs/.gitignore create mode 100644 adfs/Makefile.am create mode 100644 adfs/adfs-lite.vcproj create mode 100644 adfs/adfs.cpp create mode 100644 adfs/adfs.rc create mode 100644 adfs/adfs.vcproj create mode 100644 adfs/resource.h create mode 100644 schemas/WS-Trust.xsd diff --git a/.cproject b/.cproject index 2bf704c..327af9d 100644 --- a/.cproject +++ b/.cproject @@ -4,6 +4,16 @@ + + + + + + + + + + @@ -29,13 +39,7 @@ - - - - - - - + diff --git a/Makefile.am b/Makefile.am index 9eba768..7fd7ef7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,7 +14,7 @@ WANT_SUBDIRS = @WANT_SUBDIRS@ SUBDIRS = $(WANT_SUBDIRS) -DIST_SUBDIRS = doc schemas configs shibsp shibd util apache nsapi_shib odbc-store selinux +DIST_SUBDIRS = doc schemas configs shibsp shibd adfs util apache nsapi_shib odbc-store selinux all-local: shibboleth.spec pkginfo diff --git a/Shibboleth.sln b/Shibboleth.sln index f904e1d..31262d4 100644 --- a/Shibboleth.sln +++ b/Shibboleth.sln @@ -111,6 +111,24 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "siterefresh", "util\siteref Release.AspNetCompiler.Debug = "False" EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "adfs", "adfs\adfs.vcproj", "{26D4FABF-ACDE-4947-9C4A-7AE1B50CD83A}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection + ProjectSection(ProjectDependencies) = postProject + {81F0F7A6-DC36-46EF-957F-F9E81D4403F6} = {81F0F7A6-DC36-46EF-957F-F9E81D4403F6} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "adfs-lite", "adfs\adfs-lite.vcproj", "{26D4FABF-ACDE-4947-9C4A-7AE1B50CD83B}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection + ProjectSection(ProjectDependencies) = postProject + {81F0F7A6-DC36-46EF-957F-F9E81D4403F7} = {81F0F7A6-DC36-46EF-957F-F9E81D4403F7} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -165,6 +183,14 @@ Global {4D02F36E-D2CD-4FD1-AC50-2941E27BB3FB}.Debug|Win32.Build.0 = Debug|Win32 {4D02F36E-D2CD-4FD1-AC50-2941E27BB3FB}.Release|Win32.ActiveCfg = Release|Win32 {4D02F36E-D2CD-4FD1-AC50-2941E27BB3FB}.Release|Win32.Build.0 = Release|Win32 + {26D4FABF-ACDE-4947-9C4A-7AE1B50CD83A}.Debug|Win32.ActiveCfg = Debug|Win32 + {26D4FABF-ACDE-4947-9C4A-7AE1B50CD83A}.Debug|Win32.Build.0 = Debug|Win32 + {26D4FABF-ACDE-4947-9C4A-7AE1B50CD83A}.Release|Win32.ActiveCfg = Release|Win32 + {26D4FABF-ACDE-4947-9C4A-7AE1B50CD83A}.Release|Win32.Build.0 = Release|Win32 + {26D4FABF-ACDE-4947-9C4A-7AE1B50CD83B}.Debug|Win32.ActiveCfg = Debug|Win32 + {26D4FABF-ACDE-4947-9C4A-7AE1B50CD83B}.Debug|Win32.Build.0 = Debug|Win32 + {26D4FABF-ACDE-4947-9C4A-7AE1B50CD83B}.Release|Win32.ActiveCfg = Release|Win32 + {26D4FABF-ACDE-4947-9C4A-7AE1B50CD83B}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -177,6 +203,8 @@ Global {87C25D4E-8D19-4513-B0BA-BC668BC2DEE3} = {26BA8F84-6E42-41FA-9B13-5D3F4B5B2050} {D341DCD8-7DCD-43A2-8559-C07DAB838711} = {96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C} {666A63A7-983F-4C19-8411-207F24305197} = {96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C} + {26D4FABF-ACDE-4947-9C4A-7AE1B50CD83A} = {96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C} + {26D4FABF-ACDE-4947-9C4A-7AE1B50CD83B} = {96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C} {F13141B6-6C87-40BB-8D4E-5CC56EBB4C59} = {FED80230-119E-4B2F-9F53-D2660A5F022B} {4D02F36E-D2CD-4FD1-AC50-2941E27BB3FB} = {FED80230-119E-4B2F-9F53-D2660A5F022B} EndGlobalSection diff --git a/adfs/.gitignore b/adfs/.gitignore new file mode 100644 index 0000000..10de953 --- /dev/null +++ b/adfs/.gitignore @@ -0,0 +1,5 @@ +/*.user +/adfs-lite-Debug +/Release +/Debug +/adfs-lite-Release diff --git a/adfs/Makefile.am b/adfs/Makefile.am new file mode 100644 index 0000000..8c16b49 --- /dev/null +++ b/adfs/Makefile.am @@ -0,0 +1,27 @@ +## $Id$ + +AUTOMAKE_OPTIONS = foreign + +plugindir = $(libexecdir) +plugin_LTLIBRARIES = adfs.la adfs-lite.la + +adfs_la_LIBADD = \ + $(top_builddir)/shibsp/libshibsp.la + +adfs_la_SOURCES = \ + adfs.cpp + +adfs_lite_la_LIBADD = \ + $(top_builddir)/shibsp/libshibsp-lite.la + +adfs_lite_la_SOURCES = \ + adfs.cpp + +adfs_la_LDFLAGS = -module -avoid-version $(XMLSEC_LIBS) +adfs_lite_la_LDFLAGS = -module -avoid-version $(LITE_LIBS) +adfs_lite_la_CPPFLAGS = -DSHIBSP_LITE + +install-exec-hook: + for la in $(plugin_LTLIBRARIES) ; do rm -f $(DESTDIR)$(plugindir)/$$la ; done + +EXTRA_DIST = adfs.vcproj adfs-lite.vcproj resource.h adfs.rc diff --git a/adfs/adfs-lite.vcproj b/adfs/adfs-lite.vcproj new file mode 100644 index 0000000..b9afe32 --- /dev/null +++ b/adfs/adfs-lite.vcproj @@ -0,0 +1,196 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/adfs/adfs.cpp b/adfs/adfs.cpp new file mode 100644 index 0000000..0547614 --- /dev/null +++ b/adfs/adfs.cpp @@ -0,0 +1,593 @@ +/* + * Copyright 2001-2005 Internet2 + * + * 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 + * + * 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. + */ + +/** + * adfs.cpp + * + * ADFSv1 extension library + */ + +#if defined (_MSC_VER) || defined(__BORLANDC__) +# include "config_win32.h" +#else +# include "config.h" +#endif + +#ifdef WIN32 +# define _CRT_NONSTDC_NO_DEPRECATE 1 +# define _CRT_SECURE_NO_DEPRECATE 1 +# define ADFS_EXPORTS __declspec(dllexport) +#else +# define ADFS_EXPORTS +#endif + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifndef SHIBSP_LITE +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +using namespace opensaml::saml2md; +using namespace opensaml; +#endif +using namespace shibsp; +using namespace xmltooling; +using namespace xercesc; +using namespace log4cpp; +using namespace std; + +#define WSFED_NS "http://schemas.xmlsoap.org/ws/2003/07/secext" +#define WSTRUST_NS "http://schemas.xmlsoap.org/ws/2005/02/trust" + +namespace { + +#if defined (_MSC_VER) + #pragma warning( push ) + #pragma warning( disable : 4250 ) +#endif + + class SHIBSP_DLLLOCAL ADFSSessionInitiator : public SessionInitiator, public AbstractHandler, public RemotedHandler + { + public: + ADFSSessionInitiator(const DOMElement* e, const char* appId) + : AbstractHandler(e, Category::getInstance(SHIBSP_LOGCAT".SessionInitiator")), m_appId(appId), m_binding(WSFED_NS) { + // 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::ADFSSI"; + setAddress(address.c_str()); + } + } + virtual ~ADFSSessionInitiator() {} + + void setParent(const PropertySet* parent); + void receive(DDF& in, ostream& out); + pair run(SPRequest& request, const char* entityID=NULL, bool isHandler=true) const; + + private: + pair doRequest( + const Application& application, + HTTPResponse& httpResponse, + const char* entityID, + const char* acsLocation, + string& relayState + ) const; + string m_appId; + auto_ptr_XMLCh m_binding; + }; + + class SHIBSP_DLLLOCAL ADFSConsumer : public shibsp::AssertionConsumerService + { + public: + ADFSConsumer(const DOMElement* e, const char* appId) + : shibsp::AssertionConsumerService(e, appId, Category::getInstance(SHIBSP_LOGCAT".ADFSSSO")) +#ifndef SHIBSP_LITE + ,m_binding(WSFED_NS) +#endif + {} + virtual ~ADFSConsumer() {} + + private: +#ifndef SHIBSP_LITE + string implementProtocol( + const Application& application, + const HTTPRequest& httpRequest, + SecurityPolicy& policy, + const PropertySet* settings, + const XMLObject& xmlObject + ) const; + auto_ptr_XMLCh m_binding; +#endif + }; + +#if defined (_MSC_VER) + #pragma warning( pop ) +#endif + +#ifndef SHIBSP_LITE + class ADFSDecoder : public MessageDecoder + { + auto_ptr_XMLCh m_ns; + public: + ADFSDecoder() : m_ns(WSTRUST_NS) {} + virtual ~ADFSDecoder() {} + + XMLObject* decode(string& relayState, const GenericRequest& genericRequest, SecurityPolicy& policy) const; + }; + + MessageDecoder* ADFSDecoderFactory(const pair& p) + { + return new ADFSDecoder(); + } +#endif + + SessionInitiator* ADFSSessionInitiatorFactory(const pair& p) + { + return new ADFSSessionInitiator(p.first, p.second); + } + + Handler* ADFSConsumerFactory(const pair& p) + { + return new ADFSConsumer(p.first, p.second); + } + + const XMLCh RequestedSecurityToken[] = UNICODE_LITERAL_22(R,e,q,u,e,s,t,e,d,S,e,c,u,r,i,t,y,T,o,k,e,n); + const XMLCh RequestSecurityTokenResponse[] =UNICODE_LITERAL_28(R,e,q,u,e,s,t,S,e,c,u,r,i,t,y,T,o,k,e,n,R,e,s,p,o,n,s,e); +}; + +extern "C" int ADFS_EXPORTS xmltooling_extension_init(void*) +{ + SPConfig& conf=SPConfig::getConfig(); + conf.SessionInitiatorManager.registerFactory("ADFS", ADFSSessionInitiatorFactory); + conf.AssertionConsumerServiceManager.registerFactory("ADFS", ADFSConsumerFactory); + conf.AssertionConsumerServiceManager.registerFactory(WSFED_NS, ADFSConsumerFactory); +#ifndef SHIBSP_LITE + SAMLConfig::getConfig().MessageDecoderManager.registerFactory(WSFED_NS, ADFSDecoderFactory); + XMLObjectBuilder::registerBuilder(QName(WSTRUST_NS,"RequestedSecurityToken"), new AnyElementBuilder()); + XMLObjectBuilder::registerBuilder(QName(WSTRUST_NS,"RequestedSecurityTokenResponse"), new AnyElementBuilder()); +#endif + return 0; +} + +extern "C" void ADFS_EXPORTS xmltooling_extension_term() +{ + /* should get unregistered during normal shutdown... + SPConfig& conf=SPConfig::getConfig(); + conf.SessionInitiatorManager.deregisterFactory("ADFS"); + conf.AssertionConsumerServiceManager.deregisterFactory("ADFS"); + conf.AssertionConsumerServiceManager.deregisterFactory(WSFED_NS); +#ifndef SHIBSP_LITE + SAMLConfig::getConfig().MessageDecoderManager.deregisterFactory(WSFED_NS); +#endif + */ +} + +void ADFSSessionInitiator::setParent(const PropertySet* parent) +{ + DOMPropertySet::setParent(parent); + pair loc = getString("Location"); + if (loc.first) { + string address = m_appId + loc.second + "::run::ADFSSI"; + setAddress(address.c_str()); + } + else { + m_log.warn("no Location property in ADFS SessionInitiator (or parent), can't register as remoted handler"); + } +} + +pair ADFSSessionInitiator::run(SPRequest& request, const char* entityID, bool isHandler) const +{ + // We have to know the IdP to function. + if (!entityID || !*entityID) + return make_pair(false,0); + + string target; + const Handler* ACS=NULL; + const char* option; + const Application& app=request.getApplication(); + + if (isHandler) { + option = request.getParameter("target"); + if (option) + target = option; + + // 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); + } + 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(); + } + + // Since we're not passing by index, we need to fully compute the return URL. + if (!ACS) { + // Get all the ADFS endpoints. + const vector& handlers = app.getAssertionConsumerServicesByBinding(m_binding.get()); + + // Index comes from request, or default set in the handler, or we just pick the first endpoint. + pair 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_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."); + + // Compute the ACS URL. We add the ACS location to the base handlerURL. + string ACSloc=request.getHandlerURL(target.c_str()); + pair loc=ACS ? ACS->getString("Location") : pair(false,NULL); + if (loc.first) ACSloc+=loc.second; + + if (isHandler) { + // We may already have RelayState set if we looped back here, + // but just in case target is a resource, we reset it back. + target.erase(); + option = request.getParameter("target"); + if (option) + target = option; + } + + m_log.debug("attempting to initiate session using ADFS with provider (%s)", entityID); + + if (SPConfig::getConfig().isEnabled(SPConfig::OutOfProcess)) + return doRequest(app, request, entityID, ACSloc.c_str(), 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("acsLocation").string(ACSloc.c_str()); + if (!target.empty()) + in.addmember("RelayState").string(target.c_str()); + + // Remote the processing. + out = request.getServiceProvider().getListenerService()->send(in); + return unwrap(request, out); +} + +void ADFSSessionInitiator::receive(DDF& in, ostream& out) +{ + // Find application. + const char* aid=in["application_id"].string(); + const Application* app=aid ? SPConfig::getConfig().getServiceProvider()->getApplication(aid) : NULL; + if (!app) { + // Something's horribly wrong. + m_log.error("couldn't find application (%s) to generate ADFS request", aid ? aid : "(missing)"); + throw ConfigurationException("Unable to locate application for new session, deleted?"); + } + + const char* entityID = in["entity_id"].string(); + const char* acsLocation = in["acsLocation"].string(); + if (!entityID || !acsLocation) + throw ConfigurationException("No entityID or acsLocation parameter supplied to remoted SessionInitiator."); + + DDF ret(NULL); + DDFJanitor jout(ret); + + // Wrap the outgoing object with a Response facade. + auto_ptr http(getResponse(ret)); + + string relayState(in["RelayState"].string() ? in["RelayState"].string() : ""); + + // 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); + out << ret; +} + +pair ADFSSessionInitiator::doRequest( + const Application& app, + HTTPResponse& httpResponse, + const char* entityID, + const char* acsLocation, + string& relayState + ) const +{ +#ifndef SHIBSP_LITE + // 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(role->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); + } + + preserveRelayState(app, httpResponse, relayState); + + // UTC timestamp +#ifndef HAVE_GMTIME_R + time_t epoch=time(NULL); + struct tm* ptime=gmtime(&epoch); +#else + struct tm res; + struct tm* ptime=gmtime_r(&epoch,&res); +#endif + char timebuf[32]; + strftime(timebuf,32,"%Y-%m-%dT%H:%M:%SZ",ptime); + + auto_ptr_char dest(ep->getLocation()); + const URLEncoder* urlenc = XMLToolingConfig::getConfig().getURLEncoder(); + + 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 (!relayState.empty()) + req += "&wctx=" + urlenc->encode(relayState.c_str()); + + return make_pair(true, httpResponse.sendRedirect(req.c_str())); +#else + return make_pair(false,0); +#endif +} + +#ifndef SHIBSP_LITE + +XMLObject* ADFSDecoder::decode(string& relayState, const GenericRequest& genericRequest, SecurityPolicy& policy) const +{ +#ifdef _DEBUG + xmltooling::NDC ndc("decode"); +#endif + Category& log = Category::getInstance(SHIBSP_LOGCAT".MessageDecoder.ADFS"); + + log.debug("validating input"); + const HTTPRequest* httpRequest=dynamic_cast(&genericRequest); + if (!httpRequest) + throw BindingException("Unable to cast request object to HTTPRequest type."); + if (strcmp(httpRequest->getMethod(),"POST")) + throw BindingException("Invalid HTTP method ($1).", params(1, httpRequest->getMethod())); + const char* param = httpRequest->getParameter("wa"); + if (!param || strcmp(param, "wsignin1.0")) + throw BindingException("Missing or invalid wa parameter (should be wsignin1.0)."); + param = httpRequest->getParameter("wctx"); + if (param) + relayState = param; + + param = httpRequest->getParameter("wresult"); + if (!param) + throw BindingException("Request missing wresult parameter."); + + log.debug("decoded ADFS response:\n%s", param); + + // Parse and bind the document into an XMLObject. + istringstream is(param); + DOMDocument* doc = (policy.getValidating() ? XMLToolingConfig::getConfig().getValidatingParser() + : XMLToolingConfig::getConfig().getParser()).parse(is); + XercesJanitor janitor(doc); + auto_ptr xmlObject(XMLObjectBuilder::buildOneFromElement(doc->getDocumentElement(), true)); + janitor.release(); + + if (!XMLHelper::isNodeNamed(xmlObject->getDOM(), m_ns.get(), RequestSecurityTokenResponse)) + throw BindingException("Decoded message was not of the appropriate type."); + + if (!policy.getValidating()) + SchemaValidators.validate(xmlObject.get()); + + // Run through the policy. + policy.evaluate(*xmlObject.get(), &genericRequest); + + return xmlObject.release(); +} + +string ADFSConsumer::implementProtocol( + const Application& application, + const HTTPRequest& httpRequest, + SecurityPolicy& policy, + const PropertySet* settings, + const XMLObject& xmlObject + ) const +{ + // Implementation of ADFS profile. + m_log.debug("processing message against ADFS Passive Requester profile"); + + // With ADFS, all the security comes from the assertion, which is two levels down in the message. + + const ElementProxy* response = dynamic_cast(&xmlObject); + if (!response || !response->hasChildren()) + throw FatalProfileException("Incoming message was not of the proper type or contains no security token."); + response = dynamic_cast(response->getUnknownXMLObjects().front()); + if (!response || !response->hasChildren()) + throw FatalProfileException("Token wrapper element did not contain a security token."); + const saml1::Assertion* token = dynamic_cast(response->getUnknownXMLObjects().front()); + if (!token || !token->getSignature()) + throw FatalProfileException("Incoming message did not contain a signed SAML 1.1 assertion."); + + // Run the policy over the assertion. Handles issuer consistency, 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()) + 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 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()); + } + + m_log.debug("ADFS profile processing completed successfully"); + + saml1::NameIdentifier* n = ssoStatement->getSubject()->getNameIdentifier(); + + // Now we have to extract the authentication details for attribute and session setup. + + // Session expiration for ADFS is purely SP-driven, and the method is mapped to a ctx class. + const PropertySet* sessionProps = application.getPropertySet("Sessions"); + pair lifetime = sessionProps ? sessionProps->getUnsignedInt("lifetime") : pair(true,28800); + if (!lifetime.first || lifetime.second == 0) + lifetime.second = 28800; + + // We've successfully "accepted" the SSO token. + // To complete processing, we need to extract and resolve attributes and then create the session. + multimap 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(), cleanup_pair()); + resolvedAttributes.clear(); + } + } + } + + // Normalize the SAML 1.x NameIdentifier... + auto_ptr nameid(n ? saml2::NameIDBuilder::buildNameID() : NULL); + if (n) { + nameid->setName(n->getName()); + nameid->setFormat(n->getFormat()); + nameid->setNameQualifier(n->getNameQualifier()); + } + + const EntityDescriptor* issuerMetadata = + policy.getIssuerMetadata() ? dynamic_cast(policy.getIssuerMetadata()->getParent()) : NULL; + auto_ptr ctx( + resolveAttributes( + application, + issuerMetadata, + m_binding.get(), + nameid.get(), + ssoStatement->getAuthenticationMethod(), + NULL, + &tokens, + &resolvedAttributes + ) + ); + + 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(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_binding.get(), + nameid.get(), + ssoStatement->getAuthenticationInstant() ? ssoStatement->getAuthenticationInstant()->getRawData() : NULL, + NULL, + ssoStatement->getAuthenticationMethod(), + NULL, + &tokens, + &resolvedAttributes + ); + for_each(resolvedAttributes.begin(), resolvedAttributes.end(), cleanup_pair()); + return key; + } + catch (exception&) { + for_each(resolvedAttributes.begin(), resolvedAttributes.end(), cleanup_pair()); + throw; + } +} + +#endif diff --git a/adfs/adfs.rc b/adfs/adfs.rc new file mode 100644 index 0000000..5b9bc14 --- /dev/null +++ b/adfs/adfs.rc @@ -0,0 +1,109 @@ +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +#ifndef _MAC +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 2,0,0,0 + PRODUCTVERSION 2,0,0,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "Comments", "\0" + VALUE "CompanyName", "Internet2\0" + VALUE "FileDescription", "Shibboleth 2.0 ADFSv1 Plugin\0" + VALUE "FileVersion", "2, 0, 0, 0\0" + VALUE "InternalName", "adfs\0" + VALUE "LegalCopyright", "Copyright © 2007 Internet2\0" + VALUE "LegalTrademarks", "\0" + VALUE "OriginalFilename", "adfs.so\0" + VALUE "PrivateBuild", "\0" + VALUE "ProductName", "Shibboleth 2.0\0" + VALUE "ProductVersion", "2, 0, 0, 0\0" + VALUE "SpecialBuild", "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // !_MAC + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/adfs/adfs.vcproj b/adfs/adfs.vcproj new file mode 100644 index 0000000..6c707e5 --- /dev/null +++ b/adfs/adfs.vcproj @@ -0,0 +1,196 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/adfs/resource.h b/adfs/resource.h new file mode 100644 index 0000000..95f2c63 --- /dev/null +++ b/adfs/resource.h @@ -0,0 +1,15 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Developer Studio generated include file. +// Used by adfs.rc +// + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 101 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1000 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/configure.ac b/configure.ac index 4f1005f..1c2be3d 100644 --- a/configure.ac +++ b/configure.ac @@ -200,10 +200,10 @@ AC_SUBST(LITE_LIBS) AC_SUBST(XMLSEC_LIBS) # output the underlying makefiles -WANT_SUBDIRS="doc schemas configs shibsp shibd util" +WANT_SUBDIRS="doc schemas configs shibsp shibd adfs util" AC_CONFIG_FILES([Makefile doc/Makefile schemas/Makefile \ configs/Makefile shibsp/Makefile shibd/Makefile \ - util/Makefile selinux/Makefile]) + adfs/Makefile util/Makefile selinux/Makefile]) # # Build NSAPI module? diff --git a/schemas/Makefile.am b/schemas/Makefile.am index 3fd6989..8d4f997 100644 --- a/schemas/Makefile.am +++ b/schemas/Makefile.am @@ -13,6 +13,7 @@ schemafiles = \ shibboleth-2.0-afp-mf-saml.xsd \ shibboleth-2.0-attribute-map.xsd \ shibboleth-2.0-sp-notify.xsd \ + WS-Trust.xsd \ metadata_v12_to_v13.xsl \ metadata_v13_to_v12.xsl \ trust_v13_to_v12.xsl diff --git a/schemas/WS-Trust.xsd b/schemas/WS-Trust.xsd new file mode 100644 index 0000000..8c10883 --- /dev/null +++ b/schemas/WS-Trust.xsd @@ -0,0 +1,113 @@ + + + + + + + + + + + + + Actual content model is non-deterministic, hence wildcard. The following shows intended content model: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/schemas/catalog.xml.in b/schemas/catalog.xml.in index 115473e..e59eb48 100644 --- a/schemas/catalog.xml.in +++ b/schemas/catalog.xml.in @@ -8,4 +8,5 @@ + -- 2.1.4