https://issues.shibboleth.net/jira/browse/SSPCPP-255
[shibboleth/cpp-sp.git] / isapi_shib / isapi_shib.cpp
index 56a89b4..f30cab6 100644 (file)
@@ -1,50 +1,17 @@
 /*
- * The Shibboleth License, Version 1.
- * Copyright (c) 2002
- * University Corporation for Advanced Internet Development, Inc.
- * All rights reserved
+ *  Copyright 2001-2009 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
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution, if any, must include
- * the following acknowledgment: "This product includes software developed by
- * the University Corporation for Advanced Internet Development
- * <http://www.ucaid.edu>Internet2 Project. Alternately, this acknowledegement
- * may appear in the software itself, if and wherever such third-party
- * acknowledgments normally appear.
- *
- * Neither the name of Shibboleth nor the names of its contributors, nor
- * Internet2, nor the University Corporation for Advanced Internet Development,
- * Inc., nor UCAID may be used to endorse or promote products derived from this
- * software without specific prior written permission. For written permission,
- * please contact shibboleth@shibboleth.org
- *
- * Products derived from this software may not be called Shibboleth, Internet2,
- * UCAID, or the University Corporation for Advanced Internet Development, nor
- * may Shibboleth appear in their name, without prior written permission of the
- * University Corporation for Advanced Internet Development.
- *
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND WITH ALL FAULTS. ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE, AND NON-INFRINGEMENT ARE DISCLAIMED AND THE ENTIRE RISK
- * OF SATISFACTORY QUALITY, PERFORMANCE, ACCURACY, AND EFFORT IS WITH LICENSEE.
- * IN NO EVENT SHALL THE COPYRIGHT OWNER, CONTRIBUTORS OR THE UNIVERSITY
- * CORPORATION FOR ADVANCED INTERNET DEVELOPMENT, INC. BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 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.
  */
 
 /* isapi_shib.cpp - Shibboleth ISAPI filter
    8/23/02
 */
 
+#include "config_win32.h"
+
 // SAML Runtime
 #include <saml/saml.h>
 #include <shib/shib.h>
 #include <shib/shib-threads.h>
 #include <shib-target/shib-target.h>
 
-#include <log4cpp/Category.hh>
-
 #include <ctime>
 #include <fstream>
 #include <sstream>
 #include <stdexcept>
+#include <process.h>
 
 #include <httpfilt.h>
 #include <httpext.h>
 
-#include <cgiparse.h>
-
 using namespace std;
-using namespace log4cpp;
 using namespace saml;
 using namespace shibboleth;
 using namespace shibtarget;
 
