X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=apache%2Fmod_apache.cpp;h=0f0a770a8054c7f221ae1a9ca79a95cf465ca387;hb=621faed65a615fbd80c6160953332a1ebac3f15a;hp=4fd81e8e456031422cd7b806b464de3041265880;hpb=b5479b104f4e1fef6e21f9f25bd8e7ef8502e26f;p=shibboleth%2Fcpp-sp.git diff --git a/apache/mod_apache.cpp b/apache/mod_apache.cpp index 4fd81e8..0f0a770 100644 --- a/apache/mod_apache.cpp +++ b/apache/mod_apache.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2001-2007 Internet2 + * Copyright 2001-2010 Internet2 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ /** * mod_apache.cpp * - * Apache module implementation + * Apache module implementation. */ #define SHIBSP_LITE @@ -31,14 +31,16 @@ # define _CRT_SECURE_NO_DEPRECATE 1 #endif +#include #include #include -#include +#include #include #include #include #include #include + #include #include #include @@ -69,6 +71,7 @@ #include #endif +#include #include #include #include @@ -87,16 +90,17 @@ using xercesc::XMLException; extern "C" module MODULE_VAR_EXPORT mod_shib; namespace { - char* g_szSHIBConfig = NULL; - char* g_szSchemaDir = NULL; - char* g_szPrefix = NULL; - SPConfig* g_Config = NULL; - string g_unsetHeaderValue; + char* g_szSHIBConfig = nullptr; + char* g_szSchemaDir = nullptr; + char* g_szPrefix = nullptr; + SPConfig* g_Config = nullptr; + string g_unsetHeaderValue,g_spoofKey; bool g_checkSpoofing = true; bool g_catchAll = false; - static const char* g_UserDataKey = "_shib_check_user_"; - static const XMLCh path[] = UNICODE_LITERAL_4(p,a,t,h); - static const XMLCh validate[] = UNICODE_LITERAL_8(v,a,l,i,d,a,t,e); +#ifndef SHIB_APACHE_13 + char* g_szGSSContextKey = "mod_auth_gssapi:gss_ctx"; +#endif + static const char* g_UserDataKey = "urn:mace:shibboleth:Apache:shib_check_user"; } /* Apache 2.2.x headers must be accumulated and set in the output filter. @@ -121,7 +125,7 @@ struct shib_server_config extern "C" void* create_shib_server_config(SH_AP_POOL* p, server_rec* s) { shib_server_config* sc=(shib_server_config*)ap_pcalloc(p,sizeof(shib_server_config)); - sc->szScheme = NULL; + sc->szScheme = nullptr; return sc; } @@ -137,7 +141,7 @@ extern "C" void* merge_shib_server_config (SH_AP_POOL* p, void* base, void* sub) else if (parent->szScheme) sc->szScheme=ap_pstrdup(p,parent->szScheme); else - sc->szScheme=NULL; + sc->szScheme=nullptr; return sc; } @@ -168,13 +172,13 @@ struct shib_dir_config extern "C" void* create_shib_dir_config (SH_AP_POOL* p, char* d) { shib_dir_config* dc=(shib_dir_config*)ap_pcalloc(p,sizeof(shib_dir_config)); - dc->tSettings = NULL; - dc->szAuthGrpFile = NULL; + dc->tSettings = nullptr; + dc->szAuthGrpFile = nullptr; dc->bRequireAll = -1; dc->bAuthoritative = -1; - dc->szApplicationId = NULL; - dc->szRequireWith = NULL; - dc->szRedirectToSSL = NULL; + dc->szApplicationId = nullptr; + dc->szRequireWith = nullptr; + dc->szRedirectToSSL = nullptr; dc->bOff = -1; dc->bBasicHijack = -1; dc->bRequireSession = -1; @@ -192,7 +196,7 @@ extern "C" void* merge_shib_dir_config (SH_AP_POOL* p, void* base, void* sub) shib_dir_config* child=(shib_dir_config*)sub; // The child supersedes any matching table settings in the parent. - dc->tSettings = NULL; + dc->tSettings = nullptr; if (parent->tSettings) dc->tSettings = ap_copy_table(p, parent->tSettings); if (child->tSettings) { @@ -207,28 +211,28 @@ extern "C" void* merge_shib_dir_config (SH_AP_POOL* p, void* base, void* sub) else if (parent->szAuthGrpFile) dc->szAuthGrpFile=ap_pstrdup(p,parent->szAuthGrpFile); else - dc->szAuthGrpFile=NULL; + dc->szAuthGrpFile=nullptr; if (child->szApplicationId) dc->szApplicationId=ap_pstrdup(p,child->szApplicationId); else if (parent->szApplicationId) dc->szApplicationId=ap_pstrdup(p,parent->szApplicationId); else - dc->szApplicationId=NULL; + dc->szApplicationId=nullptr; if (child->szRequireWith) dc->szRequireWith=ap_pstrdup(p,child->szRequireWith); else if (parent->szRequireWith) dc->szRequireWith=ap_pstrdup(p,parent->szRequireWith); else - dc->szRequireWith=NULL; + dc->szRequireWith=nullptr; if (child->szRedirectToSSL) dc->szRedirectToSSL=ap_pstrdup(p,child->szRedirectToSSL); else if (parent->szRedirectToSSL) dc->szRedirectToSSL=ap_pstrdup(p,parent->szRedirectToSSL); else - dc->szRedirectToSSL=NULL; + dc->szRedirectToSSL=nullptr; dc->bOff=((child->bOff==-1) ? parent->bOff : child->bOff); dc->bBasicHijack=((child->bBasicHijack==-1) ? parent->bBasicHijack : child->bBasicHijack); @@ -264,7 +268,7 @@ static shib_request_config *init_request_config(request_rec *r) extern "C" const char* ap_set_global_string_slot(cmd_parms* parms, void*, const char* arg) { *((char**)(parms->info))=ap_pstrdup(parms->pool,arg); - return NULL; + return nullptr; } extern "C" const char* shib_set_server_string_slot(cmd_parms* parms, void*, const char* arg) @@ -272,7 +276,7 @@ extern "C" const char* shib_set_server_string_slot(cmd_parms* parms, void*, cons char* base=(char*)ap_get_module_config(parms->server->module_config,&mod_shib); size_t offset=(size_t)parms->info; *((char**)(base + offset))=ap_pstrdup(parms->pool,arg); - return NULL; + return nullptr; } extern "C" const char* shib_ap_set_file_slot(cmd_parms* parms, @@ -292,17 +296,18 @@ extern "C" const char* shib_table_set(cmd_parms* parms, shib_dir_config* dc, con if (!dc->tSettings) dc->tSettings = ap_make_table(parms->pool, 4); ap_table_set(dc->tSettings, arg1, arg2); - return NULL; + return nullptr; } -/********************************************************************************/ -// Apache ShibTarget subclass(es) here. class ShibTargetApache : public AbstractSPRequest +#if defined(HAVE_GSSAPI) && !defined(SHIB_APACHE_13) + , public GSSRequest +#endif { bool m_handler; mutable string m_body; - mutable bool m_gotBody; + mutable bool m_gotBody,m_firsttime; mutable vector m_certs; set m_allhttp; @@ -312,13 +317,29 @@ public: shib_server_config* m_sc; shib_request_config* m_rc; - ShibTargetApache(request_rec* req, bool handler) : AbstractSPRequest(SHIBSP_LOGCAT".Apache"), m_handler(handler), m_gotBody(false) { + ShibTargetApache(request_rec* req, bool handler, bool shib_check_user) + : AbstractSPRequest(SHIBSP_LOGCAT".Apache"), m_handler(handler), m_gotBody(false),m_firsttime(true) { m_sc = (shib_server_config*)ap_get_module_config(req->server->module_config, &mod_shib); m_dc = (shib_dir_config*)ap_get_module_config(req->per_dir_config, &mod_shib); m_rc = (shib_request_config*)ap_get_module_config(req->request_config, &mod_shib); m_req = req; setRequestURI(m_req->unparsed_uri); + + if (shib_check_user && m_dc->bUseHeaders == 1) { + // Try and see if this request was already processed, to skip spoof checking. + if (!ap_is_initial_req(m_req)) { + m_firsttime = false; + } + else if (!g_spoofKey.empty()) { + const char* hdr = ap_table_get(m_req->headers_in, "Shib-Spoof-Check"); + if (hdr && g_spoofKey == hdr) + m_firsttime=false; + } + + if (!m_firsttime) + log(SPDebug, "shib_check_user running more than once"); + } } virtual ~ShibTargetApache() {} @@ -342,7 +363,8 @@ public: return m_gotBody ? m_body.length() : m_req->remaining; } string getRemoteAddr() const { - return m_req->connection->remote_ip; + string ret = AbstractSPRequest::getRemoteAddr(); + return ret.empty() ? m_req->connection->remote_ip : ret; } void log(SPLogLevel level, const string& msg) const { AbstractSPRequest::log(level,msg); @@ -421,7 +443,7 @@ public: void clearHeader(const char* rawname, const char* cginame) { if (m_dc->bUseHeaders == 1) { // ap_log_rerror(APLOG_MARK,APLOG_DEBUG|APLOG_NOERRNO,SH_AP_R(m_req), "shib_clear_header: hdr\n"); - if (g_checkSpoofing && ap_is_initial_req(m_req)) { + if (g_checkSpoofing && m_firsttime) { if (m_allhttp.empty()) { // First time, so populate set with "CGI" versions of client-supplied headers. #ifdef SHIB_APACHE_13 @@ -476,27 +498,48 @@ public: if (m_rc && m_rc->env) hdr = ap_table_get(m_rc->env, name); else - hdr = NULL; + hdr = nullptr; return string(hdr ? hdr : ""); } return getHeader(name); } void setRemoteUser(const char* user) { - SH_AP_USER(m_req) = user ? ap_pstrdup(m_req->pool, user) : NULL; + SH_AP_USER(m_req) = user ? ap_pstrdup(m_req->pool, user) : nullptr; + if (m_dc->bUseHeaders == 1) { + if (user) { + ap_table_set(m_req->headers_in, "REMOTE_USER", user); + } + else { + ap_table_unset(m_req->headers_in, "REMOTE_USER"); + ap_table_set(m_req->headers_in, "REMOTE_USER", g_unsetHeaderValue.c_str()); + } + } } string getRemoteUser() const { return string(SH_AP_USER(m_req) ? SH_AP_USER(m_req) : ""); } + void setAuthType(const char* authtype) { + if (authtype && m_dc->bBasicHijack == 1) + authtype = "Basic"; + SH_AP_AUTH_TYPE(m_req) = authtype ? ap_pstrdup(m_req->pool, authtype) : nullptr; + } + string getAuthType() const { + return string(SH_AP_AUTH_TYPE(m_req) ? SH_AP_AUTH_TYPE(m_req) : ""); + } void setContentType(const char* type) { m_req->content_type = ap_psprintf(m_req->pool, type); } void setResponseHeader(const char* name, const char* value) { + HTTPResponse::setResponseHeader(name, value); #ifdef SHIB_DEFERRED_HEADERS if (!m_rc) // this happens on subrequests m_rc = init_request_config(m_req); - if (m_handler) + if (m_handler) { + if (!m_rc->hdr_out) + m_rc->hdr_out = ap_make_table(m_req->pool, 5); ap_table_add(m_rc->hdr_out, name, value); + } else #endif ap_table_add(m_req->err_headers_out, name, value); @@ -517,6 +560,7 @@ public: return DONE; } long sendRedirect(const char* url) { + HTTPResponse::sendRedirect(url); ap_table_set(m_req->headers_out, "Location", url); return REDIRECT; } @@ -536,6 +580,13 @@ public: } long returnDecline(void) { return DECLINED; } long returnOK(void) { return OK; } +#if defined(HAVE_GSSAPI) && !defined(SHIB_APACHE_13) + gss_ctx_id_t getGSSContext() const { + gss_ctx_id_t ctx = GSS_C_NO_CONTEXT; + apr_pool_userdata_get((void**)&ctx, g_szGSSContextKey, m_req->pool); + return ctx; + } +#endif }; /********************************************************************************/ @@ -554,11 +605,14 @@ extern "C" int shib_check_user(request_rec* r) xmltooling::NDC ndc(threadid.str().c_str()); try { - ShibTargetApache sta(r,false); + ShibTargetApache sta(r,false,true); // Check user authentication and export information, then set the handler bypass pair res = sta.getServiceProvider().doAuthentication(sta,true); - apr_pool_userdata_setn((const void*)42,g_UserDataKey,NULL,r->pool); + apr_pool_userdata_setn((const void*)42,g_UserDataKey,nullptr,r->pool); + // If directed, install a spoof key to recognize when we've already cleared headers. + if (!g_spoofKey.empty() && (((shib_dir_config*)ap_get_module_config(r->per_dir_config, &mod_shib))->bUseHeaders==1)) + ap_table_set(r->headers_in, "Shib-Spoof-Check", g_spoofKey.c_str()); if (res.first) return res.second; // user auth was okay -- export the assertions now @@ -605,7 +659,7 @@ extern "C" int shib_handler(request_rec* r) ap_log_rerror(APLOG_MARK,APLOG_DEBUG|APLOG_NOERRNO,SH_AP_R(r),"shib_handler(%d): ENTER: %s", (int)getpid(), r->handler); try { - ShibTargetApache sta(r,true); + ShibTargetApache sta(r,true,false); pair res = sta.getServiceProvider().doHandler(sta); if (res.first) return res.second; @@ -642,7 +696,7 @@ extern "C" int shib_auth_checker(request_rec* r) xmltooling::NDC ndc(threadid.str().c_str()); try { - ShibTargetApache sta(r,false); + ShibTargetApache sta(r,false,false); pair res = sta.getServiceProvider().doAuthorization(sta); if (res.first) return res.second; @@ -687,16 +741,16 @@ public: ApacheRequestMapper(const xercesc::DOMElement* e); ~ApacheRequestMapper() { delete m_mapper; delete m_htaccess; delete m_staKey; delete m_propsKey; } Lockable* lock() { return m_mapper->lock(); } - void unlock() { m_staKey->setData(NULL); m_propsKey->setData(NULL); m_mapper->unlock(); } + void unlock() { m_staKey->setData(nullptr); m_propsKey->setData(nullptr); m_mapper->unlock(); } Settings getSettings(const HTTPRequest& request) const; - const PropertySet* getParent() const { return NULL; } + const PropertySet* getParent() const { return nullptr; } void setParent(const PropertySet*) {} - pair getBool(const char* name, const char* ns=NULL) const; - pair getString(const char* name, const char* ns=NULL) const; - pair getXMLString(const char* name, const char* ns=NULL) const; - pair getUnsignedInt(const char* name, const char* ns=NULL) const; - pair getInt(const char* name, const char* ns=NULL) const; + pair getBool(const char* name, const char* ns=nullptr) const; + pair getString(const char* name, const char* ns=nullptr) const; + pair getXMLString(const char* name, const char* ns=nullptr) const; + pair getUnsignedInt(const char* name, const char* ns=nullptr) const; + pair getInt(const char* name, const char* ns=nullptr) const; void getAll(map& properties) const; const PropertySet* getPropertySet(const char* name, const char* ns=shibspconstants::ASCII_SHIB2SPCONFIG_NS) const; const xercesc::DOMElement* getElement() const; @@ -713,12 +767,12 @@ RequestMapper* ApacheRequestMapFactory(const xercesc::DOMElement* const & e) return new ApacheRequestMapper(e); } -ApacheRequestMapper::ApacheRequestMapper(const xercesc::DOMElement* e) : m_mapper(NULL), m_staKey(NULL), m_propsKey(NULL), m_htaccess(NULL) +ApacheRequestMapper::ApacheRequestMapper(const xercesc::DOMElement* e) : m_mapper(nullptr), m_staKey(nullptr), m_propsKey(nullptr), m_htaccess(nullptr) { m_mapper=SPConfig::getConfig().RequestMapperManager.newPlugin(XML_REQUEST_MAPPER,e); m_htaccess=new htAccessControl(); - m_staKey=ThreadKey::create(NULL); - m_propsKey=ThreadKey::create(NULL); + m_staKey=ThreadKey::create(nullptr); + m_propsKey=ThreadKey::create(nullptr); } RequestMapper::Settings ApacheRequestMapper::getSettings(const HTTPRequest& request) const @@ -775,13 +829,13 @@ pair ApacheRequestMapper::getString(const char* name, const ch return make_pair(true, prop); } } - return s ? s->getString(name,ns) : pair(false,NULL); + return s ? s->getString(name,ns) : pair(false,nullptr); } pair ApacheRequestMapper::getXMLString(const char* name, const char* ns) const { const PropertySet* s=reinterpret_cast(m_propsKey->getData()); - return s ? s->getXMLString(name,ns) : pair(false,NULL); + return s ? s->getXMLString(name,ns) : pair(false,nullptr); } pair ApacheRequestMapper::getUnsignedInt(const char* name, const char* ns) const @@ -791,7 +845,7 @@ pair ApacheRequestMapper::getUnsignedInt(const char* name, co if (sta && !ns) { // Override Apache-settable int properties. if (name && !strcmp(name,"redirectToSSL") && sta->m_dc->szRedirectToSSL) - return pair(true, strtol(sta->m_dc->szRedirectToSSL, NULL, 10)); + return pair(true, strtol(sta->m_dc->szRedirectToSSL, nullptr, 10)); else if (sta->m_dc->tSettings) { const char* prop = ap_table_get(sta->m_dc->tSettings, name); if (prop) @@ -818,6 +872,12 @@ pair ApacheRequestMapper::getInt(const char* name, const char* ns) con return s ? s->getInt(name,ns) : pair(false,0); } +static int _rm_get_all_table_walk(void *v, const char *key, const char *value) +{ + reinterpret_cast*>(v)->insert(pair(key, value)); + return 1; +} + void ApacheRequestMapper::getAll(map& properties) const { const ShibTargetApache* sta=reinterpret_cast(m_staKey->getData()); @@ -846,18 +906,21 @@ void ApacheRequestMapper::getAll(map& properties) const properties["requireSession"] = (sta->m_dc->bRequireSession==1) ? "true" : "false"; if (sta->m_dc->bExportAssertion != 0) properties["exportAssertion"] = (sta->m_dc->bExportAssertion==1) ? "true" : "false"; + + if (sta->m_dc->tSettings) + ap_table_do(_rm_get_all_table_walk, &properties, sta->m_dc->tSettings, nullptr); } const PropertySet* ApacheRequestMapper::getPropertySet(const char* name, const char* ns) const { const PropertySet* s=reinterpret_cast(m_propsKey->getData()); - return s ? s->getPropertySet(name,ns) : NULL; + return s ? s->getPropertySet(name,ns) : nullptr; } const xercesc::DOMElement* ApacheRequestMapper::getElement() const { const PropertySet* s=reinterpret_cast(m_propsKey->getData()); - return s ? s->getElement() : NULL; + return s ? s->getElement() : nullptr; } static SH_AP_TABLE* groups_for_user(request_rec* r, const char* user, char* grpfile) @@ -873,7 +936,7 @@ static SH_AP_TABLE* groups_for_user(request_rec* r, const char* user, char* grpf if (ap_pcfg_openfile(&f,r->pool,grpfile) != APR_SUCCESS) { #endif ap_log_rerror(APLOG_MARK,APLOG_DEBUG,SH_AP_R(r),"groups_for_user() could not open group file: %s\n",grpfile); - return NULL; + return nullptr; } SH_AP_POOL* sp; @@ -883,7 +946,7 @@ static SH_AP_TABLE* groups_for_user(request_rec* r, const char* user, char* grpf if (apr_pool_create(&sp,r->pool) != APR_SUCCESS) { ap_log_rerror(APLOG_MARK,APLOG_ERR,0,r, "groups_for_user() could not create a subpool"); - return NULL; + return nullptr; } #endif @@ -978,17 +1041,18 @@ AccessControl::aclresult_t htAccessControl::authorized(const SPRequest& request, status = true; } else if (!strcmp(w,"user") && !remote_user.empty()) { - bool regexp=false,negate=false; + bool regexp = false; while (*t) { - w=ap_getword_conf(sta->m_req->pool,&t); - if (*w=='~') { - regexp=true; + w = ap_getword_conf(sta->m_req->pool,&t); + if (*w == '~') { + regexp = true; continue; } - else if (*w=='!') { - negate=true; - if (*(w+1)=='~') - regexp=true; + else if (*w == '!') { + // A negated rule presumes success unless a match is found. + status = true; + if (*(w+1) == '~') + regexp = true; continue; } @@ -1008,87 +1072,93 @@ AccessControl::aclresult_t htAccessControl::authorized(const SPRequest& request, string("htaccess plugin caught exception while parsing regular expression (") + w + "): " + tmp.get()); } } - else if (remote_user==w) { + else if (remote_user == w) { match = true; } if (match) { - // If we matched, then we're done with this rule either way and status is set to reflect the outcome. - status = !negate; + // If we matched, then we're done with this rule either way and we flip status to reflect the outcome. + status = !status; if (request.isPriorityEnabled(SPRequest::SPDebug)) request.log(SPRequest::SPDebug, - string("htaccess: require user ") + (negate ? "rejecting (" : "accepting (") + remote_user + ")"); + string("htaccess: require user ") + (!status ? "rejecting (" : "accepting (") + remote_user + ")"); break; } } } else if (!strcmp(w,"group") && !remote_user.empty()) { - SH_AP_TABLE* grpstatus=NULL; + SH_AP_TABLE* grpstatus = nullptr; if (sta->m_dc->szAuthGrpFile) { if (request.isPriorityEnabled(SPRequest::SPDebug)) request.log(SPRequest::SPDebug,string("htaccess plugin using groups file: ") + sta->m_dc->szAuthGrpFile); - grpstatus=groups_for_user(sta->m_req,remote_user.c_str(),sta->m_dc->szAuthGrpFile); + grpstatus = groups_for_user(sta->m_req,remote_user.c_str(),sta->m_dc->szAuthGrpFile); } - bool negate=false; while (*t) { - w=ap_getword_conf(sta->m_req->pool,&t); - if (*w=='!') { - negate=true; + w = ap_getword_conf(sta->m_req->pool,&t); + if (*w == '!') { + // A negated rule presumes success unless a match is found. + status = true; continue; } if (grpstatus && ap_table_get(grpstatus,w)) { - // If we matched, then we're done with this rule either way and status is set to reflect the outcome. - status = !negate; - request.log(SPRequest::SPDebug, string("htaccess: require group ") + (negate ? "rejecting (" : "accepting (") + w + ")"); + // If we matched, then we're done with this rule either way and we flip status to reflect the outcome. + status = !status; + request.log(SPRequest::SPDebug, string("htaccess: require group ") + (!status ? "rejecting (" : "accepting (") + w + ")"); break; } } } else if (!strcmp(w,"authnContextClassRef") || !strcmp(w,"authnContextDeclRef")) { const char* ref = !strcmp(w,"authnContextClassRef") ? session->getAuthnContextClassRef() : session->getAuthnContextDeclRef(); - bool regexp=false,negate=false; - while (ref && *t) { - w=ap_getword_conf(sta->m_req->pool,&t); - if (*w=='~') { - regexp=true; - continue; - } - else if (*w=='!') { - negate=true; - if (*(w+1)=='~') + if (ref && *ref) { + bool regexp = false; + while (ref && *t) { + w = ap_getword_conf(sta->m_req->pool,&t); + if (*w == '~') { regexp=true; - continue; - } + continue; + } + else if (*w == '!') { + // A negated rule presumes success unless a match is found. + status = true; + if (*(w+1)=='~') + regexp = true; + continue; + } - // Figure out if there's a match. - bool match = false; - if (regexp) { - try { - // To do regex matching, we have to convert from UTF-8. - RegularExpression re(w); - match = re.matches(ref); + // Figure out if there's a match. + bool match = false; + if (regexp) { + try { + // To do regex matching, we have to convert from UTF-8. + RegularExpression re(w); + match = re.matches(ref); + } + catch (XMLException& ex) { + auto_ptr_char tmp(ex.getMessage()); + request.log(SPRequest::SPError, + string("htaccess plugin caught exception while parsing regular expression (") + w + "): " + tmp.get()); + } } - catch (XMLException& ex) { - auto_ptr_char tmp(ex.getMessage()); - request.log(SPRequest::SPError, - string("htaccess plugin caught exception while parsing regular expression (") + w + "): " + tmp.get()); + else if (!strcmp(w,ref)) { + match = true; } - } - else if (!strcmp(w,ref)) { - match = true; - } - if (match) { - // If we matched, then we're done with this rule either way and status is set to reflect the outcome. - status = !negate; - if (request.isPriorityEnabled(SPRequest::SPDebug)) - request.log(SPRequest::SPDebug, - string("htaccess: require authnContext ") + (negate ? "rejecting (" : "accepting (") + ref + ")"); - break; + if (match) { + // If we matched, then we're done with this rule either way and we flip status to reflect the outcome. + status = !status; + if (request.isPriorityEnabled(SPRequest::SPDebug)) + request.log(SPRequest::SPDebug, + string("htaccess: require authnContext ") + (!status ? "rejecting (" : "accepting (") + ref + ")"); + break; + } } } + else if (request.isPriorityEnabled(SPRequest::SPDebug)) { + request.log(SPRequest::SPDebug, "htaccess: require authnContext rejecting session with no context associated"); + } } else if (!session) { request.log(SPRequest::SPError, string("htaccess: require ") + w + " not given a valid session, are you using lazy sessions?"); @@ -1114,9 +1184,10 @@ AccessControl::aclresult_t htAccessControl::authorized(const SPRequest& request, auto_ptr temp(new xercesc::RegularExpression(trans.get())); re=temp; } - - for (; !status && attrs.first!=attrs.second; ++attrs.first) { - if (checkAttribute(request, attrs.first->second, w, regexp ? re.get() : NULL)) { + + pair::const_iterator,multimap::const_iterator> attrs2(attrs); + for (; !status && attrs2.first!=attrs2.second; ++attrs2.first) { + if (checkAttribute(request, attrs2.first->second, w, regexp ? re.get() : nullptr)) { status = true; } } @@ -1178,12 +1249,7 @@ AccessControl::aclresult_t htAccessControl::authorized(const SPRequest& request, static int shib_post_read(request_rec *r) { shib_request_config* rc = init_request_config(r); - - ap_log_rerror(APLOG_MARK,APLOG_DEBUG|APLOG_NOERRNO,SH_AP_R(r), "shib_post_read"); - -#ifdef SHIB_DEFERRED_HEADERS - rc->hdr_out = ap_make_table(r->pool, 5); -#endif + //ap_log_rerror(APLOG_MARK,APLOG_DEBUG|APLOG_NOERRNO,SH_AP_R(r), "shib_post_read"); return DECLINED; } @@ -1198,7 +1264,7 @@ extern "C" int shib_fixups(request_rec* r) ap_log_rerror(APLOG_MARK,APLOG_DEBUG|APLOG_NOERRNO,SH_AP_R(r), "shib_fixup(%d): ENTER", (int)getpid()); - if (rc==NULL || rc->env==NULL || ap_is_empty_table(rc->env)) + if (rc==nullptr || rc->env==nullptr || ap_is_empty_table(rc->env)) return DECLINED; ap_log_rerror(APLOG_MARK,APLOG_DEBUG|APLOG_NOERRNO,SH_AP_R(r), "shib_fixup adding %d vars", ap_table_elts(rc->env)->nelts); @@ -1217,7 +1283,7 @@ extern "C" void shib_child_exit(server_rec* s, SH_AP_POOL* p) if (g_Config) { ap_log_error(APLOG_MARK,APLOG_DEBUG|APLOG_NOERRNO,SH_AP_R(s),"shib_child_exit(%d) dealing with g_Config..", (int)getpid()); g_Config->term(); - g_Config = NULL; + g_Config = nullptr; ap_log_error(APLOG_MARK,APLOG_DEBUG|APLOG_NOERRNO,SH_AP_R(s),"shib_child_exit() done"); } } @@ -1230,9 +1296,9 @@ extern "C" apr_status_t shib_exit(void* data) { if (g_Config) { g_Config->term(); - g_Config = NULL; + g_Config = nullptr; } - ap_log_error(APLOG_MARK,APLOG_DEBUG|APLOG_NOERRNO,0,NULL,"shib_exit() done"); + ap_log_error(APLOG_MARK,APLOG_DEBUG|APLOG_NOERRNO,0,nullptr,"shib_exit() done"); return OK; } #endif @@ -1285,19 +1351,24 @@ extern "C" void shib_child_init(apr_pool_t* p, server_rec* s) ServiceProvider* sp=g_Config->getServiceProvider(); xmltooling::Locker locker(sp); - const PropertySet* props=sp->getPropertySet("Local"); + const PropertySet* props=sp->getPropertySet("InProcess"); if (props) { pair unsetValue=props->getString("unsetHeaderValue"); if (unsetValue.first) g_unsetHeaderValue = unsetValue.second; pair flag=props->getBool("checkSpoofing"); g_checkSpoofing = !flag.first || flag.second; + if (g_checkSpoofing) { + unsetValue=props->getString("spoofKey"); + if (unsetValue.first) + g_spoofKey = unsetValue.second; + } flag=props->getBool("catchAll"); g_catchAll = flag.first && flag.second; } // Set the cleanup handler - apr_pool_cleanup_register(p, NULL, &shib_exit, apr_pool_cleanup_null); + apr_pool_cleanup_register(p, nullptr, &shib_exit, apr_pool_cleanup_null); ap_log_error(APLOG_MARK,APLOG_DEBUG|APLOG_NOERRNO,SH_AP_R(s),"shib_child_init() done"); } @@ -1306,12 +1377,12 @@ extern "C" void shib_child_init(apr_pool_t* p, server_rec* s) #ifdef SHIB_DEFERRED_HEADERS static void set_output_filter(request_rec *r) { - ap_add_output_filter("SHIB_HEADERS_OUT", NULL, r, r->connection); + ap_add_output_filter("SHIB_HEADERS_OUT", nullptr, r, r->connection); } static void set_error_filter(request_rec *r) { - ap_add_output_filter("SHIB_HEADERS_ERR", NULL, r, r->connection); + ap_add_output_filter("SHIB_HEADERS_ERR", nullptr, r, r->connection); } static int _table_add(void *v, const char *key, const char *value) @@ -1325,11 +1396,11 @@ static apr_status_t do_output_filter(ap_filter_t *f, apr_bucket_brigade *in) request_rec *r = f->r; shib_request_config *rc = (shib_request_config*) ap_get_module_config(r->request_config, &mod_shib); - if (rc) { + if (rc && rc->hdr_out) { ap_log_rerror(APLOG_MARK,APLOG_DEBUG|APLOG_NOERRNO,SH_AP_R(r),"shib_out_filter: merging %d headers", apr_table_elts(rc->hdr_out)->nelts); - apr_table_do(_table_add,r->headers_out, rc->hdr_out,NULL); // can't use overlap call because it will collapse Set-Cookie headers //apr_table_overlap(r->headers_out, rc->hdr_out, APR_OVERLAP_TABLES_MERGE); + apr_table_do(_table_add,r->headers_out, rc->hdr_out,nullptr); } /* remove ourselves from the filter chain */ @@ -1344,11 +1415,11 @@ static apr_status_t do_error_filter(ap_filter_t *f, apr_bucket_brigade *in) request_rec *r = f->r; shib_request_config *rc = (shib_request_config*) ap_get_module_config(r->request_config, &mod_shib); - if (rc) { + if (rc && rc->hdr_out) { ap_log_rerror(APLOG_MARK,APLOG_DEBUG|APLOG_NOERRNO,SH_AP_R(r),"shib_err_filter: merging %d headers", apr_table_elts(rc->hdr_out)->nelts); - apr_table_do(_table_add,r->err_headers_out, rc->hdr_out,NULL); // can't use overlap call because it will collapse Set-Cookie headers //apr_table_overlap(r->err_headers_out, rc->hdr_out, APR_OVERLAP_TABLES_MERGE); + apr_table_do(_table_add,r->err_headers_out, rc->hdr_out,nullptr); } /* remove ourselves from the filter chain */ @@ -1369,7 +1440,7 @@ static command_rec shire_cmds[] = { {"ShibPrefix", (config_fn_t)ap_set_global_string_slot, &g_szPrefix, RSRC_CONF, TAKE1, "Shibboleth installation directory"}, {"ShibConfig", (config_fn_t)ap_set_global_string_slot, &g_szSHIBConfig, - RSRC_CONF, TAKE1, "Path to shibboleth.xml config file"}, + RSRC_CONF, TAKE1, "Path to shibboleth2.xml config file"}, {"ShibCatalogs", (config_fn_t)ap_set_global_string_slot, &g_szSchemaDir, RSRC_CONF, TAKE1, "Paths of XML schema catalogs"}, @@ -1377,7 +1448,7 @@ static command_rec shire_cmds[] = { (void *) XtOffsetOf (shib_server_config, szScheme), RSRC_CONF, TAKE1, "URL scheme to force into generated URLs for a vhost"}, - {"ShibRequestSetting", (config_fn_t)shib_table_set, NULL, + {"ShibRequestSetting", (config_fn_t)shib_table_set, nullptr, OR_AUTHCFG, TAKE2, "Set arbitrary Shibboleth request property for content"}, {"ShibDisable", (config_fn_t)ap_set_flag_slot, @@ -1388,7 +1459,7 @@ static command_rec shire_cmds[] = { OR_AUTHCFG, TAKE1, "Set Shibboleth applicationId property for content"}, {"ShibBasicHijack", (config_fn_t)ap_set_flag_slot, (void *) XtOffsetOf (shib_dir_config, bBasicHijack), - OR_AUTHCFG, FLAG, "Respond to AuthType Basic and convert to shibboleth"}, + OR_AUTHCFG, FLAG, "(DEPRECATED) Respond to AuthType Basic and convert to shibboleth"}, {"ShibRequireSession", (config_fn_t)ap_set_flag_slot, (void *) XtOffsetOf (shib_dir_config, bRequireSession), OR_AUTHCFG, FLAG, "Initiates a new session if one does not exist"}, @@ -1417,32 +1488,32 @@ static command_rec shire_cmds[] = { (void *) XtOffsetOf (shib_dir_config, bUseHeaders), OR_AUTHCFG, FLAG, "Export attributes using custom HTTP headers"}, - {NULL} + {nullptr} }; extern "C"{ handler_rec shib_handlers[] = { { "shib-handler", shib_handler }, - { NULL } + { nullptr } }; module MODULE_VAR_EXPORT mod_shib = { STANDARD_MODULE_STUFF, - NULL, /* initializer */ + nullptr, /* initializer */ create_shib_dir_config, /* dir config creater */ merge_shib_dir_config, /* dir merger --- default is to override */ create_shib_server_config, /* server config */ merge_shib_server_config, /* merge server config */ shire_cmds, /* command table */ shib_handlers, /* handlers */ - NULL, /* filename translation */ + nullptr, /* filename translation */ shib_check_user, /* check_user_id */ shib_auth_checker, /* check auth */ - NULL, /* check access */ - NULL, /* type_checker */ + nullptr, /* check access */ + nullptr, /* type_checker */ shib_fixups, /* fixups */ - NULL, /* logger */ - NULL, /* header parser */ + nullptr, /* logger */ + nullptr, /* header parser */ shib_child_init, /* child_init */ shib_child_exit, /* child_exit */ shib_post_read /* post read-request */ @@ -1450,20 +1521,29 @@ module MODULE_VAR_EXPORT mod_shib = { #elif defined(SHIB_APACHE_20) || defined(SHIB_APACHE_22) +//static const char * const authnPre[] = { "mod_gss.c", nullptr }; + extern "C" void shib_register_hooks (apr_pool_t *p) { #ifdef SHIB_DEFERRED_HEADERS - ap_register_output_filter("SHIB_HEADERS_OUT", do_output_filter, NULL, AP_FTYPE_CONTENT_SET); - ap_hook_insert_filter(set_output_filter, NULL, NULL, APR_HOOK_LAST); - ap_register_output_filter("SHIB_HEADERS_ERR", do_error_filter, NULL, AP_FTYPE_CONTENT_SET); - ap_hook_insert_error_filter(set_error_filter, NULL, NULL, APR_HOOK_LAST); - ap_hook_post_read_request(shib_post_read, NULL, NULL, APR_HOOK_MIDDLE); + ap_register_output_filter("SHIB_HEADERS_OUT", do_output_filter, nullptr, AP_FTYPE_CONTENT_SET); + ap_hook_insert_filter(set_output_filter, nullptr, nullptr, APR_HOOK_LAST); + ap_register_output_filter("SHIB_HEADERS_ERR", do_error_filter, nullptr, AP_FTYPE_CONTENT_SET); + ap_hook_insert_error_filter(set_error_filter, nullptr, nullptr, APR_HOOK_LAST); + ap_hook_post_read_request(shib_post_read, nullptr, nullptr, APR_HOOK_MIDDLE); #endif - ap_hook_child_init(shib_child_init, NULL, NULL, APR_HOOK_MIDDLE); - ap_hook_check_user_id(shib_check_user, NULL, NULL, APR_HOOK_MIDDLE); - ap_hook_auth_checker(shib_auth_checker, NULL, NULL, APR_HOOK_FIRST); - ap_hook_handler(shib_handler, NULL, NULL, APR_HOOK_LAST); - ap_hook_fixups(shib_fixups, NULL, NULL, APR_HOOK_MIDDLE); + ap_hook_child_init(shib_child_init, nullptr, nullptr, APR_HOOK_MIDDLE); + const char* prereq = getenv("SHIBSP_APACHE_PREREQ"); + if (prereq && *prereq) { + const char* const authnPre[] = { prereq, nullptr }; + ap_hook_check_user_id(shib_check_user, authnPre, nullptr, APR_HOOK_MIDDLE); + } + else { + ap_hook_check_user_id(shib_check_user, nullptr, nullptr, APR_HOOK_MIDDLE); + } + ap_hook_auth_checker(shib_auth_checker, nullptr, nullptr, APR_HOOK_FIRST); + ap_hook_handler(shib_handler, nullptr, nullptr, APR_HOOK_LAST); + ap_hook_fixups(shib_fixups, nullptr, nullptr, APR_HOOK_MIDDLE); } // SHIB Module commands @@ -1473,15 +1553,17 @@ static command_rec shib_cmds[] = { AP_INIT_TAKE1("ShibPrefix", (config_fn_t)ap_set_global_string_slot, &g_szPrefix, RSRC_CONF, "Shibboleth installation directory"), AP_INIT_TAKE1("ShibConfig", (config_fn_t)ap_set_global_string_slot, &g_szSHIBConfig, - RSRC_CONF, "Path to shibboleth.xml config file"), + RSRC_CONF, "Path to shibboleth2.xml config file"), AP_INIT_TAKE1("ShibCatalogs", (config_fn_t)ap_set_global_string_slot, &g_szSchemaDir, RSRC_CONF, "Paths of XML schema catalogs"), + AP_INIT_TAKE1("ShibGSSKey", (config_fn_t)ap_set_global_string_slot, &g_szGSSContextKey, + RSRC_CONF, "Name of user data key containing GSS context established by GSS module"), AP_INIT_TAKE1("ShibURLScheme", (config_fn_t)shib_set_server_string_slot, (void *) offsetof (shib_server_config, szScheme), RSRC_CONF, "URL scheme to force into generated URLs for a vhost"), - AP_INIT_TAKE2("ShibRequestSetting", (config_fn_t)shib_table_set, NULL, + AP_INIT_TAKE2("ShibRequestSetting", (config_fn_t)shib_table_set, nullptr, OR_AUTHCFG, "Set arbitrary Shibboleth request property for content"), AP_INIT_FLAG("ShibDisable", (config_fn_t)ap_set_flag_slot, @@ -1492,7 +1574,7 @@ static command_rec shib_cmds[] = { OR_AUTHCFG, "Set Shibboleth applicationId property for content"), AP_INIT_FLAG("ShibBasicHijack", (config_fn_t)ap_set_flag_slot, (void *) offsetof (shib_dir_config, bBasicHijack), - OR_AUTHCFG, "Respond to AuthType Basic and convert to shibboleth"), + OR_AUTHCFG, "(DEPRECATED) Respond to AuthType Basic and convert to shibboleth"), AP_INIT_FLAG("ShibRequireSession", (config_fn_t)ap_set_flag_slot, (void *) offsetof (shib_dir_config, bRequireSession), OR_AUTHCFG, "Initiates a new session if one does not exist"), @@ -1521,7 +1603,7 @@ static command_rec shib_cmds[] = { (void *) offsetof (shib_dir_config, bUseHeaders), OR_AUTHCFG, "Export attributes using custom HTTP headers"), - {NULL} + {nullptr} }; module AP_MODULE_DECLARE_DATA mod_shib = {