-/* ====================================================================
- * The Apache Software License, Version 1.1
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
- * reserved.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowledgment may appear in the software itself,
- * if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" must
- * not be used to endorse or promote products derived from this
- * software without prior written permission. For written
- * permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- * nor may "Apache" appear in their name, without prior written
- * permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- * Portions of this software are based upon public domain software
- * originally written at the National Center for Supercomputing Applications,
- * University of Illinois, Urbana-Champaign.
+ * 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.
*/
/*
- * http_request.c: functions to get and process requests
+ * @file request.c
+ * @brief functions to get and process requests
*
- * Rob McCool 3/21/93
+ * @author Rob McCool 3/21/93
*
* Thoroughly revamped by rst for Apache. NB this file reads
* best from the bottom up.
#define APR_WANT_STRFUNC
#include "apr_want.h"
-#define CORE_PRIVATE
#include "ap_config.h"
+#include "ap_provider.h"
#include "httpd.h"
#include "http_config.h"
#include "http_request.h"
#include "http_main.h"
#include "util_filter.h"
#include "util_charset.h"
+#include "util_script.h"
+#include "ap_expr.h"
+#include "mod_request.h"
#include "mod_core.h"
+#include "mod_auth.h"
#if APR_HAVE_STDARG_H
#include <stdarg.h>
)
AP_IMPLEMENT_HOOK_RUN_FIRST(int,translate_name,
- (request_rec *r),(r),DECLINED)
+ (request_rec *r), (r), DECLINED)
AP_IMPLEMENT_HOOK_RUN_FIRST(int,map_to_storage,
- (request_rec *r),(r),DECLINED)
+ (request_rec *r), (r), DECLINED)
AP_IMPLEMENT_HOOK_RUN_FIRST(int,check_user_id,
- (request_rec *r),(r),DECLINED)
+ (request_rec *r), (r), DECLINED)
AP_IMPLEMENT_HOOK_RUN_ALL(int,fixups,
- (request_rec *r),(r),OK,DECLINED)
+ (request_rec *r), (r), OK, DECLINED)
AP_IMPLEMENT_HOOK_RUN_FIRST(int,type_checker,
- (request_rec *r),(r),DECLINED)
+ (request_rec *r), (r), DECLINED)
AP_IMPLEMENT_HOOK_RUN_ALL(int,access_checker,
- (request_rec *r),(r),OK,DECLINED)
+ (request_rec *r), (r), OK, DECLINED)
AP_IMPLEMENT_HOOK_RUN_FIRST(int,auth_checker,
- (request_rec *r),(r),DECLINED)
+ (request_rec *r), (r), DECLINED)
AP_IMPLEMENT_HOOK_VOID(insert_filter, (request_rec *r), (r))
-AP_IMPLEMENT_HOOK_RUN_ALL(int,create_request,(request_rec *r),(r),OK,DECLINED)
+AP_IMPLEMENT_HOOK_RUN_ALL(int, create_request,
+ (request_rec *r), (r), OK, DECLINED)
+
+static int auth_internal_per_conf = 0;
+static int auth_internal_per_conf_hooks = 0;
+static int auth_internal_per_conf_providers = 0;
static int decl_die(int status, char *phase, request_rec *r)
{
if (status == DECLINED) {
- ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_CRIT, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_CRIT, 0, r,
"configuration error: couldn't %s: %s", phase, r->uri);
return HTTP_INTERNAL_SERVER_ERROR;
}
int file_req = (r->main && r->filename);
int access_status;
- access_status = ap_run_quick_handler(r);
- if (access_status != DECLINED) {
- if (access_status == OK) {
- if (!r->main)
- return DONE;
- else
- return OK;
- }
- else {
- return access_status;
- }
- }
-
/* Ignore embedded %2F's in path for proxy requests */
if (!r->proxyreq && r->parsed_uri.path) {
- access_status = ap_unescape_url(r->parsed_uri.path);
+ core_dir_config *d;
+ d = ap_get_module_config(r->per_dir_config, &core_module);
+ if (d->allow_encoded_slashes) {
+ access_status = ap_unescape_url_keep2f(r->parsed_uri.path);
+ }
+ else {
+ access_status = ap_unescape_url(r->parsed_uri.path);
+ }
if (access_status) {
+ if (access_status == HTTP_NOT_FOUND) {
+ if (! d->allow_encoded_slashes) {
+ ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
+ "found %%2f (encoded '/') in URI "
+ "(decoded='%s'), returning 404",
+ r->parsed_uri.path);
+ }
+ }
return access_status;
}
}
ap_getparents(r->uri); /* OK --- shrinking transformations... */
- /* All file subrequests are a huge pain... they cannot bubble through the
- * next several steps. Only file subrequests are allowed an empty uri,
+ /* All file subrequests are a huge pain... they cannot bubble through the
+ * next several steps. Only file subrequests are allowed an empty uri,
* otherwise let translate_name kill the request.
*/
if (!file_req) {
}
}
- /* Reset to the server default config prior to running map_to_storage
+ /* Reset to the server default config prior to running map_to_storage
*/
r->per_dir_config = r->server->lookup_defaults;
return access_status;
}
- /* Excluding file-specific requests with no 'true' URI...
+ /* Rerun the location walk, which overrides any map_to_storage config.
*/
- if (!file_req) {
- /* Rerun the location walk, which overrides any map_to_storage config.
- */
- if ((access_status = ap_location_walk(r))) {
- return access_status;
- }
+ if ((access_status = ap_location_walk(r))) {
+ return access_status;
}
/* Only on the main request! */
* functions in map_to_storage that use the same merge results given
* identical input.) If the config changes, we must re-auth.
*/
- if (r->main && (r->main->per_dir_config == r->per_dir_config)) {
- r->user = r->main->user;
- r->ap_auth_type = r->main->ap_auth_type;
- }
- else if (r->prev && (r->prev->per_dir_config == r->per_dir_config)) {
- r->user = r->prev->user;
+ if (r->prev && (r->prev->per_dir_config == r->per_dir_config)) {
+ r->user = r->prev->user;
r->ap_auth_type = r->prev->ap_auth_type;
}
+ else if (r->main && (r->main->per_dir_config == r->per_dir_config)) {
+ r->user = r->main->user;
+ r->ap_auth_type = r->main->ap_auth_type;
+ }
else {
switch (ap_satisfies(r)) {
case SATISFY_ALL:
case SATISFY_NOSPEC:
- if ((access_status = ap_run_access_checker(r)) != 0) {
+ if ((access_status = ap_run_access_checker(r)) != OK) {
return decl_die(access_status, "check access", r);
}
- if (ap_some_auth_required(r)) {
- if (((access_status = ap_run_check_user_id(r)) != 0)
- || !ap_auth_type(r)) {
- return decl_die(access_status, ap_auth_type(r)
- ? "check user. No user file?"
- : "perform authentication. AuthType not set!",
- r);
- }
- if (((access_status = ap_run_auth_checker(r)) != 0)
- || !ap_auth_type(r)) {
- return decl_die(access_status, ap_auth_type(r)
- ? "check access. No groups file?"
- : "perform authentication. AuthType not set!",
- r);
- }
+
+ if ((access_status = ap_run_check_user_id(r)) != OK) {
+ return decl_die(access_status, "check user", r);
+ }
+
+ if ((access_status = ap_run_auth_checker(r)) != OK) {
+ return decl_die(access_status, "check authorization", r);
}
break;
case SATISFY_ANY:
- if (((access_status = ap_run_access_checker(r)) != 0) ||
- !ap_auth_type(r)) {
- if (!ap_some_auth_required(r)) {
- return decl_die(access_status, ap_auth_type(r)
- ? "check access"
- : "perform authentication. AuthType not set!",
- r);
- }
- if (((access_status = ap_run_check_user_id(r)) != 0)
- || !ap_auth_type(r)) {
- return decl_die(access_status, ap_auth_type(r)
- ? "check user. No user file?"
- : "perform authentication. AuthType not set!",
- r);
+ if ((access_status = ap_run_access_checker(r)) != OK) {
+
+ if ((access_status = ap_run_check_user_id(r)) != OK) {
+ return decl_die(access_status, "check user", r);
}
- if (((access_status = ap_run_auth_checker(r)) != 0)
- || !ap_auth_type(r)) {
- return decl_die(access_status, ap_auth_type(r)
- ? "check access. No groups file?"
- : "perform authentication. AuthType not set!",
- r);
+
+ if ((access_status = ap_run_auth_checker(r)) != OK) {
+ return decl_die(access_status, "check authorization", r);
}
}
break;
}
+
+
}
/* XXX Must make certain the ap_run_type_checker short circuits mime
- * in mod-proxy for r->proxyreq && r->parsed_uri.scheme
+ * in mod-proxy for r->proxyreq && r->parsed_uri.scheme
* && !strcmp(r->parsed_uri.scheme, "http")
*/
- if ((access_status = ap_run_type_checker(r)) != 0) {
+ if ((access_status = ap_run_type_checker(r)) != OK) {
return decl_die(access_status, "find types", r);
}
- if ((access_status = ap_run_fixups(r)) != 0) {
+ if ((access_status = ap_run_fixups(r)) != OK) {
return access_status;
}
*
* Directive order in the httpd.conf file and its Includes significantly
* impact this optimization. Grouping common blocks at the front of the
- * config that are less likely to change between a request and
+ * config that are less likely to change between a request and
* its subrequests, or between a request and its redirects reduced
* the work of these functions significantly.
*/
} walk_walked_t;
typedef struct walk_cache_t {
- const char *cached; /* The identifier we matched */
- ap_conf_vector_t **dir_conf_tested;/* The sections we matched against */
- ap_conf_vector_t *dir_conf_merged;/* Base per_dir_config */
- ap_conf_vector_t *per_dir_result; /* per_dir_config += walked result */
- apr_array_header_t *walked; /* The list of walk_walked_t results */
+ const char *cached; /* The identifier we matched */
+ ap_conf_vector_t **dir_conf_tested; /* The sections we matched against */
+ ap_conf_vector_t *dir_conf_merged; /* Base per_dir_config */
+ ap_conf_vector_t *per_dir_result; /* per_dir_config += walked result */
+ apr_array_header_t *walked; /* The list of walk_walked_t results */
+ struct walk_cache_t *prev; /* Prev cache of same call in this (sub)req */
+ int count; /* Number of prev invocations of same call in this (sub)req */
} walk_cache_t;
static walk_cache_t *prep_walk_cache(apr_size_t t, request_rec *r)
{
- walk_cache_t *cache;
- void **note;
-
- /* Find the most relevant, recent entry to work from. That would be
- * this request (on the second call), or the parent request of a
- * subrequest, or the prior request of an internal redirect. Provide
- * this _walk()er with a copy it is allowed to munge. If there is no
- * parent or prior cached request, then create a new walk cache.
+ void **note, **inherit_note;
+ walk_cache_t *cache, *prev_cache, *copy_cache;
+ int count;
+
+ /* Find the most relevant, recent walk cache to work from and provide
+ * a copy the caller is allowed to munge. In the case of a sub-request
+ * or internal redirect, this is the cache corresponding to the equivalent
+ * invocation of the same function call in the "parent" request, if such
+ * a cache exists. Otherwise it is the walk cache of the previous
+ * invocation of the same function call in the current request, if
+ * that exists; if not, then create a new walk cache.
*/
note = ap_get_request_note(r, t);
if (!note) {
return NULL;
}
- if (!(cache = *note)) {
- void **inherit_note;
- if ((r->main &&
- ((inherit_note = ap_get_request_note(r->main, t))) &&
- *inherit_note) ||
- (r->prev &&
- ((inherit_note = ap_get_request_note(r->prev, t))) &&
- *inherit_note)) {
- cache = apr_pmemdup(r->pool, *inherit_note,
- sizeof(*cache));
- cache->walked = apr_array_copy(r->pool, cache->walked);
+
+ copy_cache = prev_cache = *note;
+ count = prev_cache ? (prev_cache->count + 1) : 0;
+
+ if ((r->prev
+ && (inherit_note = ap_get_request_note(r->prev, t))
+ && *inherit_note)
+ || (r->main
+ && (inherit_note = ap_get_request_note(r->main, t))
+ && *inherit_note)) {
+ walk_cache_t *inherit_cache = *inherit_note;
+
+ while (inherit_cache->count > count) {
+ inherit_cache = inherit_cache->prev;
}
- else {
- cache = apr_pcalloc(r->pool, sizeof(*cache));
- cache->walked = apr_array_make(r->pool, 4, sizeof(walk_walked_t));
+ if (inherit_cache->count == count) {
+ copy_cache = inherit_cache;
}
- *note = cache;
}
+
+ if (copy_cache) {
+ cache = apr_pmemdup(r->pool, copy_cache, sizeof(*cache));
+ cache->walked = apr_array_copy(r->pool, cache->walked);
+ cache->prev = prev_cache;
+ cache->count = count;
+ }
+ else {
+ cache = apr_pcalloc(r->pool, sizeof(*cache));
+ cache->walked = apr_array_make(r->pool, 4, sizeof(walk_walked_t));
+ }
+
+ *note = cache;
+
return cache;
}
* they change, all the way down.
*/
-/*
- * We don't want people able to serve up pipes, or unix sockets, or other
- * scary things. Note that symlink tests are performed later.
- */
-static int check_safe_file(request_rec *r)
-{
-
- if (r->finfo.filetype == 0 /* doesn't exist */
- || r->finfo.filetype == APR_DIR
- || r->finfo.filetype == APR_REG
- || r->finfo.filetype == APR_LNK) {
- return OK;
- }
-
- ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
- "object is not a file, directory or symlink: %s",
- r->filename);
- return HTTP_FORBIDDEN;
-}
/*
* resolve_symlink must _always_ be called on an APR_LNK file type!
- * It will resolve the actual target file type, modification date, etc,
+ * It will resolve the actual target file type, modification date, etc,
* and provide any processing required for symlink evaluation.
* Path must already be cleaned, no trailing slash, no multi-slashes,
* and don't call this on the root!
* to the number of times we had an extra lstat() since we 'weren't sure'.
*
* To optimize, we stat() anything when given (opts & OPT_SYM_LINKS), otherwise
- * we start off with an lstat(). Every lstat() must be dereferenced in case
+ * we start off with an lstat(). Every lstat() must be dereferenced in case
* it points at a 'nasty' - we must always rerun check_safe_file (or similar.)
*/
static int resolve_symlink(char *d, apr_finfo_t *lfi, int opts, apr_pool_t *p)
{
apr_finfo_t fi;
int res;
+ const char *savename;
if (!(opts & (OPT_SYM_OWNER | OPT_SYM_LINKS))) {
return HTTP_FORBIDDEN;
}
- if (opts & OPT_SYM_LINKS) {
- if ((res = apr_stat(&fi, d, lfi->valid, p)) != APR_SUCCESS) {
+ /* Save the name from the valid bits. */
+ savename = (lfi->valid & APR_FINFO_NAME) ? lfi->name : NULL;
+
+ /* if OPT_SYM_OWNER is unset, we only need to check target accessible */
+ if (!(opts & OPT_SYM_OWNER)) {
+ if ((res = apr_stat(&fi, d, lfi->valid & ~(APR_FINFO_NAME
+ | APR_FINFO_LINK), p))
+ != APR_SUCCESS) {
return HTTP_FORBIDDEN;
}
/* Give back the target */
memcpy(lfi, &fi, sizeof(fi));
+ if (savename) {
+ lfi->name = savename;
+ lfi->valid |= APR_FINFO_NAME;
+ }
+
return OK;
}
- /* OPT_SYM_OWNER only works if we can get the owner of
+ /* OPT_SYM_OWNER only works if we can get the owner of
* both the file and symlink. First fill in a missing
* owner of the symlink, then get the info of the target.
*/
if (!(lfi->valid & APR_FINFO_OWNER)) {
- if ((res = apr_lstat(&fi, d, lfi->valid | APR_FINFO_OWNER, p))
+ if ((res = apr_stat(lfi, d,
+ lfi->valid | APR_FINFO_LINK | APR_FINFO_OWNER, p))
!= APR_SUCCESS) {
return HTTP_FORBIDDEN;
}
}
- if ((res = apr_stat(&fi, d, lfi->valid, p)) != APR_SUCCESS) {
+ if ((res = apr_stat(&fi, d, lfi->valid & ~(APR_FINFO_NAME), p))
+ != APR_SUCCESS) {
return HTTP_FORBIDDEN;
}
- if (apr_compare_users(fi.user, lfi->user) != APR_SUCCESS) {
+ if (apr_uid_compare(fi.user, lfi->user) != APR_SUCCESS) {
return HTTP_FORBIDDEN;
}
/* Give back the target */
memcpy(lfi, &fi, sizeof(fi));
+ if (savename) {
+ lfi->name = savename;
+ lfi->valid |= APR_FINFO_NAME;
+ }
+
return OK;
}
+/*
+ * As we walk the directory configuration, the merged config won't
+ * be 'rooted' to a specific vhost until the very end of the merge.
+ *
+ * We need a very fast mini-merge to a real, vhost-rooted merge
+ * of core.opts and core.override, the only options tested within
+ * directory_walk itself.
+ *
+ * See core.c::merge_core_dir_configs() for explanation.
+ */
+
+typedef struct core_opts_t {
+ allow_options_t opts;
+ allow_options_t add;
+ allow_options_t remove;
+ overrides_t override;
+ overrides_t override_opts;
+} core_opts_t;
+
+static void core_opts_merge(const ap_conf_vector_t *sec, core_opts_t *opts)
+{
+ core_dir_config *this_dir = ap_get_module_config(sec, &core_module);
+
+ if (!this_dir) {
+ return;
+ }
+
+ if (this_dir->opts & OPT_UNSET) {
+ opts->add = (opts->add & ~this_dir->opts_remove)
+ | this_dir->opts_add;
+ opts->remove = (opts->remove & ~this_dir->opts_add)
+ | this_dir->opts_remove;
+ opts->opts = (opts->opts & ~opts->remove) | opts->add;
+ }
+ else {
+ opts->opts = this_dir->opts;
+ opts->add = this_dir->opts_add;
+ opts->remove = this_dir->opts_remove;
+ }
+
+ if (!(this_dir->override & OR_UNSET)) {
+ opts->override = this_dir->override;
+ opts->override_opts = this_dir->override_opts;
+ }
+}
+
+
/*****************************************************************
*
* Getting and checking directory configuration. Also checks the
walk_cache_t *cache;
char *entry_dir;
apr_status_t rv;
+ int cached;
/* XXX: Better (faster) tests needed!!!
*
- * "OK" as a response to a real problem is not _OK_, but to allow broken
+ * "OK" as a response to a real problem is not _OK_, but to allow broken
* modules to proceed, we will permit the not-a-path filename to pass the
* following two tests. This behavior may be revoked in future versions
- * of Apache. We still must catch it later if it's heading for the core
+ * of Apache. We still must catch it later if it's heading for the core
* handler. Leave INFO notes here for module debugging.
*/
if (r->filename == NULL) {
- ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, 0, r,
- "Module bug? Request filename is missing for URI %s",
+ ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
+ "Module bug? Request filename is missing for URI %s",
r->uri);
return OK;
}
* so we can begin by checking the cache for a recent directory walk.
* This call will ensure we have an absolute path in the same pass.
*/
- if ((rv = apr_filepath_merge(&entry_dir, NULL, r->filename,
- APR_FILEPATH_NOTRELATIVE, r->pool))
+ if ((rv = apr_filepath_merge(&entry_dir, NULL, r->filename,
+ APR_FILEPATH_NOTRELATIVE, r->pool))
!= APR_SUCCESS) {
- ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
"Module bug? Request filename path %s is invalid or "
- "or not absolute for uri %s",
+ "or not absolute for uri %s",
r->filename, r->uri);
return OK;
}
r->filename = entry_dir;
cache = prep_walk_cache(AP_NOTE_DIRECTORY_WALK, r);
+ cached = (cache->cached != NULL);
- /* If this is not a dirent subrequest with a preconstructed
+ /* If this is not a dirent subrequest with a preconstructed
* r->finfo value, then we can simply stat the filename to
* save burning mega-cycles with unneeded stats - if this is
* an exact file match. We don't care about failure... we
* with APR_ENOENT, knowing that the path is good.
*/
if (!r->finfo.filetype || r->finfo.filetype == APR_LNK) {
- apr_stat(&r->finfo, r->filename, APR_FINFO_MIN, r->pool);
+ rv = apr_stat(&r->finfo, r->filename, APR_FINFO_MIN, r->pool);
+
+ /* some OSs will return APR_SUCCESS/APR_REG if we stat
+ * a regular file but we have '/' at the end of the name;
+ *
+ * other OSs will return APR_ENOTDIR for that situation;
+ *
+ * handle it the same everywhere by simulating a failure
+ * if it looks like a directory but really isn't
+ *
+ * Also reset if the stat failed, just for safety.
+ */
+ if ((rv != APR_SUCCESS) ||
+ (r->finfo.filetype &&
+ (r->finfo.filetype != APR_DIR) &&
+ (r->filename[strlen(r->filename) - 1] == '/'))) {
+ r->finfo.filetype = 0; /* forget what we learned */
+ }
}
if (r->finfo.filetype == APR_REG) {
}
/* If we have a file already matches the path of r->filename,
- * and the vhost's list of directory sections hasn't changed,
+ * and the vhost's list of directory sections hasn't changed,
* we can skip rewalking the directory_walk entries.
*/
- if (cache->cached
+ if (cached
&& ((r->finfo.filetype == APR_REG)
- || ((r->finfo.filetype == APR_DIR)
- && (!r->path_info || !*r->path_info)))
- && (cache->dir_conf_tested == sec_ent)
+ || ((r->finfo.filetype == APR_DIR)
+ && (!r->path_info || !*r->path_info)))
+ && (cache->dir_conf_tested == sec_ent)
&& (strcmp(entry_dir, cache->cached) == 0)) {
+ int familiar = 0;
+
/* Well this looks really familiar! If our end-result (per_dir_result)
- * didn't change, we have absolutely nothing to do :)
+ * didn't change, we have absolutely nothing to do :)
* Otherwise (as is the case with most dir_merged/file_merged requests)
* we must merge our dir_conf_merged onto this new r->per_dir_config.
*/
if (r->per_dir_config == cache->per_dir_result) {
- return OK;
+ familiar = 1;
}
+
if (r->per_dir_config == cache->dir_conf_merged) {
r->per_dir_config = cache->per_dir_result;
+ familiar = 1;
+ }
+
+ if (familiar) {
+ apr_finfo_t thisinfo;
+ int res;
+ allow_options_t opts;
+ core_dir_config *this_dir;
+
+ this_dir = ap_get_module_config(r->per_dir_config, &core_module);
+ opts = this_dir->opts;
+ /*
+ * If Symlinks are allowed in general we do not need the following
+ * check.
+ */
+ if (!(opts & OPT_SYM_LINKS)) {
+ rv = apr_stat(&thisinfo, r->filename,
+ APR_FINFO_MIN | APR_FINFO_NAME | APR_FINFO_LINK,
+ r->pool);
+ /*
+ * APR_INCOMPLETE is as fine as result as APR_SUCCESS as we
+ * have added APR_FINFO_NAME to the wanted parameter of
+ * apr_stat above. On Unix platforms this means that apr_stat
+ * is always going to return APR_INCOMPLETE in the case that
+ * the call to the native stat / lstat did not fail.
+ */
+ if ((rv != APR_INCOMPLETE) && (rv != APR_SUCCESS)) {
+ /*
+ * This should never happen, because we did a stat on the
+ * same file, resolving a possible symlink several lines
+ * above. Therefore do not make a detailed analysis of rv
+ * in this case for the reason of the failure, just bail out
+ * with a HTTP_FORBIDDEN in case we hit a race condition
+ * here.
+ */
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
+ "access to %s failed; stat of '%s' failed.",
+ r->uri, r->filename);
+ return r->status = HTTP_FORBIDDEN;
+ }
+ if (thisinfo.filetype == APR_LNK) {
+ /* Is this a possibly acceptable symlink? */
+ if ((res = resolve_symlink(r->filename, &thisinfo,
+ opts, r->pool)) != OK) {
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ "Symbolic link not allowed "
+ "or link target not accessible: %s",
+ r->filename);
+ return r->status = res;
+ }
+ }
+ }
return OK;
}
+
if (cache->walked->nelts) {
now_merged = ((walk_walked_t*)cache->walked->elts)
[cache->walked->nelts - 1].merged;
}
}
else {
- /* We start now_merged from NULL since we want to build
+ /* We start now_merged from NULL since we want to build
* a locations list that can be merged to any vhost.
*/
int sec_idx;
int matches = cache->walked->nelts;
+ int cached_matches = matches;
walk_walked_t *last_walk = (walk_walked_t*)cache->walked->elts;
core_dir_config *this_dir;
- allow_options_t opts;
- allow_options_t opts_add;
- allow_options_t opts_remove;
- overrides_t override;
-
+ core_opts_t opts;
apr_finfo_t thisinfo;
char *save_path_info;
apr_size_t buflen;
#ifdef CASE_BLIND_FILESYSTEM
apr_size_t canonical_len;
#endif
+
+ cached &= auth_internal_per_conf;
+
/*
- * We must play our own mimi-merge game here, for the few
+ * We must play our own mini-merge game here, for the few
* running dir_config values we care about within dir_walk.
* We didn't start the merge from r->per_dir_config, so we
* accumulate opts and override as we merge, from the globals.
*/
this_dir = ap_get_module_config(r->per_dir_config, &core_module);
- opts = this_dir->opts;
- opts_add = this_dir->opts_add;
- opts_remove = this_dir->opts_remove;
- override = this_dir->override;
+ opts.opts = this_dir->opts;
+ opts.add = this_dir->opts_add;
+ opts.remove = this_dir->opts_remove;
+ opts.override = this_dir->override;
+ opts.override_opts = this_dir->override_opts;
/* Set aside path_info to merge back onto path_info later.
- * If r->filename is a directory, we must remerge the path_info,
+ * If r->filename is a directory, we must remerge the path_info,
* before we continue! [Directories cannot, by defintion, have
* path info. Either the next segment is not-found, or a file.]
*
* r->path_info tracks the unconsumed source path.
* r->filename tracks the path as we process it
*/
- if ((r->finfo.filetype == APR_DIR) && r->path_info && *r->path_info)
+ if ((r->finfo.filetype == APR_DIR) && r->path_info && *r->path_info)
{
- if ((rv = apr_filepath_merge(&r->path_info, r->filename, r->path_info,
+ if ((rv = apr_filepath_merge(&r->path_info, r->filename,
+ r->path_info,
APR_FILEPATH_NOTABOVEROOT, r->pool))
- != APR_SUCCESS) {
+ != APR_SUCCESS) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
"dir_walk error, path_info %s is not relative "
- "to the filename path %s for uri %s",
+ "to the filename path %s for uri %s",
r->path_info, r->filename, r->uri);
return HTTP_INTERNAL_SERVER_ERROR;
}
+
save_path_info = NULL;
}
else {
#ifdef CASE_BLIND_FILESYSTEM
- canonical_len = 0;
+ canonical_len = 0;
while (r->canonical_filename && r->canonical_filename[canonical_len]
- && (r->canonical_filename[canonical_len]
- == r->path_info[canonical_len])) {
+ && (r->canonical_filename[canonical_len]
+ == r->path_info[canonical_len])) {
++canonical_len;
}
+
while (canonical_len
- && ((r->canonical_filename[canonical_len - 1] != '/'
+ && ((r->canonical_filename[canonical_len - 1] != '/'
&& r->canonical_filename[canonical_len - 1])
- || (r->path_info[canonical_len - 1] != '/'
- && r->path_info[canonical_len - 1]))) {
+ || (r->path_info[canonical_len - 1] != '/'
+ && r->path_info[canonical_len - 1]))) {
--canonical_len;
}
- /*
+ /*
* Now build r->filename component by component, starting
* with the root (on Unix, simply "/"). We will make a huge
- * assumption here for efficiency, that any canonical path
+ * assumption here for efficiency, that any canonical path
* already given included a canonical root.
*/
rv = apr_filepath_root((const char **)&r->filename,
(const char **)&r->path_info,
- canonical_len
- ? 0 : APR_FILEPATH_TRUENAME,
+ canonical_len ? 0 : APR_FILEPATH_TRUENAME,
r->pool);
filename_len = strlen(r->filename);
* than the canonical length, then it cannot be trusted as
* a truename. So try again, this time more seriously.
*/
- if ((rv == APR_SUCCESS) && canonical_len
- && (filename_len > canonical_len)) {
+ if ((rv == APR_SUCCESS) && canonical_len
+ && (filename_len > canonical_len)) {
rv = apr_filepath_root((const char **)&r->filename,
(const char **)&r->path_info,
APR_FILEPATH_TRUENAME, r->pool);
if (rv != APR_SUCCESS) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
"dir_walk error, could not determine the root "
- "path of filename %s%s for uri %s",
+ "path of filename %s%s for uri %s",
r->filename, r->path_info, r->uri);
return HTTP_INTERNAL_SERVER_ERROR;
}
/*
* seg keeps track of which segment we've copied.
* sec_idx keeps track of which section we're on, since sections are
- * ordered by number of segments. See core_reorder_directories
+ * ordered by number of segments. See core_reorder_directories
+ * startseg tells us how many segments describe the root path
+ * e.g. the complete path "//host/foo/" to a UNC share (4)
*/
startseg = seg = ap_count_dirs(r->filename);
sec_idx = 0;
/*
- * Go down the directory hierarchy. Where we have to check for
- * symlinks, do so. Where a .htaccess file has permission to
+ * Go down the directory hierarchy. Where we have to check for
+ * symlinks, do so. Where a .htaccess file has permission to
* override anything, try to find one.
*/
do {
char *seg_name;
char *delim;
int temp_slash=0;
-
- /* We have no trailing slash, but we sure would appreciate one...
+
+ /* We have no trailing slash, but we sure would appreciate one.
+ * However, we don't want to append a / our first time through.
*/
- if (sec_idx && r->filename[filename_len-1] != '/') {
+ if ((seg > startseg) && r->filename[filename_len-1] != '/') {
r->filename[filename_len++] = '/';
r->filename[filename_len] = 0;
temp_slash=1;
core_dir_config *entry_core;
entry_core = ap_get_module_config(entry_config, &core_module);
- /* No more possible matches for this many segments?
+ /* No more possible matches for this many segments?
* We are done when we find relative/regex/longer components.
*/
if (entry_core->r || entry_core->d_components > seg) {
}
/* We will never skip '0' element components, e.g. plain old
- * <Directory >, and <Directory "/"> are classified as zero
- * so that Win32/Netware/OS2 etc all pick them up.
+ * <Directory >, and <Directory "/"> are classified as zero
+ * so that Win32/Netware etc all pick them up.
* Otherwise, skip over the mismatches.
*/
if (entry_core->d_components
- && (entry_core->d_is_fnmatch
- ? (apr_fnmatch(entry_core->d, r->filename,
- FNM_PATHNAME) != APR_SUCCESS)
- : (strcmp(r->filename, entry_core->d) != 0))) {
+ && ((entry_core->d_components < seg)
+ || (entry_core->d_is_fnmatch
+ ? (apr_fnmatch(entry_core->d, r->filename,
+ APR_FNM_PATHNAME) != APR_SUCCESS)
+ : (strcmp(r->filename, entry_core->d) != 0)))) {
continue;
}
+ /* If we haven't continue'd above, we have a match.
+ *
+ * Calculate our full-context core opts & override.
+ */
+ core_opts_merge(sec_ent[sec_idx], &opts);
+
/* If we merged this same section last time, reuse it
*/
if (matches) {
now_merged = last_walk->merged;
++last_walk;
--matches;
- goto minimerge;
+ continue;
}
+
/* We fell out of sync. This is our own copy of walked,
* so truncate the remaining matches and reset remaining.
*/
cache->walked->nelts -= matches;
matches = 0;
+ cached = 0;
}
if (now_merged) {
- now_merged = ap_merge_per_dir_configs(r->pool,
+ now_merged = ap_merge_per_dir_configs(r->pool,
now_merged,
sec_ent[sec_idx]);
}
last_walk = (walk_walked_t*)apr_array_push(cache->walked);
last_walk->matched = sec_ent[sec_idx];
last_walk->merged = now_merged;
-
- /* Do a mini-merge to our globally-based running calculations of
- * core_dir->override and core_dir->opts, since now_merged
- * never considered the global config. Of course, if there is
- * no core config at this level, continue without a thought.
- * See core.c::merge_core_dir_configs() for explanation.
- */
-minimerge:
- this_dir = ap_get_module_config(sec_ent[sec_idx], &core_module);
-
- if (!this_dir) {
- continue;
- }
-
- if (this_dir->opts & OPT_UNSET) {
- opts_add = (opts_add & ~this_dir->opts_remove)
- | this_dir->opts_add;
- opts_remove = (opts_remove & ~this_dir->opts_add)
- | this_dir->opts_remove;
- opts = (opts & ~opts_remove) | opts_add;
- }
- else {
- opts = this_dir->opts;
- opts_add = this_dir->opts_add;
- opts_remove = this_dir->opts_remove;
- }
- if (!(this_dir->override & OR_UNSET)) {
- override = this_dir->override;
- }
}
/* If .htaccess files are enabled, check for one, provided we
* have reached a real path.
*/
- if (seg >= startseg && override) {
+ do { /* Not really a loop, just a break'able code block */
+
ap_conf_vector_t *htaccess_conf = NULL;
- res = ap_parse_htaccess(&htaccess_conf, r, override,
+ /* No htaccess in an incomplete root path,
+ * nor if it's disabled
+ */
+ if (seg < startseg || !opts.override) {
+ break;
+ }
+
+ res = ap_parse_htaccess(&htaccess_conf, r, opts.override,
+ opts.override_opts,
apr_pstrdup(r->pool, r->filename),
sconf->access_name);
if (res) {
return res;
}
- if (htaccess_conf) {
+ if (!htaccess_conf) {
+ break;
+ }
- /* If we merged this same htaccess last time, reuse it...
- * this wouldn't work except that we cache the htaccess
- * sections for the lifetime of the request, so we match
- * the same conf. Good planning (no, pure luck ;)
- */
- if (matches) {
- if (last_walk->matched == htaccess_conf) {
- now_merged = last_walk->merged;
- ++last_walk;
- --matches;
- goto minimerge2;
- }
- /* We fell out of sync. This is our own copy of walked,
- * so truncate the remaining matches and reset
- * remaining.
- */
- cache->walked->nelts -= matches;
- matches = 0;
- }
+ /* If we are still here, we found our htaccess.
+ *
+ * Calculate our full-context core opts & override.
+ */
+ core_opts_merge(htaccess_conf, &opts);
- if (now_merged) {
- now_merged = ap_merge_per_dir_configs(r->pool,
- now_merged,
- htaccess_conf);
- }
- else {
- now_merged = htaccess_conf;
+ /* If we merged this same htaccess last time, reuse it...
+ * this wouldn't work except that we cache the htaccess
+ * sections for the lifetime of the request, so we match
+ * the same conf. Good planning (no, pure luck ;)
+ */
+ if (matches) {
+ if (last_walk->matched == htaccess_conf) {
+ now_merged = last_walk->merged;
+ ++last_walk;
+ --matches;
+ break;
}
- last_walk = (walk_walked_t*)apr_array_push(cache->walked);
- last_walk->matched = htaccess_conf;
- last_walk->merged = now_merged;
-
- /* Do a mini-merge to our globally-based running
- * calculations of core_dir->override and core_dir->opts,
- * since now_merged never considered the global config.
- * Of course, if there is no core config at this level,
- * continue without a thought.
- * See core.c::merge_core_dir_configs() for explanation.
+ /* We fell out of sync. This is our own copy of walked,
+ * so truncate the remaining matches and reset
+ * remaining.
*/
-minimerge2:
- this_dir = ap_get_module_config(htaccess_conf,
- &core_module);
-
- if (this_dir) {
- if (this_dir->opts & OPT_UNSET) {
- opts_add = (opts_add & ~this_dir->opts_remove)
- | this_dir->opts_add;
- opts_remove = (opts_remove & ~this_dir->opts_add)
- | this_dir->opts_remove;
- opts = (opts & ~opts_remove) | opts_add;
- }
- else {
- opts = this_dir->opts;
- opts_add = this_dir->opts_add;
- opts_remove = this_dir->opts_remove;
- }
- if (!(this_dir->override & OR_UNSET)) {
- override = this_dir->override;
- }
- }
+ cache->walked->nelts -= matches;
+ matches = 0;
+ cached = 0;
}
- }
+
+ if (now_merged) {
+ now_merged = ap_merge_per_dir_configs(r->pool,
+ now_merged,
+ htaccess_conf);
+ }
+ else {
+ now_merged = htaccess_conf;
+ }
+
+ last_walk = (walk_walked_t*)apr_array_push(cache->walked);
+ last_walk->matched = htaccess_conf;
+ last_walk->merged = now_merged;
+
+ } while (0); /* Only one htaccess, not a real loop */
/* That temporary trailing slash was useful, now drop it.
*/
break;
}
- /* Now it's time for the next segment...
+ /* Now it's time for the next segment...
* We will assume the next element is an end node, and fix it up
* below as necessary...
*/
-
+
seg_name = r->filename + filename_len;
delim = strchr(r->path_info + (*r->path_info == '/' ? 1 : 0), '/');
if (delim) {
filename_len += path_info_len;
r->path_info += path_info_len;
}
- if (*seg_name == '/')
+ if (*seg_name == '/')
++seg_name;
-
+
/* If nothing remained but a '/' string, we are finished
- */
+ * XXX: NO WE ARE NOT!!! Now process this puppy!!! */
if (!*seg_name) {
break;
}
* if...we have allowed symlinks
* skip the lstat and dummy up an APR_DIR value for thisinfo.
*/
- if (r->finfo.filetype
+ if (r->finfo.filetype
#ifdef CASE_BLIND_FILESYSTEM
&& (filename_len <= canonical_len)
#endif
- && ((opts & (OPT_SYM_OWNER | OPT_SYM_LINKS)) == OPT_SYM_LINKS))
+ && ((opts.opts & (OPT_SYM_OWNER | OPT_SYM_LINKS)) == OPT_SYM_LINKS))
{
thisinfo.filetype = APR_DIR;
continue;
}
- /* We choose apr_lstat here, rather that apr_stat, so that we
- * capture this path object rather than its target. We will
- * replace the info with our target's info below. We especially
- * want the name of this 'link' object, not the name of its
- * target, if we are fixing the filename case/resolving aliases.
+ /* We choose apr_stat with flag APR_FINFO_LINK here, rather that
+ * plain apr_stat, so that we capture this path object rather than
+ * its target. We will replace the info with our target's info
+ * below. We especially want the name of this 'link' object, not
+ * the name of its target, if we are fixing the filename
+ * case/resolving aliases.
*/
- rv = apr_lstat(&thisinfo, r->filename,
- APR_FINFO_MIN | APR_FINFO_NAME, r->pool);
+ rv = apr_stat(&thisinfo, r->filename,
+ APR_FINFO_MIN | APR_FINFO_NAME | APR_FINFO_LINK,
+ r->pool);
if (APR_STATUS_IS_ENOENT(rv)) {
/* Nothing? That could be nice. But our directory
"access to %s denied", r->uri);
return r->status = HTTP_FORBIDDEN;
}
- else if ((rv != APR_SUCCESS && rv != APR_INCOMPLETE)
+ else if ((rv != APR_SUCCESS && rv != APR_INCOMPLETE)
|| !(thisinfo.valid & APR_FINFO_TYPE)) {
- /* If we hit ENOTDIR, we must have over-optimized, deny
+ /* If we hit ENOTDIR, we must have over-optimized, deny
* rather than assume not found.
*/
ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
return r->status = HTTP_FORBIDDEN;
}
- if ((res = check_safe_file(r))) {
- r->status = res;
- return res;
- }
-
/* Fix up the path now if we have a name, and they don't agree
*/
- if ((thisinfo.valid & APR_FINFO_NAME)
+ if ((thisinfo.valid & APR_FINFO_NAME)
&& strcmp(seg_name, thisinfo.name)) {
/* TODO: provide users an option that an internal/external
* redirect is required here? We need to walk the URI and
if (thisinfo.filetype == APR_LNK) {
/* Is this a possibly acceptable symlink?
*/
- if ((res = resolve_symlink(r->filename, &thisinfo,
- opts, r->pool)) != OK) {
- ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
- "Symbolic link not allowed: %s",
+ if ((res = resolve_symlink(r->filename, &thisinfo,
+ opts.opts, r->pool)) != OK) {
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ "Symbolic link not allowed "
+ "or link target not accessible: %s",
r->filename);
return r->status = res;
}
+ }
- /* Ok, we are done with the link's info, test the real target
+ /* Ok, we are done with the link's info, test the real target
+ */
+ if (thisinfo.filetype == APR_REG ||
+ thisinfo.filetype == APR_NOFILE) {
+ /* That was fun, nothing left for us here
*/
- if (thisinfo.filetype == APR_REG) {
- /* That was fun, nothing left for us here
- */
- break;
- }
- else if (thisinfo.filetype != APR_DIR) {
- ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
- "symlink doesn't point to a file or directory: %s",
- r->filename);
- return r->status = HTTP_FORBIDDEN;
- }
+ break;
+ }
+ else if (thisinfo.filetype != APR_DIR) {
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ "Forbidden: %s doesn't point to "
+ "a file or directory",
+ r->filename);
+ return r->status = HTTP_FORBIDDEN;
}
++seg;
*/
if (save_path_info) {
if (r->path_info && *r->path_info) {
- r->path_info = ap_make_full_path(r->pool, r->path_info,
+ r->path_info = ap_make_full_path(r->pool, r->path_info,
save_path_info);
}
else {
*/
for (; sec_idx < num_sec; ++sec_idx) {
- core_dir_config *entry_core;
+ core_dir_config *entry_core;
entry_core = ap_get_module_config(sec_ent[sec_idx], &core_module);
if (!entry_core->r) {
continue;
}
- if (ap_regexec(entry_core->r, r->filename, 0, NULL, REG_NOTEOL)) {
+ if (ap_regexec(entry_core->r, r->filename, 0, NULL, AP_REG_NOTEOL)) {
continue;
}
+ /* If we haven't already continue'd above, we have a match.
+ *
+ * Calculate our full-context core opts & override.
+ */
+ core_opts_merge(sec_ent[sec_idx], &opts);
+
/* If we merged this same section last time, reuse it
*/
if (matches) {
now_merged = last_walk->merged;
++last_walk;
--matches;
- goto minimerge;
+ continue;
}
+
/* We fell out of sync. This is our own copy of walked,
* so truncate the remaining matches and reset remaining.
*/
cache->walked->nelts -= matches;
matches = 0;
+ cached = 0;
}
if (now_merged) {
- now_merged = ap_merge_per_dir_configs(r->pool,
+ now_merged = ap_merge_per_dir_configs(r->pool,
now_merged,
sec_ent[sec_idx]);
}
last_walk->merged = now_merged;
}
- /* Whoops - everything matched in sequence, but the original walk
- * found some additional matches. Truncate them.
+ /* Whoops - everything matched in sequence, but either the original
+ * walk found some additional matches (which we need to truncate), or
+ * this walk found some additional matches.
*/
if (matches) {
cache->walked->nelts -= matches;
+ cached = 0;
+ }
+ else if (cache->walked->nelts > cached_matches) {
+ cached = 0;
}
}
x symlink above into a real resource, and should have died up there.
x Even if we keep this, it needs more thought (maybe an r->file_is_symlink)
x perhaps it should actually happen in file_walk, so we catch more
- x obscure cases in autoindex sub requests, etc.
+ x obscure cases in autoindex subrequests, etc.
x
x * Symlink permissions are determined by the parent. If the request is
x * for a directory then applying the symlink test here would use the
x if (r->finfo.filetype != APR_DIR
x && (res = resolve_symlink(r->filename, r->info, ap_allow_options(r),
x r->pool))) {
- x ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
+ x ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
x "Symbolic link not allowed: %s", r->filename);
x return res;
x }
cache->cached = ap_make_dirstr_parent(r->pool, r->filename);
}
+ if (cached
+ && r->per_dir_config == cache->dir_conf_merged) {
+ r->per_dir_config = cache->per_dir_result;
+ return OK;
+ }
+
cache->dir_conf_tested = sec_ent;
cache->dir_conf_merged = r->per_dir_config;
ap_conf_vector_t *now_merged = NULL;
core_server_config *sconf = ap_get_module_config(r->server->module_config,
&core_module);
- ap_conf_vector_t **sec_ent = (ap_conf_vector_t **) sconf->sec_url->elts;
+ ap_conf_vector_t **sec_ent = (ap_conf_vector_t **)sconf->sec_url->elts;
int num_sec = sconf->sec_url->nelts;
walk_cache_t *cache;
const char *entry_uri;
+ int cached;
- cache = prep_walk_cache(AP_NOTE_LOCATION_WALK, r);
-
/* No tricks here, there are no <Locations > to parse in this vhost.
* We won't destroy the cache, just in case _this_ redirect is later
* redirected again to a vhost with <Location > blocks to optimize.
return OK;
}
+ cache = prep_walk_cache(AP_NOTE_LOCATION_WALK, r);
+ cached = (cache->cached != NULL);
+
/* Location and LocationMatch differ on their behaviour w.r.t. multiple
* slashes. Location matches multiple slashes with a single slash,
* LocationMatch doesn't. An exception, for backwards brokenness is
* and the vhost's list of locations hasn't changed, we can skip
* rewalking the location_walk entries.
*/
- if (cache->cached
- && (cache->dir_conf_tested == sec_ent)
+ if (cached
+ && (cache->dir_conf_tested == sec_ent)
&& (strcmp(entry_uri, cache->cached) == 0)) {
/* Well this looks really familiar! If our end-result (per_dir_result)
- * didn't change, we have absolutely nothing to do :)
+ * didn't change, we have absolutely nothing to do :)
* Otherwise (as is the case with most dir_merged/file_merged requests)
* we must merge our dir_conf_merged onto this new r->per_dir_config.
*/
if (r->per_dir_config == cache->per_dir_result) {
return OK;
}
- if (r->per_dir_config == cache->dir_conf_merged) {
- r->per_dir_config = cache->per_dir_result;
- return OK;
- }
+
if (cache->walked->nelts) {
now_merged = ((walk_walked_t*)cache->walked->elts)
[cache->walked->nelts - 1].merged;
}
}
else {
- /* We start now_merged from NULL since we want to build
+ /* We start now_merged from NULL since we want to build
* a locations list that can be merged to any vhost.
*/
int len, sec_idx;
int matches = cache->walked->nelts;
+ int cached_matches = matches;
walk_walked_t *last_walk = (walk_walked_t*)cache->walked->elts;
+
+ cached &= auth_internal_per_conf;
cache->cached = entry_uri;
/* Go through the location entries, and check for matches.
*/
for (sec_idx = 0; sec_idx < num_sec; ++sec_idx) {
- core_dir_config *entry_core;
+ core_dir_config *entry_core;
entry_core = ap_get_module_config(sec_ent[sec_idx], &core_module);
-
+
/* ### const strlen can be optimized in location config parsing */
len = strlen(entry_core->d);
/* Test the regex, fnmatch or string as appropriate.
- * If it's a strcmp, and the <Location > pattern was
+ * If it's a strcmp, and the <Location > pattern was
* not slash terminated, then this uri must be slash
* terminated (or at the end of the string) to match.
*/
- if (entry_core->r
+ if (entry_core->r
? ap_regexec(entry_core->r, r->uri, 0, NULL, 0)
: (entry_core->d_is_fnmatch
- ? apr_fnmatch(entry_core->d, cache->cached, FNM_PATHNAME)
+ ? apr_fnmatch(entry_core->d, cache->cached, APR_FNM_PATHNAME)
: (strncmp(entry_core->d, cache->cached, len)
- || (entry_core->d[len - 1] != '/'
- && cache->cached[len] != '/'
- && cache->cached[len] != '\0')))) {
+ || (len > 0
+ && entry_core->d[len - 1] != '/'
+ && cache->cached[len] != '/'
+ && cache->cached[len] != '\0')))) {
continue;
}
--matches;
continue;
}
+
/* We fell out of sync. This is our own copy of walked,
* so truncate the remaining matches and reset remaining.
*/
cache->walked->nelts -= matches;
matches = 0;
+ cached = 0;
}
if (now_merged) {
- now_merged = ap_merge_per_dir_configs(r->pool,
+ now_merged = ap_merge_per_dir_configs(r->pool,
now_merged,
sec_ent[sec_idx]);
}
last_walk->matched = sec_ent[sec_idx];
last_walk->merged = now_merged;
}
- /* Whoops - everything matched in sequence, but the original walk
- * found some additional matches. Truncate them.
+
+ /* Whoops - everything matched in sequence, but either the original
+ * walk found some additional matches (which we need to truncate), or
+ * this walk found some additional matches.
*/
if (matches) {
cache->walked->nelts -= matches;
+ cached = 0;
+ }
+ else if (cache->walked->nelts > cached_matches) {
+ cached = 0;
}
}
+ if (cached
+ && r->per_dir_config == cache->dir_conf_merged) {
+ r->per_dir_config = cache->per_dir_result;
+ return OK;
+ }
+
cache->dir_conf_tested = sec_ent;
cache->dir_conf_merged = r->per_dir_config;
ap_conf_vector_t *now_merged = NULL;
core_dir_config *dconf = ap_get_module_config(r->per_dir_config,
&core_module);
- ap_conf_vector_t **sec_ent = (ap_conf_vector_t **) dconf->sec_file->elts;
+ ap_conf_vector_t **sec_ent = (ap_conf_vector_t **)dconf->sec_file->elts;
int num_sec = dconf->sec_file->nelts;
walk_cache_t *cache;
const char *test_file;
+ int cached;
/* To allow broken modules to proceed, we allow missing filenames to pass.
- * We will catch it later if it's heading for the core handler.
+ * We will catch it later if it's heading for the core handler.
* directory_walk already posted an INFO note for module debugging.
*/
- if (r->filename == NULL) {
+ if (r->filename == NULL) {
return OK;
}
cache = prep_walk_cache(AP_NOTE_FILE_WALK, r);
+ cached = (cache->cached != NULL);
/* No tricks here, there are just no <Files > to parse in this context.
* We won't destroy the cache, just in case _this_ redirect is later
return OK;
}
- /* Get the basename .. and copy for the cache just
+ /* Get the basename .. and copy for the cache just
* in case r->filename is munged by another module
*/
test_file = strrchr(r->filename, '/');
}
/* If we have an cache->cached file name that matches test_file,
- * and the directory's list of file sections hasn't changed, we
+ * and the directory's list of file sections hasn't changed, we
* can skip rewalking the file_walk entries.
*/
- if (cache->cached
- && (cache->dir_conf_tested == sec_ent)
+ if (cached
+ && (cache->dir_conf_tested == sec_ent)
&& (strcmp(test_file, cache->cached) == 0)) {
/* Well this looks really familiar! If our end-result (per_dir_result)
- * didn't change, we have absolutely nothing to do :)
+ * didn't change, we have absolutely nothing to do :)
* Otherwise (as is the case with most dir_merged requests)
* we must merge our dir_conf_merged onto this new r->per_dir_config.
*/
if (r->per_dir_config == cache->per_dir_result) {
return OK;
}
- if (r->per_dir_config == cache->dir_conf_merged) {
- r->per_dir_config = cache->per_dir_result;
- return OK;
- }
+
if (cache->walked->nelts) {
now_merged = ((walk_walked_t*)cache->walked->elts)
[cache->walked->nelts - 1].merged;
}
}
else {
- /* We start now_merged from NULL since we want to build
+ /* We start now_merged from NULL since we want to build
* a file section list that can be merged to any dir_walk.
*/
int sec_idx;
int matches = cache->walked->nelts;
+ int cached_matches = matches;
walk_walked_t *last_walk = (walk_walked_t*)cache->walked->elts;
+
+ cached &= auth_internal_per_conf;
cache->cached = test_file;
/* Go through the location entries, and check for matches.
* really try them with the most general first.
*/
for (sec_idx = 0; sec_idx < num_sec; ++sec_idx) {
-
+ int err = 0;
core_dir_config *entry_core;
entry_core = ap_get_module_config(sec_ent[sec_idx], &core_module);
- if (entry_core->r
- ? ap_regexec(entry_core->r, cache->cached , 0, NULL, 0)
- : (entry_core->d_is_fnmatch
- ? apr_fnmatch(entry_core->d, cache->cached, FNM_PATHNAME)
- : strcmp(entry_core->d, cache->cached))) {
- continue;
+ if (entry_core->condition) {
+ if (!ap_expr_eval(r, entry_core->condition, &err, NULL,
+ ap_expr_string, NULL)) {
+ continue;
+ }
+ }
+ else {
+ if (entry_core->r
+ ? ap_regexec(entry_core->r, cache->cached , 0, NULL, 0)
+ : (entry_core->d_is_fnmatch
+ ? apr_fnmatch(entry_core->d, cache->cached, APR_FNM_PATHNAME)
+ : strcmp(entry_core->d, cache->cached))) {
+ continue;
+ }
}
/* If we merged this same section last time, reuse it
--matches;
continue;
}
+
/* We fell out of sync. This is our own copy of walked,
* so truncate the remaining matches and reset remaining.
*/
cache->walked->nelts -= matches;
matches = 0;
+ cached = 0;
}
if (now_merged) {
- now_merged = ap_merge_per_dir_configs(r->pool,
+ now_merged = ap_merge_per_dir_configs(r->pool,
now_merged,
sec_ent[sec_idx]);
}
last_walk->matched = sec_ent[sec_idx];
last_walk->merged = now_merged;
}
- /* Whoops - everything matched in sequence, but the original walk
- * found some additional matches. Truncate them.
+
+ /* Whoops - everything matched in sequence, but either the original
+ * walk found some additional matches (which we need to truncate), or
+ * this walk found some additional matches.
*/
if (matches) {
cache->walked->nelts -= matches;
+ cached = 0;
+ }
+ else if (cache->walked->nelts > cached_matches) {
+ cached = 0;
}
}
+ if (cached
+ && r->per_dir_config == cache->dir_conf_merged) {
+ r->per_dir_config = cache->per_dir_result;
+ return OK;
+ }
+
cache->dir_conf_tested = sec_ent;
cache->dir_conf_merged = r->per_dir_config;
* structure...
*/
-static request_rec *make_sub_request(const request_rec *r,
+static request_rec *make_sub_request(const request_rec *r,
ap_filter_t *next_filter)
{
apr_pool_t *rrp;
request_rec *rnew;
-
+
apr_pool_create(&rrp, r->pool);
+ apr_pool_tag(rrp, "subrequest");
rnew = apr_pcalloc(rrp, sizeof(request_rec));
rnew->pool = rrp;
/* Start a clean config from this subrequest's vhost. Optimization in
* Location/File/Dir walks from the parent request assure that if the
* config blocks of the subrequest match the parent request, no merges
- * will actually occur (and generally a minimal number of merges are
+ * will actually occur (and generally a minimal number of merges are
* required, even if the parent and subrequest aren't quite identical.)
*/
rnew->per_dir_config = r->server->lookup_defaults;
- rnew->htaccess = r->htaccess;
+ rnew->htaccess = r->htaccess;
rnew->allowed_methods = ap_make_method_list(rnew->pool, 2);
/* make a copy of the allowed-methods list */
/* start with the same set of output filters */
if (next_filter) {
+ /* while there are no input filters for a subrequest, we will
+ * try to insert some, so if we don't have valid data, the code
+ * will seg fault.
+ */
+ rnew->input_filters = r->input_filters;
+ rnew->proto_input_filters = r->proto_input_filters;
rnew->output_filters = next_filter;
+ rnew->proto_output_filters = r->proto_output_filters;
+ ap_add_output_filter_handle(ap_subreq_core_filter_handle,
+ NULL, rnew, rnew->connection);
}
else {
- rnew->output_filters = r->output_filters;
+ /* If NULL - we are expecting to be internal_fast_redirect'ed
+ * to this subrequest - or this request will never be invoked.
+ * Ignore the original request filter stack entirely, and
+ * drill the input and output stacks back to the connection.
+ */
+ rnew->proto_input_filters = r->proto_input_filters;
+ rnew->proto_output_filters = r->proto_output_filters;
+
+ rnew->input_filters = r->proto_input_filters;
+ rnew->output_filters = r->proto_output_filters;
}
- ap_add_output_filter("SUBREQ_CORE", NULL, rnew, rnew->connection);
/* no input filters for a subrequest */
ap_set_sub_req_protocol(rnew, r);
- /* We have to run this after we fill in sub req vars,
+ /* We have to run this after we fill in sub req vars,
* or the r->main pointer won't be setup
*/
ap_run_create_request(rnew);
+ /* Begin by presuming any module can make its own path_info assumptions,
+ * until some module interjects and changes the value.
+ */
+ rnew->used_path_info = AP_REQ_DEFAULT_PATH_INFO;
+
+ /* Pass on the kept body (if any) into the new request. */
+ rnew->kept_body = r->kept_body;
+
return rnew;
}
if (APR_BUCKET_IS_EOS(e)) {
apr_bucket_delete(e);
}
+
if (!APR_BRIGADE_EMPTY(bb)) {
return ap_pass_brigade(f->next, bb);
}
- else {
- return APR_SUCCESS;
- }
+
+ return APR_SUCCESS;
}
-
+extern APR_OPTIONAL_FN_TYPE(authz_some_auth_required) *ap__authz_ap_some_auth_required;
+
AP_DECLARE(int) ap_some_auth_required(request_rec *r)
{
/* Is there a require line configured for the type of *this* req? */
-
- const apr_array_header_t *reqs_arr = ap_requires(r);
- require_line *reqs;
- int i;
-
- if (!reqs_arr) {
+ if (ap__authz_ap_some_auth_required) {
+ return ap__authz_ap_some_auth_required(r);
+ }
+ else
return 0;
+}
+
+AP_DECLARE(void) ap_clear_auth_internal(void)
+{
+ auth_internal_per_conf_hooks = 0;
+ auth_internal_per_conf_providers = 0;
+}
+
+AP_DECLARE(void) ap_setup_auth_internal(apr_pool_t *ptemp)
+{
+ int total_auth_hooks = 0;
+ int total_auth_providers = 0;
+
+ auth_internal_per_conf = 0;
+
+ if (_hooks.link_access_checker) {
+ total_auth_hooks += _hooks.link_access_checker->nelts;
}
-
- reqs = (require_line *) reqs_arr->elts;
-
- for (i = 0; i < reqs_arr->nelts; ++i) {
- if (reqs[i].method_mask & (AP_METHOD_BIT << r->method_number)) {
- return 1;
- }
+ if (_hooks.link_check_user_id) {
+ total_auth_hooks += _hooks.link_check_user_id->nelts;
+ }
+ if (_hooks.link_auth_checker) {
+ total_auth_hooks += _hooks.link_auth_checker->nelts;
}
-
- return 0;
-}
+ if (total_auth_hooks > auth_internal_per_conf_hooks) {
+ return;
+ }
+
+ total_auth_providers +=
+ ap_list_provider_names(ptemp, AUTHN_PROVIDER_GROUP,
+ AUTHN_PROVIDER_VERSION)->nelts;
+ total_auth_providers +=
+ ap_list_provider_names(ptemp, AUTHZ_PROVIDER_GROUP,
+ AUTHZ_PROVIDER_VERSION)->nelts;
+
+ if (total_auth_providers > auth_internal_per_conf_providers) {
+ return;
+ }
+
+ auth_internal_per_conf = 1;
+}
+
+AP_DECLARE(apr_status_t) ap_register_auth_provider(apr_pool_t *pool,
+ const char *provider_group,
+ const char *provider_name,
+ const char *provider_version,
+ const void *provider,
+ int type)
+{
+ if ((type & AP_AUTH_INTERNAL_MASK) == AP_AUTH_INTERNAL_PER_CONF) {
+ ++auth_internal_per_conf_providers;
+ }
+
+ return ap_register_provider(pool, provider_group, provider_name,
+ provider_version, provider);
+}
+
+AP_DECLARE(void) ap_hook_check_access(ap_HOOK_access_checker_t *pf,
+ const char * const *aszPre,
+ const char * const *aszSucc,
+ int nOrder, int type)
+{
+ if ((type & AP_AUTH_INTERNAL_MASK) == AP_AUTH_INTERNAL_PER_CONF) {
+ ++auth_internal_per_conf_hooks;
+ }
+
+ ap_hook_access_checker(pf, aszPre, aszSucc, nOrder);
+}
+
+AP_DECLARE(void) ap_hook_check_authn(ap_HOOK_check_user_id_t *pf,
+ const char * const *aszPre,
+ const char * const *aszSucc,
+ int nOrder, int type)
+{
+ if ((type & AP_AUTH_INTERNAL_MASK) == AP_AUTH_INTERNAL_PER_CONF) {
+ ++auth_internal_per_conf_hooks;
+ }
+
+ ap_hook_check_user_id(pf, aszPre, aszSucc, nOrder);
+}
+
+AP_DECLARE(void) ap_hook_check_authz(ap_HOOK_auth_checker_t *pf,
+ const char * const *aszPre,
+ const char * const *aszSucc,
+ int nOrder, int type)
+{
+ if ((type & AP_AUTH_INTERNAL_MASK) == AP_AUTH_INTERNAL_PER_CONF) {
+ ++auth_internal_per_conf_hooks;
+ }
+
+ ap_hook_auth_checker(pf, aszPre, aszSucc, nOrder);
+}
AP_DECLARE(request_rec *) ap_sub_req_method_uri(const char *method,
- const char *new_file,
+ const char *new_uri,
const request_rec *r,
ap_filter_t *next_filter)
{
request_rec *rnew;
- int res;
+ /* Initialise res, to avoid a gcc warning */
+ int res = HTTP_INTERNAL_SERVER_ERROR;
char *udir;
rnew = make_sub_request(r, next_filter);
rnew->method = method;
rnew->method_number = ap_method_number_of(method);
- if (new_file[0] == '/') {
- ap_parse_uri(rnew, new_file);
+ if (new_uri[0] == '/') {
+ ap_parse_uri(rnew, new_uri);
}
else {
udir = ap_make_dirstr_parent(rnew->pool, r->uri);
udir = ap_escape_uri(rnew->pool, udir); /* re-escape it */
- ap_parse_uri(rnew, ap_make_full_path(rnew->pool, udir, new_file));
+ ap_parse_uri(rnew, ap_make_full_path(rnew->pool, udir, new_uri));
}
- if ((res = ap_process_request_internal(rnew))) {
- rnew->status = res;
+ /* We cannot return NULL without violating the API. So just turn this
+ * subrequest into a 500 to indicate the failure. */
+ if (ap_is_recursion_limit_exceeded(r)) {
+ rnew->status = HTTP_INTERNAL_SERVER_ERROR;
+ return rnew;
+ }
+
+ /* lookup_uri
+ * If the content can be served by the quick_handler, we can
+ * safely bypass request_internal processing.
+ *
+ * If next_filter is NULL we are expecting to be
+ * internal_fast_redirect'ed to the subrequest, or the subrequest will
+ * never be invoked. We need to make sure that the quickhandler is not
+ * invoked by any lookups. Since an internal_fast_redirect will always
+ * occur too late for the quickhandler to handle the request.
+ */
+ if (next_filter) {
+ res = ap_run_quick_handler(rnew, 1);
+ }
+
+ if (next_filter == NULL || res != OK) {
+ if ((res = ap_process_request_internal(rnew))) {
+ rnew->status = res;
+ }
}
return rnew;
}
-AP_DECLARE(request_rec *) ap_sub_req_lookup_uri(const char *new_file,
+AP_DECLARE(request_rec *) ap_sub_req_lookup_uri(const char *new_uri,
const request_rec *r,
ap_filter_t *next_filter)
{
- return ap_sub_req_method_uri("GET", new_file, r, next_filter);
+ return ap_sub_req_method_uri("GET", new_uri, r, next_filter);
}
AP_DECLARE(request_rec *) ap_sub_req_lookup_dirent(const apr_finfo_t *dirent,
const request_rec *r,
+ int subtype,
ap_filter_t *next_filter)
{
request_rec *rnew;
rnew = make_sub_request(r, next_filter);
- /* Special case: we are looking at a relative lookup in the same directory.
+ /* Special case: we are looking at a relative lookup in the same directory.
* This is 100% safe, since dirent->name just came from the filesystem.
*/
- udir = ap_make_dirstr_parent(rnew->pool, r->uri);
- rnew->uri = ap_make_full_path(rnew->pool, udir, dirent->name);
+ if (r->path_info && *r->path_info) {
+ /* strip path_info off the end of the uri to keep it in sync
+ * with r->filename, which has already been stripped by directory_walk,
+ * merge the dirent->name, and then, if the caller wants us to remerge
+ * the original path info, do so. Note we never fix the path_info back
+ * to r->filename, since dir_walk would do so (but we don't expect it
+ * to happen in the usual cases)
+ */
+ udir = apr_pstrdup(rnew->pool, r->uri);
+ udir[ap_find_path_info(udir, r->path_info)] = '\0';
+ udir = ap_make_dirstr_parent(rnew->pool, udir);
+
+ rnew->uri = ap_make_full_path(rnew->pool, udir, dirent->name);
+ if (subtype == AP_SUBREQ_MERGE_ARGS) {
+ rnew->uri = ap_make_full_path(rnew->pool, rnew->uri, r->path_info + 1);
+ rnew->path_info = apr_pstrdup(rnew->pool, r->path_info);
+ }
+ rnew->uri = ap_escape_uri(rnew->pool, rnew->uri);
+ }
+ else {
+ udir = ap_make_dirstr_parent(rnew->pool, r->uri);
+ rnew->uri = ap_escape_uri(rnew->pool, ap_make_full_path(rnew->pool,
+ udir,
+ dirent->name));
+ }
+
fdir = ap_make_dirstr_parent(rnew->pool, r->filename);
rnew->filename = ap_make_full_path(rnew->pool, fdir, dirent->name);
if (r->canonical_filename == r->filename) {
rnew->canonical_filename = rnew->filename;
}
-
+
/* XXX This is now less relevant; we will do a full location walk
- * these days for this case. Preserve the apr_stat results, and
- * perhaps we also tag that symlinks were tested and/or found for
+ * these days for this case. Preserve the apr_stat results, and
+ * perhaps we also tag that symlinks were tested and/or found for
* r->filename.
*/
rnew->per_dir_config = r->server->lookup_defaults;
if ((dirent->valid & APR_FINFO_MIN) != APR_FINFO_MIN) {
/*
* apr_dir_read isn't very complete on this platform, so
- * we need another apr_lstat (or simply apr_stat if we allow
- * all symlinks here.) If this is an APR_LNK that resolves
- * to an APR_DIR, then we will rerun everything anyways...
- * this should be safe.
+ * we need another apr_stat (with or without APR_FINFO_LINK
+ * depending on whether we allow all symlinks here.) If this
+ * is an APR_LNK that resolves to an APR_DIR, then we will rerun
+ * everything anyways... this should be safe.
*/
apr_status_t rv;
if (ap_allow_options(rnew) & OPT_SYM_LINKS) {
}
}
else {
- if (((rv = apr_lstat(&rnew->finfo, rnew->filename,
- APR_FINFO_MIN, rnew->pool)) != APR_SUCCESS)
+ if (((rv = apr_stat(&rnew->finfo, rnew->filename,
+ APR_FINFO_LINK | APR_FINFO_MIN,
+ rnew->pool)) != APR_SUCCESS)
&& (rv != APR_INCOMPLETE)) {
rnew->finfo.filetype = 0;
}
/*
* Resolve this symlink. We should tie this back to dir_walk's cache
*/
- if ((res = resolve_symlink(rnew->filename, &rnew->finfo,
+ if ((res = resolve_symlink(rnew->filename, &rnew->finfo,
ap_allow_options(rnew), rnew->pool))
!= OK) {
rnew->status = res;
}
if (rnew->finfo.filetype == APR_DIR) {
- /* ### Would be real nice if apr_make_full_path overallocated
- * the buffer by one character instead of a complete copy.
+ /* ap_make_full_path overallocated the buffers
+ * by one character to help us out here.
*/
- rnew->filename = apr_pstrcat(rnew->pool, rnew->filename, "/", NULL);
- rnew->uri = apr_pstrcat(rnew->pool, rnew->uri, "/", NULL);
- if (r->canonical_filename == r->filename) {
- rnew->canonical_filename = rnew->filename;
+ strcat(rnew->filename, "/");
+ if (!rnew->path_info || !*rnew->path_info) {
+ strcat(rnew->uri, "/");
}
}
- ap_parse_uri(rnew, rnew->uri); /* fill in parsed_uri values */
+ /* fill in parsed_uri values
+ */
+ if (r->args && *r->args && (subtype == AP_SUBREQ_MERGE_ARGS)) {
+ ap_parse_uri(rnew, apr_pstrcat(r->pool, rnew->uri, "?",
+ r->args, NULL));
+ }
+ else {
+ ap_parse_uri(rnew, rnew->uri);
+ }
+
+ /* We cannot return NULL without violating the API. So just turn this
+ * subrequest into a 500. */
+ if (ap_is_recursion_limit_exceeded(r)) {
+ rnew->status = HTTP_INTERNAL_SERVER_ERROR;
+ return rnew;
+ }
if ((res = ap_process_request_internal(rnew))) {
rnew->status = res;
if (r->canonical_filename == r->filename) {
rnew->canonical_filename = (char*)(1);
}
+
if (apr_filepath_merge(&rnew->filename, fdir, new_file,
APR_FILEPATH_TRUENAME, rnew->pool) != APR_SUCCESS) {
rnew->status = HTTP_FORBIDDEN;
return rnew;
}
+
if (rnew->canonical_filename) {
rnew->canonical_filename = rnew->filename;
}
/*
* Check for a special case... if there are no '/' characters in new_file
- * at all, and the path was the same, then we are looking at a relative
+ * at all, and the path was the same, then we are looking at a relative
* lookup in the same directory. Fixup the URI to match.
*/
if (strncmp(rnew->filename, fdir, fdirlen) == 0
- && rnew->filename[fdirlen]
+ && rnew->filename[fdirlen]
&& ap_strchr_c(rnew->filename + fdirlen, '/') == NULL) {
apr_status_t rv;
if (ap_allow_options(rnew) & OPT_SYM_LINKS) {
}
}
else {
- if (((rv = apr_lstat(&rnew->finfo, rnew->filename,
- APR_FINFO_MIN, rnew->pool)) != APR_SUCCESS)
+ if (((rv = apr_stat(&rnew->finfo, rnew->filename,
+ APR_FINFO_LINK | APR_FINFO_MIN,
+ rnew->pool)) != APR_SUCCESS)
&& (rv != APR_INCOMPLETE)) {
rnew->finfo.filetype = 0;
}
rnew->uri = apr_pstrdup(rnew->pool, "");
}
+ /* We cannot return NULL without violating the API. So just turn this
+ * subrequest into a 500. */
+ if (ap_is_recursion_limit_exceeded(r)) {
+ rnew->status = HTTP_INTERNAL_SERVER_ERROR;
+ return rnew;
+ }
+
if ((res = ap_process_request_internal(rnew))) {
rnew->status = res;
}
AP_DECLARE(int) ap_run_sub_req(request_rec *r)
{
- int retval;
-
- retval = ap_invoke_handler(r);
+ int retval = DECLINED;
+ /* Run the quick handler if the subrequest is not a dirent or file
+ * subrequest
+ */
+ if (!(r->filename && r->finfo.filetype)) {
+ retval = ap_run_quick_handler(r, 0);
+ }
+ if (retval != OK) {
+ retval = ap_invoke_handler(r);
+ if (retval == DONE) {
+ retval = OK;
+ }
+ }
ap_finalize_sub_req_protocol(r);
return retval;
}
*/
AP_DECLARE(int) ap_is_initial_req(request_rec *r)
{
- return
- (r->main == NULL) /* otherwise, this is a sub-request */
- &&
- (r->prev == NULL); /* otherwise, this is an internal redirect */
-}
+ return (r->main == NULL) /* otherwise, this is a sub-request */
+ && (r->prev == NULL); /* otherwise, this is an internal redirect */
+}
projects / apache / blobdiff