webserver: comparison src/server/webdav/webdav.c

-:d7e7ea9c6bc6
+:4a6be4f10d5f
 rq->davCollection ? rq->davCollection : &default_backend;
 // requested uri path
 char *path = pblock_findkeyval(pb_key_path, rq->vars);
-// Initialize WebDAV Backend Chain
+// VFS settings are only taken from the first backend
-//
+uint32_t settings = dav->settings;
-// Call propfind_init of each Backend
+// list of individual WebdavPropfindRequest objects for each Backend
+UcxList *requestObjects = NULL;
+// Initialize all Webdav Backends
+if(webdav_propfind_init(dav, propfind, path, &requestObjects)) {
+return REQ_ABORTED;
+}
+// some Backends can list all children by themselves, but some
+// require the VFS for this
+WSBool usevfs = (settings & WS_PROPFIND_NO_VFS) != WS_PROPFIND_NO_VFS;
+struct stat s;
+struct stat *statptr = NULL;
+VFSContext *vfs = NULL;
+if(usevfs) {
+vfs = vfs_request_context(sn, rq);
+if(vfs_stat(vfs, path, &s)) {
+protocol_status(sn, rq, util_errno2status(vfs->vfs_errno), NULL);
+return REQ_ABORTED;
+}
+statptr = &s;
+if(!S_ISDIR(s.st_mode)) {
+// the file is not a directory, therefore we don't need the VFS
+usevfs = FALSE;
+}
+}
+if(propfind->depth == 0) {
+usevfs = FALSE;
+}
+int ret = REQ_ABORTED;
+if(!webdav_propfind_do(dav, requestObjects, response, NULL, path, statptr)) {
+// propfind for the requested resource was successful
+// usevfsdir is TRUE if
+//   the webdav backend has not disabled vfs usage
+//   the file is a directory
+//   depth is not 0
+// in this case we need to execute propfind_do for all children
+if(usevfs && !propfind_children(dav, requestObjects, response, vfs, path)) {
+ret = REQ_PROCEED;
+}
+}
+// finish the propfind request
+// this function should cleanup all resources, therefore we execute it
+// even if a previous function failed
+if(dav->propfind_finish(propfind)) {
+ret = REQ_ABORTED;
+}
+return ret;
+}
+/*
+* Initializes Backend Chain
+*
+* Calls propfind_init of each Backend and generates a list of custom
+* WebdavPropfindRequest objects for each backend
+*/
+int webdav_propfind_init(
+WebdavBackend *dav,
+WebdavPropfindRequest *propfind,
+const char *path,
+UcxList **out_req)
+{
+pool_handle_t *pool = propfind->sn->pool;
+UcxAllocator *a = session_get_allocator(propfind->sn);
+// list of individual WebdavPropfindRequest objects for each Backend
+UcxList *requestObjects = NULL;
+// new properties after init, start with clone of original plist
+WebdavPList *newProp = webdav_plist_clone(pool, propfind->properties);
+size_t newPropCount = propfind->propcount;
+// Call propfind_init for each Backend
 // propfind_init can return a new property list, which
 // will be passed to the next backend
-//
-// VFS settings are only taken from the first backend
-uint32_t settings = dav->settings;
-// list of individual WebdavPropfindRequest objects for each Backend
-UcxList *backendPropfind = NULL;
-// new properties after init, start with clone of original plist
-WebdavPList *newProp = webdav_plist_clone(sn->pool, propfind->properties);
-size_t newPropCount = propfind->propcount;
 WebdavBackend *davList = dav;
 while(davList) {
 // create WebdavPropfindRequest copy
 WebdavPropfindRequest *pReq = pool_malloc(
-sn->pool,
+pool,
 sizeof(WebdavPropfindRequest));
 memcpy(propfind, pReq, sizeof(WebdavPropfindRequest));
 // use new plist after previous init (or orig. plist in the first run)
 pReq->properties = newProp;
 pReq->propcount = newPropCount;
 // add new WebdavPropfindRequest object to list for later use
-backendPropfind = ucx_list_append_a(a, backendPropfind, pReq);
+requestObjects = ucx_list_append_a(a, requestObjects, pReq);
-if(!backendPropfind) {
+if(!requestObjects) {
 return REQ_ABORTED; // OOM
 }
 // create plist copy as out-plist for init
-newProp = webdav_plist_clone(sn->pool, newProp);
+newProp = webdav_plist_clone(pool, newProp);
 // run init: this can generate a new properties list (newProp)
 //           which will be passed to the next backend
 if(dav->propfind_init(pReq, path, &newProp)) {
 return REQ_ABORTED;
 newPropCount = webdav_plist_count(newProp);
 davList = davList->next;
 }
-// some Backends can list all children by themselves, but some
+*out_req = requestObjects;
-// require the VFS for this
+return REQ_PROCEED;
-WSBool usevfs = (settings & WS_PROPFIND_NO_VFS) != WS_PROPFIND_NO_VFS;
+}
-struct stat s;
-struct stat *statptr = NULL;
-VFSContext *vfs = NULL;
-if(usevfs) {
-vfs = vfs_request_context(sn, rq);
-if(vfs_stat(vfs, path, &s)) {
-protocol_status(sn, rq, util_errno2status(vfs->vfs_errno), NULL);
-return REQ_ABORTED;
-}
-statptr = &s;
-if(!S_ISDIR(s.st_mode)) {
-// the file is not a directory, therefore we don't need the VFS
-usevfs = FALSE;
-}
-}
-if(propfind->depth == 0) {
-usevfs = FALSE;
-}
-int ret = REQ_ABORTED;
-if(!webdav_propfind_do(dav, backendPropfind, response, NULL, path, statptr)) {
-// propfind for the requested resource was successful
-// usevfsdir is TRUE if
-//   the webdav backend has not disabled vfs usage
-//   the file is a directory
-//   depth is not 0
-// in this case we need to execute propfind_do for all children
-if(usevfs && !propfind_children(dav, backendPropfind, response, vfs, path)) {
-ret = REQ_PROCEED;
-}
-}
-// finish the propfind request
-// this function should cleanup all resources, therefore we execute it
-// even if a previous function failed
-if(dav->propfind_finish(propfind)) {
-ret = REQ_ABORTED;
-}
-return ret;
-}
 /*
 * Executes propfind_do for each Backend
 * The list requests must contain all WebdavPropfindRequest objects
 * of all backends

Mercurial > hg > webserver / file comparison

comparison: src/server/webdav/webdav.c

src/server/webdav/webdav.c