Removed ShibTarget members.
[shibboleth/cpp-sp.git] / shib-target / shib-target.cpp
index 66bd6c9..928f270 100644 (file)
 /*
- * shib-target.cpp -- General target initialization and finalization routines
+ *  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
  *
- * Created By: Derek Atkins <derek@ihtfp.com>
+ *     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.
+ */
+
+/*
+ * shib-target.cpp -- The ShibTarget class, a superclass for general
+ *                   target code
+ *
+ * Created by: Derek Atkins <derek@ihtfp.com>
  *
  * $Id$
  */
 
-#include "shib-target.h"
+#include "internal.h"
 
-#include <log4cpp/PropertyConfigurator.hh>
-#include <log4cpp/Category.hh>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
 
-using namespace saml;
-using namespace shibboleth;
+#include <fstream>
+
+#include <saml/SAMLConfig.h>
+#include <xercesc/util/Base64.hpp>
+#include <shibsp/AccessControl.h>
+#include <shibsp/RequestMapper.h>
+#include <xmltooling/util/NDC.h>
+#include <xmltooling/util/TemplateEngine.h>
+#include <xmltooling/util/XMLHelper.h>
+
+#ifndef HAVE_STRCASECMP
+# define strcasecmp stricmp
+#endif
+
+using namespace shibsp;
 using namespace shibtarget;
+using namespace shibboleth;
+using namespace saml;
+using namespace opensaml::saml2md;
+using namespace log4cpp;
 using namespace std;
 
-CCache* shibtarget::g_shibTargetCCache = NULL;
+using xmltooling::TemplateEngine;
+using xmltooling::XMLToolingException;
+using xmltooling::XMLToolingConfig;
+using xmltooling::XMLHelper;
+
+namespace shibtarget {
+
+    class ExtTemplateParameters : public TemplateEngine::TemplateParameters
+    {
+        const PropertySet* m_props;
+    public:
+        ExtTemplateParameters() : m_props(NULL) {}
+        ~ExtTemplateParameters() {}
 
-/* shib-target.cpp */
+        void setPropertySet(const PropertySet* props) {
+            m_props = props;
 
-#ifndef SHIBTARGET_INIFILE
-#define SHIBTARGET_INIFILE "/etc/shibboleth.ini"
+            // Create a timestamp.
+            time_t now = time(NULL);
+#ifdef HAVE_CTIME_R
+            char timebuf[32];
+            m_map["now"] = ctime_r(&now,timebuf);
+#else
+            m_map["now"] = ctime(&now);
 #endif
+        }
 
-static bool get_tag (ShibINI& ini, string& header, string& tag, bool try_general,
-                    string* result)
-{
-  if (!result) return false;
+        const char* getParameter(const char* name) const {
+            const char* pch = TemplateParameters::getParameter(name);
+            if (pch || !m_props)
+                return pch;
+            pair<bool,const char*> p = m_props->getString(name);
+            return p.first ? p.second : NULL;
+        }
+    };
 
-  if (ini.exists (header, tag)) {
-    *result = ini.get(header, tag);
-    return true;
-  }
-  if (try_general && ini.exists (SHIBTARGET_GENERAL, tag)) {
-    *result = ini.get(SHIBTARGET_GENERAL, tag);
-    return true;
-  }
-  return false;
+    class ShibTargetPriv
+    {
+    public:
+        ShibTargetPriv();
+        ~ShibTargetPriv();
+
+        // Helper functions
+        void get_application(ShibTarget* st, const string& protocol, const string& hostname, int port, const string& uri);
+        long sendError(ShibTarget* st, const char* page, ExtTemplateParameters& tp, const XMLToolingException* ex=NULL);
+        void clearHeaders(ShibTarget* st);
+    
+    private:
+        friend class ShibTarget;
+        RequestMapper::Settings m_settings;
+        const IApplication *m_app;
+
+        ISessionCacheEntry* m_cacheEntry;
+
+        ShibTargetConfig* m_Config;
+
+        IConfig* m_conf;
+        RequestMapper* m_mapper;
+    };
+
+    static const XMLCh SessionInitiator[] =     UNICODE_LITERAL_16(S,e,s,s,i,o,n,I,n,i,t,i,a,t,o,r);
+    static const XMLCh DiagnosticService[] =    UNICODE_LITERAL_17(D,i,a,g,n,o,s,t,i,c,S,e,r,v,i,c,e);
 }
 
-static bool get_tag (ShibINI& ini, string& header, const char* tag,
-                    bool try_general, string* result)
+
+/*************************************************************************
+ * Shib Target implementation
+ */
+
+ShibTarget::ShibTarget() : m_priv(new ShibTargetPriv()) {}
+
+ShibTarget::ShibTarget(const IApplication *app) : m_priv(new ShibTargetPriv())
 {
-  string tag_s = tag;
-  return get_tag (ini, header, tag_s, try_general, result);
+    m_priv->m_app = app;
 }
 
-class DummyMapper : public IOriginSiteMapper
+ShibTarget::~ShibTarget(void)
 {
-public:
-    DummyMapper();
-    ~DummyMapper();
-    virtual Iterator<xstring> getHandleServiceNames(const XMLCh* originSite) { return Iterator<xstring>(m_hsnames); }
-    virtual Key* getHandleServiceKey(const XMLCh* handleService) { return NULL; }
-    virtual Iterator<xstring> getSecurityDomains(const XMLCh* originSite);
-    virtual Iterator<X509Certificate*> getTrustedRoots() { return Iterator<X509Certificate*>(); }
-
-private:
-    typedef map<xstring,vector<xstring>*> domains_t;
-    domains_t m_domains;
-    vector<xstring> m_hsnames;
-};
-
-DummyMapper::DummyMapper()
+    delete m_priv;
+}
+
+void ShibTarget::init(
+    const char* scheme,
+    const char* hostname,
+    int port,
+    const char* uri
+    )
 {
-    auto_ptr<XMLCh> buf(XMLString::transcode("shibprod0.internet2.edu"));
-    m_hsnames.push_back(buf.get());
+    if (m_priv->m_app)
+        throw XMLToolingException("Request initialization occurred twice!");
+
+    m_priv->m_Config = &ShibTargetConfig::getConfig();
+    m_priv->get_application(this, scheme, hostname, port, uri);
+    AbstractSPRequest::m_app = m_priv->m_app;
 }
 
