X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=apache%2Fmod_apache.cpp;h=cbc0dbfa77850a93703f60093a4edeb2fc947459;hb=HEAD;hp=a7a60a78f4bc1825c618efde488a927f846bef3b;hpb=df536b5a11833b530104f4f9af93271edb045761;p=shibboleth%2Fsp.git diff --git a/apache/mod_apache.cpp b/apache/mod_apache.cpp index a7a60a7..cbc0dbf 100644 --- a/apache/mod_apache.cpp +++ b/apache/mod_apache.cpp @@ -85,11 +85,13 @@ using xercesc::XMLException; extern "C" module MODULE_VAR_EXPORT mod_shib; namespace { - char* g_szSHIBConfig = SHIBSP_CONFIG; - char* g_szSchemaDir = SHIBSP_SCHEMAS; + char* g_szSHIBConfig = NULL; + char* g_szSchemaDir = NULL; + char* g_szPrefix = NULL; SPConfig* g_Config = NULL; string g_unsetHeaderValue; 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); @@ -308,11 +310,13 @@ public: shib_server_config* m_sc; shib_request_config* m_rc; - ShibTargetApache(request_rec* req, bool handler) : m_handler(handler), m_gotBody(false) { + ShibTargetApache(request_rec* req, bool handler) : AbstractSPRequest(SHIBSP_LOGCAT".Apache"), m_handler(handler), m_gotBody(false) { 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); } virtual ~ShibTargetApache() {} @@ -325,9 +329,6 @@ public: int getPort() const { return ap_get_server_port(m_req); } - const char* getRequestURI() const { - return m_req->unparsed_uri; - } const char* getMethod() const { return m_req->method; } @@ -499,14 +500,18 @@ public: ap_table_add(m_req->err_headers_out, name, value); } long sendResponse(istream& in, long status) { + if (status != XMLTOOLING_HTTP_STATUS_OK) + m_req->status = status; ap_send_http_header(m_req); char buf[1024]; while (in) { in.read(buf,1024); ap_rwrite(buf,in.gcount(),m_req); } - if (status!=XMLTOOLING_HTTP_STATUS_OK) - m_req->status = status; +#if (defined(SHIB_APACHE_20) || defined(SHIB_APACHE_22)) + if (status != XMLTOOLING_HTTP_STATUS_OK && status != XMLTOOLING_HTTP_STATUS_ERROR) + return status; +#endif return DONE; } long sendRedirect(const char* url) { @@ -565,12 +570,12 @@ extern "C" int shib_check_user(request_rec* r) ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, SH_AP_R(r), "shib_check_user threw an exception: %s", e.what()); return SERVER_ERROR; } -#ifndef _DEBUG catch (...) { - ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, SH_AP_R(r), "shib_check_user threw an uncaught exception!"); - return SERVER_ERROR; + ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, SH_AP_R(r), "shib_check_user threw an unknown exception!"); + if (g_catchAll) + return SERVER_ERROR; + throw; } -#endif } extern "C" int shib_handler(request_rec* r) @@ -610,12 +615,12 @@ extern "C" int shib_handler(request_rec* r) ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, SH_AP_R(r), "shib_handler threw an exception: %s", e.what()); return SERVER_ERROR; } -#ifndef _DEBUG catch (...) { - ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, SH_AP_R(r), "shib_handler threw an uncaught exception!"); - return SERVER_ERROR; + ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, SH_AP_R(r), "shib_handler threw an unknown exception!"); + if (g_catchAll) + return SERVER_ERROR; + throw; } -#endif } /* @@ -648,12 +653,12 @@ extern "C" int shib_auth_checker(request_rec* r) ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, SH_AP_R(r), "shib_auth_checker threw an exception: %s", e.what()); return SERVER_ERROR; } -#ifndef _DEBUG catch (...) { - ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, SH_AP_R(r), "shib_auth_checker threw an uncaught exception!"); - return SERVER_ERROR; + ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, SH_AP_R(r), "shib_auth_checker threw an unknown exception!"); + if (g_catchAll) + return SERVER_ERROR; + throw; } -#endif } // Access control plugin that enforces htaccess rules @@ -681,7 +686,7 @@ public: ~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(); } - Settings getSettings(const SPRequest& request) const; + Settings getSettings(const HTTPRequest& request) const; const PropertySet* getParent() const { return NULL; } void setParent(const PropertySet*) {} @@ -690,7 +695,8 @@ public: 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; - const PropertySet* getPropertySet(const char* name, const char* ns="urn:mace:shibboleth:2.0:native:sp:config") 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; private: @@ -713,7 +719,7 @@ ApacheRequestMapper::ApacheRequestMapper(const xercesc::DOMElement* e) : m_mappe m_propsKey=ThreadKey::create(NULL); } -RequestMapper::Settings ApacheRequestMapper::getSettings(const SPRequest& request) const +RequestMapper::Settings ApacheRequestMapper::getSettings(const HTTPRequest& request) const { Settings s=m_mapper->getSettings(request); m_staKey->setData((void*)dynamic_cast(&request)); @@ -787,7 +793,7 @@ pair ApacheRequestMapper::getUnsignedInt(const char* name, co else if (sta->m_dc->tSettings) { const char* prop = ap_table_get(sta->m_dc->tSettings, name); if (prop) - return make_pair(true, strtol(prop, NULL, 10)); + return pair(true, atoi(prop)); } } return s ? s->getUnsignedInt(name,ns) : pair(false,0); @@ -810,6 +816,36 @@ pair ApacheRequestMapper::getInt(const char* name, const char* ns) con return s ? s->getInt(name,ns) : pair(false,0); } +void ApacheRequestMapper::getAll(map& properties) const +{ + const ShibTargetApache* sta=reinterpret_cast(m_staKey->getData()); + const PropertySet* s=reinterpret_cast(m_propsKey->getData()); + + if (s) + s->getAll(properties); + if (!sta) + return; + + const char* auth_type=ap_auth_type(sta->m_req); + if (auth_type) { + // Check for Basic Hijack + if (!strcasecmp(auth_type, "basic") && sta->m_dc->bBasicHijack == 1) + auth_type = "shibboleth"; + properties["authType"] = auth_type; + } + + if (sta->m_dc->szApplicationId) + properties["applicationId"] = sta->m_dc->szApplicationId; + if (sta->m_dc->szRequireWith) + properties["requireSessionWith"] = sta->m_dc->szRequireWith; + if (sta->m_dc->szRedirectToSSL) + properties["redirectToSSL"] = sta->m_dc->szRedirectToSSL; + if (sta->m_dc->bRequireSession != 0) + properties["requireSession"] = (sta->m_dc->bRequireSession==1) ? "true" : "false"; + if (sta->m_dc->bExportAssertion != 0) + properties["exportAssertion"] = (sta->m_dc->bExportAssertion==1) ? "true" : "false"; +} + const PropertySet* ApacheRequestMapper::getPropertySet(const char* name, const char* ns) const { const PropertySet* s=reinterpret_cast(m_propsKey->getData()); @@ -878,22 +914,18 @@ bool htAccessControl::checkAttribute(const SPRequest& request, const Attribute* if (re) { auto_arrayptr trans(fromUTF8(v->c_str())); if (re->matches(trans.get())) { - request.log(SPRequest::SPDebug, - string("htAccessControl plugin expecting regexp ") + toMatch + ", got " + *v + ": authorization granted" - ); + if (request.isPriorityEnabled(SPRequest::SPDebug)) + request.log(SPRequest::SPDebug, string("htaccess: expecting regexp ") + toMatch + ", got " + *v + ": acccepted"); return true; } } else if ((caseSensitive && *v == toMatch) || (!caseSensitive && !strcasecmp(v->c_str(), toMatch))) { - request.log(SPRequest::SPDebug, - string("htAccessControl plugin expecting ") + toMatch + ", got " + *v + ": authorization granted." - ); + if (request.isPriorityEnabled(SPRequest::SPDebug)) + request.log(SPRequest::SPDebug, string("htaccess: expecting ") + toMatch + ", got " + *v + ": accepted"); return true; } - else { - request.log(SPRequest::SPDebug, - string("htAccessControl plugin expecting ") + toMatch + ", got " + *v + ": authorization not granted." - ); + else if (request.isPriorityEnabled(SPRequest::SPDebug)) { + request.log(SPRequest::SPDebug, string("htaccess: expecting ") + toMatch + ", got " + *v + ": rejected"); } } return false; @@ -917,24 +949,18 @@ AccessControl::aclresult_t htAccessControl::authorized(const SPRequest& request, return shib_acl_indeterminate; // should never happen require_line* reqs=(require_line*)reqs_arr->elts; - - ap_log_rerror(APLOG_MARK,APLOG_DEBUG|APLOG_NOERRNO,SH_AP_R(sta->m_req),"REQUIRE nelts: %d", reqs_arr->nelts); - ap_log_rerror(APLOG_MARK,APLOG_DEBUG|APLOG_NOERRNO,SH_AP_R(sta->m_req),"REQUIRE all: %d", sta->m_dc->bRequireAll); - - vector auth_OK(reqs_arr->nelts,false); - -#define SHIB_AP_CHECK_IS_OK { \ - if (sta->m_dc->bRequireAll < 1) \ - return shib_acl_true; \ - auth_OK[x] = true; \ - continue; \ -} for (int x=0; xnelts; x++) { - auth_OK[x] = false; + // This rule should be completely ignored, the method doesn't fit. + // The rule just doesn't exist for our purposes. if (!(reqs[x].method_mask & (1 << m))) continue; - method_restricted=true; + + method_restricted=true; // this lets us know at the end that at least one rule was potentially enforcable. + + // Tracks status of this rule's evaluation. + bool status = false; + string remote_user = request.getRemoteUser(); t = reqs[x].requirement; @@ -943,84 +969,135 @@ AccessControl::aclresult_t htAccessControl::authorized(const SPRequest& request, if (!strcasecmp(w,"shibboleth")) { // This is a dummy rule needed because Apache conflates authn and authz. // Without some require rule, AuthType is ignored and no check_user hooks run. - SHIB_AP_CHECK_IS_OK; + status = true; // treat it as an "accepted" rule } - else if (!strcmp(w,"valid-user")) { - if (session) { - request.log(SPRequest::SPDebug,"htAccessControl plugin accepting valid-user based on active session"); - SHIB_AP_CHECK_IS_OK; - } - else { - request.log(SPRequest::SPError,"htAccessControl plugin rejecting access for valid-user rule, no session is active"); - } + else if (!strcmp(w,"valid-user") && session) { + request.log(SPRequest::SPDebug, "htaccess: accepting valid-user based on active session"); + status = true; } else if (!strcmp(w,"user") && !remote_user.empty()) { - bool regexp=false; + bool regexp=false,negate=false; while (*t) { w=ap_getword_conf(sta->m_req->pool,&t); if (*w=='~') { regexp=true; continue; } - + else if (*w=='!') { + negate=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. auto_arrayptr trans(fromUTF8(w)); RegularExpression re(trans.get()); auto_arrayptr trans2(fromUTF8(remote_user.c_str())); - if (re.matches(trans2.get())) { - request.log(SPRequest::SPDebug, string("htAccessControl plugin accepting user (") + w + ")"); - SHIB_AP_CHECK_IS_OK; - } + match = re.matches(trans2.get()); } catch (XMLException& ex) { auto_ptr_char tmp(ex.getMessage()); request.log(SPRequest::SPError, - string("htAccessControl plugin caught exception while parsing regular expression (") + w + "): " + tmp.get()); + string("htaccess plugin caught exception while parsing regular expression (") + w + "): " + tmp.get()); } } else if (remote_user==w) { - request.log(SPRequest::SPDebug, string("htAccessControl plugin accepting user (") + w + ")"); - SHIB_AP_CHECK_IS_OK; + 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 user ") + (negate ? "rejecting (" : "accepting (") + remote_user + ")"); + break; } } } - else if (!strcmp(w,"group")) { + else if (!strcmp(w,"group") && !remote_user.empty()) { SH_AP_TABLE* grpstatus=NULL; - if (sta->m_dc->szAuthGrpFile && !remote_user.empty()) { - request.log(SPRequest::SPDebug,string("htAccessControl plugin using groups file: ") + sta->m_dc->szAuthGrpFile); + 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); } - if (!grpstatus) - continue; + bool negate=false; while (*t) { w=ap_getword_conf(sta->m_req->pool,&t); - if (ap_table_get(grpstatus,w)) { - request.log(SPRequest::SPDebug, string("htAccessControl plugin accepting group (") + w + ")"); - SHIB_AP_CHECK_IS_OK; + if (*w=='!') { + negate=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 + ")"); + 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)=='~') + 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); + } + 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; + } + + 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; } } } + else if (!session) { + request.log(SPRequest::SPError, string("htaccess: require ") + w + " not given a valid session, are you using lazy sessions?"); + } else { - // Map alias in rule to the attribute. - if (!session) { - request.log(SPRequest::SPError, "htAccessControl plugin not given a valid session to evaluate, are you using lazy sessions?"); - continue; - } - // Find the attribute(s) matching the require rule. pair::const_iterator,multimap::const_iterator> attrs = session->getIndexedAttributes().equal_range(w); - if (attrs.first == attrs.second) { - request.log(SPRequest::SPWarn, string("htAccessControl rule requires attribute (") + w + "), not found in session"); - continue; - } bool regexp=false; - - while (!auth_OK[x] && *t) { + while (!status && attrs.first!=attrs.second && *t) { w=ap_getword_conf(sta->m_req->pool,&t); if (*w=='~') { regexp=true; @@ -1036,31 +1113,62 @@ AccessControl::aclresult_t htAccessControl::authorized(const SPRequest& request, re=temp; } - for (; !auth_OK[x] && attrs.first!=attrs.second; ++attrs.first) { + for (; !status && attrs.first!=attrs.second; ++attrs.first) { if (checkAttribute(request, attrs.first->second, w, regexp ? re.get() : NULL)) { - SHIB_AP_CHECK_IS_OK; + status = true; } } } catch (XMLException& ex) { auto_ptr_char tmp(ex.getMessage()); request.log(SPRequest::SPError, - string("htAccessControl plugin caught exception while parsing regular expression (") + w + "): " + tmp.get() + string("htaccess plugin caught exception while parsing regular expression (") + w + "): " + tmp.get() ); } } } + + // If status is false, we found a rule we couldn't satisfy. + // Could be an unknown rule to us, or it just didn't match. + + if (status && sta->m_dc->bRequireAll != 1) { + // If we're not insisting that all rules be met, then we're done. + request.log(SPRequest::SPDebug, "htaccess: a rule was successful, granting access"); + return shib_acl_true; + } + else if (!status && sta->m_dc->bRequireAll == 1) { + // If we're insisting that all rules be met, which is not something Apache really handles well, + // then we either return false or indeterminate based on the authoritative option, which defaults on. + if (sta->m_dc->bAuthoritative != 0) { + request.log(SPRequest::SPDebug, "htaccess: a rule was unsuccessful, denying access"); + return shib_acl_false; + } + + request.log(SPRequest::SPDebug, "htaccess: a rule was unsuccessful but not authoritative, leaving it up to Apache"); + return shib_acl_indeterminate; + } + + // Otherwise, we keep going. If we're requring all, then we have to check every rule. + // If not we just didn't find a successful rule yet, so we keep going anyway. } - // If we get here, we either "failed" or we're in require all mode. - bool auth_all_OK = true; - for (int i= 0; inelts; i++) { - auth_all_OK &= auth_OK[i]; + // If we get here, we either "failed" or we're in require all mode (but not both). + // If no rules possibly apply or we insisted that all rules check out, then we're good. + if (!method_restricted) { + request.log(SPRequest::SPDebug, "htaccess: no rules applied to this request method, granting access"); + return shib_acl_true; } - if (auth_all_OK || !method_restricted) + else if (sta->m_dc->bRequireAll == 1) { + request.log(SPRequest::SPDebug, "htaccess: all rules successful, granting access"); return shib_acl_true; + } + else if (sta->m_dc->bAuthoritative != 0) { + request.log(SPRequest::SPDebug, "htaccess: no rules were successful, denying access"); + return shib_acl_false; + } - return (sta->m_dc->bAuthoritative != 0) ? shib_acl_false : shib_acl_indeterminate; + request.log(SPRequest::SPDebug, "htaccess: no rules were successful but not authoritative, leaving it up to Apache"); + return shib_acl_indeterminate; } @@ -1156,12 +1264,17 @@ extern "C" void shib_child_init(apr_pool_t* p, server_rec* s) SPConfig::Logging | SPConfig::Handlers ); - if (!g_Config->init(g_szSchemaDir)) { + if (!g_Config->init(g_szSchemaDir, g_szPrefix)) { ap_log_error(APLOG_MARK,APLOG_CRIT|APLOG_NOERRNO,SH_AP_R(s),"shib_child_init() failed to initialize libraries"); exit(1); } g_Config->AccessControlManager.registerFactory(HT_ACCESS_CONTROL,&htAccessFactory); g_Config->RequestMapperManager.registerFactory(NATIVE_REQUEST_MAPPER,&ApacheRequestMapFactory); + + if (!g_szSHIBConfig) + g_szSHIBConfig=getenv("SHIBSP_CONFIG"); + if (!g_szSHIBConfig) + g_szSHIBConfig=SHIBSP_CONFIG; try { xercesc::DOMDocument* dummydoc=XMLToolingConfig::getConfig().getParser().newDocument(); @@ -1187,9 +1300,10 @@ extern "C" void shib_child_init(apr_pool_t* p, server_rec* s) pair unsetValue=props->getString("unsetHeaderValue"); if (unsetValue.first) g_unsetHeaderValue = unsetValue.second; - pair checkSpoofing=props->getBool("checkSpoofing"); - if (checkSpoofing.first && !checkSpoofing.second) - g_checkSpoofing = false; + pair flag=props->getBool("checkSpoofing"); + g_checkSpoofing = !flag.first || flag.second; + flag=props->getBool("catchAll"); + g_catchAll = flag.first && flag.second; } // Set the cleanup handler @@ -1262,6 +1376,8 @@ typedef const char* (*config_fn_t)(void); // SHIB Module commands 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"}, {"ShibCatalogs", (config_fn_t)ap_set_global_string_slot, &g_szSchemaDir, @@ -1366,6 +1482,8 @@ extern "C" void shib_register_hooks (apr_pool_t *p) extern "C" { 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"), AP_INIT_TAKE1("ShibCatalogs", (config_fn_t)ap_set_global_string_slot, &g_szSchemaDir,