Add NEWS file

[mod-vhost-ldap.git] / mod_vhost_ldap.c

diff --git a/mod_vhost_ldap.c b/mod_vhost_ldap.c
index 97671af4d90001cfe92116cbcde5a6f2169199fc..cf89f8407fab47dfa0993c29cf114064ccbd66ba 100644 (file)
--- a/mod_vhost_ldap.c
+++ b/mod_vhost_ldap.c
@@ -50,6 +50,8 @@
 #define MIN_UID 100
 #define MIN_GID 100
 
+#define MAX_FAILURES 5
+
 module AP_MODULE_DECLARE_DATA vhost_ldap_module;
 
 typedef enum {
@@ -123,15 +125,10 @@ static int set_document_root(request_rec *r, const char *arg)
     core_server_config *conf = ap_get_module_config(sconf, &core_module);
 
     /* Make it absolute, relative to ServerRoot */
-    ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r, 
-                 "[mod_vhost_ldap.c] set_document_root: translating DocumentRoot [%s]",
-                 arg);
     arg = ap_server_root_relative(r->pool, arg);
-    ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r, 
-                 "[mod_vhost_ldap.c] set_document_root: relative DocumentRoot [%s]",
-                 arg);
+
     if (arg == NULL) {
-        ap_log_rerror(APLOG_MARK, APLOG_WARNING|APLOG_NOERRNO, 0, r, 
+        ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, 
                       "[mod_vhost_ldap.c] set_document_root: DocumentRoot [%s] must be a directory",
                      arg);
 
@@ -143,7 +140,7 @@ static int set_document_root(request_rec *r, const char *arg)
                            APR_FILEPATH_TRUENAME, r->pool) != APR_SUCCESS
         || !ap_is_directory(r->pool, arg)) {
 
-        ap_log_rerror(APLOG_MARK, APLOG_STARTUP, 0,
+        ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0,
                      r,
                      "[mod_vhost_ldap.c] set_document_root: Warning: DocumentRoot [%s] does not exist",
                      arg);
@@ -470,9 +467,12 @@ static int mod_vhost_ldap_translate_name(request_rec *r)
     util_ldap_connection_t *ldc = NULL;
     int result = 0;
     const char *dn = NULL;
-    char *cgi, *real;
+    char *cgi;
     const char *hostname = NULL;
     int is_fallback = 0;
+    int sleep0 = 0;
+    int sleep1 = 1;
+    int sleep;
 
     reqc =
        (mod_vhost_ldap_request_t *)apr_pcalloc(r->pool, sizeof(mod_vhost_ldap_request_t));
@@ -503,7 +503,7 @@ start_over:
 fallback:
 
     ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r,
-                  "[mod_vhost_ldap.c]: translating %s", r->uri);
+                 "[mod_vhost_ldap.c]: translating hostname [%s], uri [%s]", hostname, r->uri);
 
     apr_snprintf(filtbuf, FILTER_LENGTH, "(&(%s)(|(apacheServerName=%s)(apacheServerAlias=%s)))", conf->filter, hostname, hostname);
 
@@ -513,8 +513,17 @@ fallback:
     util_ldap_connection_close(ldc);
 
     /* sanity check - if server is down, retry it up to 5 times */
-    if (result == LDAP_SERVER_DOWN) {
-        if (failures++ <= 5) {
+    if (AP_LDAP_IS_SERVER_DOWN(result) ||
+       (result == LDAP_TIMEOUT) ||
+       (result == LDAP_CONNECT_ERROR)) {
+        sleep = sleep0 + sleep1;
+        ap_log_rerror(APLOG_MARK, APLOG_WARNING|APLOG_NOERRNO, 0, r,
+                     "[mod_vhost_ldap.c]: lookup failure, retry number #[%d], sleeping for [%d] seconds", failures, sleep);
+        if (failures++ < MAX_FAILURES) {
+           /* Back-off exponentially */
+           apr_sleep(apr_time_from_sec(sleep));
+           sleep0 = sleep1;
+           sleep1 = sleep;
             goto start_over;
         } else {
            return HTTP_GATEWAY_TIME_OUT;
@@ -604,7 +613,8 @@ fallback:
        }
     }
     if (cgi) {
-        cgi = apr_pstrcat (r->pool, reqc->cgiroot, cgi + strlen("cgi-bin"), NULL);
+        /* Set exact filename for CGI script */
+        cgi = apr_pstrcat(r->pool, reqc->cgiroot, cgi + strlen("cgi-bin"), NULL);
         if ((cgi = ap_server_root_relative(r->pool, cgi))) {
          ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r,
                        "[mod_vhost_ldap.c]: ap_document_root is: %s", ap_document_root(r));
@@ -613,9 +623,12 @@ fallback:
          apr_table_setn(r->notes, "alias-forced-type", r->handler);
        }
     } else if (r->uri[0] == '/') {
-        /*      r->filename = apr_pstrdup(r->pool, r->uri); */
-       /*      r->filename = apr_pstrcat (r->pool, reqc->docroot, r->uri, NULL); */
+        /* we don't set r->filename here, and let other modules do it
+         * this allows other modules (mod_rewrite.c) to work as usual
+        */
+        /* r->filename = apr_pstrcat (r->pool, reqc->docroot, r->uri, NULL); */
     } else {
+        /* We don't handle non-file requests here */
        return DECLINED;
     }
 
@@ -625,28 +638,16 @@ fallback:
        top->server->server_admin = apr_pstrdup (top->pool, reqc->admin);
     }
 
-    real = apr_pstrcat(r->pool, reqc->docroot, r->uri);
-
-    ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r,
-                 "[mod_vhost_ldap.c]: ap_server_root_relative(%s) is: %s", real, ap_server_root_relative(r->pool, real));
-
-    ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r,
-                 "[mod_vhost_ldap.c]: ap_document_root is: %s", ap_document_root(r));
-
     reqc->saved_docroot = apr_pstrdup(top->pool, ap_document_root(r));
 
-    if (set_document_root(r, reqc->docroot) != OK)
+    result = set_document_root(r, reqc->docroot);
+    if (result != OK) {
         return HTTP_INTERNAL_SERVER_ERROR;
-
-    ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r,
-                 "[mod_vhost_ldap.c]: ap_document_root set to: [%s], relative [%s]",
-                 ap_document_root(r),
-                 ap_server_root_relative(r->pool, real));
+    }
 
     // set environment variables
     e = top->subprocess_env;
-    apr_table_addn (e, "SERVER_ROOT", reqc->docroot);
-    apr_table_addn (e, "DOCUMENT_ROOT", reqc->docroot);
+    apr_table_addn(e, "DOCUMENT_ROOT", reqc->docroot);
 
     /* Hack to allow post-processing by other modules (mod_rewrite, mod_alias) */
     return DECLINED;
@@ -658,13 +659,8 @@ static int mod_vhost_ldap_cleanup(request_rec * r)
       (mod_vhost_ldap_request_t *)ap_get_module_config(r->request_config,
                                                       &vhost_ldap_module);
 
-    if (set_document_root(r, reqc->saved_docroot) != OK)
-        return HTTP_INTERNAL_SERVER_ERROR;
-
-    ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r,
-                 "[mod_vhost_ldap.c]: ap_document_root restored to: %s", ap_document_root(r));
-
-    return OK;
+    /* Set ap_document_root back to saved value */
+    return set_document_root(r, reqc->saved_docroot);
 }
 
 #ifdef HAVE_UNIX_SUEXEC