-Iterator<xstring> DummyMapper::getSecurityDomains(const XMLCh* originSite)
+
+// These functions implement the server-agnostic shibboleth engine
+// The web server modules implement a subclass and then call into 
+// these methods once they instantiate their request object.
+
+pair<bool,long> ShibTarget::doCheckAuthN(bool handler)
 {
-    domains_t::iterator i=m_domains.find(originSite);
-    if (i==m_domains.end())
-    {
-        vector<xstring>* pv=new vector<xstring>();
-        pv->push_back(originSite);
-        pair<domains_t::iterator,bool> p=m_domains.insert(domains_t::value_type(originSite,pv));
-       i=p.first;
+#ifdef _DEBUG
+    xmltooling::NDC ndc("doCheckAuthN");
+#endif
+
+    const char* procState = "Request Processing Error";
+    const char* targetURL = m_url.c_str();
+    ExtTemplateParameters tp;
+
+    try {
+        if (!m_priv->m_app)
+            throw ConfigurationException("System uninitialized, application did not supply request information.");
+
+        // If not SSL, check to see if we should block or redirect it.
+        if (!strcmp("http",getScheme())) {
+            pair<bool,const char*> redirectToSSL = m_priv->m_settings.first->getString("redirectToSSL");
+            if (redirectToSSL.first) {
+                if (!strcasecmp("GET",getMethod()) || !strcasecmp("HEAD",getMethod())) {
+                    // Compute the new target URL
+                    string redirectURL = string("https://") + getHostname();
+                    if (strcmp(redirectToSSL.second,"443")) {
+                        redirectURL = redirectURL + ':' + redirectToSSL.second;
+                    }
+                    redirectURL += getRequestURI();
+                    return make_pair(true, sendRedirect(redirectURL.c_str()));
+                }
+                else {
+                    tp.m_map["requestURL"] = m_url.substr(0,m_url.find('?'));
+                    return make_pair(true,m_priv->sendError(this,"ssl", tp));
+                }
+            }
+        }
+        
+        string hURL = getHandlerURL(targetURL);
+        const char* handlerURL=hURL.c_str();
+        if (!handlerURL)
+            throw ConfigurationException("Cannot determine handler from resource URL, check configuration.");
+
+        // If the request URL contains the handler base URL for this application, either dispatch
+        // directly (mainly Apache 2.0) or just pass back control.
+        if (strstr(targetURL,handlerURL)) {
+            if (handler)
+                return doHandler();
+            else
+                return make_pair(true, returnOK());
+        }
+
+        // Three settings dictate how to proceed.
+        pair<bool,const char*> authType = m_priv->m_settings.first->getString("authType");
+        pair<bool,bool> requireSession = m_priv->m_settings.first->getBool("requireSession");
+        pair<bool,const char*> requireSessionWith = m_priv->m_settings.first->getString("requireSessionWith");
+
+        // If no session is required AND the AuthType (an Apache-derived concept) isn't shibboleth,
+        // then we ignore this request and consider it unprotected. Apache might lie to us if
+        // ShibBasicHijack is on, but that's up to it.
+        if ((!requireSession.first || !requireSession.second) && !requireSessionWith.first &&
+#ifdef HAVE_STRCASECMP
+                (!authType.first || strcasecmp(authType.second,"shibboleth")))
+#else
+                (!authType.first || _stricmp(authType.second,"shibboleth")))
+#endif
+            return make_pair(true,returnDecline());
+
+        // Fix for secadv 20050901
+        m_priv->clearHeaders(this);
+
+        pair<string,const char*> shib_cookie = m_priv->m_app->getCookieNameProps("_shibsession_");
+        const char* session_id = getCookie(shib_cookie.first.c_str());
+        if (!session_id || !*session_id) {
+            // No session.  Maybe that's acceptable?
+            if ((!requireSession.first || !requireSession.second) && !requireSessionWith.first)
+                return make_pair(true,returnOK());
+
+            // No cookie, but we require a session. Initiate a new session using the indicated method.
+            procState = "Session Initiator Error";
+            const IHandler* initiator=NULL;
+            if (requireSessionWith.first) {
+                initiator=m_priv->m_app->getSessionInitiatorById(requireSessionWith.second);
+                if (!initiator)
+                    throw ConfigurationException(
+                        "No session initiator found with id ($1), check requireSessionWith command.",
+                        xmltooling::params(1,requireSessionWith.second)
+                        );
+            }
+            else {
+                initiator=m_priv->m_app->getDefaultSessionInitiator();
+                if (!initiator)
+                    throw ConfigurationException("No default session initiator found, check configuration.");
+            }
+
+            return initiator->run(this,false);
+        }
+
+        procState = "Session Processing Error";
+        try {
+            m_priv->m_cacheEntry=m_priv->m_conf->getSessionCache()->find(
+                session_id,
+                m_priv->m_app,
+                getRemoteAddr().c_str()
+                );
+            // Make a localized exception throw if the session isn't valid.
+            if (!m_priv->m_cacheEntry)
+                throw RetryableProfileException("Session no longer valid.");
+        }
+        catch (exception& e) {
+            log(SPError, string("session processing failed: ") + e.what());
+
+            // If no session is required, bail now.
+            if ((!requireSession.first || !requireSession.second) && !requireSessionWith.first)
+                // Has to be OK because DECLINED will just cause Apache
+                // to fail when it can't locate anything to process the
+                // AuthType.  No session plus requireSession false means
+                // do not authenticate the user at this time.
+                return make_pair(true, returnOK());
+
+            // Try and cast down.
+            exception* base = &e;
+            RetryableProfileException* trycast=dynamic_cast<RetryableProfileException*>(base);
+            if (trycast) {
+                // Session is invalid but we can retry -- initiate a new session.
+                procState = "Session Initiator Error";
+                const IHandler* initiator=NULL;
+                if (requireSessionWith.first) {
+                    initiator=m_priv->m_app->getSessionInitiatorById(requireSessionWith.second);
+                    if (!initiator)
+                        throw ConfigurationException(
+                            "No session initiator found with id ($1), check requireSessionWith command.",
+                            xmltooling::params(1,requireSessionWith.second)
+                            );
+                }
+                else {
+                    initiator=m_priv->m_app->getDefaultSessionInitiator();
+                    if (!initiator)
+                        throw ConfigurationException("No default session initiator found, check configuration.");
+                }
+                return initiator->run(this,false);
+            }
+            throw;    // send it to the outer handler
+        }
+
+        // We're done.  Everything is okay.  Nothing to report.  Nothing to do..
+        // Let the caller decide how to proceed.
+        log(SPDebug, "doCheckAuthN succeeded");
+        return make_pair(false,0);
+    }
+    catch (XMLToolingException& e) {
+        tp.m_map["errorType"] = procState;
+        tp.m_map["errorText"] = e.what();
+        if (targetURL)
+            tp.m_map["requestURL"] = m_url.substr(0,m_url.find('?'));
+        return make_pair(true,m_priv->sendError(this, "session", tp, &e));
+    }
+#ifndef _DEBUG
+    catch (...) {
+        tp.m_map["errorType"] = procState;
+        tp.m_map["errorText"] = "Caught an unknown exception.";
+        if (targetURL)
+            tp.m_map["requestURL"] = m_url.substr(0,m_url.find('?'));
+        return make_pair(true,m_priv->sendError(this, "session", tp));
     }
-    return Iterator<xstring>(*(i->second));
+#endif
 }
 
