/*
+ * Copyright 2001-2007 Internet2
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
* mod_apache.cpp -- the core Apache Module code
*
* Created by: Derek Atkins <derek@ihtfp.com>
#undef _XOPEN_SOURCE // causes gethostname conflict in unistd.h
#endif
-// SAML Runtime
-#include <saml/saml.h>
-#include <shib/shib.h>
-#include <shib/shib-threads.h>
-#include <shib-target/shib-target.h>
+#ifdef WIN32
+# define _CRT_NONSTDC_NO_DEPRECATE 1
+# define _CRT_SECURE_NO_DEPRECATE 1
+#endif
+
+#include <shibsp/AbstractSPRequest.h>
+#include <shibsp/AccessControl.h>
+#include <shibsp/exceptions.h>
+#include <shibsp/RequestMapper.h>
+#include <shibsp/SPConfig.h>
+#include <shibsp/ServiceProvider.h>
+#include <shibsp/SessionCache.h>
+#include <shibsp/attribute/Attribute.h>
+
#include <xercesc/util/regx/RegularExpression.hpp>
+#include <xmltooling/XMLToolingConfig.h>
+#include <xmltooling/util/NDC.h>
+#include <xmltooling/util/Threads.h>
+#include <xmltooling/util/XMLHelper.h>
+
+#ifdef WIN32
+# include <winsock.h>
+#endif
#undef _XPG4_2
#include <unistd.h> // for getpid()
#endif
+using namespace shibsp;
+using namespace xmltooling;
using namespace std;
-using namespace saml;
-using namespace shibboleth;
-using namespace shibtarget;
extern "C" module MODULE_VAR_EXPORT mod_shib;
namespace {
- char* g_szSHIBConfig = NULL;
- char* g_szSchemaDir = NULL;
- ShibTargetConfig* g_Config = NULL;
+ char* g_szSHIBConfig = SHIBSP_CONFIG;
+ char* g_szSchemaDir = SHIBSP_SCHEMAS;
+ SPConfig* g_Config = NULL;
+ string g_unsetHeaderValue;
static const char* g_UserDataKey = "_shib_check_user_";
+ static const XMLCh path[] = UNICODE_LITERAL_4(p,a,t,h);
}
+/* Apache 2.2.x headers must be accumulated and set in the output filter.
+ Apache 2.0.49+ supports the filter method.
+ Apache 1.3.x and lesser 2.0.x must write the headers directly. */
+
+#if (defined(SHIB_APACHE_20) || defined(SHIB_APACHE_22)) && AP_MODULE_MAGIC_AT_LEAST(20020903,6)
+#define SHIB_DEFERRED_HEADERS
+#endif
+
/********************************************************************************/
// Basic Apache Configuration code.
//
// Content Configuration
char* szApplicationId; // Shib applicationId value
char* szRequireWith; // require a session using a specific initiator?
+ char* szRedirectToSSL; // redirect non-SSL requests to SSL port
int bOff; // flat-out disable all Shib processing
int bBasicHijack; // activate for AuthType Basic?
int bRequireSession; // require a session?
int bExportAssertion; // export SAML assertion to the environment?
+ int bUseEnvVars; // use environment instead of headers?
};
// creates per-directory config structure
dc->bRequireSession = -1;
dc->bExportAssertion = -1;
dc->bRequireAll = -1;
+ dc->szRedirectToSSL = NULL;
dc->szAuthGrpFile = NULL;
dc->szApplicationId = NULL;
dc->szRequireWith = NULL;
+ dc->bUseEnvVars = -1;
return dc;
}
else
dc->szRequireWith=NULL;
+ 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->bOff=((child->bOff==-1) ? parent->bOff : child->bOff);
dc->bBasicHijack=((child->bBasicHijack==-1) ? parent->bBasicHijack : child->bBasicHijack);
dc->bRequireSession=((child->bRequireSession==-1) ? parent->bRequireSession : child->bRequireSession);
dc->bExportAssertion=((child->bExportAssertion==-1) ? parent->bExportAssertion : child->bExportAssertion);
dc->bRequireAll=((child->bRequireAll==-1) ? parent->bRequireAll : child->bRequireAll);
+ dc->bUseEnvVars=((child->bUseEnvVars==-1) ? parent->bUseEnvVars : child->bUseEnvVars);
return dc;
}
+// per-request module structure
+struct shib_request_config
+{
+ SH_AP_TABLE *env; // environment vars
+#ifdef SHIB_DEFERRED_HEADERS
+ SH_AP_TABLE *hdr_out; // headers to browser
+ SH_AP_TABLE *hdr_err; // err headers to browser
+#endif
+};
+
+// create a request record
+static shib_request_config *init_request_config(request_rec *r)
+{
+ shib_request_config* rc=(shib_request_config*)ap_pcalloc(r->pool,sizeof(shib_request_config));
+ ap_set_module_config (r->request_config, &mod_shib, rc);
+ memset(rc, 0, sizeof(shib_request_config));
+ ap_log_rerror(APLOG_MARK,APLOG_DEBUG|APLOG_NOERRNO,SH_AP_R(r), "shib_init_rc");
+ return rc;
+}
+
// generic global slot handlers
extern "C" const char* ap_set_global_string_slot(cmd_parms* parms, void*, const char* arg)
{
extern "C" const char* shib_set_server_string_slot(cmd_parms* parms, void*, const char* arg)
{
char* base=(char*)ap_get_module_config(parms->server->module_config,&mod_shib);
- int offset=(int)parms->info;
+ size_t offset=(size_t)parms->info;
*((char**)(base + offset))=ap_pstrdup(parms->pool,arg);
return NULL;
}
/********************************************************************************/
// Apache ShibTarget subclass(es) here.
-class ShibTargetApache : public ShibTarget
+class ShibTargetApache : public AbstractSPRequest
{
+ mutable string m_body;
+ mutable bool m_gotBody;
+ vector<XSECCryptoX509*> m_certs;
+
public:
- ShibTargetApache(request_rec* req) {
+ request_rec* m_req;
+ shib_dir_config* m_dc;
+ shib_server_config* m_sc;
+ shib_request_config* m_rc;
+
+ ShibTargetApache(request_rec* req) : 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);
-
- init(
- m_sc->szScheme ? m_sc->szScheme : ap_http_method(req),
- ap_get_server_name(req),
- (int)ap_get_server_port(req),
- req->unparsed_uri,
- ap_table_get(req->headers_in, "Content-type"),
- req->connection->remote_ip,
- req->method
- );
-
+ m_rc = (shib_request_config*)ap_get_module_config(req->request_config, &mod_shib);
m_req = req;
}
- ~ShibTargetApache() { }
+ virtual ~ShibTargetApache() {}
- virtual void log(ShibLogLevel level, const string &msg) {
- ShibTarget::log(level,msg);
-#ifdef SHIB_APACHE_13
- ap_log_rerror(APLOG_MARK,
- (level == LogLevelDebug ? APLOG_DEBUG :
- (level == LogLevelInfo ? APLOG_INFO :
- (level == LogLevelWarn ? APLOG_WARNING : APLOG_ERR)))|APLOG_NOERRNO, SH_AP_R(m_req), msg.c_str());
-#else
- if (level == LogLevelError)
- ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, SH_AP_R(m_req), msg.c_str());
-#endif
+ const char* getScheme() const {
+ return m_sc->szScheme ? m_sc->szScheme : ap_http_method(m_req);
+ }
+ const char* getHostname() const {
+ return ap_get_server_name(m_req);
+ }
+ int getPort() const {
+ return ap_get_server_port(m_req);
+ }
+ const char* getRequestURI() const {
+ return m_req->unparsed_uri;
}
- virtual string getCookies(void) const {
- const char *c = ap_table_get(m_req->headers_in, "Cookie");
- return string(c ? c : "");
+ const char* getMethod() const {
+ return m_req->method;
}
- virtual void setCookie(const string &name, const string &value) {
- char* val = ap_psprintf(m_req->pool, "%s=%s", name.c_str(), value.c_str());
- ap_table_addn(m_req->err_headers_out, "Set-Cookie", val);
+ string getContentType() const {
+ const char* type = ap_table_get(m_req->headers_in, "Content-Type");
+ return type ? type : "";
}
- virtual string getArgs(void) { return string(m_req->args ? m_req->args : ""); }
- virtual string getPostData(void) {
+ long getContentLength() const {
+ return m_gotBody ? m_body.length() : m_req->remaining;
+ }
+ string getRemoteAddr() const {
+ return m_req->connection->remote_ip;
+ }
+ void log(SPLogLevel level, const string& msg) const {
+ AbstractSPRequest::log(level,msg);
+ ap_log_rerror(
+ APLOG_MARK,
+ (level == SPDebug ? APLOG_DEBUG :
+ (level == SPInfo ? APLOG_INFO :
+ (level == SPWarn ? APLOG_WARNING :
+ (level == SPError ? APLOG_ERR : APLOG_CRIT))))|APLOG_NOERRNO,
+ SH_AP_R(m_req),
+ msg.c_str()
+ );
+ }
+ const char* getQueryString() const { return m_req->args; }
+ const char* getRequestBody() const {
+ if (m_gotBody)
+ return m_body.c_str();
// Read the posted data
if (ap_setup_client_block(m_req, REQUEST_CHUNKED_ERROR))
- throw FatalProfileException("Apache function (setup_client_block) failed while reading profile submission.");
+ throw opensaml::BindingException("Apache function (setup_client_block) failed while reading POST request body.");
if (!ap_should_client_block(m_req))
- throw FatalProfileException("Apache function (should_client_block) failed while reading profile submission.");
+ throw opensaml::BindingException("Apache function (should_client_block) failed while reading POST request body.");
if (m_req->remaining > 1024*1024)
- throw FatalProfileException("Blocked too-large a submission to profile endpoint.");
- string cgistr;
+ throw opensaml::BindingException("Blocked POST request body larger than size limit.");
+ m_gotBody=true;
char buff[HUGE_STRING_LEN];
- ap_hard_timeout("[mod_shib] getPostData", m_req);
+ ap_hard_timeout("[mod_shib] getRequestBody", m_req);
memset(buff, 0, sizeof(buff));
while (ap_get_client_block(m_req, buff, sizeof(buff)-1) > 0) {
ap_reset_timeout(m_req);
- cgistr += buff;
+ m_body += buff;
memset(buff, 0, sizeof(buff));
}
ap_kill_timeout(m_req);
-
- return cgistr;
+ return m_body.c_str();
}
- virtual void clearHeader(const string &name) {
- ap_table_unset(m_req->headers_in, name.c_str());
+ void clearHeader(const char* name) {
+ if (m_dc->bUseEnvVars!=0) {
+ // ap_log_rerror(APLOG_MARK,APLOG_DEBUG|APLOG_NOERRNO,SH_AP_R(m_req), "shib_clear_header: env\n");
+ if (m_rc && m_rc->env) ap_table_unset(m_rc->env, name);
+ } else {
+ // ap_log_rerror(APLOG_MARK,APLOG_DEBUG|APLOG_NOERRNO,SH_AP_R(m_req), "shib_clear_header: hdr\n");
+ ap_table_unset(m_req->headers_in, name);
+ ap_table_set(m_req->headers_in, name, g_unsetHeaderValue.c_str());
+ }
}
- virtual void setHeader(const string &name, const string &value) {
- ap_table_set(m_req->headers_in, name.c_str(), value.c_str());
+ void setHeader(const char* name, const char* value) {
+ if (m_dc->bUseEnvVars!=0) {
+ if (!m_rc) {
+ // this happens on subrequests
+ // ap_log_rerror(APLOG_MARK,APLOG_DEBUG|APLOG_NOERRNO,SH_AP_R(m_req), "shib_setheader: no_m_rc\n");
+ m_rc = init_request_config(m_req);
+ }
+ if (!m_rc->env) m_rc->env = ap_make_table(m_req->pool, 10);
+ // ap_log_rerror(APLOG_MARK,APLOG_DEBUG|APLOG_NOERRNO,SH_AP_R(m_req), "shib_set_env: %s=%s\n", name, value?value:"Null");
+ ap_table_set(m_rc->env, name, value?value:"");
+ }
+ else {
+ ap_table_set(m_req->headers_in, name, value);
+ }
}
- virtual string getHeader(const string &name) {
- const char *hdr = ap_table_get(m_req->headers_in, name.c_str());
+ string getHeader(const char* name) const {
+ const char* hdr = ap_table_get(m_req->headers_in, name);
return string(hdr ? hdr : "");
}
- virtual void setRemoteUser(const string &user) {
- SH_AP_USER(m_req) = ap_pstrdup(m_req->pool, user.c_str());
+ string getSecureHeader(const char* name) const {
+ if (m_dc->bUseEnvVars!=0) {
+ const char *hdr;
+ if (m_rc && m_rc->env)
+ hdr = ap_table_get(m_rc->env, name);
+ else
+ hdr = NULL;
+ 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;
}
- virtual string getRemoteUser(void) {
+ string getRemoteUser() const {
return string(SH_AP_USER(m_req) ? SH_AP_USER(m_req) : "");
}
- virtual void* sendPage(
- const string& msg,
- int code=200,
- const string& content_type="text/html",
- const Iterator<header_t>& headers=EMPTY(header_t)
- ) {
- m_req->content_type = ap_psprintf(m_req->pool, content_type.c_str());
- while (headers.hasNext()) {
- const header_t& h=headers.next();
- ap_table_set(m_req->headers_out, h.first.c_str(), h.second.c_str());
- }
+ void setContentType(const char* type) {
+ m_req->content_type = ap_psprintf(m_req->pool, type);
+ }
+ void setResponseHeader(const char* name, const char* value) {
+#ifdef SHIB_DEFERRED_HEADERS
+ if (!m_rc)
+ // this happens on subrequests
+ m_rc = init_request_config(m_req);
+ ap_table_add(m_rc->hdr_err, name, value);
+ ap_table_add(m_rc->hdr_out, name, value);
+#else
+ ap_table_add(m_req->err_headers_out, name, value);
+#endif
+ }
+ long sendResponse(istream& in, long status) {
ap_send_http_header(m_req);
- ap_rprintf(m_req, msg.c_str());
- return (void*)((code==200) ? DONE : code);
+ char buf[1024];
+ while (in) {
+ in.read(buf,1024);
+ ap_rwrite(buf,in.gcount(),m_req);
+ }
+ return ((status==SAML_HTTP_STATUS_OK) ? DONE : status);
}
- virtual void* sendRedirect(const string& url) {
- ap_table_set(m_req->headers_out, "Location", url.c_str());
- return (void*)REDIRECT;
+ long sendRedirect(const char* url) {
+ ap_table_set(m_req->headers_out, "Location", url);
+ return REDIRECT;
}
- virtual void* returnDecline(void) { return (void*)DECLINED; }
- virtual void* returnOK(void) { return (void*)OK; }
-
- request_rec* m_req;
- shib_dir_config* m_dc;
- shib_server_config* m_sc;
+ const vector<XSECCryptoX509*>& getClientCertificates() const {
+ return m_certs;
+ }
+ long returnDecline(void) { return DECLINED; }
+ long returnOK(void) { return OK; }
};
/********************************************************************************/
ostringstream threadid;
threadid << "[" << getpid() << "] shib_check_user" << '\0';
- saml::NDC ndc(threadid.str().c_str());
+ xmltooling::NDC ndc(threadid.str().c_str());
-#ifndef _DEBUG
try {
-#endif
ShibTargetApache sta(r);
// Check user authentication and export information, then set the handler bypass
- pair<bool,void*> res = sta.doCheckAuthN(true);
+ pair<bool,long> res = sta.getServiceProvider().doAuthentication(sta,true);
apr_pool_userdata_setn((const void*)42,g_UserDataKey,NULL,r->pool);
- if (res.first) return (int)res.second;
+ if (res.first) return res.second;
// user auth was okay -- export the assertions now
- res = sta.doExportAssertions();
- if (res.first) return (int)res.second;
+ res = sta.getServiceProvider().doExport(sta);
+ if (res.first) return res.second;
// export happened successfully.. this user is ok.
return OK;
-
+ }
+ catch (exception& e) {
+ 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 (...) {
+ catch (...) {
ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, SH_AP_R(r), "shib_check_user threw an uncaught exception!");
return SERVER_ERROR;
}
ostringstream threadid;
threadid << "[" << getpid() << "] shib_handler" << '\0';
- saml::NDC ndc(threadid.str().c_str());
+ xmltooling::NDC ndc(threadid.str().c_str());
#ifndef SHIB_APACHE_13
// With 2.x, this handler always runs, though last.
ap_log_rerror(APLOG_MARK,APLOG_DEBUG|APLOG_NOERRNO,SH_AP_R(r),"shib_handler(%d): ENTER: %s", (int)getpid(), r->handler);
-#ifndef _DEBUG
try {
-#endif
ShibTargetApache sta(r);
- pair<bool,void*> res = sta.doHandler();
- if (res.first) return (int)res.second;
+ pair<bool,long> res = sta.getServiceProvider().doHandler(sta);
+ if (res.first) return res.second;
ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, SH_AP_R(r), "doHandler() did not do anything.");
return SERVER_ERROR;
-
+ }
+ catch (exception& e) {
+ 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 (...) {
+ catch (...) {
ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, SH_AP_R(r), "shib_handler threw an uncaught exception!");
return SERVER_ERROR;
}
ostringstream threadid;
threadid << "[" << getpid() << "] shib_auth_checker" << '\0';
- saml::NDC ndc(threadid.str().c_str());
+ xmltooling::NDC ndc(threadid.str().c_str());
-#ifndef _DEBUG
try {
-#endif
ShibTargetApache sta(r);
- pair<bool,void*> res = sta.doCheckAuthZ();
- if (res.first) return (int)res.second;
+ pair<bool,long> res = sta.getServiceProvider().doAuthorization(sta);
+ if (res.first) return res.second;
// We're all okay.
return OK;
-
+ }
+ catch (exception& e) {
+ 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 (...) {
+ catch (...) {
ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, SH_AP_R(r), "shib_auth_checker threw an uncaught exception!");
return SERVER_ERROR;
}
}
// Access control plugin that enforces htaccess rules
-class htAccessControl : virtual public IAccessControl
+class htAccessControl : virtual public AccessControl
{
public:
htAccessControl() {}
~htAccessControl() {}
- void lock() {}
+ Lockable* lock() {return this;}
void unlock() {}
- bool authorized(
- ShibTarget* st,
- ISessionCacheEntry* entry
- ) const;
+ bool authorized(const SPRequest& request, const Session* session) const;
};
-IPlugIn* htAccessFactory(const DOMElement* e)
+AccessControl* htAccessFactory(const DOMElement* const & e)
{
return new htAccessControl();
}
-class ApacheRequestMapper : public virtual IRequestMapper, public virtual IPropertySet
+class ApacheRequestMapper : public virtual RequestMapper, public virtual PropertySet
{
public:
ApacheRequestMapper(const DOMElement* e);
~ApacheRequestMapper() { delete m_mapper; delete m_htaccess; delete m_staKey; delete m_propsKey; }
- void lock() { m_mapper->lock(); }
+ Lockable* lock() { return m_mapper->lock(); }
void unlock() { m_staKey->setData(NULL); m_propsKey->setData(NULL); m_mapper->unlock(); }
- Settings getSettings(ShibTarget* st) const;
+ Settings getSettings(const SPRequest& request) const;
pair<bool,bool> getBool(const char* name, const char* ns=NULL) const;
pair<bool,const char*> getString(const char* name, const char* ns=NULL) const;
pair<bool,const XMLCh*> getXMLString(const char* name, const char* ns=NULL) const;
pair<bool,unsigned int> getUnsignedInt(const char* name, const char* ns=NULL) const;
pair<bool,int> getInt(const char* name, const char* ns=NULL) const;
- const IPropertySet* getPropertySet(const char* name, const char* ns="urn:mace:shibboleth:target:config:1.0") const;
+ const PropertySet* getPropertySet(const char* name, const char* ns="urn:mace:shibboleth:target:config:1.0") const;
const DOMElement* getElement() const;
private:
- IRequestMapper* m_mapper;
+ RequestMapper* m_mapper;
ThreadKey* m_staKey;
ThreadKey* m_propsKey;
- IAccessControl* m_htaccess;
+ AccessControl* m_htaccess;
};
-IPlugIn* ApacheRequestMapFactory(const DOMElement* e)
+RequestMapper* ApacheRequestMapFactory(const DOMElement* const & e)
{
return new ApacheRequestMapper(e);
}
-ApacheRequestMapper::ApacheRequestMapper(const DOMElement* e) : m_mapper(NULL), m_htaccess(NULL), m_staKey(NULL), m_propsKey(NULL)
+ApacheRequestMapper::ApacheRequestMapper(const DOMElement* e) : m_mapper(NULL), m_staKey(NULL), m_propsKey(NULL), m_htaccess(NULL)
{
- IPlugIn* p=SAMLConfig::getConfig().getPlugMgr().newPlugin(shibtarget::XML::XMLRequestMapType,e);
- m_mapper=dynamic_cast<IRequestMapper*>(p);
- if (!m_mapper) {
- delete p;
- throw UnsupportedExtensionException("Embedded request mapper plugin was not of correct type.");
- }
+ m_mapper=SPConfig::getConfig().RequestMapperManager.newPlugin(XML_REQUEST_MAPPER,e);
m_htaccess=new htAccessControl();
m_staKey=ThreadKey::create(NULL);
m_propsKey=ThreadKey::create(NULL);
}
-IRequestMapper::Settings ApacheRequestMapper::getSettings(ShibTarget* st) const
+RequestMapper::Settings ApacheRequestMapper::getSettings(const SPRequest& request) const
{
- Settings s=m_mapper->getSettings(st);
- m_staKey->setData(dynamic_cast<ShibTargetApache*>(st));
+ Settings s=m_mapper->getSettings(request);
+ m_staKey->setData((void*)dynamic_cast<const ShibTargetApache*>(&request));
m_propsKey->setData((void*)s.first);
- return pair<const IPropertySet*,IAccessControl*>(this,s.second ? s.second : m_htaccess);
+ return pair<const PropertySet*,AccessControl*>(this,s.second ? s.second : m_htaccess);
}
pair<bool,bool> ApacheRequestMapper::getBool(const char* name, const char* ns) const
{
- ShibTargetApache* sta=reinterpret_cast<ShibTargetApache*>(m_staKey->getData());
- const IPropertySet* s=reinterpret_cast<const IPropertySet*>(m_propsKey->getData());
+ const ShibTargetApache* sta=reinterpret_cast<const ShibTargetApache*>(m_staKey->getData());
+ const PropertySet* s=reinterpret_cast<const PropertySet*>(m_propsKey->getData());
if (sta && !ns) {
// Override Apache-settable boolean properties.
if (name && !strcmp(name,"requireSession") && sta->m_dc->bRequireSession==1)
pair<bool,const char*> ApacheRequestMapper::getString(const char* name, const char* ns) const
{
- ShibTargetApache* sta=reinterpret_cast<ShibTargetApache*>(m_staKey->getData());
- const IPropertySet* s=reinterpret_cast<const IPropertySet*>(m_propsKey->getData());
+ const ShibTargetApache* sta=reinterpret_cast<const ShibTargetApache*>(m_staKey->getData());
+ const PropertySet* s=reinterpret_cast<const PropertySet*>(m_propsKey->getData());
if (sta && !ns) {
// Override Apache-settable string properties.
if (name && !strcmp(name,"authType")) {
return pair<bool,const char*>(true,sta->m_dc->szApplicationId);
else if (name && !strcmp(name,"requireSessionWith") && sta->m_dc->szRequireWith)
return pair<bool,const char*>(true,sta->m_dc->szRequireWith);
+ else if (name && !strcmp(name,"redirectToSSL") && sta->m_dc->szRedirectToSSL)
+ return pair<bool,const char*>(true,sta->m_dc->szRedirectToSSL);
}
return s ? s->getString(name,ns) : pair<bool,const char*>(false,NULL);
}
pair<bool,const XMLCh*> ApacheRequestMapper::getXMLString(const char* name, const char* ns) const
{
- const IPropertySet* s=reinterpret_cast<const IPropertySet*>(m_propsKey->getData());
+ const PropertySet* s=reinterpret_cast<const PropertySet*>(m_propsKey->getData());
return s ? s->getXMLString(name,ns) : pair<bool,const XMLCh*>(false,NULL);
}
pair<bool,unsigned int> ApacheRequestMapper::getUnsignedInt(const char* name, const char* ns) const
{
- const IPropertySet* s=reinterpret_cast<const IPropertySet*>(m_propsKey->getData());
+ const ShibTargetApache* sta=reinterpret_cast<const ShibTargetApache*>(m_staKey->getData());
+ const PropertySet* s=reinterpret_cast<const PropertySet*>(m_propsKey->getData());
+ if (sta && !ns) {
+ // Override Apache-settable int properties.
+ if (name && !strcmp(name,"redirectToSSL") && sta->m_dc->szRedirectToSSL)
+ return pair<bool,unsigned int>(true,strtol(sta->m_dc->szRedirectToSSL,NULL,10));
+ }
return s ? s->getUnsignedInt(name,ns) : pair<bool,unsigned int>(false,0);
}
pair<bool,int> ApacheRequestMapper::getInt(const char* name, const char* ns) const
{
- const IPropertySet* s=reinterpret_cast<const IPropertySet*>(m_propsKey->getData());
+ const ShibTargetApache* sta=reinterpret_cast<const ShibTargetApache*>(m_staKey->getData());
+ const PropertySet* s=reinterpret_cast<const PropertySet*>(m_propsKey->getData());
+ if (sta && !ns) {
+ // Override Apache-settable int properties.
+ if (name && !strcmp(name,"redirectToSSL") && sta->m_dc->szRedirectToSSL)
+ return pair<bool,int>(true,atoi(sta->m_dc->szRedirectToSSL));
+ }
return s ? s->getInt(name,ns) : pair<bool,int>(false,0);
}
-const IPropertySet* ApacheRequestMapper::getPropertySet(const char* name, const char* ns) const
+const PropertySet* ApacheRequestMapper::getPropertySet(const char* name, const char* ns) const
{
- const IPropertySet* s=reinterpret_cast<const IPropertySet*>(m_propsKey->getData());
+ const PropertySet* s=reinterpret_cast<const PropertySet*>(m_propsKey->getData());
return s ? s->getPropertySet(name,ns) : NULL;
}
const DOMElement* ApacheRequestMapper::getElement() const
{
- const IPropertySet* s=reinterpret_cast<const IPropertySet*>(m_propsKey->getData());
+ const PropertySet* s=reinterpret_cast<const PropertySet*>(m_propsKey->getData());
return s ? s->getElement() : NULL;
}
return grps;
}
-bool htAccessControl::authorized(
- ShibTarget* st,
- ISessionCacheEntry* entry
-) const
+bool htAccessControl::authorized(const SPRequest& request, const Session* session) const
{
// Make sure the object is our type.
- ShibTargetApache* sta=dynamic_cast<ShibTargetApache*>(st);
+ const ShibTargetApache* sta=dynamic_cast<const ShibTargetApache*>(&request);
if (!sta)
throw ConfigurationException("Request wrapper object was not of correct type.");
if (!(reqs[x].method_mask & (1 << m)))
continue;
method_restricted=true;
- string remote_user = st->getRemoteUser();
+ string remote_user = request.getRemoteUser();
t = reqs[x].requirement;
w = ap_getword_white(sta->m_req->pool, &t);
// Without some require rule, AuthType is ignored and no check_user hooks run.
SHIB_AP_CHECK_IS_OK;
}
- else if (!strcmp(w,"valid-user") && entry) {
- st->log(ShibTarget::LogLevelDebug,"htAccessControl plugin accepting valid-user based on active session");
- SHIB_AP_CHECK_IS_OK;
+ 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,"user") && !remote_user.empty()) {
bool regexp=false;
RegularExpression re(trans.get());
auto_ptr<XMLCh> trans2(fromUTF8(remote_user.c_str()));
if (re.matches(trans2.get())) {
- st->log(ShibTarget::LogLevelDebug, string("htAccessControl plugin accepting user (") + w + ")");
+ request.log(SPRequest::SPDebug, string("htAccessControl plugin accepting user (") + w + ")");
SHIB_AP_CHECK_IS_OK;
}
}
catch (XMLException& ex) {
auto_ptr_char tmp(ex.getMessage());
- st->log(ShibTarget::LogLevelError,
+ request.log(SPRequest::SPError,
string("htAccessControl plugin caught exception while parsing regular expression (") + w + "): " + tmp.get());
}
}
else if (remote_user==w) {
- st->log(ShibTarget::LogLevelDebug, string("htAccessControl plugin accepting user (") + w + ")");
+ request.log(SPRequest::SPDebug, string("htAccessControl plugin accepting user (") + w + ")");
SHIB_AP_CHECK_IS_OK;
}
}
else if (!strcmp(w,"group")) {
SH_AP_TABLE* grpstatus=NULL;
if (sta->m_dc->szAuthGrpFile && !remote_user.empty()) {
- st->log(ShibTarget::LogLevelDebug,string("htAccessControl plugin using groups file: ") + sta->m_dc->szAuthGrpFile);
+ request.log(SPRequest::SPDebug,string("htAccessControl 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)
- return false;
+ continue;
while (*t) {
w=ap_getword_conf(sta->m_req->pool,&t);
if (ap_table_get(grpstatus,w)) {
- st->log(ShibTarget::LogLevelDebug, string("htAccessControl plugin accepting group (") + w + ")");
+ request.log(SPRequest::SPDebug, string("htAccessControl plugin accepting group (") + w + ")");
SHIB_AP_CHECK_IS_OK;
}
}
}
else {
- Iterator<IAAP*> provs=st->getApplication()->getAAPProviders();
- AAP wrapper(provs,w);
- if (wrapper.fail()) {
- st->log(ShibTarget::LogLevelWarn, string("htAccessControl plugin didn't recognize require rule: ") + w);
+ // 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 matching the require rule.
+ map<string,const Attribute*>::const_iterator attr = session->getAttributes().find(w);
+ if (attr == session->getAttributes().end()) {
+ request.log(SPRequest::SPWarn, string("htAccessControl rule requires attribute (") + w + "), not found in session");
continue;
}
bool regexp=false;
- const char* vals=ap_table_get(sta->m_req->headers_in,wrapper->getHeader());
- while (*t && vals) {
+ bool caseSensitive = attr->second->isCaseSensitive();
+ const vector<string>& vals = attr->second->getSerializedValues();
+
+ while (!auth_OK[x] && *t) {
w=ap_getword_conf(sta->m_req->pool,&t);
if (*w=='~') {
regexp=true;
re=temp;
}
- string vals_str(vals);
- int j = 0;
- for (int i = 0; i < vals_str.length(); i++) {
- if (vals_str.at(i) == ';') {
- if (i == 0) {
- st->log(ShibTarget::LogLevelError, string("htAccessControl plugin found invalid header encoding (") +
- vals + "): starts with a semicolon");
- throw SAMLException("Invalid information supplied to authorization plugin.");
- }
-
- if (vals_str.at(i-1) == '\\') {
- vals_str.erase(i-1, 1);
- i--;
- continue;
- }
-
- string val = vals_str.substr(j, i-j);
- j = i+1;
- if (regexp) {
- auto_ptr<XMLCh> trans(fromUTF8(val.c_str()));
- if (re->matches(trans.get())) {
- st->log(ShibTarget::LogLevelDebug, string("htAccessControl plugin expecting ") + w +
- ", got " + val + ": authorization granted");
- SHIB_AP_CHECK_IS_OK;
- }
- }
- else if ((wrapper->getCaseSensitive() && val==w) || (!wrapper->getCaseSensitive() && !strcasecmp(val.c_str(),w))) {
- st->log(ShibTarget::LogLevelDebug, string("htAccessControl plugin expecting ") + w +
- ", got " + val + ": authorization granted.");
+ for (vector<string>::const_iterator v=vals.begin(); !auth_OK[x] && v!=vals.end(); ++v) {
+ if (regexp) {
+ auto_ptr<XMLCh> trans(fromUTF8(v->c_str()));
+ if (re->matches(trans.get())) {
+ request.log(SPRequest::SPDebug,
+ string("htAccessControl plugin expecting ") + w + ", got " + *v + ": authorization granted"
+ );
SHIB_AP_CHECK_IS_OK;
}
- else {
- st->log(ShibTarget::LogLevelDebug, string("htAccessControl plugin expecting ") + w +
- ", got " + val + ": authoritzation not granted.");
- }
}
- }
-
- string val = vals_str.substr(j, vals_str.length()-j);
- if (regexp) {
- auto_ptr<XMLCh> trans(fromUTF8(val.c_str()));
- if (re->matches(trans.get())) {
- st->log(ShibTarget::LogLevelDebug, string("htAccessControl plugin expecting ") + w +
- ", got " + val + ": authorization granted.");
+ else if ((caseSensitive && *v == w) || (!caseSensitive && !strcasecmp(v->c_str(),w))) {
+ request.log(SPRequest::SPDebug,
+ string("htAccessControl plugin expecting ") + w + ", got " + *v + ": authorization granted."
+ );
SHIB_AP_CHECK_IS_OK;
}
- }
- else if ((wrapper->getCaseSensitive() && val==w) || (!wrapper->getCaseSensitive() && !strcasecmp(val.c_str(),w))) {
- st->log(ShibTarget::LogLevelDebug, string("htAccessControl plugin expecting ") + w +
- ", got " + val + ": authorization granted");
- SHIB_AP_CHECK_IS_OK;
- }
- else {
- st->log(ShibTarget::LogLevelDebug, string("htAccessControl plugin expecting ") + w +
- ", got " + val + ": authorization not granted");
+ else {
+ request.log(SPRequest::SPDebug,
+ string("htAccessControl plugin expecting ") + w + ", got " + *v + ": authorization not granted."
+ );
+ }
}
}
catch (XMLException& ex) {
auto_ptr_char tmp(ex.getMessage());
- st->log(ShibTarget::LogLevelError, string("htAccessControl plugin caught exception while parsing regular expression (")
- + w + "): " + tmp.get());
+ request.log(SPRequest::SPError,
+ string("htAccessControl plugin caught exception while parsing regular expression (") + w + "): " + tmp.get()
+ );
}
}
}
extern "C" apr_status_t shib_exit(void* data)
{
if (g_Config) {
- g_Config->shutdown();
+ g_Config->term();
g_Config = NULL;
}
- ap_log_error(APLOG_MARK,APLOG_DEBUG|APLOG_NOERRNO,0,NULL,"shib_exit() done\n");
+ ap_log_error(APLOG_MARK,APLOG_DEBUG|APLOG_NOERRNO,0,NULL,"shib_exit() done");
return OK;
}
#endif
+// Initial look at a request - create the per-request structure
+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: E=%s", rc->env?"env":"hdr");
+
+#ifdef SHIB_DEFERRED_HEADERS
+ rc->hdr_out = ap_make_table(r->pool, 5);
+ rc->hdr_err = ap_make_table(r->pool, 5);
+#endif
+ return DECLINED;
+}
+
+// fixups: set environment vars
+
+extern "C" int shib_fixups(request_rec* r)
+{
+ shib_request_config *rc = (shib_request_config*)ap_get_module_config(r->request_config, &mod_shib);
+ shib_dir_config *dc = (shib_dir_config*)ap_get_module_config(r->per_dir_config, &mod_shib);
+ if (dc->bOff==1 || dc->bUseEnvVars==0)
+ return DECLINED;
+
+ 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))
+ 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);
+ r->subprocess_env = ap_overlay_tables(r->pool, r->subprocess_env, rc->env);
+
+ return OK;
+}
+
/*
* shib_child_exit()
* Cleanup the (per-process) pool info.
#endif
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->shutdown();
+ g_Config->term();
g_Config = NULL;
- ap_log_error(APLOG_MARK,APLOG_DEBUG|APLOG_NOERRNO,SH_AP_R(s),"shib_child_exit() done\n");
+ ap_log_error(APLOG_MARK,APLOG_DEBUG|APLOG_NOERRNO,SH_AP_R(s),"shib_child_exit() done");
#ifndef SHIB_APACHE_13
return OK;
exit(1);
}
+ g_Config=&SPConfig::getConfig();
+ g_Config->setFeatures(
+ SPConfig::Caching |
+ SPConfig::Listener |
+ SPConfig::Metadata |
+ SPConfig::RequestMapping |
+ SPConfig::InProcess |
+ SPConfig::Logging
+ );
+ if (!g_Config->init(g_szSchemaDir)) {
+ 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);
+
try {
- g_Config=&ShibTargetConfig::getConfig();
- g_Config->setFeatures(
- ShibTargetConfig::Listener |
- ShibTargetConfig::Metadata |
- ShibTargetConfig::AAP |
- ShibTargetConfig::RequestMapper |
- ShibTargetConfig::LocalExtensions |
- ShibTargetConfig::Logging
- );
- if (!g_Config->init(g_szSchemaDir)) {
- ap_log_error(APLOG_MARK,APLOG_CRIT|APLOG_NOERRNO,SH_AP_R(s),"shib_child_init() failed to initialize libraries");
- exit(1);
- }
- SAMLConfig::getConfig().getPlugMgr().regFactory(shibtarget::XML::htAccessControlType,&htAccessFactory);
- SAMLConfig::getConfig().getPlugMgr().regFactory(shibtarget::XML::NativeRequestMapType,&ApacheRequestMapFactory);
- // We hijack the legacy type so that 1.2 config files will load this plugin
- SAMLConfig::getConfig().getPlugMgr().regFactory(shibtarget::XML::LegacyRequestMapType,&ApacheRequestMapFactory);
-
- if (!g_Config->load(g_szSHIBConfig)) {
- ap_log_error(APLOG_MARK,APLOG_CRIT|APLOG_NOERRNO,SH_AP_R(s),"shib_child_init() failed to load configuration");
- exit(1);
- }
+ DOMDocument* dummydoc=XMLToolingConfig::getConfig().getParser().newDocument();
+ XercesJanitor<DOMDocument> docjanitor(dummydoc);
+ DOMElement* dummy = dummydoc->createElementNS(NULL,path);
+ auto_ptr_XMLCh src(g_szSHIBConfig);
+ dummy->setAttributeNS(NULL,path,src.get());
+
+ g_Config->setServiceProvider(g_Config->ServiceProviderManager.newPlugin(XML_SERVICE_PROVIDER,dummy));
+ g_Config->getServiceProvider()->init();
}
- catch (...) {
- ap_log_error(APLOG_MARK,APLOG_CRIT|APLOG_NOERRNO,SH_AP_R(s),"shib_child_init() failed to initialize system");
+ catch (exception& ex) {
+ ap_log_error(APLOG_MARK,APLOG_CRIT|APLOG_NOERRNO,SH_AP_R(s),ex.what());
+ ap_log_error(APLOG_MARK,APLOG_CRIT|APLOG_NOERRNO,SH_AP_R(s),"shib_child_init() failed to load configuration");
exit(1);
}
+ ServiceProvider* sp=g_Config->getServiceProvider();
+ xmltooling::Locker locker(sp);
+ const PropertySet* props=sp->getPropertySet("Local");
+ if (props) {
+ pair<bool,const char*> unsetValue=props->getString("unsetHeaderValue");
+ if (unsetValue.first)
+ g_unsetHeaderValue = unsetValue.second;
+ }
+
// Set the cleanup handler
apr_pool_cleanup_register(p, NULL, &shib_exit, &shib_child_exit);
ap_log_error(APLOG_MARK,APLOG_DEBUG|APLOG_NOERRNO,SH_AP_R(s),"shib_child_init() done");
}
+// Output filters
+#ifdef SHIB_DEFERRED_HEADERS
+static void set_output_filter(request_rec *r)
+{
+ ap_add_output_filter("SHIB_HEADERS_OUT", NULL, r, r->connection);
+}
+
+static void set_error_filter(request_rec *r)
+{
+ ap_add_output_filter("SHIB_HEADERS_ERR", NULL, r, r->connection);
+}
+
+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) {
+ 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_overlap(r->headers_out, rc->hdr_out, APR_OVERLAP_TABLES_MERGE);
+ }
+
+ /* remove ourselves from the filter chain */
+ ap_remove_output_filter(f);
+
+ /* send the data up the stack */
+ return ap_pass_brigade(f->next,in);
+}
+
+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) {
+ ap_log_rerror(APLOG_MARK,APLOG_DEBUG|APLOG_NOERRNO,SH_AP_R(r),"shib_err_filter: merging %d headers", apr_table_elts(rc->hdr_err)->nelts);
+ apr_table_overlap(r->err_headers_out, rc->hdr_err, APR_OVERLAP_TABLES_MERGE);
+ }
+
+ /* remove ourselves from the filter chain */
+ ap_remove_output_filter(f);
+
+ /* send the data up the stack */
+ return ap_pass_brigade(f->next,in);
+}
+#endif // SHIB_DEFERRED_HEADERS
+
typedef const char* (*config_fn_t)(void);
#ifdef SHIB_APACHE_13
// SHIB Module commands
static command_rec shire_cmds[] = {
- {"SHIREConfig", (config_fn_t)ap_set_global_string_slot, &g_szSHIBConfig,
- RSRC_CONF, TAKE1, "Path to shibboleth.xml config file."},
{"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 shibboleth.xml config file"},
{"ShibSchemaDir", (config_fn_t)ap_set_global_string_slot, &g_szSchemaDir,
- RSRC_CONF, TAKE1, "Path to Shibboleth XML schema directory."},
+ RSRC_CONF, TAKE1, "Path to Shibboleth XML schema directory"},
{"ShibURLScheme", (config_fn_t)shib_set_server_string_slot,
(void *) XtOffsetOf (shib_server_config, szScheme),
- RSRC_CONF, TAKE1, "URL scheme to force into generated URLs for a vhost."},
+ RSRC_CONF, TAKE1, "URL scheme to force into generated URLs for a vhost"},
{"ShibDisable", (config_fn_t)ap_set_flag_slot,
(void *) XtOffsetOf (shib_dir_config, bOff),
OR_AUTHCFG, FLAG, "Disable all Shib module activity here to save processing effort"},
{"ShibApplicationId", (config_fn_t)ap_set_string_slot,
(void *) XtOffsetOf (shib_dir_config, szApplicationId),
- OR_AUTHCFG, FLAG, "Set Shibboleth applicationId property for content"},
+ 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 shib?"},
+ OR_AUTHCFG, FLAG, "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."},
+ OR_AUTHCFG, FLAG, "Initiates a new session if one does not exist"},
{"ShibRequireSessionWith", (config_fn_t)ap_set_string_slot,
(void *) XtOffsetOf (shib_dir_config, szRequireWith),
- OR_AUTHCFG, FLAG, "Initiates a new session if one does not exist using a specific SessionInitiator"},
+ OR_AUTHCFG, TAKE1, "Initiates a new session if one does not exist using a specific SessionInitiator"},
{"ShibExportAssertion", (config_fn_t)ap_set_flag_slot,
(void *) XtOffsetOf (shib_dir_config, bExportAssertion),
- OR_AUTHCFG, FLAG, "Export SAML attribute assertion(s) to Shib-Attributes header?"},
+ OR_AUTHCFG, FLAG, "Export SAML attribute assertion(s) to Shib-Attributes header"},
+ {"ShibRedirectToSSL", (config_fn_t)ap_set_string_slot,
+ (void *) XtOffsetOf (shib_dir_config, szRedirectToSSL),
+ OR_AUTHCFG, TAKE1, "Redirect non-SSL requests to designated port" },
{"AuthGroupFile", (config_fn_t)shib_ap_set_file_slot,
(void *) XtOffsetOf (shib_dir_config, szAuthGrpFile),
OR_AUTHCFG, TAKE1, "text file containing group names and member user IDs"},
{"ShibRequireAll", (config_fn_t)ap_set_flag_slot,
(void *) XtOffsetOf (shib_dir_config, bRequireAll),
- OR_AUTHCFG, FLAG, "All require directives must match!"},
+ OR_AUTHCFG, FLAG, "All require directives must match"},
+ {"ShibUseEnvironment", (config_fn_t)ap_set_flag_slot,
+ (void *) XtOffsetOf (shib_dir_config, bUseEnvVars),
+ OR_AUTHCFG, FLAG, "Export data in environment instead of headers (default)"},
{NULL}
};
shib_auth_checker, /* check auth */
NULL, /* check access */
NULL, /* type_checker */
- NULL, /* fixups */
+ shib_fixups, /* fixups */
NULL, /* logger */
NULL, /* header parser */
shib_child_init, /* child_init */
shib_child_exit, /* child_exit */
- NULL /* post read-request */
+ shib_post_read /* post read-request */
};
-#elif defined(SHIB_APACHE_20)
+#elif defined(SHIB_APACHE_20) || defined(SHIB_APACHE_22)
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);
+#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);
}
// SHIB Module commands
static command_rec shib_cmds[] = {
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 shibboleth.xml config file"),
AP_INIT_TAKE1("ShibSchemaDir",
(config_fn_t)ap_set_global_string_slot, &g_szSchemaDir,
- RSRC_CONF, "Path to Shibboleth XML schema directory."),
+ RSRC_CONF, "Path to Shibboleth XML schema directory"),
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."),
+ RSRC_CONF, "URL scheme to force into generated URLs for a vhost"),
AP_INIT_FLAG("ShibDisable", (config_fn_t)ap_set_flag_slot,
- (void *) offsetof (shib_dir_config, bOff),
+ (void *) offsetof (shib_dir_config, bOff),
OR_AUTHCFG, "Disable all Shib module activity here to save processing effort"),
AP_INIT_TAKE1("ShibApplicationId", (config_fn_t)ap_set_string_slot,
- (void *) offsetof (shib_dir_config, szApplicationId),
+ (void *) offsetof (shib_dir_config, szApplicationId),
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 shib?"),
+ (void *) offsetof (shib_dir_config, bBasicHijack),
+ OR_AUTHCFG, "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."),
+ (void *) offsetof (shib_dir_config, bRequireSession),
+ OR_AUTHCFG, "Initiates a new session if one does not exist"),
AP_INIT_TAKE1("ShibRequireSessionWith", (config_fn_t)ap_set_string_slot,
- (void *) offsetof (shib_dir_config, szRequireWith),
+ (void *) offsetof (shib_dir_config, szRequireWith),
OR_AUTHCFG, "Initiates a new session if one does not exist using a specific SessionInitiator"),
AP_INIT_FLAG("ShibExportAssertion", (config_fn_t)ap_set_flag_slot,
- (void *) offsetof (shib_dir_config, bExportAssertion),
- OR_AUTHCFG, "Export SAML attribute assertion(s) to Shib-Attributes header?"),
+ (void *) offsetof (shib_dir_config, bExportAssertion),
+ OR_AUTHCFG, "Export SAML attribute assertion(s) to Shib-Attributes header"),
+ AP_INIT_TAKE1("ShibRedirectToSSL", (config_fn_t)ap_set_string_slot,
+ (void *) offsetof (shib_dir_config, szRedirectToSSL),
+ OR_AUTHCFG, "Redirect non-SSL requests to designated port"),
AP_INIT_TAKE1("AuthGroupFile", (config_fn_t)shib_ap_set_file_slot,
(void *) offsetof (shib_dir_config, szAuthGrpFile),
OR_AUTHCFG, "Text file containing group names and member user IDs"),
AP_INIT_FLAG("ShibRequireAll", (config_fn_t)ap_set_flag_slot,
- (void *) offsetof (shib_dir_config, bRequireAll),
- OR_AUTHCFG, "All require directives must match!"),
+ (void *) offsetof (shib_dir_config, bRequireAll),
+ OR_AUTHCFG, "All require directives must match"),
+ AP_INIT_FLAG("ShibUseEnvironment", (config_fn_t)ap_set_flag_slot,
+ (void *) offsetof (shib_dir_config, bUseEnvVars),
+ OR_AUTHCFG, "Export data in environment instead of headers (default)"),
{NULL}
};
projects / shibboleth / cpp-sp.git / blobdiff