X-Git-Url: http://andersk.mit.edu/gitweb/mod-vhost-ldap.git/blobdiff_plain/6056cddb70f6bf8667edbc23d2679950b605f3ee..3b8a47e087fba2cdf22f3ee5d8f63ec6cf707c7a:/mod_vhost_ldap.c diff --git a/mod_vhost_ldap.c b/mod_vhost_ldap.c index 3a13cdf..2b1dc81 100644 --- a/mod_vhost_ldap.c +++ b/mod_vhost_ldap.c @@ -34,7 +34,7 @@ #include "apr_reslist.h" #include "util_ldap.h" -#ifndef APU_HAS_LDAP +#if !defined(APU_HAS_LDAP) && !defined(APR_HAS_LDAP) #error mod_vhost_ldap requires APR-util to have LDAP support built in #endif @@ -93,6 +93,27 @@ typedef struct mod_vhost_ldap_request_t { char *attributes[] = { "apacheServerName", "apacheDocumentRoot", "apacheScriptAlias", "apacheSuexecUid", "apacheSuexecGid", "apacheServerAdmin", 0 }; +#ifdef APR_HAS_LDAP +static APR_OPTIONAL_FN_TYPE(uldap_connection_close) *util_ldap_connection_close; +static APR_OPTIONAL_FN_TYPE(uldap_connection_find) *util_ldap_connection_find; +static APR_OPTIONAL_FN_TYPE(uldap_cache_comparedn) *util_ldap_cache_comparedn; +static APR_OPTIONAL_FN_TYPE(uldap_cache_compare) *util_ldap_cache_compare; +static APR_OPTIONAL_FN_TYPE(uldap_cache_checkuserid) *util_ldap_cache_checkuserid; +static APR_OPTIONAL_FN_TYPE(uldap_cache_getuserdn) *util_ldap_cache_getuserdn; +static APR_OPTIONAL_FN_TYPE(uldap_ssl_supported) *util_ldap_ssl_supported; + +static void ImportULDAPOptFn(void) +{ + util_ldap_connection_close = APR_RETRIEVE_OPTIONAL_FN(uldap_connection_close); + util_ldap_connection_find = APR_RETRIEVE_OPTIONAL_FN(uldap_connection_find); + util_ldap_cache_comparedn = APR_RETRIEVE_OPTIONAL_FN(uldap_cache_comparedn); + util_ldap_cache_compare = APR_RETRIEVE_OPTIONAL_FN(uldap_cache_compare); + util_ldap_cache_checkuserid = APR_RETRIEVE_OPTIONAL_FN(uldap_cache_checkuserid); + util_ldap_cache_getuserdn = APR_RETRIEVE_OPTIONAL_FN(uldap_cache_getuserdn); + util_ldap_ssl_supported = APR_RETRIEVE_OPTIONAL_FN(uldap_ssl_supported); +} +#endif + static int mod_vhost_ldap_post_config(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *s) { /* make sure that mod_ldap (util_ldap) is loaded */ @@ -185,6 +206,7 @@ static const char *mod_vhost_ldap_parse_url(cmd_parms *cmd, { int result; apr_ldap_url_desc_t *urld; + apr_ldap_err_t *result_err; mod_vhost_ldap_config_t *conf = (mod_vhost_ldap_config_t *)ap_get_module_config(cmd->server->module_config, @@ -194,21 +216,28 @@ static const char *mod_vhost_ldap_parse_url(cmd_parms *cmd, cmd->server, "[mod_vhost_ldap.c] url parse: `%s'", url); +#ifdef APR_HAS_LDAP /* for apache >= 2.2 */ + result = apr_ldap_url_parse(cmd->pool, url, &(urld), &(result_err)); + if (result != LDAP_SUCCESS) { + return result_err->reason; + } +#else result = apr_ldap_url_parse(url, &(urld)); if (result != LDAP_SUCCESS) { switch (result) { - case LDAP_URL_ERR_NOTLDAP: - return "LDAP URL does not begin with ldap://"; - case LDAP_URL_ERR_NODN: - return "LDAP URL does not have a DN"; - case LDAP_URL_ERR_BADSCOPE: - return "LDAP URL has an invalid scope"; - case LDAP_URL_ERR_MEM: - return "Out of memory parsing LDAP URL"; - default: - return "Could not parse LDAP URL"; + case LDAP_URL_ERR_NOTLDAP: + return "LDAP URL does not begin with ldap://"; + case LDAP_URL_ERR_NODN: + return "LDAP URL does not have a DN"; + case LDAP_URL_ERR_BADSCOPE: + return "LDAP URL has an invalid scope"; + case LDAP_URL_ERR_MEM: + return "Out of memory parsing LDAP URL"; + default: + return "Could not parse LDAP URL"; } } +#endif conf->url = apr_pstrdup(cmd->pool, url); ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, @@ -278,7 +307,9 @@ static const char *mod_vhost_ldap_parse_url(cmd_parms *cmd, } conf->have_ldap_url = 1; +#ifdef APU_HAS_LDAP /* free only required for older apr */ apr_ldap_free_urldesc(urld); +#endif return NULL; } @@ -385,9 +416,10 @@ command_rec mod_vhost_ldap_cmds[] = { }; #define FILTER_LENGTH MAX_STRING_LEN -static int -mod_vhost_ldap_translate_name (request_rec * r) +static int mod_vhost_ldap_translate_name(request_rec *r) { + request_rec *top = (r->main)?r->main:r; + mod_vhost_ldap_request_t *reqc; apr_table_t *e; int failures = 0; const char **vals = NULL; @@ -403,9 +435,10 @@ mod_vhost_ldap_translate_name (request_rec * r) const char *hostname = NULL; int is_fallback = 0; - mod_vhost_ldap_request_t *req = + reqc = (mod_vhost_ldap_request_t *)apr_pcalloc(r->pool, sizeof(mod_vhost_ldap_request_t)); - ap_set_module_config(r->request_config, &vhost_ldap_module, req); + + ap_set_module_config(r->request_config, &vhost_ldap_module, reqc); // mod_vhost_ldap is disabled or we don't have LDAP Url if ((conf->enabled != MVL_ENABLED)||(!conf->have_ldap_url)) { @@ -474,7 +507,7 @@ fallback: } /* mark the user and DN */ - req->dn = apr_pstrdup(r->pool, dn); + reqc->dn = apr_pstrdup(r->pool, dn); /* Optimize */ if (vals) { @@ -482,22 +515,22 @@ fallback: while (attributes[i]) { if (strcasecmp (attributes[i], "apacheServerName") == 0) { - req->name = apr_pstrdup (r->pool, vals[i]); + reqc->name = apr_pstrdup (r->pool, vals[i]); } else if (strcasecmp (attributes[i], "apacheServerAdmin") == 0) { - req->admin = apr_pstrdup (r->pool, vals[i]); + reqc->admin = apr_pstrdup (r->pool, vals[i]); } else if (strcasecmp (attributes[i], "apacheDocumentRoot") == 0) { - req->docroot = apr_pstrdup (r->pool, vals[i]); + reqc->docroot = apr_pstrdup (r->pool, vals[i]); } else if (strcasecmp (attributes[i], "apacheScriptAlias") == 0) { - req->cgiroot = apr_pstrdup (r->pool, vals[i]); + reqc->cgiroot = apr_pstrdup (r->pool, vals[i]); } else if (strcasecmp (attributes[i], "apacheSuexecUid") == 0) { - req->uid = apr_pstrdup(r->pool, vals[i]); + reqc->uid = apr_pstrdup(r->pool, vals[i]); } else if (strcasecmp (attributes[i], "apacheSuexecGid") == 0) { - req->gid = apr_pstrdup(r->pool, vals[i]); + reqc->gid = apr_pstrdup(r->pool, vals[i]); } i++; } @@ -510,10 +543,10 @@ fallback: "apacheDocumentRoot: %s, " "apacheScriptAlias: %s, " "apacheSuexecUid: %s, " - "apacheSuexecGid: %s" - , req->name, req->admin, req->docroot, req->cgiroot, req->uid, req->gid); + "apacheSuexecGid: %s", + reqc->name, reqc->admin, reqc->docroot, reqc->cgiroot, reqc->uid, reqc->gid); - if ((req->name == NULL)||(req->docroot == NULL)) { + if ((reqc->name == NULL)||(reqc->docroot == NULL)) { ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, r, "[mod_vhost_ldap.c] translate: " "translate failed; ServerName or DocumentRoot not defined"); @@ -522,33 +555,33 @@ fallback: cgi = NULL; - if (req->cgiroot) { + if (reqc->cgiroot) { cgi = strstr(r->uri, "cgi-bin/"); if (cgi && (cgi != r->uri + strspn(r->uri, "/"))) { cgi = NULL; } } if (cgi) { - r->filename = apr_pstrcat (r->pool, req->cgiroot, cgi + strlen("cgi-bin"), NULL); + r->filename = apr_pstrcat (r->pool, reqc->cgiroot, cgi + strlen("cgi-bin"), NULL); r->handler = "cgi-script"; apr_table_setn(r->notes, "alias-forced-type", r->handler); } else if (r->uri[0] == '/') { - r->filename = apr_pstrcat (r->pool, req->docroot, r->uri, NULL); + r->filename = apr_pstrcat (r->pool, reqc->docroot, r->uri, NULL); } else { return DECLINED; } - r->server->server_hostname = apr_pstrdup (r->pool, req->name); + top->server->server_hostname = apr_pstrdup (top->pool, reqc->name); - if (req->admin) { - r->server->server_admin = apr_pstrdup (r->pool, req->admin); + if (reqc->admin) { + top->server->server_admin = apr_pstrdup (top->pool, reqc->admin); } // set environment variables - e = r->subprocess_env; - apr_table_addn (e, "SERVER_ROOT", req->docroot); + e = top->subprocess_env; + apr_table_addn (e, "SERVER_ROOT", reqc->docroot); - core->ap_document_root = apr_pstrdup(r->pool, req->docroot); + core->ap_document_root = apr_pstrdup(top->pool, reqc->docroot); ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r, "[mod_vhost_ldap.c]: translated to %s", r->filename); @@ -606,6 +639,9 @@ mod_vhost_ldap_register_hooks (apr_pool_t * p) #ifdef HAVE_UNIX_SUEXEC ap_hook_get_suexec_identity(mod_vhost_ldap_get_suexec_id_doer, NULL, NULL, APR_HOOK_MIDDLE); #endif +#ifdef APR_HAS_LDAP + ap_hook_optional_fn_retrieve(ImportULDAPOptFn,NULL,NULL,APR_HOOK_MIDDLE); +#endif } module AP_MODULE_DECLARE_DATA vhost_ldap_module = {