-DummyMapper::~DummyMapper()
+pair<bool,long> ShibTarget::doHandler(void)
 {
-    for (domains_t::iterator i=m_domains.begin(); i!=m_domains.end(); i++)
-        delete i->second;
+#ifdef _DEBUG
+    xmltooling::NDC ndc("doHandler");
+#endif
+
+    ExtTemplateParameters tp;
+    const char* procState = "Shibboleth Handler Error";
+    const char* targetURL = m_url.c_str();
+
+    try {
+        if (!m_priv->m_app)
+            throw ConfigurationException("System uninitialized, application did not supply request information.");
+
+        string hURL = getHandlerURL(targetURL);
+        const char* handlerURL=hURL.c_str();
+        if (!handlerURL)
+            throw ConfigurationException("Cannot determine handler from resource URL, check configuration.");
+
+        // Make sure we only process handler requests.
+        if (!strstr(targetURL,handlerURL))
+            return make_pair(true, returnDecline());
+
+        const PropertySet* sessionProps=m_priv->m_app->getPropertySet("Sessions");
+        if (!sessionProps)
+            throw ConfigurationException("Unable to map request to application session settings, check configuration.");
+
+        // Process incoming request.
+        pair<bool,bool> handlerSSL=sessionProps->getBool("handlerSSL");
+      
+        // Make sure this is SSL, if it should be
+        if ((!handlerSSL.first || handlerSSL.second) && strcmp(getScheme(),"https"))
+            throw FatalProfileException("Blocked non-SSL access to Shibboleth handler.");
+
+        // We dispatch based on our path info. We know the request URL begins with or equals the handler URL,
+        // so the path info is the next character (or null).
+        const IHandler* handler=m_priv->m_app->getHandler(targetURL + strlen(handlerURL));
+        if (!handler)
+            throw opensaml::BindingException("Shibboleth handler invoked at an unconfigured location.");
+
+        if (XMLHelper::isNodeNamed(handler->getProperties()->getElement(),samlconstants::SAML20MD_NS,AssertionConsumerService::LOCAL_NAME))
+            procState = "Session Creation Error";
+        else if (XMLString::equals(handler->getProperties()->getElement()->getLocalName(),SessionInitiator))
+            procState = "Session Initiator Error";
+        else if (XMLHelper::isNodeNamed(handler->getProperties()->getElement(),samlconstants::SAML20MD_NS,SingleLogoutService::LOCAL_NAME))
+            procState = "Session Termination Error";
+        else if (XMLString::equals(handler->getProperties()->getElement()->getLocalName(),DiagnosticService))
+            procState = "Diagnostics Error";
+        else
+            procState = "Extension Service Error";
+        pair<bool,long> hret=handler->run(this);
+
+        // Did the handler run successfully?
+        if (hret.first)
+            return hret;
+       
+        throw opensaml::BindingException("Configured Shibboleth handler failed to process the request.");
+    }
+    catch (MetadataException& e) {
+        tp.m_map["errorText"] = e.what();
+        // See if a metadata error page is installed.
+        const PropertySet* props=m_priv->m_app->getPropertySet("Errors");
+        if (props) {
+            pair<bool,const char*> p=props->getString("metadata");
+            if (p.first) {
+                tp.m_map["errorType"] = procState;
+                if (targetURL)
+                    tp.m_map["requestURL"] = targetURL;
+                return make_pair(true,m_priv->sendError(this, "metadata", tp));
+            }
+        }
+        throw;
+    }
+    catch (XMLToolingException& e) {
+        tp.m_map["errorType"] = procState;
+        tp.m_map["errorText"] = e.what();
+        if (targetURL)
+            tp.m_map["requestURL"] = m_url.substr(0,m_url.find('?'));
+        return make_pair(true,m_priv->sendError(this, "session", tp, &e));
+    }
+#ifndef _DEBUG
+    catch (...) {
+        tp.m_map["errorType"] = procState;
+        tp.m_map["errorText"] = "Caught an unknown exception.";
+        if (targetURL)
+            tp.m_map["requestURL"] = m_url.substr(0,m_url.find('?'));
+        return make_pair(true,m_priv->sendError(this, "session", tp));
+    }
+#endif
 }
 