-struct settings_t
-{
-    settings_t() {}
-    settings_t(string& name) : m_name(name) {}
-    
-    string m_name;
-    vector<string> m_mustContain;
-};
-
 // globals
 namespace {
+    static const XMLCh name[] = { chLatin_n, chLatin_a, chLatin_m, chLatin_e, chNull };
+    static const XMLCh port[] = { chLatin_p, chLatin_o, chLatin_r, chLatin_t, chNull };
+    static const XMLCh sslport[] = { chLatin_s, chLatin_s, chLatin_l, chLatin_p, chLatin_o, chLatin_r, chLatin_t, chNull };
+    static const XMLCh scheme[] = { chLatin_s, chLatin_c, chLatin_h, chLatin_e, chLatin_m, chLatin_e, chNull };
+    static const XMLCh id[] = { chLatin_i, chLatin_d, chNull };
+    static const XMLCh Implementation[] =
+    { chLatin_I, chLatin_m, chLatin_p, chLatin_l, chLatin_e, chLatin_m, chLatin_e, chLatin_n, chLatin_t, chLatin_a, chLatin_t, chLatin_i, chLatin_o, chLatin_n, chNull };
+    static const XMLCh ISAPI[] = { chLatin_I, chLatin_S, chLatin_A, chLatin_P, chLatin_I, chNull };
+    static const XMLCh Alias[] = { chLatin_A, chLatin_l, chLatin_i, chLatin_a, chLatin_s, chNull };
+    static const XMLCh normalizeRequest[] =
+    { chLatin_n, chLatin_o, chLatin_r, chLatin_m, chLatin_a, chLatin_l, chLatin_i, chLatin_z, chLatin_e,
+      chLatin_R, chLatin_e, chLatin_q, chLatin_u, chLatin_e, chLatin_s, chLatin_t, chNull
+    };
+    static const XMLCh safeHeaderNames[] =
+    { chLatin_s, chLatin_a, chLatin_f, chLatin_e, chLatin_H, chLatin_e, chLatin_a, chLatin_d, chLatin_e, chLatin_r,
+      chLatin_N, chLatin_a, chLatin_m, chLatin_e, chLatin_s, chNull
+    };
+    static const XMLCh Site[] = { chLatin_S, chLatin_i, chLatin_t, chLatin_e, chNull };
+
+    struct site_t {
+        site_t(const DOMElement* e)
+        {
+            auto_ptr_char n(e->getAttributeNS(NULL,name));
+            auto_ptr_char s(e->getAttributeNS(NULL,scheme));
+            auto_ptr_char p(e->getAttributeNS(NULL,port));
+            auto_ptr_char p2(e->getAttributeNS(NULL,sslport));
+            if (n.get()) m_name=n.get();
+            if (s.get()) m_scheme=s.get();
+            if (p.get()) m_port=p.get();
+            if (p2.get()) m_sslport=p2.get();
+            DOMNodeList* nlist=e->getElementsByTagNameNS(shibtarget::XML::SHIBTARGET_NS,Alias);
+            for (int i=0; nlist && i<nlist->getLength(); i++) {
+                if (nlist->item(i)->hasChildNodes()) {
+                    auto_ptr_char alias(nlist->item(i)->getFirstChild()->getNodeValue());
+                    m_aliases.insert(alias.get());
+                }
+            }
+        }
+        string m_scheme,m_port,m_sslport,m_name;
+        set<string> m_aliases;
+    };
+
     HINSTANCE g_hinstDLL;
-    ThreadKey* rpc_handle_key = NULL;
     ShibTargetConfig* g_Config = NULL;
-    vector<settings_t> g_Sites;
-}
-
-void destroy_handle(void* data)
-{
-    delete (RPCHandle*)data;
+    map<string,site_t> g_Sites;
+    bool g_bNormalizeRequest = true;
+    string g_unsetHeaderValue,g_spoofKey;
+    set<string> g_allowedSchemes;
+    bool g_checkSpoofing = true;
+    bool g_catchAll = true;
+    bool g_bSafeHeaderNames = false;
 }
 
 BOOL LogEvent(
@@ -107,7 +105,7 @@ BOOL LogEvent(
     LPCSTR  message)
 {
     LPCSTR  messages[] = {message, NULL};
-    
+
     HANDLE hElog = RegisterEventSource(lpUNCServerName, "Shibboleth ISAPI Filter");
     BOOL res = ReportEvent(hElog, wType, 0, dwEventID, lpUserSid, 1, 0, messages, NULL);
     return (DeregisterEventSource(hElog) && res);
@@ -124,7 +122,7 @@ extern "C" BOOL WINAPI GetExtensionVersion(HSE_VERSION_INFO* pVer)
 {
     if (!pVer)
         return FALSE;
-        
+
     if (!g_Config)
     {
         LogEvent(NULL, EVENTLOG_ERROR_TYPE, 2100, NULL,
@@ -137,80 +135,115 @@ extern "C" BOOL WINAPI GetExtensionVersion(HSE_VERSION_INFO* pVer)
     return TRUE;
 }
 
+extern "C" BOOL WINAPI TerminateExtension(DWORD)
+{
+    return TRUE;    // cleanup should happen when filter unloads
+}
+
 extern "C" BOOL WINAPI GetFilterVersion(PHTTP_FILTER_VERSION pVer)
 {
     if (!pVer)
         return FALSE;
+    else if (g_Config) {
+        LogEvent(NULL, EVENTLOG_ERROR_TYPE, 2100, NULL,
+                "Reentrant filter initialization, ignoring...");
+        return TRUE;
+    }
 
-    try
-    {
-        ShibTargetConfig::preinit();
-        g_Config = &(ShibTargetConfig::init(SHIBTARGET_SHIRE, getenv("SHIBCONFIG")));
-        ShibINI& ini = g_Config->getINI();
-
-        // Create the RPC Handle TLS key.
-        rpc_handle_key=ThreadKey::create(destroy_handle);
+    try {
+        LPCSTR schemadir=getenv("SHIBSCHEMAS");
+        if (!schemadir)
+            schemadir=SHIB_SCHEMAS;
+        LPCSTR config=getenv("SHIBCONFIG");
+        if (!config)
+            config=SHIB_CONFIG;
+        g_Config=&ShibTargetConfig::getConfig();
+        g_Config->setFeatures(
+            ShibTargetConfig::Listener |
+            ShibTargetConfig::Metadata |
+            ShibTargetConfig::AAP |
+            ShibTargetConfig::RequestMapper |
+            ShibTargetConfig::LocalExtensions |
+            ShibTargetConfig::Logging
+            );
+        if (!g_Config->init(schemadir)) {
+            g_Config=NULL;
+            LogEvent(NULL, EVENTLOG_ERROR_TYPE, 2100, NULL,
+                    "Filter startup failed during library initialization, check native log for help.");
+            return FALSE;
+        }
+        else if (!g_Config->load(config)) {
+            g_Config=NULL;
+            LogEvent(NULL, EVENTLOG_ERROR_TYPE, 2100, NULL,
+                    "Filter startup failed to load configuration, check native log for help.");
+            return FALSE;
+        }
 
-        Category& log=Category::getInstance("isapi_shib.GetFilterVersion");
+        // Access the implementation-specifics for site mappings.
+        IConfig* conf=g_Config->getINI();
+        Locker locker(conf);
+        const IPropertySet* props=conf->getPropertySet("Local");
+        if (props) {
+            pair<bool,bool> flag=props->getBool("checkSpoofing");
+            g_checkSpoofing = !flag.first || flag.second;
+            flag=props->getBool("catchAll");
+            g_catchAll = !flag.first || flag.second;
+
+            pair<bool,const char*> str=props->getString("unsetHeaderValue");
+            if (str.first)
+                g_unsetHeaderValue = str.second;
+
+            str=props->getString("allowedSchemes");
+            if (str.first) {
+                string schemes=str.second;
+                unsigned int j=0;
+                for (unsigned int i=0;  i < schemes.length();  i++) {
+                    if (schemes.at(i)==' ') {
+                        g_allowedSchemes.insert(schemes.substr(j, i-j));
+                        j = i+1;
+                    }
+                }
+                g_allowedSchemes.insert(schemes.substr(j, schemes.length()-j));
+            }
 
-        // Read site-specific settings for each instance ID we can find.
-        unsigned short i=1;
-        char iid[8];
-        sprintf(iid,"%u",i++);
-        string hostname;
-        while (ini.get_tag("isapi",iid,false,&hostname))
-        {
-            log.info("configuring for site ID (%d), hostname (%s)",i-1,hostname.empty() ? "null" : hostname.c_str());
-
-            // If no section exists for the host, mark it as a "skip" site.
-            if (!ini.exists(hostname))
-            {
-                log.info("skipping site ID (%d)",i-1);
-                g_Sites.push_back(settings_t());
-                sprintf(iid,"%u",i++);
-                continue;
+            if (g_checkSpoofing) {
+                str = props->getString("spoofKey");
+                if (str.first)
+                    g_spoofKey = str.second;
+                else {
+                    LogEvent(NULL, EVENTLOG_WARNING_TYPE, 2100, NULL,
+                            "Filter generating a pseudorandom anti-spoofing key, consider setting spoofKey yourself.");
+                    srand(time(NULL));
+                    ostringstream keystr;
+                    keystr << rand() << rand() << rand() << rand();
+                    g_spoofKey = keystr.str();
+                }
             }
-            
-            settings_t settings(hostname);
-            
-            // Content matching string.
-            string mustcontain;
-            if (ini.get_tag(hostname,"mustContain",true,&mustcontain) && !mustcontain.empty())
-            {
-                char* buf=strdup(mustcontain.c_str());
-                _strupr(buf);
-                char* start=buf;
-                while (char* sep=strchr(start,';'))
-                {
-                    *sep='\0';
-                    if (*start)
-                        settings.m_mustContain.push_back(start);
-                    start=sep+1;
+
+            const DOMElement* impl=saml::XML::getFirstChildElement(
+                props->getElement(),shibtarget::XML::SHIBTARGET_NS,Implementation
+                );
+            if (impl && (impl=saml::XML::getFirstChildElement(impl,shibtarget::XML::SHIBTARGET_NS,ISAPI))) {
+                const XMLCh* ch=impl->getAttributeNS(NULL,normalizeRequest);
+                g_bNormalizeRequest=(!ch || !*ch || *ch==chDigit_1 || *ch==chLatin_t);
+                ch=impl->getAttributeNS(NULL,safeHeaderNames);
+                g_bSafeHeaderNames=(ch && (*ch==chDigit_1 || *ch==chLatin_t));
+                impl=saml::XML::getFirstChildElement(impl,shibtarget::XML::SHIBTARGET_NS,Site);
+                while (impl) {
+                    auto_ptr_char id(impl->getAttributeNS(NULL,id));
+                    if (id.get())
+                        g_Sites.insert(pair<string,site_t>(id.get(),site_t(impl)));
+                    impl=saml::XML::getNextSiblingElement(impl,shibtarget::XML::SHIBTARGET_NS,Site);
                 }
-                if (*start)
-                    settings.m_mustContain.push_back(start);
-                free(buf);
             }
-            
-            g_Sites.push_back(settings);
-            sprintf(iid,"%u",i++);
-            hostname.erase();
+        }
+        if (g_allowedSchemes.empty()) {
+            g_allowedSchemes.insert("https");
+            g_allowedSchemes.insert("http");
         }
     }
-    catch (SAMLException&)
-    {
-        LogEvent(NULL, EVENTLOG_ERROR_TYPE, 2100, NULL,
-                "Filter startup failed with SAML exception, check shire log for help.");
-        return FALSE;
-    }
-    catch (runtime_error& e)
-    {
-        LogEvent(NULL, EVENTLOG_ERROR_TYPE, 2100, NULL, e.what());
-        return FALSE;
-    }
-    catch (...)
-    {
-        LogEvent(NULL, EVENTLOG_ERROR_TYPE, 2100, NULL, "Filter startup failed with unexpected exception.");
+    catch (exception&) {
+        LogEvent(NULL, EVENTLOG_ERROR_TYPE, 2100, NULL, "Filter startup failed with an exception.");
         return FALSE;
     }
 
@@ -225,14 +258,8 @@ extern "C" BOOL WINAPI GetFilterVersion(PHTTP_FILTER_VERSION pVer)
     return TRUE;
 }
 
-extern "C" BOOL WINAPI TerminateExtension(DWORD)
-{
-    return TRUE;    // cleanup should happen when filter unloads
-}
-
 extern "C" BOOL WINAPI TerminateFilter(DWORD)
 {
-    delete rpc_handle_key;
     if (g_Config)
         g_Config->shutdown();
     g_Config = NULL;
@@ -293,8 +320,8 @@ bool dynabuf::operator==(const char* s) const
 void GetServerVariable(PHTTP_FILTER_CONTEXT pfc, LPSTR lpszVariable, dynabuf& s, DWORD size=80, bool bRequired=true)
     throw (bad_alloc, DWORD)
 {
-    s.erase();
     s.reserve(size);
+    s.erase();
     size=s.size();
 
     while (!pfc->GetServerVariable(pfc,lpszVariable,s,&size))
@@ -313,11 +340,11 @@ void GetServerVariable(PHTTP_FILTER_CONTEXT pfc, LPSTR lpszVariable, dynabuf& s,
 void GetServerVariable(LPEXTENSION_CONTROL_BLOCK lpECB, LPSTR lpszVariable, dynabuf& s, DWORD size=80, bool bRequired=true)
     throw (bad_alloc, DWORD)
 {
-    s.erase();
     s.reserve(size);
+    s.erase();
     size=s.size();
 
-    while (lpECB->GetServerVariable(lpECB->ConnID,lpszVariable,s,&size))
+    while (!lpECB->GetServerVariable(lpECB->ConnID,lpszVariable,s,&size))
     {
         // Grumble. Check the error.
         DWORD e=GetLastError();
@@ -334,8 +361,8 @@ void GetHeader(PHTTP_FILTER_PREPROC_HEADERS pn, PHTTP_FILTER_CONTEXT pfc,
                LPSTR lpszName, dynabuf& s, DWORD size=80, bool bRequired=true)
     throw (bad_alloc, DWORD)
 {
-    s.erase();
     s.reserve(size);
+    s.erase();
     size=s.size();
 
     while (!pn->GetHeader(pfc,lpszName,s,&size))
@@ -351,83 +378,210 @@ void GetHeader(PHTTP_FILTER_PREPROC_HEADERS pn, PHTTP_FILTER_CONTEXT pfc,
         throw ERROR_NO_DATA;
 }
 
-inline char hexchar(unsigned short s)
-{
-    return (s<=9) ? ('0' + s) : ('A' + s - 10);
-}
+/****************************************************************************/
+// ISAPI Filter
 
-string url_encode(const char* url) throw (bad_alloc)
+class ShibTargetIsapiF : public ShibTarget
 {
-    static char badchars[]="\"\\+<>#%{}|^~[]`;/?:@=&";
-    string s;
-    for (const char* pch=url; *pch; pch++)
-    {
-        if (strchr(badchars,*pch)!=NULL || *pch<=0x1F || *pch>=0x7F)
-            s=s + '%' + hexchar(*pch >> 4) + hexchar(*pch & 0x0F);
-        else
-            s+=*pch;
+  PHTTP_FILTER_CONTEXT m_pfc;
+  PHTTP_FILTER_PREPROC_HEADERS m_pn;
+  string m_cookie;
+  dynabuf m_allhttp;
+  bool m_firsttime;
+
+  void checkString(const string& s, const char* msg) {
+    string::const_iterator e = s.end();
+    for (string::const_iterator i=s.begin(); i!=e; ++i) {
+        if (iscntrl(*i))
+            throw FatalProfileException(msg);
     }
-    return s;
-}
-
-string get_target(PHTTP_FILTER_CONTEXT pfc, PHTTP_FILTER_PREPROC_HEADERS pn, settings_t& site)
-{
-    // Reconstructing the requested URL is not fun. Apparently, the PREPROC_HEADERS
-    // event means way pre. As in, none of the usual CGI headers are in place yet.
-    // It's actually almost easier, in a way, because all the path-info and query
-    // stuff is in one place, the requested URL, which we can get. But we have to
-    // reconstruct the protocol/host pair using tweezers.
-    string s;
-    if (pfc->fIsSecurePort)
-        s="https://";
-    else
-        s="http://";
+  }
 
-    // We use the "normalizeRequest" tag to decide how to obtain the server's name.
-    dynabuf buf(256);
-    string tag;
-    if (g_Config->getINI().get_tag(site.m_name,"normalizeRequest",true,&tag) && ShibINI::boolean(tag))
-    {
-        s+=site.m_name;
+public:
+    ShibTargetIsapiF(PHTTP_FILTER_CONTEXT pfc, PHTTP_FILTER_PREPROC_HEADERS pn, const site_t& site)
+        : m_pfc(pfc), m_pn(pn), m_allhttp(4096), m_firsttime(true) {
+
+    // URL path always come from IIS.
+    dynabuf url(256);
+    GetHeader(pn,pfc,"url",url,256,false);
+
+    // Port may come from IIS or from site def.
+    dynabuf port(11);
+    if (!g_bNormalizeRequest || (pfc->fIsSecurePort && site.m_sslport.empty()) || (!pfc->fIsSecurePort && site.m_port.empty()))
+        GetServerVariable(pfc,"SERVER_PORT",port,10);
+    else if (pfc->fIsSecurePort) {
+        strncpy(port,site.m_sslport.c_str(),10);
+        static_cast<char*>(port)[10]=0;
     }
-    else
-    {
-        GetServerVariable(pfc,"SERVER_NAME",buf);
-        s+=buf;
+    else {
+        strncpy(port,site.m_port.c_str(),10);
+        static_cast<char*>(port)[10]=0;
     }
 
-    GetServerVariable(pfc,"SERVER_PORT",buf,10);
-    if (buf!=(pfc->fIsSecurePort ? "443" : "80"))
-        s=s + ':' + static_cast<char*>(buf);
-
-    GetHeader(pn,pfc,"url",buf,256,false);
-    s+=buf;
+    // Scheme may come from site def or be derived from IIS.
+    const char* scheme=site.m_scheme.c_str();
+    if (!scheme || !*scheme || !g_bNormalizeRequest)
+        scheme=pfc->fIsSecurePort ? "https" : "http";
+
+    // Get the rest of the server variables.
+    dynabuf remote_addr(16),method(5),content_type(32),hostname(32);
+    GetServerVariable(pfc,"SERVER_NAME",hostname,32);
+    GetServerVariable(pfc,"REMOTE_ADDR",remote_addr,16);
+    GetServerVariable(pfc,"REQUEST_METHOD",method,5,false);
+    GetServerVariable(pfc,"CONTENT_TYPE",content_type,32,false);
+
+    // Make sure SERVER_NAME is "authorized" for use on this site. If not, set to canonical name.
+    const char* host=hostname;
+    if (site.m_name!=host && site.m_aliases.find(host)==site.m_aliases.end())
+        host=site.m_name.c_str();
+
+    init(scheme, host, atoi(port), url, content_type, remote_addr, method);
+
+    if (!g_spoofKey.empty()) {
+        GetHeader(pn, pfc, "ShibSpoofCheck:", url, 32, false);
+        if (!url.empty() && g_spoofKey == (char*)url)
+            m_firsttime = false;
+    }
 
-    return s;
-}
+    if (!m_firsttime)
+        log(LogLevelDebug, "ISAPI filter running more than once");
+  }
+  ~ShibTargetIsapiF() {}
+
+  virtual void log(ShibLogLevel level, const string &msg) {
+    ShibTarget::log(level,msg);
+  }
+  virtual string getCookies() const {
+    dynabuf buf(128);
+    GetHeader(m_pn, m_pfc, "Cookie:", buf, 128, false);
+    return buf.empty() ? "" : buf;
+  }
+  string makeSafeHeader(const char* rawname) const {
+      string hdr;
+      for (; *rawname; ++rawname) {
+          if (isalnum(*rawname))
+              hdr += *rawname;
+      }
+      return hdr + ':';
+  }
+  virtual void clearHeader(const string &name) {
+    if (g_checkSpoofing && m_firsttime) {
+        if (m_allhttp.empty())
+               GetServerVariable(m_pfc,"ALL_HTTP",m_allhttp,4096);
+
+        // Map to the expected CGI variable name.
+        string transformed("HTTP_");
+        if (g_bSafeHeaderNames) {
+            string temp = makeSafeHeader(name.c_str());
+            for (const char* pch = temp.c_str(); *pch; ++pch) {
+                if (isalnum(*pch))
+                    transformed += toupper(*pch);
+            }
+        }
+        else {
+            for (const char* pch = name.c_str(); *pch; ++pch)
+                transformed += (isalnum(*pch) ? toupper(*pch) : '_');
+            transformed += ':';
+        }
 
-string get_shire_location(settings_t& site, const char* target)
-{
-    string shireURL;
-    if (g_Config->getINI().get_tag(site.m_name,"shireURL",true,&shireURL) && !shireURL.empty())
-    {
-        if (shireURL[0]!='/')
-            return shireURL;
-        const char* colon=strchr(target,':');
-        const char* slash=strchr(colon+3,'/');
-        string s(target,slash-target);
-        s+=shireURL;
-        return s;
-    }
-    return shireURL;
-}
+        if (strstr(m_allhttp, transformed.c_str()))
+            throw SAMLException("Attempt to spoof header ($1) was detected.", params(1, transformed.c_str()));
+    }
+    if (g_bSafeHeaderNames) {
+        string hdr = makeSafeHeader(name.c_str());
+        m_pn->SetHeader(m_pfc, const_cast<char*>(hdr.c_str()), const_cast<char*>(g_unsetHeaderValue.c_str()));
+    }
+    else if (name == "REMOTE_USER") {
+        m_pn->SetHeader(m_pfc, "remote-user:", const_cast<char*>(g_unsetHeaderValue.c_str()));
+        m_pn->SetHeader(m_pfc, "remote_user:", const_cast<char*>(g_unsetHeaderValue.c_str()));
+    }
+    else {
+        string hdr = name + ':';
+        m_pn->SetHeader(m_pfc, const_cast<char*>(hdr.c_str()), const_cast<char*>(g_unsetHeaderValue.c_str()));
+    }
+  }
+  virtual void setHeader(const string &name, const string &value) {
+    string hdr = g_bSafeHeaderNames ? makeSafeHeader(name.c_str()) : (name + ':');
+    m_pn->SetHeader(m_pfc, const_cast<char*>(hdr.c_str()), const_cast<char*>(value.c_str()));
+  }
+  virtual string getHeader(const string &name) {
+    string hdr = g_bSafeHeaderNames ? makeSafeHeader(name.c_str()) : (name + ':');
+    dynabuf buf(256);
+    GetHeader(m_pn, m_pfc, const_cast<char*>(hdr.c_str()), buf, 1024, false);
+    return string(buf.empty() ? "" : buf);
+  }
+  virtual void setRemoteUser(const string &user) {
+    setHeader(string("remote-user"), user);
+    if (m_pfc->pFilterContext) {
+        if (user.empty())
+            m_pfc->pFilterContext = NULL;
+        else if (m_pfc->pFilterContext = m_pfc->AllocMem(m_pfc, sizeof(char) * (user.length() + 1), NULL))
+            strcpy(reinterpret_cast<char*>(m_pfc->pFilterContext), user.c_str());
+    }
+  }
+  virtual string getRemoteUser(void) {
+    return getHeader(string("remote-user"));
+  }
+  virtual void* sendPage(
+    const string& msg,
+    int code=200,
+    const string& content_type="text/html",
+    const Iterator<header_t>& headers=EMPTY(header_t)) {
+    checkString(content_type, "Detected control character in a response header.");
+    string hdr = string ("Connection: close\r\nContent-type: ") + content_type + "\r\n";
+    while (headers.hasNext()) {
+        const header_t& h=headers.next();
+        checkString(h.first, "Detected control character in a response header.");
+        checkString(h.second, "Detected control character in a response header.");
+        hdr += h.first + ": " + h.second + "\r\n";
+    }
+    hdr += "\r\n";
+    const char* codestr="200 OK";
+    switch (code) {
+        case 403:   codestr="403 Forbidden"; break;
+        case 404:   codestr="404 Not Found"; break;
+        case 500:   codestr="500 Server Error"; break;
+    }
+    m_pfc->ServerSupportFunction(m_pfc, SF_REQ_SEND_RESPONSE_HEADER, (void*)codestr, (DWORD)hdr.c_str(), 0);
+    DWORD resplen = msg.size();
+    m_pfc->WriteClient(m_pfc, (LPVOID)msg.c_str(), &resplen, 0);
+    return (void*)SF_STATUS_REQ_FINISHED;
+  }
+  virtual void* sendRedirect(const string& url) {
+    checkString(url, "Detected control character in an attempted redirect.");
+    if (g_allowedSchemes.find(url.substr(0, url.find(':'))) == g_allowedSchemes.end())
+        throw FatalProfileException("Invalid scheme in attempted redirect.");
+    // XXX: Don't support the httpRedirect option, yet.
+    string hdrs=m_cookie + string("Location: ") + url + "\r\n"
+      "Content-Type: text/html\r\n"
+      "Content-Length: 40\r\n"
+      "Expires: 01-Jan-1997 12:00:00 GMT\r\n"
+      "Cache-Control: private,no-store,no-cache\r\n\r\n";
+    m_pfc->ServerSupportFunction(m_pfc, SF_REQ_SEND_RESPONSE_HEADER,
+                                "302 Please Wait", (DWORD)hdrs.c_str(), 0);
+    static const char* redmsg="<HTML><BODY>Redirecting...</BODY></HTML>";
+    DWORD resplen=40;
+    m_pfc->WriteClient(m_pfc, (LPVOID)redmsg, &resplen, 0);
+    return reinterpret_cast<void*>(SF_STATUS_REQ_FINISHED);
+  }
+  // XXX: We might not ever hit the 'decline' status in this filter.
+  //virtual void* returnDecline(void) { }
+  virtual void* returnOK(void) { return (void*) SF_STATUS_REQ_NEXT_NOTIFICATION; }
+
+  // The filter never processes the POST, so stub these methods.
+  virtual void setCookie(const string &name, const string &value) {
+    // Set the cookie for later.  Use it during the redirect.
+    m_cookie += "Set-Cookie: " + name + "=" + value + "\r\n";
+  }
+  virtual string getArgs(void) { throw runtime_error("getArgs not implemented"); }
+  virtual string getPostData(void) { throw runtime_error("getPostData not implemented"); }
+};
 
 DWORD WriteClientError(PHTTP_FILTER_CONTEXT pfc, const char* msg)
 {
     LogEvent(NULL, EVENTLOG_ERROR_TYPE, 2100, NULL, msg);
-    static const char* ctype="Content-Type: text/html\r\n";
-    pfc->AddResponseHeaders(pfc,const_cast<char*>(ctype),0);
-    pfc->ServerSupportFunction(pfc,SF_REQ_SEND_RESPONSE_HEADER,"200 OK",0,0);
+    static const char* ctype="Connection: close\r\nContent-Type: text/html\r\n\r\n";
+    pfc->ServerSupportFunction(pfc,SF_REQ_SEND_RESPONSE_HEADER,"200 OK",(DWORD)ctype,0);
     static const char* xmsg="<HTML><HEAD><TITLE>Shibboleth Filter Error</TITLE></HEAD><BODY>"
                             "<H1>Shibboleth Filter Error</H1>";
     DWORD resplen=strlen(xmsg);
@@ -440,374 +594,77 @@ DWORD WriteClientError(PHTTP_FILTER_CONTEXT pfc, const char* msg)
     return SF_STATUS_REQ_FINISHED;
 }
 
-DWORD WriteClientError(PHTTP_FILTER_CONTEXT pfc, const char* filename, ShibMLP& mlp)
-{
-    ifstream infile(filename);
-    if (!infile)
-        return WriteClientError(pfc,"Unable to open error template, check settings.");   
-    string res = mlp.run(infile);
-
-    static const char* ctype="Content-Type: text/html\r\n";
-    pfc->AddResponseHeaders(pfc,const_cast<char*>(ctype),0);
-    pfc->ServerSupportFunction(pfc,SF_REQ_SEND_RESPONSE_HEADER,"200 OK",0,0);
-    DWORD resplen=res.length();
-    pfc->WriteClient(pfc,(LPVOID)res.c_str(),&resplen,0);
-    return SF_STATUS_REQ_FINISHED;
-}
-
 extern "C" DWORD WINAPI HttpFilterProc(PHTTP_FILTER_CONTEXT pfc, DWORD notificationType, LPVOID pvNotification)
 {
     // Is this a log notification?
-    if (notificationType==SF_NOTIFY_LOG)
-    {
+    if (notificationType==SF_NOTIFY_LOG) {
         if (pfc->pFilterContext)
-            ((PHTTP_FILTER_LOG)pvNotification)->pszClientUserName=static_cast<LPCSTR>(pfc->pFilterContext);
+            ((PHTTP_FILTER_LOG)pvNotification)->pszClientUserName=reinterpret_cast<char*>(pfc->pFilterContext);
         return SF_STATUS_REQ_NEXT_NOTIFICATION;
     }
 
     PHTTP_FILTER_PREPROC_HEADERS pn=(PHTTP_FILTER_PREPROC_HEADERS)pvNotification;
-    try
-    {
+    try {
         // Determine web site number. This can't really fail, I don't think.
         dynabuf buf(128);
-        ULONG site_id=0;
         GetServerVariable(pfc,"INSTANCE_ID",buf,10);
-        if ((site_id=strtoul(buf,NULL,10))==0)
-            return WriteClientError(pfc,"IIS site instance appears to be invalid.");
 
-        // Match site instance to site settings.
-        if (site_id>g_Sites.size() || g_Sites[site_id-1].m_name.length()==0)
+        // Match site instance to host name, skip if no match.
+        map<string,site_t>::const_iterator map_i=g_Sites.find(static_cast<char*>(buf));
+        if (map_i==g_Sites.end())
             return SF_STATUS_REQ_NEXT_NOTIFICATION;
-        settings_t& site=g_Sites[site_id-1];
-
-        string target_url=get_target(pfc,pn,site);
-        string shire_url=get_shire_location(site,target_url.c_str());
-
-        // If the user is accessing the SHIRE acceptance point, pass it on.
-        if (target_url.find(shire_url)!=string::npos)
-            return SF_STATUS_REQ_NEXT_NOTIFICATION;
-
-        // Get the url request and scan for the must-contain string.
-        if (!site.m_mustContain.empty())
-        {
-            char* upcased=new char[target_url.length()+1];
-            strcpy(upcased,target_url.c_str());
-            _strupr(upcased);
-            for (vector<string>::const_iterator index=site.m_mustContain.begin(); index!=site.m_mustContain.end(); index++)
-                if (strstr(upcased,index->c_str()))
-                    break;
-            delete[] upcased;
-            if (index==site.m_mustContain.end())
-                return SF_STATUS_REQ_NEXT_NOTIFICATION;
-        }
-
-        // SSL content check.
-        ShibINI& ini=g_Config->getINI();
-        string tag;
-        if (ini.get_tag(site.m_name,"contentSSLOnly",true,&tag) && ShibINI::boolean(tag) && !pfc->fIsSecurePort)
-        {
-            return WriteClientError(pfc,
-                "This server is configured to deny non-SSL requests for secure resources. "
-                "Try your request again using https instead of http.");
-        }
 
         ostringstream threadid;
-        threadid << "[" << getpid() << "] shire" << '\0';
+        threadid << "[" << getpid() << "] isapi_shib" << '\0';
         saml::NDC ndc(threadid.str().c_str());
 
-        // Set SHIRE policies.
-        SHIREConfig config;
-        config.checkIPAddress = (ini.get_tag(site.m_name,"checkIPAddress",true,&tag) && ShibINI::boolean(tag));
-        config.lifetime=config.timeout=0;
-        tag.erase();
-        if (ini.get_tag(site.m_name, "authLifetime", true, &tag))
-            config.lifetime=strtoul(tag.c_str(),NULL,10);
-        tag.erase();
-        if (ini.get_tag(site.m_name, "authTimeout", true, &tag))
-            config.timeout=strtoul(tag.c_str(),NULL,10);
-
-        // Pull the config data we need to handle the various possible conditions.
-        string shib_cookie;
-        if (!ini.get_tag(site.m_name, "cookieName", true, &shib_cookie))
-            return WriteClientError(pfc,"The cookieName configuration setting is missing, check configuration.");
-    
-        string wayfLocation;
-        if (!ini.get_tag(site.m_name, "wayfURL", true, &wayfLocation))
-            return WriteClientError(pfc,"The wayfURL configuration setting is missing, check configuration.");
-    
-        string shireError;
-        if (!ini.get_tag(site.m_name, "shireError", true, &shireError))
-            return WriteClientError(pfc,"The shireError configuration setting is missing, check configuration.");
-
-        string accessError;
-        if (!ini.get_tag(site.m_name, "accessError", true, &shireError))
-            return WriteClientError(pfc,"The accessError configuration setting is missing, check configuration.");
-        
-        // Get an RPC handle and build the SHIRE object.
-        RPCHandle* rpc_handle = (RPCHandle*)rpc_handle_key->getData();
-        if (!rpc_handle)
-        {
-            rpc_handle = new RPCHandle(shib_target_sockname(), SHIBRPC_PROG, SHIBRPC_VERS_1);
-            rpc_handle_key->setData(rpc_handle);
-        }
-        SHIRE shire(rpc_handle, config, shire_url);
+        ShibTargetIsapiF stf(pfc, pn, map_i->second);
 
-        // Check for authentication cookie.
-        const char* session_id=NULL;
-        GetHeader(pn,pfc,"Cookie:",buf,128,false);
-        Category::getInstance("isapi_shib.HttpFilterProc").debug("cookie header is {%s}",(const char*)buf);
-        if (buf.empty() || !(session_id=strstr(buf,shib_cookie.c_str())) || *(session_id+shib_cookie.length())!='=')
-        {
-            // Redirect to WAYF.
-            string wayf("Location: ");
-            wayf+=wayfLocation + "?shire=" + url_encode(shire_url.c_str()) + "&target=" + url_encode(target_url.c_str()) + "\r\n";
-            // Insert the headers.
-            pfc->AddResponseHeaders(pfc,const_cast<char*>(wayf.c_str()),0);
-            pfc->ServerSupportFunction(pfc,SF_REQ_SEND_RESPONSE_HEADER,"302 Please Wait",0,0);
-            return SF_STATUS_REQ_FINISHED;
-        }
+        // "false" because we don't override the Shib settings
+        pair<bool,void*> res = stf.doCheckAuthN();
+        if (!g_spoofKey.empty())
+            pn->SetHeader(pfc, "ShibSpoofCheck:", const_cast<char*>(g_spoofKey.c_str()));
+        if (res.first) return (DWORD)res.second;
 
-        session_id+=shib_cookie.length() + 1;  /* Skip over the '=' */
-        char* cookieend=strchr(session_id,';');
-        if (cookieend)
-            *cookieend = '\0'; /* Ignore anyting after a ; */
-  
-        // Make sure this session is still valid.
-        RPCError* status = NULL;
-        ShibMLP markupProcessor;
-        bool has_tag = ini.get_tag(site.m_name, "supportContact", true, &tag);
-        markupProcessor.insert("supportContact", has_tag ? tag : "");
-        has_tag = ini.get_tag(site.m_name, "logoLocation", true, &tag);
-        markupProcessor.insert("logoLocation", has_tag ? tag : "");
-        markupProcessor.insert("requestURL", target_url);
-    
-        GetServerVariable(pfc,"REMOTE_ADDR",buf,16);
-        try {
-            status = shire.sessionIsValid(session_id, buf, target_url.c_str());
-        }
-        catch (ShibTargetException &e) {
-            markupProcessor.insert("errorType", "SHIRE Processing Error");
-            markupProcessor.insert("errorText", e.what());
-            markupProcessor.insert("errorDesc", "An error occurred while processing your request.");
-            return WriteClientError(pfc, shireError.c_str(), markupProcessor);
-        }
-        catch (...) {
-            markupProcessor.insert("errorType", "SHIRE Processing Error");
-            markupProcessor.insert("errorText", "Unexpected Exception");
-            markupProcessor.insert("errorDesc", "An error occurred while processing your request.");
-            return WriteClientError(pfc, shireError.c_str(), markupProcessor);
-        }
-    
-        // Check the status
-        if (status->isError()) {
-            if (status->isRetryable()) {
-                // Redirect to WAYF.
-                delete status;
-                string wayf("Location: ");
-                wayf+=wayfLocation + "?shire=" + url_encode(shire_url.c_str()) + "&target=" + url_encode(target_url.c_str()) + "\r\n";
-                // Insert the headers.
-                pfc->AddResponseHeaders(pfc,const_cast<char*>(wayf.c_str()),0);
-                pfc->ServerSupportFunction(pfc,SF_REQ_SEND_RESPONSE_HEADER,"302 Please Wait",0,0);
-                return SF_STATUS_REQ_FINISHED;
-            }
-            else {
-                // return the error page to the user
-                markupProcessor.insert(*status);
-                delete status;
-                return WriteClientError(pfc, shireError.c_str(), markupProcessor);
-            }
-        }
-        delete status;
-    
-        // Move to RM phase.
-        RMConfig rm_config;
-        rm_config.checkIPAddress = config.checkIPAddress;
-        RM rm(rpc_handle,rm_config);
-
-        // Get the attributes.
-        vector<SAMLAssertion*> assertions;
-        SAMLAuthenticationStatement* sso_statement=NULL;
-        status = rm.getAssertions(session_id, buf, target_url.c_str(), assertions, &sso_statement);
-    
-        if (status->isError()) {
-            string rmError;
-            if (!ini.get_tag(site.m_name, "rmError", true, &shireError))
-                return WriteClientError(pfc,"The rmError configuration setting is missing, check configuration.");
-    
-            markupProcessor.insert(*status);
-            delete status;
-            return WriteClientError(pfc, rmError.c_str(), markupProcessor);
-        }
-        delete status;
-
-        // Only allow a single assertion...
-        if (assertions.size() > 1) {
-            for (int k = 0; k < assertions.size(); k++)
-              delete assertions[k];
-            delete sso_statement;
-            return WriteClientError(pfc, accessError.c_str(), markupProcessor);
-        }
-
-        // Get the AAP providers, which contain the attribute policy info.
-        Iterator<IAAP*> provs=ShibConfig::getConfig().getAAPProviders();
-    
-        // Clear out the list of mapped attributes
-        while (provs.hasNext())
-        {
-            IAAP* aap=provs.next();
-            aap->lock();
-            try
-            {
-                Iterator<const IAttributeRule*> rules=aap->getAttributeRules();
-                while (rules.hasNext())
-                {
-                    const char* header=rules.next()->getHeader();
-                    if (header)
-                        pn->SetHeader(pfc,const_cast<char*>(header),"");
-                }
-            }
-            catch(...)
-            {
-                aap->unlock();
-                for (int k = 0; k < assertions.size(); k++)
-                  delete assertions[k];
-                delete sso_statement;
-                throw;
-            }
-            aap->unlock();
-        }
-        provs.reset();
+        // "false" because we don't override the Shib settings
+        res = stf.doExportAssertions();
+        if (res.first) return (DWORD)res.second;
 
-        // Clear relevant headers.
-        pn->SetHeader(pfc,"remote-user:","");
-        pn->SetHeader(pfc,"Shib-Attributes:","");
-        pn->SetHeader(pfc,"Shib-Origin-Site:","");
-        pn->SetHeader(pfc,"Shib-Authentication-Method:","");
-
-        // Maybe export the assertion.
-        if (ini.get_tag(site.m_name,"exportAssertion",true,&tag) && ShibINI::boolean(tag))
-        {
-            string assertion;
-            RM::serialize(*(assertions[0]), assertion);
-            string::size_type lfeed;
-            while ((lfeed=assertion.find('\n'))!=string::npos)
-                assertion.erase(lfeed,1);
-            pn->SetHeader(pfc,"Shib-Attributes:",const_cast<char*>(assertion.c_str()));
-        }
-        
-        if (sso_statement)
-        {
-            auto_ptr<char> os(XMLString::transcode(sso_statement->getSubject()->getNameQualifier()));
-            auto_ptr<char> am(XMLString::transcode(sso_statement->getAuthMethod()));
-            pn->SetHeader(pfc,"Shib-Origin-Site:", os.get());
-            pn->SetHeader(pfc,"Shib-Authentication-Method:", am.get());
-        }
-
-        // Export the attributes. Only supports a single statement.
-        Iterator<SAMLAttribute*> j = assertions.size()==1 ? RM::getAttributes(*(assertions[0])) : EMPTY(SAMLAttribute*);
-        while (j.hasNext())
-        {
-            SAMLAttribute* attr=j.next();
-    
-            // Are we supposed to export it?
-            const char* hname=NULL;
-            AAP wrapper(attr->getName(),attr->getNamespace());
-            if (!wrapper.fail())
-                hname=wrapper->getHeader();
-            if (hname)
-            {
-                Iterator<string> vals=attr->getSingleByteValues();
-                if (!strcmp(hname,"REMOTE_USER") && vals.hasNext())
-                {
-                    char* principal=const_cast<char*>(vals.next().c_str());
-                    pn->SetHeader(pfc,"remote-user:",principal);
-                    pfc->pFilterContext=pfc->AllocMem(pfc,strlen(principal)+1,0);
-                    if (pfc->pFilterContext)
-                        strcpy(static_cast<char*>(pfc->pFilterContext),principal);
-                }    
-                else
-                {
-                    string header;
-                    for (int it = 0; 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 == 0)
-                            header=value;
-                        else
-                            header=header + ';' + value;
-                    }
-                    string hname2=string(hname) + ':';
-                    pn->SetHeader(pfc,const_cast<char*>(hname2.c_str()),const_cast<char*>(header.c_str()));
-                }
-            }
-        }
-    
-        // clean up memory
-        for (int k = 0; k < assertions.size(); k++)
-          delete assertions[k];
-        delete sso_statement;
+        res = stf.doCheckAuthZ();
+        if (res.first) return (DWORD)res.second;
 
         return SF_STATUS_REQ_NEXT_NOTIFICATION;
     }
-    catch(bad_alloc)
-    {
+    catch(bad_alloc) {
         return WriteClientError(pfc,"Out of Memory");
     }
-    catch(DWORD e)
-    {
+    catch(long e) {
         if (e==ERROR_NO_DATA)
             return WriteClientError(pfc,"A required variable or header was empty.");
         else
-            return WriteClientError(pfc,"Server detected unexpected IIS error.");
+            return WriteClientError(pfc,"Shibboleth Filter detected unexpected IIS error.");
     }
-    catch(...)
-    {
-        return WriteClientError(pfc,"Server caught an unknown exception.");
+    catch (exception& e) {
+        LogEvent(NULL, EVENTLOG_ERROR_TYPE, 2100, NULL, e.what());
+        return WriteClientError(pfc,"Shibboleth Filter caught an exception, ask administrator to check Event Log for details.");
     }
-
-    return WriteClientError(pfc,"Server reached unreachable code!");
-}
-
-string get_target(LPEXTENSION_CONTROL_BLOCK lpECB, settings_t& site)
-{
-    string s;
-    dynabuf buf(256);
-    GetServerVariable(lpECB,"HTTPS",buf);
-    bool SSL=(buf=="on");
-    if (SSL)
-        s="https://";
-    else
-        s="http://";
-
-    // We use the "normalizeRequest" tag to decide how to obtain the server's name.
-    string tag;
-    if (g_Config->getINI().get_tag(site.m_name,"normalizeRequest",true,&tag) && ShibINI::boolean(tag))
-    {
-        s+=site.m_name;
-    }
-    else
-    {
-        GetServerVariable(lpECB,"SERVER_NAME",buf);
-        s+=buf;
+    catch(...) {
+        if (g_catchAll)
+            return WriteClientError(pfc,"Shibboleth Filter caught an unknown exception.");
+        throw;
     }
 
-    GetServerVariable(lpECB,"SERVER_PORT",buf,10);
-    if (buf!=(SSL ? "443" : "80"))
-        s=s + ':' + static_cast<char*>(buf);
+    return WriteClientError(pfc,"Shibboleth Filter reached unreachable code, save my walrus!");
+}
 
-    GetServerVariable(lpECB,"URL",buf,255);
-    s+=buf;
 
-    return s;
-}
+/****************************************************************************/
+// ISAPI Extension
 
 DWORD WriteClientError(LPEXTENSION_CONTROL_BLOCK lpECB, const char* msg)
 {
     LogEvent(NULL, EVENTLOG_ERROR_TYPE, 2100, NULL, msg);
-    static const char* ctype="Content-Type: text/html\r\n";
+    static const char* ctype="Connection: close\r\nContent-Type: text/html\r\n\r\n";
     lpECB->ServerSupportFunction(lpECB->ConnID,HSE_REQ_SEND_RESPONSE_HEADER,"200 OK",0,(LPDWORD)ctype);
     static const char* xmsg="<HTML><HEAD><TITLE>Shibboleth Error</TITLE></HEAD><BODY><H1>Shibboleth Error</H1>";
     DWORD resplen=strlen(xmsg);
@@ -820,175 +677,239 @@ DWORD WriteClientError(LPEXTENSION_CONTROL_BLOCK lpECB, const char* msg)
     return HSE_STATUS_SUCCESS;
 }
 
-DWORD WriteClientError(LPEXTENSION_CONTROL_BLOCK lpECB, const char* filename, ShibMLP& mlp)
+
+class ShibTargetIsapiE : public ShibTarget
 {
-    ifstream infile(filename);
-    if (!infile)
-        return WriteClientError(lpECB,"Unable to open error template, check settings.");   
+  LPEXTENSION_CONTROL_BLOCK m_lpECB;
+  string m_cookie;
+
+  void checkString(const string& s, const char* msg) {
+    string::const_iterator e = s.end();
+    for (string::const_iterator i=s.begin(); i!=e; ++i) {
+        if (iscntrl(*i))
+            throw FatalProfileException(msg);
+    }
+  }
 
-    string res = mlp.run(infile);
-    static const char* ctype="Content-Type: text/html\r\n";
-    lpECB->ServerSupportFunction(lpECB->ConnID,HSE_REQ_SEND_RESPONSE_HEADER,"200 OK",0,(LPDWORD)ctype);
-    DWORD resplen=res.length();
-    lpECB->WriteClient(lpECB->ConnID,(LPVOID)res.c_str(),&resplen,0);
-    return HSE_STATUS_SUCCESS;
-}
+public:
+  ShibTargetIsapiE(LPEXTENSION_CONTROL_BLOCK lpECB, const site_t& site) {
+    dynabuf ssl(5);
+    GetServerVariable(lpECB,"HTTPS",ssl,5);
+    bool SSL=(ssl=="on" || ssl=="ON");
+
+    // URL path always come from IIS.
+    dynabuf url(256);
+    GetServerVariable(lpECB,"URL",url,255);
+
+    // Port may come from IIS or from site def.
+    dynabuf port(11);
+    if (!g_bNormalizeRequest || (SSL && site.m_sslport.empty()) || (!SSL && site.m_port.empty()))
+        GetServerVariable(lpECB,"SERVER_PORT",port,10);
+    else if (SSL) {
+        strncpy(port,site.m_sslport.c_str(),10);
+        static_cast<char*>(port)[10]=0;
+    }
+    else {
+        strncpy(port,site.m_port.c_str(),10);
+        static_cast<char*>(port)[10]=0;
+    }
+
+    // Scheme may come from site def or be derived from IIS.
+    const char* scheme=site.m_scheme.c_str();
+    if (!scheme || !*scheme || !g_bNormalizeRequest) {
+        scheme = SSL ? "https" : "http";
+    }
+
+    // Get the other server variables.
+    dynabuf remote_addr(16),hostname(32);
+    GetServerVariable(lpECB, "REMOTE_ADDR", remote_addr, 16);
+    GetServerVariable(lpECB, "SERVER_NAME", hostname, 32);
+
+    // Make sure SERVER_NAME is "authorized" for use on this site. If not, set to canonical name.
+    const char* host=hostname;
+    if (site.m_name!=host && site.m_aliases.find(host)==site.m_aliases.end())
+        host=site.m_name.c_str();
+
+    /*
+     * IIS screws us over on PATH_INFO (the hits keep on coming). We need to figure out if
+     * the server is set up for proper PATH_INFO handling, or "IIS sucks rabid weasels mode",
+     * which is the default. No perfect way to tell, but we can take a good guess by checking
+     * whether the URL is a substring of the PATH_INFO:
+     *
+     * e.g. for /Shibboleth.sso/SAML/POST
+     *
+     *  Bad mode (default):
+     *      URL:        /Shibboleth.sso
+     *      PathInfo:   /Shibboleth.sso/SAML/POST
+     *
+     *  Good mode:
+     *      URL:        /Shibboleth.sso
+     *      PathInfo:   /SAML/POST
+     */
+
+    string fullurl;
+
+    // Clearly we're only in bad mode if path info exists at all.
+    if (lpECB->lpszPathInfo && *(lpECB->lpszPathInfo)) {
+        if (strstr(lpECB->lpszPathInfo,url))
+            // Pretty good chance we're in bad mode, unless the PathInfo repeats the path itself.
+            fullurl=lpECB->lpszPathInfo;
+        else {
+            fullurl = url;
+            fullurl+=lpECB->lpszPathInfo;
+        }
+    }
+    else {
+        fullurl = url;
+    }
+
+    // For consistency with Apache, let's add the query string.
+    if (lpECB->lpszQueryString && *(lpECB->lpszQueryString)) {
+        fullurl+='?';
+        fullurl+=lpECB->lpszQueryString;
+    }
+    init(scheme, host, atoi(port), fullurl.c_str(), lpECB->lpszContentType, remote_addr, lpECB->lpszMethod);
+
+    m_lpECB = lpECB;
+  }
+  ~ShibTargetIsapiE() { }
+
+  virtual void log(ShibLogLevel level, const string &msg) {
+      ShibTarget::log(level,msg);
+  }
+  virtual string getCookies() const {
+    dynabuf buf(128);
+    GetServerVariable(m_lpECB, "HTTP_COOKIE", buf, 128, false);
+    return buf.empty() ? "" : buf;
+  }
+  virtual void setCookie(const string &name, const string &value) {
+    // Set the cookie for later.  Use it during the redirect.
+    m_cookie += "Set-Cookie: " + name + "=" + value + "\r\n";
+  }
+  virtual string getArgs(void) {
+    return string(m_lpECB->lpszQueryString ? m_lpECB->lpszQueryString : "");
+  }
+  virtual string getPostData(void) {
+    if (m_lpECB->cbTotalBytes > 1024*1024) // 1MB?
+      throw FatalProfileException("Blocked too-large a submission to profile endpoint.");
+    else if (m_lpECB->cbTotalBytes > m_lpECB->cbAvailable) {
+      string cgistr(reinterpret_cast<char*>(m_lpECB->lpbData),m_lpECB->cbAvailable);
+      char buf[8192];
+      DWORD datalen=m_lpECB->cbTotalBytes - m_lpECB->cbAvailable;
+      while (datalen) {
+        DWORD buflen=8192;
+        BOOL ret = m_lpECB->ReadClient(m_lpECB->ConnID, buf, &buflen);
+        if (!ret || !buflen)
+          throw FatalProfileException("Error reading profile submission from browser.");
+        cgistr.append(buf, buflen);
+        datalen-=buflen;
+      }
+      return cgistr;
+    }
+    else {
+      return string(reinterpret_cast<char*>(m_lpECB->lpbData),m_lpECB->cbAvailable);
+    }
+  }
+  virtual void* sendPage(
+    const string &msg,
+    int code=200,
+    const string& content_type="text/html",
+    const Iterator<header_t>& headers=EMPTY(header_t)) {
+    checkString(content_type, "Detected control character in a response header.");
+    string hdr = m_cookie + "Connection: close\r\nContent-type: " + content_type + "\r\n";
+    for (int k = 0; k < headers.size(); k++) {
+      checkString(headers[k].first, "Detected control character in a response header.");
+      checkString(headers[k].second, "Detected control character in a response header.");
+      hdr += headers[k].first + ": " + headers[k].second + "\r\n";
+    }
+    hdr += "\r\n";
+    const char* codestr="200 OK";
+    switch (code) {
+        case 403:   codestr="403 Forbidden"; break;
+        case 404:   codestr="404 Not Found"; break;
+        case 500:   codestr="500 Server Error"; break;
+    }
+    m_lpECB->ServerSupportFunction(m_lpECB->ConnID, HSE_REQ_SEND_RESPONSE_HEADER, (void*)codestr, 0, (LPDWORD)hdr.c_str());
+    DWORD resplen = msg.size();
+    m_lpECB->WriteClient(m_lpECB->ConnID, (LPVOID)msg.c_str(), &resplen, HSE_IO_SYNC);
+    return (void*)HSE_STATUS_SUCCESS;
+  }
+  virtual void* sendRedirect(const string& url) {
+    // XXX: Don't support the httpRedirect option, yet.
+    checkString(url, "Detected control character in an attempted redirect.");
+    if (g_allowedSchemes.find(url.substr(0, url.find(':'))) == g_allowedSchemes.end())
+        throw FatalProfileException("Invalid scheme in attempted redirect.");
+    string hdrs = m_cookie + "Location: " + url + "\r\n"
+      "Content-Type: text/html\r\n"
+      "Content-Length: 40\r\n"
+      "Expires: 01-Jan-1997 12:00:00 GMT\r\n"
+      "Cache-Control: private,no-store,no-cache\r\n\r\n";
+    m_lpECB->ServerSupportFunction(m_lpECB->ConnID, HSE_REQ_SEND_RESPONSE_HEADER,
+                                "302 Moved", 0, (LPDWORD)hdrs.c_str());
+    static const char* redmsg="<HTML><BODY>Redirecting...</BODY></HTML>";
+    DWORD resplen=40;
+    m_lpECB->WriteClient(m_lpECB->ConnID, (LPVOID)redmsg, &resplen, HSE_IO_SYNC);
+    return (void*)HSE_STATUS_SUCCESS;
+  }
+  // Decline happens in the POST processor if this isn't the shire url
+  // Note that it can also happen with HTAccess, but we don't support that, yet.
+  virtual void* returnDecline(void) {
+    return (void*)
+      WriteClientError(m_lpECB, "ISAPI extension can only be invoked to process Shibboleth protocol requests."
+                      "Make sure the mapped file extension doesn't match actual content.");
+  }
+  virtual void* returnOK(void) { return (void*) HSE_STATUS_SUCCESS; }
+
+  // Not used in the extension.
+  virtual void clearHeader(const string &name) { throw runtime_error("clearHeader not implemented"); }
+  virtual void setHeader(const string &name, const string &value) { throw runtime_error("setHeader not implemented"); }
+  virtual string getHeader(const string &name) { throw runtime_error("getHeader not implemented"); }
+  virtual void setRemoteUser(const string &user) { throw runtime_error("setRemoteUser not implemented"); }
+  virtual string getRemoteUser(void) { throw runtime_error("getRemoteUser not implemented"); }
+};
 
 extern "C" DWORD WINAPI HttpExtensionProc(LPEXTENSION_CONTROL_BLOCK lpECB)
 {
-    ostringstream threadid;
-    threadid << "[" << getpid() << "] shire" << '\0';
-    saml::NDC ndc(threadid.str().c_str());
-
-    ShibINI& ini = g_Config->getINI();
-    string shireError;
-    ShibMLP markupProcessor;
+    try {
+        ostringstream threadid;
+        threadid << "[" << getpid() << "] isapi_shib_extension" << '\0';
+        saml::NDC ndc(threadid.str().c_str());
 
-    try
-    {
         // Determine web site number. This can't really fail, I don't think.
         dynabuf buf(128);
-        ULONG site_id=0;
         GetServerVariable(lpECB,"INSTANCE_ID",buf,10);
-        if ((site_id=strtoul(buf,NULL,10))==0)
-            return WriteClientError(lpECB,"IIS site instance appears to be invalid.");
-
-        // Match site instance to site settings.
-        if (site_id>g_Sites.size() || g_Sites[site_id-1].m_name.length()==0)
-            return WriteClientError(lpECB,"Shibboleth filter not configured for this web site.");
-        settings_t& site=g_Sites[site_id-1];
-
-        if (!ini.get_tag(site.m_name, "shireError", true, &shireError))
-            return WriteClientError(lpECB,"The shireError configuration setting is missing, check configuration.");
-
-        string target_url=get_target(lpECB,site);
-        string shire_url = get_shire_location(site,target_url.c_str());
-
-        // Set SHIRE policies.
-        SHIREConfig config;
-        string tag;
-        config.checkIPAddress = (ini.get_tag(site.m_name,"checkIPAddress",true,&tag) && ShibINI::boolean(tag));
-        config.lifetime=config.timeout=0;
-        tag.erase();
-        if (ini.get_tag(site.m_name, "authLifetime", true, &tag))
-            config.lifetime=strtoul(tag.c_str(),NULL,10);
-        tag.erase();
-        if (ini.get_tag(site.m_name, "authTimeout", true, &tag))
-            config.timeout=strtoul(tag.c_str(),NULL,10);
-
-        // Pull the config data we need to handle the various possible conditions.
-        string shib_cookie;
-        if (!ini.get_tag(site.m_name, "cookieName", true, &shib_cookie))
-            return WriteClientError(lpECB,"The cookieName configuration setting is missing, check configuration.");
-    
-        string wayfLocation;
-        if (!ini.get_tag(site.m_name, "wayfURL", true, &wayfLocation))
-            return WriteClientError(lpECB,"The wayfURL configuration setting is missing, check configuration.");
-    
-        bool has_tag = ini.get_tag(site.m_name, "supportContact", true, &tag);
-        markupProcessor.insert("supportContact", has_tag ? tag : "");
-        has_tag = ini.get_tag(site.m_name, "logoLocation", true, &tag);
-        markupProcessor.insert("logoLocation", has_tag ? tag : "");
-        markupProcessor.insert("requestURL", target_url.c_str());
-  
-        // Get an RPC handle and build the SHIRE object.
-        RPCHandle* rpc_handle = (RPCHandle*)rpc_handle_key->getData();
-        if (!rpc_handle)
-        {
-            rpc_handle = new RPCHandle(shib_target_sockname(), SHIBRPC_PROG, SHIBRPC_VERS_1);
-            rpc_handle_key->setData(rpc_handle);
-        }
-        SHIRE shire(rpc_handle, config, shire_url.c_str());
 
-        // Process SHIRE POST
-        if (ini.get_tag(site.m_name, "shireSSLOnly", true, &tag) && ShibINI::boolean(tag))
-        {
-            // Make sure this is SSL, if it should be.
-            GetServerVariable(lpECB,"HTTPS",buf,10);
-            if (buf!="on")
-                throw ShibTargetException(SHIBRPC_OK,"blocked non-SSL access to SHIRE POST processor");
-        }
-        
-        // Make sure this is a POST
-        if (stricmp(lpECB->lpszMethod,"POST"))
-            throw ShibTargetException(SHIBRPC_OK,"blocked non-POST to SHIRE POST processor");
-
-        // Sure sure this POST is an appropriate content type
-        if (!lpECB->lpszContentType || stricmp(lpECB->lpszContentType,"application/x-www-form-urlencoded"))
-            throw ShibTargetException(SHIBRPC_OK,"blocked bad content-type to SHIRE POST processor");
-    
-        // Make sure the "bytes sent" is a reasonable number and that we have all of it.
-        if (lpECB->cbTotalBytes > 1024*1024) // 1MB?
-            throw ShibTargetException (SHIBRPC_OK,"blocked too-large a post to SHIRE POST processor");
-        else if (lpECB->cbTotalBytes>lpECB->cbAvailable)
-            throw ShibTargetException (SHIBRPC_OK,"blocked incomplete post to SHIRE POST processor");
-
-        // Parse the incoming data.
-        HQUERY params=ParseQuery(lpECB);
-        if (!params)
-            throw ShibTargetException (SHIBRPC_OK,"unable to parse form data");
-
-        // Make sure the TARGET parameter exists
-        const char* target = QueryValue(params,"TARGET");
-        if (!target || *target == '\0')
-            throw ShibTargetException(SHIBRPC_OK,"SHIRE POST failed to find TARGET parameter");
-    
-        // Make sure the SAMLResponse parameter exists
-        const char* post = QueryValue(params,"SAMLResponse");
-        if (!post || *post == '\0')
-            throw ShibTargetException (SHIBRPC_OK,"SHIRE POST failed to find SAMLResponse parameter");
-
-        GetServerVariable(lpECB,"REMOTE_ADDR",buf,16);
-
-        // Process the post.
-        string cookie;
-        RPCError* status = shire.sessionCreate(post,buf,cookie);
-    
-        if (status->isError()) {
-            if (status->isRetryable()) {
-                delete status;
-                string wayf=wayfLocation + "?shire=" + url_encode(shire_url.c_str()) + "&target=" + url_encode(target);
-                DWORD len=wayf.length();
-                if (lpECB->ServerSupportFunction(lpECB->ConnID,HSE_REQ_SEND_URL_REDIRECT_RESP,(LPVOID)wayf.c_str(),&len,0))
-                    return HSE_STATUS_SUCCESS;
-                return HSE_STATUS_ERROR;
-            }
-    
-            // Return this error to the user.
-            markupProcessor.insert(*status);
-            delete status;
-            return WriteClientError(lpECB,shireError.c_str(),markupProcessor);
-        }
-        delete status;
-    
-        // We've got a good session, set the cookie and redirect to target.
-        shib_cookie = "Set-Cookie: " + shib_cookie + '=' + cookie + "; path=/\r\n" 
-            "Location: " + target + "\r\n"
-            "Expires: 01-Jan-1997 12:00:00 GMT\r\n"
-            "Cache-Control: private,no-store,no-cache\r\n"
-            "Connection: close\r\n";
-        HSE_SEND_HEADER_EX_INFO hinfo;
-        hinfo.pszStatus="302 Moved";
-        hinfo.pszHeader=shib_cookie.c_str();
-        hinfo.cchStatus=9;
-        hinfo.cchHeader=shib_cookie.length();
-        hinfo.fKeepConn=FALSE;
-        if (lpECB->ServerSupportFunction(lpECB->ConnID,HSE_REQ_SEND_RESPONSE_HEADER_EX,&hinfo,0,0))
-            return HSE_STATUS_SUCCESS;
-    }
-    catch (ShibTargetException &e) {
-        markupProcessor.insert ("errorType", "SHIRE Processing Error");
-        markupProcessor.insert ("errorText", e.what());
-        markupProcessor.insert ("errorDesc", "An error occurred while processing your request.");
-        return WriteClientError(lpECB,shireError.c_str(),markupProcessor);
-    }
-    catch (...) {
-        markupProcessor.insert ("errorType", "SHIRE Processing Error");
-        markupProcessor.insert ("errorText", "Unexpected Exception");
-        markupProcessor.insert ("errorDesc", "An error occurred while processing your request.");
-        return WriteClientError(lpECB,shireError.c_str(),markupProcessor);
-    }
-    
+        // Match site instance to host name, skip if no match.
+        map<string,site_t>::const_iterator map_i=g_Sites.find(static_cast<char*>(buf));
+        if (map_i==g_Sites.end())
+            return WriteClientError(lpECB, "Shibboleth Extension not configured for this web site.");
+
+        ShibTargetIsapiE ste(lpECB, map_i->second);
+        pair<bool,void*> res = ste.doHandler();
+        if (res.first) return (DWORD)res.second;
+
+        return WriteClientError(lpECB, "Shibboleth Extension failed to process request");
+
+    }
+    catch(bad_alloc) {
+        return WriteClientError(lpECB,"Out of Memory");
+    }
+    catch(long e) {
+        if (e==ERROR_NO_DATA)
+            return WriteClientError(lpECB,"A required variable or header was empty.");
+        else
+            return WriteClientError(lpECB,"Server detected unexpected IIS error.");
+    }
+    catch (exception& e) {
+        LogEvent(NULL, EVENTLOG_ERROR_TYPE, 2100, NULL, e.what());
+        return WriteClientError(lpECB,"Shibboleth Extension caught an exception, check Event Log for details.");
+    }
+    catch(...) {
+        if (g_catchAll)
+            return WriteClientError(lpECB,"Shibboleth Extension caught an unknown exception.");
+        throw;
+    }
+
+    // If we get here we've got an error.
     return HSE_STATUS_ERROR;
 }
-