Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow mod_dav_fs to tolerate race conditions in PROPFIND #369

Closed
wants to merge 1 commit into from
Closed

Allow mod_dav_fs to tolerate race conditions in PROPFIND #369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions modules/dav/fs/repos.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
#include "mod_dav.h"
#include "repos.h"

APLOG_USE_MODULE(dav_fs);

/* to assist in debugging mod_dav's GET handling */
#define DEBUG_GET_HANDLER 0
Expand Down Expand Up @@ -1613,6 +1614,19 @@ static dav_error * dav_fs_walker(dav_fs_walker_context *fsctx, int depth)
status = apr_stat(&fsctx->info1.finfo, fsctx->path1.buf,
DAV_FINFO_MASK, pool);
if (status != APR_SUCCESS && status != APR_INCOMPLETE) {
dav_resource_private *ctx = params->root->info;

ap_log_rerror(APLOG_MARK, APLOG_ERR, status, ctx->r,
APLOGNO(10472) "could not access file (%s) during directory walk",
fsctx->path1.buf);

/* If being tolerant, ignore failure due to losing a race
* with some other process deleting files out from under
* the directory walk. */
if ((params->walk_type & DAV_WALKTYPE_TOLERANT)
&& APR_STATUS_IS_ENOENT(status)) {
continue;
}
/* woah! where'd it go? */
/* ### should have a better error here */
err = dav_new_error(pool, HTTP_NOT_FOUND, 0, status, NULL);
Expand Down
2 changes: 1 addition & 1 deletion modules/dav/main/mod_dav.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2269,7 +2269,7 @@ static int dav_method_propfind(request_rec *r)
return HTTP_BAD_REQUEST;
}

ctx.w.walk_type = DAV_WALKTYPE_NORMAL | DAV_WALKTYPE_AUTH;
ctx.w.walk_type = DAV_WALKTYPE_NORMAL | DAV_WALKTYPE_AUTH | DAV_WALKTYPE_TOLERANT;
ctx.w.func = dav_propfind_walker;
ctx.w.walk_ctx = &ctx;
ctx.w.pool = r->pool;
Expand Down
1 change: 1 addition & 0 deletions modules/dav/main/mod_dav.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1834,6 +1834,7 @@ typedef struct
#define DAV_WALKTYPE_AUTH 0x0001 /* limit to authorized files */
#define DAV_WALKTYPE_NORMAL 0x0002 /* walk normal files */
#define DAV_WALKTYPE_LOCKNULL 0x0004 /* walk locknull resources */
#define DAV_WALKTYPE_TOLERANT 0x0008 /* tolerate non-fatal errors */

/* callback function and a client context for the walk */
dav_error * (*func)(dav_walk_resource *wres, int calltype);
Expand Down