-/* initialize and finalize the target library: return 0 on success, 1 on failure */
-extern "C" int shib_target_initialize (const char* app_name, const char* inifile)
+pair<bool,long> ShibTarget::doCheckAuthZ(void)
 {
-  if (!app_name) {
-    cerr << "APPLICATION ERROR: No application supplied to shib_target_init\n";
-    return 1;
-  }
+#ifdef _DEBUG
+    xmltooling::NDC ndc("doCheckAuthZ");
+#endif
+
+    ExtTemplateParameters tp;
+    const char* procState = "Authorization Processing Error";
+    const char* targetURL = m_url.c_str();
+
+    try {
+        if (!m_priv->m_app)
+            throw ConfigurationException("System uninitialized, application did not supply request information.");
+
+        // Three settings dictate how to proceed.
+        pair<bool,const char*> authType = m_priv->m_settings.first->getString("authType");
+        pair<bool,bool> requireSession = m_priv->m_settings.first->getBool("requireSession");
+        pair<bool,const char*> requireSessionWith = m_priv->m_settings.first->getString("requireSessionWith");
+
+        // If no session is required AND the AuthType (an Apache-derived concept) isn't shibboleth,
+        // then we ignore this request and consider it unprotected. Apache might lie to us if
+        // ShibBasicHijack is on, but that's up to it.
+        if ((!requireSession.first || !requireSession.second) && !requireSessionWith.first &&
+#ifdef HAVE_STRCASECMP
+                (!authType.first || strcasecmp(authType.second,"shibboleth")))
+#else
+                (!authType.first || _stricmp(authType.second,"shibboleth")))
+#endif
+            return make_pair(true,returnDecline());
+
+        // Do we have an access control plugin?
+        if (m_priv->m_settings.second) {
+               
+               if (!m_priv->m_cacheEntry) {
+                   // No data yet, so we may need to try and get the session.
+                       pair<string,const char*> shib_cookie=m_priv->m_app->getCookieNameProps("_shibsession_");
+                const char *session_id = getCookie(shib_cookie.first.c_str());
+                   try {
+                               if (session_id && *session_id) {
+                        m_priv->m_cacheEntry=m_priv->m_conf->getSessionCache()->find(
+                            session_id,
+                            m_priv->m_app,
+                            getRemoteAddr().c_str()
+                            );
+                               }
+                   }
+                   catch (exception&) {
+                       log(SPError, "doCheckAuthZ: unable to obtain session information to pass to access control provider");
+                   }
+               }
+       
+            xmltooling::Locker acllock(m_priv->m_settings.second);
+            /* TODO: port
+            if (m_priv->m_settings.second->authorized(this,m_priv->m_cacheEntry)) {
+                // Let the caller decide how to proceed.
+                log(LogLevelDebug, "doCheckAuthZ: access control provider granted access");
+                return make_pair(false,0);
+            }
+            else {
+                log(LogLevelWarn, "doCheckAuthZ: access control provider denied access");
+                if (targetURL)
+                    tp.m_map["requestURL"] = targetURL;
+                return make_pair(true,m_priv->sendError(this, "access", tp));
+            }
+            */
+            return make_pair(false,0);
+        }
+        else
+            return make_pair(true,returnDecline());
+    }
+    catch (exception& e) {
+        tp.m_map["errorType"] = procState;
+        tp.m_map["errorText"] = e.what();
+        if (targetURL)
+            tp.m_map["requestURL"] = m_url.substr(0,m_url.find('?'));
+        return make_pair(true,m_priv->sendError(this, "access", tp));
+    }
+#ifndef _DEBUG
+    catch (...) {
+        tp.m_map["errorType"] = procState;
+        tp.m_map["errorText"] = "Caught an unknown exception.";
+        if (targetURL)
+            tp.m_map["requestURL"] = m_url.substr(0,m_url.find('?'));
+        return make_pair(true,m_priv->sendError(this, "access", tp));
+    }
+#endif
+}
 
-  // Open the inifile
-  ShibINI ini((inifile ? inifile : SHIBTARGET_INIFILE));
+pair<bool,long> ShibTarget::doExportAssertions(bool requireSession)
+{
+#ifdef _DEBUG
+    xmltooling::NDC ndc("doExportAssertions");
+#endif
 
-  string app = app_name;
-  string tag;
+    ExtTemplateParameters tp;
+    const char* procState = "Attribute Processing Error";
+    const char* targetURL = m_url.c_str();
 
-  // Initialize Log4cpp
-  if (get_tag (ini, app, SHIBTARGET_TAG_LOGGER, true, &tag)) {
-    cerr << "Trying to load logger configuration: " << tag << "\n";
     try {
-      log4cpp::PropertyConfigurator::configure(tag);
-    } catch (log4cpp::ConfigureFailure& e) {
-      cerr << "Error reading configuration: " << e.what() << "\n";
-    }
-  } else {
-    log4cpp::Category& category = log4cpp::Category::getRoot();
-    category.setPriority(log4cpp::Priority::DEBUG);
-    cerr << "No logger configuration found\n";
-  }
+        if (!m_priv->m_app)
+            throw ConfigurationException("System uninitialized, application did not supply request information.");
+
+        if (!m_priv->m_cacheEntry) {
+            // No data yet, so we need to get the session. This can only happen
+            // if the call to doCheckAuthn doesn't happen in the same object lifetime.
+               pair<string,const char*> shib_cookie=m_priv->m_app->getCookieNameProps("_shibsession_");
+            const char *session_id = getCookie(shib_cookie.first.c_str());
+            try {
+                       if (session_id && *session_id) {
+                    m_priv->m_cacheEntry=m_priv->m_conf->getSessionCache()->find(
+                        session_id,
+                        m_priv->m_app,
+                        getRemoteAddr().c_str()
+                        );
+                       }
+            }
+            catch (exception&) {
+               log(SPError, "unable to obtain session information to export into request headers");
+               // If we have to have a session, then this is a fatal error.
+               if (requireSession)
+                       throw;
+            }
+        }
+
+               // Still no data?
+        if (!m_priv->m_cacheEntry) {
+               if (requireSession)
+                       throw RetryableProfileException("Unable to obtain session information for request.");
+               else
+                       return make_pair(false,0);      // just bail silently
+        }
+        
+        // Extract data from session.
+        pair<const char*,const SAMLSubject*> sub=m_priv->m_cacheEntry->getSubject(false,true);
+        pair<const char*,const SAMLResponse*> unfiltered=m_priv->m_cacheEntry->getTokens(true,false);
+        pair<const char*,const SAMLResponse*> filtered=m_priv->m_cacheEntry->getTokens(false,true);
+
+        // Maybe export the tokens.
+        pair<bool,bool> exp=m_priv->m_settings.first->getBool("exportAssertion");
+        if (exp.first && exp.second && unfiltered.first && *unfiltered.first) {
+            unsigned int outlen;
+            XMLByte* serialized =
+                Base64::encode(reinterpret_cast<XMLByte*>((char*)unfiltered.first), XMLString::stringLen(unfiltered.first), &outlen);
+            XMLByte *pos, *pos2;
+            for (pos=serialized, pos2=serialized; *pos2; pos2++)
+                if (isgraph(*pos2))
+                    *pos++=*pos2;
+            *pos=0;
+            setHeader("Shib-Attributes", reinterpret_cast<char*>(serialized));
+            XMLString::release(&serialized);
+        }
+
+        // Export the SAML AuthnMethod and the origin site name, and possibly the NameIdentifier.
+        setHeader("Shib-Origin-Site", m_priv->m_cacheEntry->getProviderId());
+        setHeader("Shib-Identity-Provider", m_priv->m_cacheEntry->getProviderId());
+        setHeader("Shib-Authentication-Method", m_priv->m_cacheEntry->getAuthnContext());
+        
+        // Get the AAP providers, which contain the attribute policy info.
+        Iterator<IAAP*> provs=m_priv->m_app->getAAPProviders();
 
-  log4cpp::Category& log = log4cpp::Category::getInstance("shibtarget.initialize");
-
-  // Initialize SAML and Shib libraries
-  SAMLConfig& samlConf = SAMLConfig::getConfig();
-  ShibConfig& shibConf = ShibConfig::getConfig();
-
-  // Init SAML
-  if (get_tag (ini, app, SHIBTARGET_TAG_SCHEMAS, true, &tag))
-    samlConf.schema_dir = tag;
-  if (get_tag (ini, app, SHIBTARGET_TAG_CERTFILE, true, &tag))
-    samlConf.ssl_certfile = tag;
-  if (get_tag (ini, app, SHIBTARGET_TAG_KEYFILE, true, &tag))
-    samlConf.ssl_keyfile = tag;
-  if (get_tag (ini, app, SHIBTARGET_TAG_KEYPASS, true, &tag))
-    samlConf.ssl_keypass = tag;
-  if (get_tag (ini, app, SHIBTARGET_TAG_CALIST, true, &tag))
-    samlConf.ssl_calist = tag;
-
-  if (!samlConf.init()) {
-    log.error ("Failed to initialize SAML Library");
-    return 1;
-  } else
-    log.debug ("SAML Initialized");
-
-  // Init Shib
-  shibConf.origin_mapper = new DummyMapper();
-  
-  if (!shibConf.init()) {
-    log.error ("Failed to initialize SHIB library");
-    return 1;
-  } else
-    log.debug ("Shib Initialized");
-
-  // Initialize the SHAR Cache
-  if (!strcmp (app_name, SHIBTARGET_SHAR))
-    g_shibTargetCCache = CCache::getInstance();  
-
-  // Load any extensions
-  string ext = "extensions";
-  if (ini.exists(ext)) {
-    saml::NDC ndc("load extensions");
-    ShibINI::Iterator* iter = ini.tag_iterator(ext);
-
-    for (const string* str = iter->begin(); str; str = iter->next()) {
-      string file = ini.get(ext, *str);
-      try
-      {
-       samlConf.saml_register_extension(file.c_str());
-       log.debug("%s: loading %s", str->c_str(), file.c_str());
-      }
-      catch (SAMLException& e)
-      {
-       log.error("%s: %s", str->c_str(), e.what());
-      }
-    }
-    delete iter;
+        // Export NameID?
+        while (provs.hasNext()) {
+            IAAP* aap=provs.next();
+            xmltooling::Locker locker(aap);
+            const XMLCh* format = sub.second->getNameIdentifier()->getFormat();
+            const IAttributeRule* rule=aap->lookup(format ? format : SAMLNameIdentifier::UNSPECIFIED);
+            if (rule && rule->getHeader()) {
+                auto_ptr_char form(format ? format : SAMLNameIdentifier::UNSPECIFIED);
+                auto_ptr_char nameid(sub.second->getNameIdentifier()->getName());
+                setHeader("Shib-NameIdentifier-Format", form.get());
+                if (!strcmp(rule->getHeader(),"REMOTE_USER"))
+                    setRemoteUser(nameid.get());
+                else
+                    setHeader(rule->getHeader(), nameid.get());
+            }
+        }
+        
+        setHeader("Shib-Application-ID", m_priv->m_app->getId());
+    
+        // Export the attributes.
+        Iterator<SAMLAssertion*> a_iter(filtered.second ? filtered.second->getAssertions() : EMPTY(SAMLAssertion*));
+        while (a_iter.hasNext()) {
+            SAMLAssertion* assert=a_iter.next();
+            Iterator<SAMLStatement*> statements=assert->getStatements();
+            while (statements.hasNext()) {
+                SAMLAttributeStatement* astate=dynamic_cast<SAMLAttributeStatement*>(statements.next());
+                if (!astate)
+                    continue;
+                Iterator<SAMLAttribute*> attrs=astate->getAttributes();
+                while (attrs.hasNext()) {
+                    SAMLAttribute* attr=attrs.next();
+            
+                    // Are we supposed to export it?
+                    provs.reset();
+                    while (provs.hasNext()) {
+                        IAAP* aap=provs.next();
+                        xmltooling::Locker locker(aap);
+                        const IAttributeRule* rule=aap->lookup(attr->getName(),attr->getNamespace());
+                        if (!rule || !rule->getHeader())
+                            continue;
+                    
+                        Iterator<string> vals=attr->getSingleByteValues();
+                        if (!strcmp(rule->getHeader(),"REMOTE_USER") && vals.hasNext())
+                            setRemoteUser(vals.next().c_str());
+                        else {
+                            int it=0;
+                            string header = getSecureHeader(rule->getHeader());
+                            if (!header.empty())
+                                it++;
+                            for (; vals.hasNext(); it++) {
+                                string value = vals.next();
+                                for (string::size_type pos = value.find_first_of(";", string::size_type(0));
+                                        pos != string::npos;
+                                        pos = value.find_first_of(";", pos)) {
+                                    value.insert(pos, "\\");
+                                    pos += 2;
+                                }
+                                if (it)
+                                    header += ";";
+                                header += value;
+                            }
+                            setHeader(rule->getHeader(), header.c_str());
+                        }
+                    }
+                }
+            }
+        }
+    
+        return make_pair(false,0);
+    }
+    catch (XMLToolingException& e) {
+        tp.m_map["errorType"] = procState;
+        tp.m_map["errorText"] = e.what();
+        if (targetURL)
+            tp.m_map["requestURL"] = m_url.substr(0,m_url.find('?'));
+        return make_pair(true,m_priv->sendError(this, "rm", tp, &e));
+    }
+#ifndef _DEBUG
+    catch (...) {
+        tp.m_map["errorType"] = procState;
+        tp.m_map["errorText"] = "Caught an unknown exception.";
+        if (targetURL)
+            tp.m_map["requestURL"] = m_url.substr(0,m_url.find('?'));
+        return make_pair(true,m_priv->sendError(this, "rm", tp));
+    }
+#endif
+}
+
+const IApplication* ShibTarget::getApplication() const
+{
+    return m_priv->m_app;
+}
+
+const IConfig* ShibTarget::getConfig() const
+{
+    return m_priv->m_conf;
+}
+
+long ShibTarget::returnDecline(void)
+{
+    return NULL;
+}
+
+long ShibTarget::returnOK(void)
+{
+    return NULL;
+}
+
+/*************************************************************************
+ * Shib Target Private implementation
+ */
+
+ShibTargetPriv::ShibTargetPriv()
+    : m_app(NULL), m_mapper(NULL), m_conf(NULL), m_Config(NULL), m_cacheEntry(NULL) {}
+
+ShibTargetPriv::~ShibTargetPriv()
+{
+    if (m_cacheEntry) {
+        m_cacheEntry->unlock();
+        m_cacheEntry = NULL;
+    }
+
+    if (m_mapper) {
+        m_mapper->unlock();
+        m_mapper = NULL;
+    }
+    
+    if (m_conf) {
+        m_conf->unlock();
+        m_conf = NULL;
+    }
+
+    m_app = NULL;
+    m_Config = NULL;
+}
+
+void ShibTargetPriv::get_application(ShibTarget* st, const string& protocol, const string& hostname, int port, const string& uri)
+{
+  if (m_app)
+    return;
+
+  // XXX: Do we need to keep conf and mapper locked while we hold m_app?
+  // TODO: No, should be able to hold the conf but release the mapper.
+
+  // We lock the configuration system for the duration.
+  m_conf=m_Config->getINI();
+  m_conf->lock();
+    
+  // Map request to application and content settings.
+  m_mapper=m_conf->getRequestMapper();
+  m_mapper->lock();
+
+  // Obtain the application settings from the parsed URL
+  m_settings = m_mapper->getSettings(*st);
+
+  // Now find the application from the URL settings
+  pair<bool,const char*> application_id=m_settings.first->getString("applicationId");
+  m_app=dynamic_cast<const IApplication*>(m_conf->getApplication(application_id.second));
+  if (!m_app) {
+    m_mapper->unlock();
+    m_mapper = NULL;
+    m_conf->unlock();
+    m_conf = NULL;
+    throw ConfigurationException("Unable to map request to application settings, check configuration.");
   }
 
-  log.debug("shib_target_initialize() finished");
-  return 0;
+  // Compute the full target URL
+  st->m_url = protocol + "://" + hostname;
+  if ((protocol == "http" && port != 80) || (protocol == "https" && port != 443)) {
+       ostringstream portstr;
+       portstr << port;
+    st->m_url += ":" + portstr.str();
+  }
+  st->m_url += uri;
 }
 
-extern "C" void shib_target_finalize (void)
+long ShibTargetPriv::sendError(
+    ShibTarget* st, const char* page, ExtTemplateParameters& tp, const XMLToolingException* ex
+    )
 {
-  delete g_shibTargetCCache;
+    st->setContentType("text/html");
+    st->setResponseHeader("Expires","01-Jan-1997 12:00:00 GMT");
+    st->setResponseHeader("Cache-Control","private,no-store,no-cache");
+
+    TemplateEngine* engine = XMLToolingConfig::getConfig().getTemplateEngine();
+    const PropertySet* props=m_app->getPropertySet("Errors");
+    if (props) {
+        pair<bool,const char*> p=props->getString(page);
+        if (p.first) {
+            ifstream infile(p.second);
+            if (infile) {
+                tp.setPropertySet(props);
+                stringstream str;
+                engine->run(infile, str, tp, ex);
+                return st->sendResponse(str);
+            }
+        }
+        else if (!strcmp(page,"access")) {
+            istringstream msg("Access Denied");
+            return static_cast<opensaml::GenericResponse*>(st)->sendResponse(msg, opensaml::HTTPResponse::SAML_HTTP_STATUS_FORBIDDEN);
+        }
+    }
 
-  ShibConfig& shibConf = ShibConfig::getConfig();
-  delete shibConf.origin_mapper;
-  shibConf.term();
+    string errstr = string("sendError could not process error template (") + page + ") for application (";
+    errstr += m_app->getId();
+    errstr += ")";
+    st->log(SPRequest::SPError, errstr);
+    istringstream msg("Internal Server Error. Please contact the site administrator.");
+    return st->sendError(msg);
+}
+
+void ShibTargetPriv::clearHeaders(ShibTarget* st)
+{
+    // Clear invariant stuff.
+    st->clearHeader("Shib-Origin-Site");
+    st->clearHeader("Shib-Identity-Provider");
+    st->clearHeader("Shib-Authentication-Method");
+    st->clearHeader("Shib-NameIdentifier-Format");
+    st->clearHeader("Shib-Attributes");
+    st->clearHeader("Shib-Application-ID");
 
-  SAMLConfig& samlConf = SAMLConfig::getConfig();
-  samlConf.term();
+    // Clear out the list of mapped attributes
+    Iterator<IAAP*> provs=m_app->getAAPProviders();
+    while (provs.hasNext()) {
+        IAAP* aap=provs.next();
+        xmltooling::Locker locker(aap);
+        Iterator<const IAttributeRule*> rules=aap->getAttributeRules();
+        while (rules.hasNext()) {
+            const char* header=rules.next()->getHeader();
+            if (header)
+                st->clearHeader(header);
+        }
+    }
 }