0f60998368b493f90120180a93fc2e1e74490872covener

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes#include "apr_strings.h"

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes#include "apr_lib.h" /* for apr_is* */

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes#define APR_WANT_STRFUNC

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes#include "apr_want.h"

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

796e4a7141265d8ed7036e4628161c6eafb2a789jorton#include "httpd.h"

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes#include "http_config.h"

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes#include "http_core.h"

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes#include "http_log.h"

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes#include "http_main.h"

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes#include "http_protocol.h"

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes#include "http_request.h"

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes#include "util_script.h"

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes#include "mod_dav.h"

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes#define DAV_DEFAULT_PROVIDER "filesystem"

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholesenum {

8113dac419143273351446c3ad653f3fe5ba5cfdwrowe DAV_ENABLED_UNSET = 0,

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes DAV_ENABLED_OFF,

482f676c6c19b1c5bb5cca04dad11509c1da3a4cwrowe DAV_ENABLED_ON

e8f95a682820a599fe41b22977010636be5c2717jim};

482f676c6c19b1c5bb5cca04dad11509c1da3a4cwrowe

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholestypedef struct {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes const char *provider_name;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes const dav_provider *provider;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes const char *dir;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes int locktimeout;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes int allow_depthinfinity;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes} dav_dir_conf;

a1790fb35c4b352dab721370985c623a9f8f5062rpluem

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholestypedef struct {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes int unused;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes} dav_server_conf;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

482f676c6c19b1c5bb5cca04dad11509c1da3a4cwrowe#define DAV_INHERIT_VALUE(parent, child, field) \

482f676c6c19b1c5bb5cca04dad11509c1da3a4cwrowe ((child)->field ? (child)->field : (parent)->field)

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholesextern module DAV_DECLARE_DATA dav_module;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholesenum {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes DAV_M_BIND = 0,

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener DAV_M_SEARCH,

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes DAV_M_LAST

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes};

f43b67c5a9d29b572eac916f8335cedc80c908bebnicholesstatic int dav_methods[DAV_M_LAST];

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

8113dac419143273351446c3ad653f3fe5ba5cfdwrowestatic int dav_init_handler(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp,

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes server_rec *s)

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes{

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /* DBG0("dav_init_handler"); */

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /* Register DAV methods */

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes dav_methods[DAV_M_BIND] = ap_method_register(p, "BIND");

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes dav_methods[DAV_M_SEARCH] = ap_method_register(p, "SEARCH");

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes ap_add_version_component(p, "DAV/2");

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes return OK;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes}

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovenerstatic void *dav_create_server_config(apr_pool_t *p, server_rec *s)

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener{

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener dav_server_conf *newconf;

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener newconf = (dav_server_conf *)apr_pcalloc(p, sizeof(*newconf));

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener /* ### this isn't used at the moment... */

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener return newconf;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes}

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholesstatic void *dav_merge_server_config(apr_pool_t *p, void *base, void *overrides)

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes{

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes#if 0

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes dav_server_conf *child = overrides;

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener#endif

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes dav_server_conf *newconf;

8113dac419143273351446c3ad653f3fe5ba5cfdwrowe

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes newconf = (dav_server_conf *)apr_pcalloc(p, sizeof(*newconf));

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /* ### nothing to merge right now... */

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes return newconf;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes}

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholesstatic void *dav_create_dir_config(apr_pool_t *p, char *dir)

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes{

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /* NOTE: dir==NULL creates the default per-dir config */

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes dav_dir_conf *conf;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes conf = (dav_dir_conf *)apr_pcalloc(p, sizeof(*conf));

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /* clean up the directory to remove any trailing slash */

1f299703465bd9975d94e9f229f76af807442de2covener if (dir != NULL) {

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener char *d;

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener apr_size_t l;

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes d = apr_pstrdup(p, dir);

8113dac419143273351446c3ad653f3fe5ba5cfdwrowe l = strlen(d);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if (l > 1 && d[l - 1] == '/')

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes d[l - 1] = '\0';

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes conf->dir = d;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

9ad7b260be233be7d7b5576979825cac72e15498rederpj

9ad7b260be233be7d7b5576979825cac72e15498rederpj return conf;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes}

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

f43b67c5a9d29b572eac916f8335cedc80c908bebnicholesstatic void *dav_merge_dir_config(apr_pool_t *p, void *base, void *overrides)

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes{

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes dav_dir_conf *parent = base;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes dav_dir_conf *child = overrides;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes dav_dir_conf *newconf = (dav_dir_conf *)apr_pcalloc(p, sizeof(*newconf));

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /* DBG3("dav_merge_dir_config: new=%08lx base=%08lx overrides=%08lx",

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

3e6d7277b90d3011db832139afc20efb5f17e203rederpj newconf->provider_name = DAV_INHERIT_VALUE(parent, child, provider_name);

3e6d7277b90d3011db832139afc20efb5f17e203rederpj newconf->provider = DAV_INHERIT_VALUE(parent, child, provider);

3e6d7277b90d3011db832139afc20efb5f17e203rederpj if (parent->provider_name != NULL) {

3e6d7277b90d3011db832139afc20efb5f17e203rederpj if (child->provider_name == NULL) {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,

f43b67c5a9d29b572eac916f8335cedc80c908bebnicholes "\"DAV Off\" cannot be used to turn off a subtree "

e8f95a682820a599fe41b22977010636be5c2717jim "of a DAV-enabled location.");

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener }

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener else if (strcasecmp(child->provider_name,

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener parent->provider_name) != 0) {

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener "A subtree cannot specify a different DAV provider "

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener "than its parent.");

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener }

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener }

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener newconf->locktimeout = DAV_INHERIT_VALUE(parent, child, locktimeout);

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener newconf->dir = DAV_INHERIT_VALUE(parent, child, dir);

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener newconf->allow_depthinfinity = DAV_INHERIT_VALUE(parent, child,

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener allow_depthinfinity);

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener

6683642c1e0032eeeed5f99e8c14880692ef84c5sf return newconf;

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener}

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovenerstatic const dav_provider *dav_get_provider(request_rec *r)

6683642c1e0032eeeed5f99e8c14880692ef84c5sf{

6683642c1e0032eeeed5f99e8c14880692ef84c5sf dav_dir_conf *conf;

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener conf = ap_get_module_config(r->per_dir_config, &dav_module);

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener /* assert: conf->provider_name != NULL

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener /* assert: conf->provider != NULL

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener return conf->provider;

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener}

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovenerconst dav_hooks_locks *dav_get_lock_hooks(request_rec *r)

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener{

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener return dav_get_provider(r)->locks;

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener}

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovenerconst dav_hooks_propdb *dav_get_propdb_hooks(request_rec *r)

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener{

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener return dav_get_provider(r)->propdb;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes}

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovenerconst dav_hooks_vsn *dav_get_vsn_hooks(request_rec *r)

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener{

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener return dav_get_provider(r)->vsn;

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener}

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovenerconst dav_hooks_binding *dav_get_binding_hooks(request_rec *r)

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener{

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener return dav_get_provider(r)->binding;

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener}

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovenerconst dav_hooks_search *dav_get_search_hooks(request_rec *r)

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener{

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener return dav_get_provider(r)->search;

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener}

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovenerstatic const char *dav_cmd_dav(cmd_parms *cmd, void *config, const char *arg1)

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes{

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes dav_dir_conf *conf = (dav_dir_conf *)config;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes if (strcasecmp(arg1, "on") == 0) {

0e05808dc59a321566303084c84b9826a4353cefrederpj conf->provider_name = DAV_DEFAULT_PROVIDER;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

b08925593f214f621161742925dcf074a8047e0acovener else if (strcasecmp(arg1, "off") == 0) {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes conf->provider_name = NULL;

54d22ed1c429b903b029bbd62621f11a9e286137minfrin conf->provider = NULL;

465bb68501690d7a47bfd2a6129580047d76d8f1rederpj }

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf else {

465bb68501690d7a47bfd2a6129580047d76d8f1rederpj conf->provider_name = apr_pstrdup(cmd->pool, arg1);

e8f95a682820a599fe41b22977010636be5c2717jim }

3dfeb02cfb853d8717ca0cc259b59fea610173f5bnicholes

3dfeb02cfb853d8717ca0cc259b59fea610173f5bnicholes if (conf->provider_name != NULL) {

54d22ed1c429b903b029bbd62621f11a9e286137minfrin /* lookup and cache the actual provider now */

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes conf->provider = dav_lookup_provider(conf->provider_name);

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes if (conf->provider == NULL) {

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes /* by the time they use it, the provider should be loaded and

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes return apr_psprintf(cmd->pool,

ebe5305f8b22507374358f32b74d12fb50c05a25covener "Unknown DAV provider: %s",

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes conf->provider_name);

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes }

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes }

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes return NULL;

513b324e774c559b579896df131fd7c8471ed529rederpj}

513b324e774c559b579896df131fd7c8471ed529rederpj

513b324e774c559b579896df131fd7c8471ed529rederpjstatic const char *dav_cmd_davdepthinfinity(cmd_parms *cmd, void *config,

513b324e774c559b579896df131fd7c8471ed529rederpj int arg)

513b324e774c559b579896df131fd7c8471ed529rederpj{

513b324e774c559b579896df131fd7c8471ed529rederpj dav_dir_conf *conf = (dav_dir_conf *)config;

513b324e774c559b579896df131fd7c8471ed529rederpj

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes if (arg)

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes conf->allow_depthinfinity = DAV_ENABLED_ON;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes else

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes conf->allow_depthinfinity = DAV_ENABLED_OFF;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes return NULL;

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes}

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholesstatic const char *dav_cmd_davmintimeout(cmd_parms *cmd, void *config,

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes const char *arg1)

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes{

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes dav_dir_conf *conf = (dav_dir_conf *)config;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

9ad7b260be233be7d7b5576979825cac72e15498rederpj conf->locktimeout = atoi(arg1);

9ad7b260be233be7d7b5576979825cac72e15498rederpj if (conf->locktimeout < 0)

9ad7b260be233be7d7b5576979825cac72e15498rederpj return "DAVMinTimeout requires a non-negative integer.";

9ad7b260be233be7d7b5576979825cac72e15498rederpj

9ad7b260be233be7d7b5576979825cac72e15498rederpj return NULL;

9ad7b260be233be7d7b5576979825cac72e15498rederpj}

9ad7b260be233be7d7b5576979825cac72e15498rederpj

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholesstatic int dav_error_response(request_rec *r, int status, const char *body)

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes{

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes r->status = status;

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes /* ### I really don't think this is needed; gotta test */

54d22ed1c429b903b029bbd62621f11a9e286137minfrin r->status_line = ap_get_status_line(status);

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes

54d22ed1c429b903b029bbd62621f11a9e286137minfrin ap_set_content_type(r, "text/html");

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes /* begin the response now... */

ebe5305f8b22507374358f32b74d12fb50c05a25covener ap_rvputs(r,

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes DAV_RESPONSE_BODY_1,

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes r->status_line,

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes DAV_RESPONSE_BODY_2,

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes &r->status_line[4],

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes DAV_RESPONSE_BODY_3,

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes body,

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes DAV_RESPONSE_BODY_4,

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes ap_psignature("<hr />\n", r),

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes DAV_RESPONSE_BODY_5,

b08925593f214f621161742925dcf074a8047e0acovener NULL);

b08925593f214f621161742925dcf074a8047e0acovener

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /* the response has been sent. */

9ad7b260be233be7d7b5576979825cac72e15498rederpj /*

128a5d93141a86e3afa151e921035a07297c9833rederpj return DONE;

9ad7b260be233be7d7b5576979825cac72e15498rederpj}

9ad7b260be233be7d7b5576979825cac72e15498rederpj

128a5d93141a86e3afa151e921035a07297c9833rederpj

9ad7b260be233be7d7b5576979825cac72e15498rederpjstatic int dav_error_response_tag(request_rec *r,

9ad7b260be233be7d7b5576979825cac72e15498rederpj dav_error *err)

128a5d93141a86e3afa151e921035a07297c9833rederpj{

9ad7b260be233be7d7b5576979825cac72e15498rederpj r->status = err->status;

9ad7b260be233be7d7b5576979825cac72e15498rederpj

9ab21648975dff7e1b680daf8aea627227ba28f7trawick /* ### I really don't think this is needed; gotta test */

9ad7b260be233be7d7b5576979825cac72e15498rederpj r->status_line = ap_get_status_line(err->status);

9ad7b260be233be7d7b5576979825cac72e15498rederpj

9ad7b260be233be7d7b5576979825cac72e15498rederpj ap_set_content_type(r, DAV_XML_CONTENT_TYPE);

9ad7b260be233be7d7b5576979825cac72e15498rederpj

87587593f1a53030e840acc0dec6cc881022ea40covener ap_rputs(DAV_XML_HEADER DEBUG_CR

87587593f1a53030e840acc0dec6cc881022ea40covener "<D:error xmlns:D=\"DAV:\"", r);

9ad7b260be233be7d7b5576979825cac72e15498rederpj

9ad7b260be233be7d7b5576979825cac72e15498rederpj if (err->desc != NULL) {

9ad7b260be233be7d7b5576979825cac72e15498rederpj /* ### should move this namespace somewhere (with the others!) */

9ad7b260be233be7d7b5576979825cac72e15498rederpj ap_rputs(" xmlns:m=\"http://apache.org/dav/xmlns\"", r);

9ad7b260be233be7d7b5576979825cac72e15498rederpj }

9ad7b260be233be7d7b5576979825cac72e15498rederpj

9ad7b260be233be7d7b5576979825cac72e15498rederpj if (err->namespace != NULL) {

9ad7b260be233be7d7b5576979825cac72e15498rederpj ap_rprintf(r,

9ad7b260be233be7d7b5576979825cac72e15498rederpj " xmlns:C=\"%s\">" DEBUG_CR

9ad7b260be233be7d7b5576979825cac72e15498rederpj "<C:%s/>" DEBUG_CR,

9ad7b260be233be7d7b5576979825cac72e15498rederpj err->namespace, err->tagname);

9ad7b260be233be7d7b5576979825cac72e15498rederpj }

9ad7b260be233be7d7b5576979825cac72e15498rederpj else {

9ab21648975dff7e1b680daf8aea627227ba28f7trawick ap_rprintf(r,

9ad7b260be233be7d7b5576979825cac72e15498rederpj ">" DEBUG_CR

9ad7b260be233be7d7b5576979825cac72e15498rederpj "<D:%s/>" DEBUG_CR, err->tagname);

9ad7b260be233be7d7b5576979825cac72e15498rederpj }

9ad7b260be233be7d7b5576979825cac72e15498rederpj

9ad7b260be233be7d7b5576979825cac72e15498rederpj /* here's our mod_dav specific tag: */

7add8f7fb048534390571801b7794f71cd9e127abnicholes if (err->desc != NULL) {

7add8f7fb048534390571801b7794f71cd9e127abnicholes ap_rprintf(r,

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem "<m:human-readable errcode=\"%d\">" DEBUG_CR

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem "%s" DEBUG_CR

7add8f7fb048534390571801b7794f71cd9e127abnicholes "</m:human-readable>" DEBUG_CR,

7add8f7fb048534390571801b7794f71cd9e127abnicholes err->error_id,

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes apr_xml_quote_string(r->pool, err->desc, 0));

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes }

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes ap_rputs("</D:error>" DEBUG_CR, r);

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes /* the response has been sent. */

7add8f7fb048534390571801b7794f71cd9e127abnicholes /*

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes return DONE;

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes}

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes

7add8f7fb048534390571801b7794f71cd9e127abnicholesstatic const char *dav_xml_escape_uri(apr_pool_t *p, const char *uri)

141e1368614dc7564e1627671361b01b4869b491bnicholes{

3dfeb02cfb853d8717ca0cc259b59fea610173f5bnicholes const char *e_uri = ap_escape_uri(p, uri);

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf /* check the easy case... */

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes if (ap_strchr_c(e_uri, '&') == NULL)

e8f95a682820a599fe41b22977010636be5c2717jim return e_uri;

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes

ebe5305f8b22507374358f32b74d12fb50c05a25covener /* there was a '&', so more work is needed... sigh. */

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes /*

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes return apr_xml_quote_string(p, e_uri, 0);

3dfeb02cfb853d8717ca0cc259b59fea610173f5bnicholes}

3dfeb02cfb853d8717ca0cc259b59fea610173f5bnicholes

4be9c459920a7c1cfe62d654327dae5c4bb6b284sfstatic void dav_send_multistatus(request_rec *r, int status,

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf dav_response *first,

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf apr_array_header_t *namespaces)

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf{

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf /* Set the correct status and Content-Type */

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf r->status = status;

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf ap_set_content_type(r, DAV_XML_CONTENT_TYPE);

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf /* Send the headers and actual multistatus response now... */

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf ap_rputs(DAV_XML_HEADER DEBUG_CR

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf "<D:multistatus xmlns:D=\"DAV:\"", r);

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf if (namespaces != NULL) {

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf int i;

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf for (i = namespaces->nelts; i--; ) {

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf ap_rprintf(r, " xmlns:ns%d=\"%s\"", i,

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf APR_XML_GET_URI_ITEM(namespaces, i));

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf }

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes }

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes

e8f95a682820a599fe41b22977010636be5c2717jim /* ap_rputc('>', r); */

7dbf29be626018bc389ef94c1846aeac4b72633bsf ap_rputs(">" DEBUG_CR, r);

7dbf29be626018bc389ef94c1846aeac4b72633bsf

7dbf29be626018bc389ef94c1846aeac4b72633bsf for (; first != NULL; first = first->next) {

7dbf29be626018bc389ef94c1846aeac4b72633bsf apr_text *t;

7dbf29be626018bc389ef94c1846aeac4b72633bsf

7dbf29be626018bc389ef94c1846aeac4b72633bsf if (first->propresult.xmlns == NULL) {

7dbf29be626018bc389ef94c1846aeac4b72633bsf ap_rputs("<D:response>", r);

7dbf29be626018bc389ef94c1846aeac4b72633bsf }

7dbf29be626018bc389ef94c1846aeac4b72633bsf else {

7dbf29be626018bc389ef94c1846aeac4b72633bsf ap_rputs("<D:response", r);

7dbf29be626018bc389ef94c1846aeac4b72633bsf for (t = first->propresult.xmlns; t; t = t->next) {

7dbf29be626018bc389ef94c1846aeac4b72633bsf ap_rputs(t->text, r);

7dbf29be626018bc389ef94c1846aeac4b72633bsf }

7dbf29be626018bc389ef94c1846aeac4b72633bsf ap_rputc('>', r);

7dbf29be626018bc389ef94c1846aeac4b72633bsf }

7dbf29be626018bc389ef94c1846aeac4b72633bsf

7dbf29be626018bc389ef94c1846aeac4b72633bsf ap_rputs(DEBUG_CR "<D:href>", r);

7dbf29be626018bc389ef94c1846aeac4b72633bsf ap_rputs(dav_xml_escape_uri(r->pool, first->href), r);

7dbf29be626018bc389ef94c1846aeac4b72633bsf ap_rputs("</D:href>" DEBUG_CR, r);

7dbf29be626018bc389ef94c1846aeac4b72633bsf

7dbf29be626018bc389ef94c1846aeac4b72633bsf if (first->propresult.propstats == NULL) {

7dbf29be626018bc389ef94c1846aeac4b72633bsf /* use the Status-Line text from Apache. Note, this will

7dbf29be626018bc389ef94c1846aeac4b72633bsf ap_rprintf(r,

7dbf29be626018bc389ef94c1846aeac4b72633bsf "<D:status>HTTP/1.1 %s</D:status>" DEBUG_CR,

7dbf29be626018bc389ef94c1846aeac4b72633bsf ap_get_status_line(first->status));

7dbf29be626018bc389ef94c1846aeac4b72633bsf }

7dbf29be626018bc389ef94c1846aeac4b72633bsf else {

7dbf29be626018bc389ef94c1846aeac4b72633bsf /* assume this includes <propstat> and is quoted properly */

7dbf29be626018bc389ef94c1846aeac4b72633bsf for (t = first->propresult.propstats; t; t = t->next) {

7dbf29be626018bc389ef94c1846aeac4b72633bsf ap_rputs(t->text, r);

7dbf29be626018bc389ef94c1846aeac4b72633bsf }

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes }

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes if (first->desc != NULL) {

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes /*

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes ap_rputs("<D:responsedescription>", r);

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes ap_rputs(first->desc, r);

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes ap_rputs("</D:responsedescription>" DEBUG_CR, r);

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes }

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf ap_rputs("</D:response>" DEBUG_CR, r);

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes }

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes ap_rputs("</D:multistatus>" DEBUG_CR, r);

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes}

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholesstatic void dav_log_err(request_rec *r, dav_error *err, int level)

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes{

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes dav_error *errscan;

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes /* Log the errors */

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes /* ### should have a directive to log the first or all */

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes for (errscan = err; errscan != NULL; errscan = errscan->prev) {

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes if (errscan->desc == NULL)

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf continue;

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes if (errscan->save_errno != 0) {

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes errno = errscan->save_errno;

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes ap_log_rerror(APLOG_MARK, level, errno, r, "%s [%d, #%d]",

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes errscan->desc, errscan->status, errscan->error_id);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes else {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes ap_log_rerror(APLOG_MARK, level, 0, r,

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf "%s [%d, #%d]",

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf errscan->desc, errscan->status, errscan->error_id);

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf}

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf

4be9c459920a7c1cfe62d654327dae5c4bb6b284sfstatic int dav_handle_err(request_rec *r, dav_error *err,

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf dav_response *response)

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf{

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf /* log the errors */

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf dav_log_err(r, err, APLOG_ERR);

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf if (response == NULL) {

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf dav_error *stackerr = err;

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes /* our error messages are safe; tell Apache this */

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes apr_table_setn(r->notes, "verbose-error-to", "*");

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes /* Didn't get a multistatus response passed in, but we still

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf while (stackerr != NULL && stackerr->tagname == NULL)

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf stackerr = stackerr->prev;

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf if (stackerr != NULL && stackerr->tagname != NULL)

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes return dav_error_response_tag(r, stackerr);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes return err->status;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

54d22ed1c429b903b029bbd62621f11a9e286137minfrin

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /* send the multistatus and tell Apache the request/response is DONE. */

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes dav_send_multistatus(r, err->status, response, NULL);

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf return DONE;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes}

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholesstatic int dav_created(request_rec *r, const char *locn, const char *what,

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes int replaced)

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes{

54d22ed1c429b903b029bbd62621f11a9e286137minfrin const char *body;

54d22ed1c429b903b029bbd62621f11a9e286137minfrin

54d22ed1c429b903b029bbd62621f11a9e286137minfrin if (locn == NULL) {

54d22ed1c429b903b029bbd62621f11a9e286137minfrin locn = r->uri;

54d22ed1c429b903b029bbd62621f11a9e286137minfrin }

54d22ed1c429b903b029bbd62621f11a9e286137minfrin

54d22ed1c429b903b029bbd62621f11a9e286137minfrin /* did the target resource already exist? */

54d22ed1c429b903b029bbd62621f11a9e286137minfrin if (replaced) {

54d22ed1c429b903b029bbd62621f11a9e286137minfrin /* Apache will supply a default message */

e8f95a682820a599fe41b22977010636be5c2717jim return HTTP_NO_CONTENT;

482f676c6c19b1c5bb5cca04dad11509c1da3a4cwrowe }

8a03cd420b800a2428f49f4617293de9b2387b20jorton

54d22ed1c429b903b029bbd62621f11a9e286137minfrin /* Per HTTP/1.1, S10.2.2: add a Location header to contain the

54d22ed1c429b903b029bbd62621f11a9e286137minfrin

54d22ed1c429b903b029bbd62621f11a9e286137minfrin /* Convert locn to an absolute URI, and return in Location header */

54d22ed1c429b903b029bbd62621f11a9e286137minfrin apr_table_setn(r->headers_out, "Location", ap_construct_url(r->pool, locn, r));

54d22ed1c429b903b029bbd62621f11a9e286137minfrin

54d22ed1c429b903b029bbd62621f11a9e286137minfrin /* ### insert an ETag header? see HTTP/1.1 S10.2.2 */

54d22ed1c429b903b029bbd62621f11a9e286137minfrin

54d22ed1c429b903b029bbd62621f11a9e286137minfrin /* Apache doesn't allow us to set a variable body for HTTP_CREATED, so

54d22ed1c429b903b029bbd62621f11a9e286137minfrin body = apr_psprintf(r->pool, "%s %s has been created.",

54d22ed1c429b903b029bbd62621f11a9e286137minfrin what, ap_escape_html(r->pool, locn));

54d22ed1c429b903b029bbd62621f11a9e286137minfrin return dav_error_response(r, HTTP_CREATED, body);

54d22ed1c429b903b029bbd62621f11a9e286137minfrin}

54d22ed1c429b903b029bbd62621f11a9e286137minfrin

54d22ed1c429b903b029bbd62621f11a9e286137minfrinint dav_get_depth(request_rec *r, int def_depth)

6999a76d8eb5ef6b4b295e51df0b2fb6064bd373covener{

6999a76d8eb5ef6b4b295e51df0b2fb6064bd373covener const char *depth = apr_table_get(r->headers_in, "Depth");

6999a76d8eb5ef6b4b295e51df0b2fb6064bd373covener

6999a76d8eb5ef6b4b295e51df0b2fb6064bd373covener if (depth == NULL) {

6999a76d8eb5ef6b4b295e51df0b2fb6064bd373covener return def_depth;

6999a76d8eb5ef6b4b295e51df0b2fb6064bd373covener }

54d22ed1c429b903b029bbd62621f11a9e286137minfrin

54d22ed1c429b903b029bbd62621f11a9e286137minfrin if (strcasecmp(depth, "infinity") == 0) {

54d22ed1c429b903b029bbd62621f11a9e286137minfrin return DAV_INFINITY;

54d22ed1c429b903b029bbd62621f11a9e286137minfrin }

54d22ed1c429b903b029bbd62621f11a9e286137minfrin else if (strcmp(depth, "0") == 0) {

54d22ed1c429b903b029bbd62621f11a9e286137minfrin return 0;

54d22ed1c429b903b029bbd62621f11a9e286137minfrin }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes else if (strcmp(depth, "1") == 0) {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes return 1;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /* The caller will return an HTTP_BAD_REQUEST. This will augment the

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,

e8f95a682820a599fe41b22977010636be5c2717jim "An invalid Depth header was specified.");

e8f95a682820a599fe41b22977010636be5c2717jim return -1;

482f676c6c19b1c5bb5cca04dad11509c1da3a4cwrowe}

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

e8f95a682820a599fe41b22977010636be5c2717jimstatic int dav_get_overwrite(request_rec *r)

8113dac419143273351446c3ad653f3fe5ba5cfdwrowe{

8113dac419143273351446c3ad653f3fe5ba5cfdwrowe const char *overwrite = apr_table_get(r->headers_in, "Overwrite");

8113dac419143273351446c3ad653f3fe5ba5cfdwrowe

f0f6f1b90ab582896f8a7d56d85bd62a55e57d90covener if (overwrite == NULL) {

8113dac419143273351446c3ad653f3fe5ba5cfdwrowe return 1; /* default is "T" */

54d22ed1c429b903b029bbd62621f11a9e286137minfrin }

560fd0658902ab57754616c172d8953e69fc4722bnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if ((*overwrite == 'F' || *overwrite == 'f') && overwrite[1] == '\0') {

e8f95a682820a599fe41b22977010636be5c2717jim return 0;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

9ad7b260be233be7d7b5576979825cac72e15498rederpj if ((*overwrite == 'T' || *overwrite == 't') && overwrite[1] == '\0') {

9ad7b260be233be7d7b5576979825cac72e15498rederpj return 1;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /* The caller will return an HTTP_BAD_REQUEST. This will augment the

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes "An invalid Overwrite header was specified.");

560fd0658902ab57754616c172d8953e69fc4722bnicholes return -1;

560fd0658902ab57754616c172d8953e69fc4722bnicholes}

560fd0658902ab57754616c172d8953e69fc4722bnicholes

e8f95a682820a599fe41b22977010636be5c2717jimstatic dav_error *dav_get_resource(request_rec *r, int label_allowed,

e8f95a682820a599fe41b22977010636be5c2717jim int use_checked_in, dav_resource **res_p)

e8f95a682820a599fe41b22977010636be5c2717jim{

e8f95a682820a599fe41b22977010636be5c2717jim dav_dir_conf *conf;

e8f95a682820a599fe41b22977010636be5c2717jim const char *label = NULL;

ae1981fc94adf2b231e2d0e15d2f895b2138c969covener dav_error *err;

482f676c6c19b1c5bb5cca04dad11509c1da3a4cwrowe

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /* if the request target can be overridden, get any target selector */

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if (label_allowed) {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes label = apr_table_get(r->headers_in, "label");

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes conf = ap_get_module_config(r->per_dir_config, &dav_module);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /* assert: conf->provider != NULL */

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /* resolve the resource */

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes err = (*conf->provider->repos->get_resource)(r, conf->dir,

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes label, use_checked_in,

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes res_p);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if (err != NULL) {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes err = dav_push_error(r->pool, err->status, 0,

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes "Could not fetch resource information.", err);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes return err;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /* Note: this shouldn't happen, but just be sure... */

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if (*res_p == NULL) {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /* ### maybe use HTTP_INTERNAL_SERVER_ERROR */

e8f95a682820a599fe41b22977010636be5c2717jim return dav_new_error(r->pool, HTTP_NOT_FOUND, 0,

560fd0658902ab57754616c172d8953e69fc4722bnicholes apr_psprintf(r->pool,

ae1981fc94adf2b231e2d0e15d2f895b2138c969covener "The provider did not define a "

482f676c6c19b1c5bb5cca04dad11509c1da3a4cwrowe "resource for %s.",

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes ap_escape_html(r->pool, r->uri)));

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /* ### hmm. this doesn't feel like the right place or thing to do */

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /* if there were any input headers requiring a Vary header in the response,

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes dav_add_vary_header(r, r, *res_p);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes return NULL;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes}

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholesstatic dav_error * dav_open_lockdb(request_rec *r, int ro, dav_lockdb **lockdb)

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes{

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes const dav_hooks_locks *hooks = DAV_GET_HOOKS_LOCKS(r);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if (hooks == NULL) {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes *lockdb = NULL;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes return NULL;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

0e05808dc59a321566303084c84b9826a4353cefrederpj /* open the thing lazily */

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes return (*hooks->open_lockdb)(r, ro, 0, lockdb);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes}

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovenerstatic int dav_parse_range(request_rec *r,

0e05808dc59a321566303084c84b9826a4353cefrederpj apr_off_t *range_start, apr_off_t *range_end)

ebe5305f8b22507374358f32b74d12fb50c05a25covener{

ebe5305f8b22507374358f32b74d12fb50c05a25covener const char *range_c;

ebe5305f8b22507374358f32b74d12fb50c05a25covener char *range;

ebe5305f8b22507374358f32b74d12fb50c05a25covener char *dash;

ebe5305f8b22507374358f32b74d12fb50c05a25covener char *slash;

ebe5305f8b22507374358f32b74d12fb50c05a25covener

ebe5305f8b22507374358f32b74d12fb50c05a25covener range_c = apr_table_get(r->headers_in, "content-range");

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener if (range_c == NULL)

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener return 0;

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener range = apr_pstrdup(r->pool, range_c);

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener if (strncasecmp(range, "bytes ", 6) != 0

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener || (dash = ap_strchr(range, '-')) == NULL

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener || (slash = ap_strchr(range, '/')) == NULL) {

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener /* malformed header. ignore it (per S14.16 of RFC2616) */

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener return 0;

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener }

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener

0e05808dc59a321566303084c84b9826a4353cefrederpj *dash = *slash = '\0';

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener *range_start = apr_atoi64(range + 6);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes *range_end = apr_atoi64(dash + 1);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if (*range_end < *range_start

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener || (slash[1] != '*' && apr_atoi64(slash + 1) <= *range_end)) {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /* invalid range. ignore it (per S14.16 of RFC2616) */

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes return 0;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

9ad7b260be233be7d7b5576979825cac72e15498rederpj /* we now have a valid range */

9ad7b260be233be7d7b5576979825cac72e15498rederpj return 1;

54d22ed1c429b903b029bbd62621f11a9e286137minfrin}

54d22ed1c429b903b029bbd62621f11a9e286137minfrin

54d22ed1c429b903b029bbd62621f11a9e286137minfrinstatic int dav_method_get(request_rec *r)

54d22ed1c429b903b029bbd62621f11a9e286137minfrin{

54d22ed1c429b903b029bbd62621f11a9e286137minfrin dav_resource *resource;

560fd0658902ab57754616c172d8953e69fc4722bnicholes dav_error *err;

54d22ed1c429b903b029bbd62621f11a9e286137minfrin

54d22ed1c429b903b029bbd62621f11a9e286137minfrin /* This method should only be called when the resource is not

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener err = dav_get_resource(r, 1 /* label_allowed */, 0 /* use_checked_in */,

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes &resource);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if (err != NULL)

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes return dav_handle_err(r, err, NULL);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if (!resource->exists) {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /* Apache will supply a default error for this. */

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes return HTTP_NOT_FOUND;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /* set up the HTTP headers for the response */

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if ((err = (*resource->hooks->set_headers)(r, resource)) != NULL) {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes err = dav_push_error(r->pool, err->status, 0,

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes "Unable to set up HTTP headers.",

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes err);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes return dav_handle_err(r, err, NULL);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

482f676c6c19b1c5bb5cca04dad11509c1da3a4cwrowe if (r->header_only) {

482f676c6c19b1c5bb5cca04dad11509c1da3a4cwrowe return DONE;

e8f95a682820a599fe41b22977010636be5c2717jim }

e8f95a682820a599fe41b22977010636be5c2717jim

482f676c6c19b1c5bb5cca04dad11509c1da3a4cwrowe /* okay... time to deliver the content */

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if ((err = (*resource->hooks->deliver)(resource,

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes r->output_filters)) != NULL) {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes err = dav_push_error(r->pool, err->status, 0,

e8f95a682820a599fe41b22977010636be5c2717jim "Unable to deliver content.",

e8f95a682820a599fe41b22977010636be5c2717jim err);

8113dac419143273351446c3ad653f3fe5ba5cfdwrowe return dav_handle_err(r, err, NULL);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

e8f95a682820a599fe41b22977010636be5c2717jim return DONE;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes}

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholesstatic int dav_method_post(request_rec *r)

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes{

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes dav_resource *resource;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes dav_error *err;

482f676c6c19b1c5bb5cca04dad11509c1da3a4cwrowe

e8f95a682820a599fe41b22977010636be5c2717jim /* Ask repository module to resolve the resource */

482f676c6c19b1c5bb5cca04dad11509c1da3a4cwrowe err = dav_get_resource(r, 0 /* label_allowed */, 0 /* use_checked_in */,

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes &resource);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if (err != NULL)

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes return dav_handle_err(r, err, NULL);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /* Note: depth == 0. Implies no need for a multistatus response. */

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if ((err = dav_validate_request(r, resource, 0, NULL, NULL,

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes DAV_VALIDATE_RESOURCE, NULL)) != NULL) {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /* ### add a higher-level description? */

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes return dav_handle_err(r, err, NULL);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes return DECLINED;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes}

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholesstatic int dav_method_put(request_rec *r)

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes{

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes dav_resource *resource;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes int resource_state;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes dav_auto_version_info av_info;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes const dav_hooks_locks *locks_hooks = DAV_GET_HOOKS_LOCKS(r);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes const char *body;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes dav_error *err;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes dav_error *err2;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes int result;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes dav_stream_mode mode;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes dav_stream *stream;

e8f95a682820a599fe41b22977010636be5c2717jim dav_response *multi_response;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes int has_range;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes apr_off_t range_start;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes apr_off_t range_end;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if ((result = ap_setup_client_block(r, REQUEST_CHUNKED_DECHUNK)) != OK) {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes return result;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /* Ask repository module to resolve the resource */

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes err = dav_get_resource(r, 0 /* label_allowed */, 0 /* use_checked_in */,

e8f95a682820a599fe41b22977010636be5c2717jim &resource);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if (err != NULL)

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes return dav_handle_err(r, err, NULL);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /* If not a file or collection resource, PUT not allowed */

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if (resource->type != DAV_RESOURCE_TYPE_REGULAR

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes && resource->type != DAV_RESOURCE_TYPE_WORKING) {

43c3e6a4b559b76b750c245ee95e2782c15b4296jim body = apr_psprintf(r->pool,

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes "Cannot create resource %s with PUT.",

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes ap_escape_html(r->pool, r->uri));

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes return dav_error_response(r, HTTP_CONFLICT, body);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

f43b67c5a9d29b572eac916f8335cedc80c908bebnicholes

43c3e6a4b559b76b750c245ee95e2782c15b4296jim /* Cannot PUT a collection */

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if (resource->collection) {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes return dav_error_response(r, HTTP_CONFLICT,

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes "Cannot PUT to a collection.");

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

37af4b0cf648275b68ff41c866c665b4ccf4667dcovener }

37af4b0cf648275b68ff41c866c665b4ccf4667dcovener

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf resource_state = dav_get_resource_state(r, resource);

37af4b0cf648275b68ff41c866c665b4ccf4667dcovener

482f676c6c19b1c5bb5cca04dad11509c1da3a4cwrowe /*

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf if ((err = dav_validate_request(r, resource, 0, NULL, &multi_response,

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf resource_state == DAV_RESOURCE_NULL ?

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf DAV_VALIDATE_PARENT :

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf DAV_VALIDATE_RESOURCE, NULL)) != NULL) {

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf /* ### add a higher-level description? */

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf return dav_handle_err(r, err, multi_response);

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /* make sure the resource can be modified (if versioning repository) */

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if ((err = dav_auto_checkout(r, resource,

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes 0 /* not parent_only */,

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes &av_info)) != NULL) {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /* ### add a higher-level description? */

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes return dav_handle_err(r, err, NULL);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /* truncate and rewrite the file unless we see a Content-Range */

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes mode = DAV_MODE_WRITE_TRUNC;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes has_range = dav_parse_range(r, &range_start, &range_end);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if (has_range) {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes mode = DAV_MODE_WRITE_SEEKABLE;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /* Create the new file in the repository */

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if ((err = (*resource->hooks->open_stream)(resource, mode,

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes &stream)) != NULL) {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /* ### assuming FORBIDDEN is probably not quite right... */

e8f95a682820a599fe41b22977010636be5c2717jim err = dav_push_error(r->pool, HTTP_FORBIDDEN, 0,

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes apr_psprintf(r->pool,

482f676c6c19b1c5bb5cca04dad11509c1da3a4cwrowe "Unable to PUT new contents for %s.",

e8f95a682820a599fe41b22977010636be5c2717jim ap_escape_html(r->pool, r->uri)),

e8f95a682820a599fe41b22977010636be5c2717jim err);

482f676c6c19b1c5bb5cca04dad11509c1da3a4cwrowe }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if (err == NULL && has_range) {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /* a range was provided. seek to the start */

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes err = (*resource->hooks->seek_stream)(stream, range_start);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if (err == NULL) {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if (ap_should_client_block(r)) {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes char *buffer = apr_palloc(r->pool, DAV_READ_BLOCKSIZE);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes long len;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /*

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem while ((len = ap_get_client_block(r, buffer,

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes DAV_READ_BLOCKSIZE)) > 0) {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if (err == NULL) {

8113dac419143273351446c3ad653f3fe5ba5cfdwrowe /* write whatever we read, until we see an error */

8113dac419143273351446c3ad653f3fe5ba5cfdwrowe err = (*resource->hooks->write_stream)(stream,

8113dac419143273351446c3ad653f3fe5ba5cfdwrowe buffer, len);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

e8f95a682820a599fe41b22977010636be5c2717jim

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /*

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if (len == -1) {

482f676c6c19b1c5bb5cca04dad11509c1da3a4cwrowe /*

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes err = dav_new_error(r->pool, HTTP_BAD_REQUEST, 0,

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes "An error occurred while reading the "

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes "request body.");

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes err2 = (*resource->hooks->close_stream)(stream,

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes err == NULL /* commit */);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if (err2 != NULL && err == NULL) {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /* no error during the write, but we hit one at close. use it. */

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes err = err2;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

e8f95a682820a599fe41b22977010636be5c2717jim

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /*

3f5585f7f4a7d74f2f94ec729ea8c1879d419e35rederpj if (err == NULL) {

e8f95a682820a599fe41b22977010636be5c2717jim resource->exists = 1;

e8f95a682820a599fe41b22977010636be5c2717jim }

482f676c6c19b1c5bb5cca04dad11509c1da3a4cwrowe

e8f95a682820a599fe41b22977010636be5c2717jim /* restore modifiability of resources back to what they were */

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes err2 = dav_auto_checkin(r, resource, err != NULL /* undo if error */,

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes 0 /*unlock*/, &av_info);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /* check for errors now */

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if (err != NULL) {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes return dav_handle_err(r, err, NULL);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if (err2 != NULL) {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /* just log a warning */

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes err2 = dav_push_error(r->pool, err->status, 0,

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes "The PUT was successful, but there "

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes "was a problem automatically checking in "

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes "the resource or its parent collection.",

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes err2);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes dav_log_err(r, err2, APLOG_WARNING);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /* ### place the Content-Type and Content-Language into the propdb */

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

3f5585f7f4a7d74f2f94ec729ea8c1879d419e35rederpj if (locks_hooks != NULL) {

3f5585f7f4a7d74f2f94ec729ea8c1879d419e35rederpj dav_lockdb *lockdb;

3f5585f7f4a7d74f2f94ec729ea8c1879d419e35rederpj

3f5585f7f4a7d74f2f94ec729ea8c1879d419e35rederpj if ((err = (*locks_hooks->open_lockdb)(r, 0, 0, &lockdb)) != NULL) {

3f5585f7f4a7d74f2f94ec729ea8c1879d419e35rederpj /* The file creation was successful, but the locking failed. */

3f5585f7f4a7d74f2f94ec729ea8c1879d419e35rederpj err = dav_push_error(r->pool, err->status, 0,

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes "The file was PUT successfully, but there "

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes "was a problem opening the lock database "

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes "which prevents inheriting locks from the "

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes "parent resources.",

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes err);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes return dav_handle_err(r, err, NULL);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /* notify lock system that we have created/replaced a resource */

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes err = dav_notify_created(r, lockdb, resource, resource_state, 0);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

3f5585f7f4a7d74f2f94ec729ea8c1879d419e35rederpj (*locks_hooks->close_lockdb)(lockdb);

f43b67c5a9d29b572eac916f8335cedc80c908bebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if (err != NULL) {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /* The file creation was successful, but the locking failed. */

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes err = dav_push_error(r->pool, err->status, 0,

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes "The file was PUT successfully, but there "

37af4b0cf648275b68ff41c866c665b4ccf4667dcovener "was a problem updating its lock "

37af4b0cf648275b68ff41c866c665b4ccf4667dcovener "information.",

37af4b0cf648275b68ff41c866c665b4ccf4667dcovener err);

37af4b0cf648275b68ff41c866c665b4ccf4667dcovener return dav_handle_err(r, err, NULL);

37af4b0cf648275b68ff41c866c665b4ccf4667dcovener }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

f43b67c5a9d29b572eac916f8335cedc80c908bebnicholes /* NOTE: WebDAV spec, S8.7.1 states properties should be unaffected */

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /* return an appropriate response (HTTP_CREATED or HTTP_NO_CONTENT) */

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf return dav_created(r, NULL, "Resource", resource_state == DAV_RESOURCE_EXISTS);

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf}

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf

4be9c459920a7c1cfe62d654327dae5c4bb6b284sfDAV_DECLARE(void) dav_add_response(dav_walk_resource *wres,

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf int status, dav_get_props_result *propstats)

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf{

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf dav_response *resp;

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /* just drop some data into an dav_response */

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes resp = apr_pcalloc(wres->pool, sizeof(*resp));

e8f95a682820a599fe41b22977010636be5c2717jim resp->href = apr_pstrdup(wres->pool, wres->resource->uri);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes resp->status = status;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if (propstats) {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes resp->propresult = *propstats;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes resp->next = wres->response;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes wres->response = resp;

3f5585f7f4a7d74f2f94ec729ea8c1879d419e35rederpj}

3f5585f7f4a7d74f2f94ec729ea8c1879d419e35rederpj

482f676c6c19b1c5bb5cca04dad11509c1da3a4cwrowestatic int dav_method_delete(request_rec *r)

e8f95a682820a599fe41b22977010636be5c2717jim{

482f676c6c19b1c5bb5cca04dad11509c1da3a4cwrowe dav_resource *resource;

e8f95a682820a599fe41b22977010636be5c2717jim dav_auto_version_info av_info;

482f676c6c19b1c5bb5cca04dad11509c1da3a4cwrowe dav_error *err;

e8f95a682820a599fe41b22977010636be5c2717jim dav_error *err2;

e8f95a682820a599fe41b22977010636be5c2717jim dav_response *multi_response;

e8f95a682820a599fe41b22977010636be5c2717jim int result;

482f676c6c19b1c5bb5cca04dad11509c1da3a4cwrowe int depth;

482f676c6c19b1c5bb5cca04dad11509c1da3a4cwrowe

3f5585f7f4a7d74f2f94ec729ea8c1879d419e35rederpj /* We don't use the request body right now, so torch it. */

3f5585f7f4a7d74f2f94ec729ea8c1879d419e35rederpj if ((result = ap_discard_request_body(r)) != OK) {

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem return result;

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem }

3f5585f7f4a7d74f2f94ec729ea8c1879d419e35rederpj

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem /* Ask repository module to resolve the resource */

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem err = dav_get_resource(r, 0 /* label_allowed */, 0 /* use_checked_in */,

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem &resource);

3f5585f7f4a7d74f2f94ec729ea8c1879d419e35rederpj if (err != NULL)

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes return dav_handle_err(r, err, NULL);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if (!resource->exists) {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /* Apache will supply a default error for this. */

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes return HTTP_NOT_FOUND;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /* 2518 says that depth must be infinity only for collections.

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes depth = dav_get_depth(r, DAV_INFINITY);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if (resource->collection && depth != DAV_INFINITY) {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /* This supplies additional information for the default message. */

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes "Depth must be \"infinity\" for DELETE of a collection.");

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes return HTTP_BAD_REQUEST;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if (!resource->collection && depth == 1) {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /* This supplies additional information for the default message. */

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes "Depth of \"1\" is not allowed for DELETE.");

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes return HTTP_BAD_REQUEST;

8869662bb1a4078297020e94ae5e928626d877c6rederpj }

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem /*

8869662bb1a4078297020e94ae5e928626d877c6rederpj if ((err = dav_validate_request(r, resource, depth, NULL,

8869662bb1a4078297020e94ae5e928626d877c6rederpj &multi_response,

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem DAV_VALIDATE_PARENT

8869662bb1a4078297020e94ae5e928626d877c6rederpj | DAV_VALIDATE_USE_424, NULL)) != NULL) {

8869662bb1a4078297020e94ae5e928626d877c6rederpj err = dav_push_error(r->pool, err->status, 0,

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem apr_psprintf(r->pool,

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem "Could not DELETE %s due to a failed "

8869662bb1a4078297020e94ae5e928626d877c6rederpj "precondition (e.g. locks).",

8869662bb1a4078297020e94ae5e928626d877c6rederpj ap_escape_html(r->pool, r->uri)),

8869662bb1a4078297020e94ae5e928626d877c6rederpj err);

8869662bb1a4078297020e94ae5e928626d877c6rederpj return dav_handle_err(r, err, multi_response);

8869662bb1a4078297020e94ae5e928626d877c6rederpj }

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem /* ### RFC 2518 s. 8.10.5 says to remove _all_ locks, not just those

8869662bb1a4078297020e94ae5e928626d877c6rederpj if ((result = dav_unlock(r, resource, NULL)) != OK) {

8869662bb1a4078297020e94ae5e928626d877c6rederpj return result;

8869662bb1a4078297020e94ae5e928626d877c6rederpj }

8869662bb1a4078297020e94ae5e928626d877c6rederpj

8869662bb1a4078297020e94ae5e928626d877c6rederpj /* if versioned resource, make sure parent is checked out */

8869662bb1a4078297020e94ae5e928626d877c6rederpj if ((err = dav_auto_checkout(r, resource, 1 /* parent_only */,

8869662bb1a4078297020e94ae5e928626d877c6rederpj &av_info)) != NULL) {

8869662bb1a4078297020e94ae5e928626d877c6rederpj /* ### add a higher-level description? */

8869662bb1a4078297020e94ae5e928626d877c6rederpj return dav_handle_err(r, err, NULL);

8869662bb1a4078297020e94ae5e928626d877c6rederpj }

8869662bb1a4078297020e94ae5e928626d877c6rederpj

8869662bb1a4078297020e94ae5e928626d877c6rederpj /* try to remove the resource */

8869662bb1a4078297020e94ae5e928626d877c6rederpj err = (*resource->hooks->remove_resource)(resource, &multi_response);

6733d943c9e8d0f27dd077a04037e8c49eb090ffcovener

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem /* restore writability of parent back to what it was */

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem err2 = dav_auto_checkin(r, NULL, err != NULL /* undo if error */,

8869662bb1a4078297020e94ae5e928626d877c6rederpj 0 /*unlock*/, &av_info);

8869662bb1a4078297020e94ae5e928626d877c6rederpj

8869662bb1a4078297020e94ae5e928626d877c6rederpj /* check for errors now */

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf if (err != NULL) {

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf err = dav_push_error(r->pool, err->status, 0,

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf apr_psprintf(r->pool,

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf "Could not DELETE %s.",

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf ap_escape_html(r->pool, r->uri)),

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf err);

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf return dav_handle_err(r, err, multi_response);

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf }

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf if (err2 != NULL) {

8869662bb1a4078297020e94ae5e928626d877c6rederpj /* just log a warning */

8869662bb1a4078297020e94ae5e928626d877c6rederpj err = dav_push_error(r->pool, err2->status, 0,

8869662bb1a4078297020e94ae5e928626d877c6rederpj "The DELETE was successful, but there "

8869662bb1a4078297020e94ae5e928626d877c6rederpj "was a problem automatically checking in "

8869662bb1a4078297020e94ae5e928626d877c6rederpj "the parent collection.",

8869662bb1a4078297020e94ae5e928626d877c6rederpj err2);

8869662bb1a4078297020e94ae5e928626d877c6rederpj dav_log_err(r, err, APLOG_WARNING);

8869662bb1a4078297020e94ae5e928626d877c6rederpj }

8869662bb1a4078297020e94ae5e928626d877c6rederpj

8869662bb1a4078297020e94ae5e928626d877c6rederpj /* ### HTTP_NO_CONTENT if no body, HTTP_OK if there is a body (some day) */

8869662bb1a4078297020e94ae5e928626d877c6rederpj

8869662bb1a4078297020e94ae5e928626d877c6rederpj /* Apache will supply a default error for this. */

8869662bb1a4078297020e94ae5e928626d877c6rederpj return HTTP_NO_CONTENT;

8869662bb1a4078297020e94ae5e928626d877c6rederpj}

8869662bb1a4078297020e94ae5e928626d877c6rederpj

8869662bb1a4078297020e94ae5e928626d877c6rederpjstatic dav_error *dav_gen_supported_methods(request_rec *r,

8869662bb1a4078297020e94ae5e928626d877c6rederpj const apr_xml_elem *elem,

8869662bb1a4078297020e94ae5e928626d877c6rederpj const apr_table_t *methods,

8869662bb1a4078297020e94ae5e928626d877c6rederpj apr_text_header *body)

8869662bb1a4078297020e94ae5e928626d877c6rederpj{

8869662bb1a4078297020e94ae5e928626d877c6rederpj const apr_array_header_t *arr;

8869662bb1a4078297020e94ae5e928626d877c6rederpj const apr_table_entry_t *elts;

8869662bb1a4078297020e94ae5e928626d877c6rederpj apr_xml_elem *child;

8869662bb1a4078297020e94ae5e928626d877c6rederpj apr_xml_attr *attr;

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem char *s;

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem int i;

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem

8869662bb1a4078297020e94ae5e928626d877c6rederpj apr_text_append(r->pool, body, "<D:supported-method-set>" DEBUG_CR);

8869662bb1a4078297020e94ae5e928626d877c6rederpj

8869662bb1a4078297020e94ae5e928626d877c6rederpj if (elem->first_child == NULL) {

8869662bb1a4078297020e94ae5e928626d877c6rederpj /* show all supported methods */

8869662bb1a4078297020e94ae5e928626d877c6rederpj arr = apr_table_elts(methods);

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem elts = (const apr_table_entry_t *)arr->elts;

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem for (i = 0; i < arr->nelts; ++i) {

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem if (elts[i].key == NULL)

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem continue;

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem s = apr_psprintf(r->pool,

8869662bb1a4078297020e94ae5e928626d877c6rederpj "<D:supported-method D:name=\"%s\"/>"

8869662bb1a4078297020e94ae5e928626d877c6rederpj DEBUG_CR,

8869662bb1a4078297020e94ae5e928626d877c6rederpj elts[i].key);

8869662bb1a4078297020e94ae5e928626d877c6rederpj apr_text_append(r->pool, body, s);

8869662bb1a4078297020e94ae5e928626d877c6rederpj }

8869662bb1a4078297020e94ae5e928626d877c6rederpj }

8869662bb1a4078297020e94ae5e928626d877c6rederpj else {

8869662bb1a4078297020e94ae5e928626d877c6rederpj /* check for support of specific methods */

8869662bb1a4078297020e94ae5e928626d877c6rederpj for (child = elem->first_child; child != NULL; child = child->next) {

8869662bb1a4078297020e94ae5e928626d877c6rederpj if (child->ns == APR_XML_NS_DAV_ID

8869662bb1a4078297020e94ae5e928626d877c6rederpj && strcmp(child->name, "supported-method") == 0) {

8869662bb1a4078297020e94ae5e928626d877c6rederpj const char *name = NULL;

8869662bb1a4078297020e94ae5e928626d877c6rederpj

8869662bb1a4078297020e94ae5e928626d877c6rederpj /* go through attributes to find method name */

8869662bb1a4078297020e94ae5e928626d877c6rederpj for (attr = child->attr; attr != NULL; attr = attr->next) {

8869662bb1a4078297020e94ae5e928626d877c6rederpj if (attr->ns == APR_XML_NS_DAV_ID

8869662bb1a4078297020e94ae5e928626d877c6rederpj && strcmp(attr->name, "name") == 0)

8869662bb1a4078297020e94ae5e928626d877c6rederpj name = attr->value;

8869662bb1a4078297020e94ae5e928626d877c6rederpj }

8869662bb1a4078297020e94ae5e928626d877c6rederpj

8869662bb1a4078297020e94ae5e928626d877c6rederpj if (name == NULL) {

8869662bb1a4078297020e94ae5e928626d877c6rederpj return dav_new_error(r->pool, HTTP_BAD_REQUEST, 0,

8869662bb1a4078297020e94ae5e928626d877c6rederpj "A DAV:supported-method element "

8869662bb1a4078297020e94ae5e928626d877c6rederpj "does not have a \"name\" attribute");

8869662bb1a4078297020e94ae5e928626d877c6rederpj }

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem /* see if method is supported */

8869662bb1a4078297020e94ae5e928626d877c6rederpj if (apr_table_get(methods, name) != NULL) {

8869662bb1a4078297020e94ae5e928626d877c6rederpj s = apr_psprintf(r->pool,

8869662bb1a4078297020e94ae5e928626d877c6rederpj "<D:supported-method D:name=\"%s\"/>"

8869662bb1a4078297020e94ae5e928626d877c6rederpj DEBUG_CR,

8869662bb1a4078297020e94ae5e928626d877c6rederpj name);

8869662bb1a4078297020e94ae5e928626d877c6rederpj apr_text_append(r->pool, body, s);

8869662bb1a4078297020e94ae5e928626d877c6rederpj }

8869662bb1a4078297020e94ae5e928626d877c6rederpj }

8869662bb1a4078297020e94ae5e928626d877c6rederpj }

8869662bb1a4078297020e94ae5e928626d877c6rederpj }

3f5585f7f4a7d74f2f94ec729ea8c1879d419e35rederpj

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem apr_text_append(r->pool, body, "</D:supported-method-set>" DEBUG_CR);

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem return NULL;

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem}

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem

8445dae5cc606ba8ba04efc341cc1e081d95920drpluemstatic dav_error *dav_gen_supported_live_props(request_rec *r,

3f5585f7f4a7d74f2f94ec729ea8c1879d419e35rederpj const dav_resource *resource,

3f5585f7f4a7d74f2f94ec729ea8c1879d419e35rederpj const apr_xml_elem *elem,

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem apr_text_header *body)

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem{

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem dav_lockdb *lockdb;

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem dav_propdb *propdb;

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem apr_xml_elem *child;

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem apr_xml_attr *attr;

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem dav_error *err;

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem /* open lock database, to report on supported lock properties */

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem /* ### should open read-only */

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem if ((err = dav_open_lockdb(r, 0, &lockdb)) != NULL) {

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem return dav_push_error(r->pool, err->status, 0,

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem "The lock database could not be opened, "

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem "preventing the reporting of supported lock "

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem "properties.",

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem err);

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem }

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem /* open the property database (readonly) for the resource */

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem if ((err = dav_open_propdb(r, lockdb, resource, 1, NULL,

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem &propdb)) != NULL) {

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem if (lockdb != NULL)

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem (*lockdb->hooks->close_lockdb)(lockdb);

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem return dav_push_error(r->pool, err->status, 0,

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem "The property database could not be opened, "

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem "preventing report of supported properties.",

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem err);

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem }

3f5585f7f4a7d74f2f94ec729ea8c1879d419e35rederpj

3f5585f7f4a7d74f2f94ec729ea8c1879d419e35rederpj apr_text_append(r->pool, body, "<D:supported-live-property-set>" DEBUG_CR);

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem if (elem->first_child == NULL) {

11ca38a20ab9b2d00258f745620e2724838e7e21rederpj /* show all supported live properties */

11ca38a20ab9b2d00258f745620e2724838e7e21rederpj dav_get_props_result props = dav_get_allprops(propdb, DAV_PROP_INSERT_SUPPORTED);

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem body->last->next = props.propstats;

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem while (body->last->next != NULL)

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem body->last = body->last->next;

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem }

11ca38a20ab9b2d00258f745620e2724838e7e21rederpj else {

11ca38a20ab9b2d00258f745620e2724838e7e21rederpj /* check for support of specific live property */

11ca38a20ab9b2d00258f745620e2724838e7e21rederpj for (child = elem->first_child; child != NULL; child = child->next) {

11ca38a20ab9b2d00258f745620e2724838e7e21rederpj if (child->ns == APR_XML_NS_DAV_ID

11ca38a20ab9b2d00258f745620e2724838e7e21rederpj && strcmp(child->name, "supported-live-property") == 0) {

11ca38a20ab9b2d00258f745620e2724838e7e21rederpj const char *name = NULL;

11ca38a20ab9b2d00258f745620e2724838e7e21rederpj const char *nmspace = NULL;

0e05808dc59a321566303084c84b9826a4353cefrederpj

a9c4332dc6241dc11dd104826bd179d42ccc0f12fuankg /* go through attributes to find name and namespace */

a9c4332dc6241dc11dd104826bd179d42ccc0f12fuankg for (attr = child->attr; attr != NULL; attr = attr->next) {

11ca38a20ab9b2d00258f745620e2724838e7e21rederpj if (attr->ns == APR_XML_NS_DAV_ID) {

11ca38a20ab9b2d00258f745620e2724838e7e21rederpj if (strcmp(attr->name, "name") == 0)

11ca38a20ab9b2d00258f745620e2724838e7e21rederpj name = attr->value;

11ca38a20ab9b2d00258f745620e2724838e7e21rederpj else if (strcmp(attr->name, "namespace") == 0)

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem nmspace = attr->value;

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem }

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem }

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem if (name == NULL) {

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem err = dav_new_error(r->pool, HTTP_BAD_REQUEST, 0,

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem "A DAV:supported-live-property "

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem "element does not have a \"name\" "

11ca38a20ab9b2d00258f745620e2724838e7e21rederpj "attribute");

85da6b76d07b7af570cbbec208a87697ba9c44f5rederpj break;

85da6b76d07b7af570cbbec208a87697ba9c44f5rederpj }

85da6b76d07b7af570cbbec208a87697ba9c44f5rederpj

3f5585f7f4a7d74f2f94ec729ea8c1879d419e35rederpj /* default namespace to DAV: */

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem if (nmspace == NULL)

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem nmspace = "DAV:";

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem /* check for support of property */

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem dav_get_liveprop_supported(propdb, nmspace, name, body);

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem }

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem }

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem }

3f5585f7f4a7d74f2f94ec729ea8c1879d419e35rederpj

85da6b76d07b7af570cbbec208a87697ba9c44f5rederpj apr_text_append(r->pool, body, "</D:supported-live-property-set>" DEBUG_CR);

3f5585f7f4a7d74f2f94ec729ea8c1879d419e35rederpj

85da6b76d07b7af570cbbec208a87697ba9c44f5rederpj dav_close_propdb(propdb);

3f5585f7f4a7d74f2f94ec729ea8c1879d419e35rederpj

85da6b76d07b7af570cbbec208a87697ba9c44f5rederpj if (lockdb != NULL)

85da6b76d07b7af570cbbec208a87697ba9c44f5rederpj (*lockdb->hooks->close_lockdb)(lockdb);

85da6b76d07b7af570cbbec208a87697ba9c44f5rederpj

85da6b76d07b7af570cbbec208a87697ba9c44f5rederpj return err;

3f5585f7f4a7d74f2f94ec729ea8c1879d419e35rederpj}

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem

8445dae5cc606ba8ba04efc341cc1e081d95920drpluemstatic dav_error *dav_gen_supported_reports(request_rec *r,

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem const dav_resource *resource,

85da6b76d07b7af570cbbec208a87697ba9c44f5rederpj const apr_xml_elem *elem,

85da6b76d07b7af570cbbec208a87697ba9c44f5rederpj const dav_hooks_vsn *vsn_hooks,

85da6b76d07b7af570cbbec208a87697ba9c44f5rederpj apr_text_header *body)

85da6b76d07b7af570cbbec208a87697ba9c44f5rederpj{

3f5585f7f4a7d74f2f94ec729ea8c1879d419e35rederpj apr_xml_elem *child;

85da6b76d07b7af570cbbec208a87697ba9c44f5rederpj apr_xml_attr *attr;

85da6b76d07b7af570cbbec208a87697ba9c44f5rederpj dav_error *err;

85da6b76d07b7af570cbbec208a87697ba9c44f5rederpj char *s;

3f5585f7f4a7d74f2f94ec729ea8c1879d419e35rederpj

85da6b76d07b7af570cbbec208a87697ba9c44f5rederpj apr_text_append(r->pool, body, "<D:supported-report-set>" DEBUG_CR);

85da6b76d07b7af570cbbec208a87697ba9c44f5rederpj

85da6b76d07b7af570cbbec208a87697ba9c44f5rederpj if (vsn_hooks != NULL) {

85da6b76d07b7af570cbbec208a87697ba9c44f5rederpj const dav_report_elem *reports;

85da6b76d07b7af570cbbec208a87697ba9c44f5rederpj const dav_report_elem *rp;

85da6b76d07b7af570cbbec208a87697ba9c44f5rederpj

3f5585f7f4a7d74f2f94ec729ea8c1879d419e35rederpj if ((err = (*vsn_hooks->avail_reports)(resource, &reports)) != NULL) {

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem return dav_push_error(r->pool, err->status, 0,

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem "DAV:supported-report-set could not be "

85da6b76d07b7af570cbbec208a87697ba9c44f5rederpj "determined due to a problem fetching the "

85da6b76d07b7af570cbbec208a87697ba9c44f5rederpj "available reports for this resource.",

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem err);

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem }

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem if (reports != NULL) {

0e05808dc59a321566303084c84b9826a4353cefrederpj if (elem->first_child == NULL) {

0e05808dc59a321566303084c84b9826a4353cefrederpj /* show all supported reports */

0e05808dc59a321566303084c84b9826a4353cefrederpj for (rp = reports; rp->nmspace != NULL; ++rp) {

0e05808dc59a321566303084c84b9826a4353cefrederpj /* Note: we presume reports->namespace is

0e05808dc59a321566303084c84b9826a4353cefrederpj s = apr_psprintf(r->pool,

0e05808dc59a321566303084c84b9826a4353cefrederpj "<D:supported-report D:name=\"%s\" "

0e05808dc59a321566303084c84b9826a4353cefrederpj "D:namespace=\"%s\"/>" DEBUG_CR,

0e05808dc59a321566303084c84b9826a4353cefrederpj rp->name, rp->nmspace);

0e05808dc59a321566303084c84b9826a4353cefrederpj apr_text_append(r->pool, body, s);

0e05808dc59a321566303084c84b9826a4353cefrederpj }

0e05808dc59a321566303084c84b9826a4353cefrederpj }

0e05808dc59a321566303084c84b9826a4353cefrederpj else {

0e05808dc59a321566303084c84b9826a4353cefrederpj /* check for support of specific report */

0e05808dc59a321566303084c84b9826a4353cefrederpj for (child = elem->first_child; child != NULL; child = child->next) {

0e05808dc59a321566303084c84b9826a4353cefrederpj if (child->ns == APR_XML_NS_DAV_ID

0e05808dc59a321566303084c84b9826a4353cefrederpj && strcmp(child->name, "supported-report") == 0) {

0e05808dc59a321566303084c84b9826a4353cefrederpj const char *name = NULL;

0e05808dc59a321566303084c84b9826a4353cefrederpj const char *nmspace = NULL;

0e05808dc59a321566303084c84b9826a4353cefrederpj

0e05808dc59a321566303084c84b9826a4353cefrederpj /* go through attributes to find name and namespace */

0e05808dc59a321566303084c84b9826a4353cefrederpj for (attr = child->attr; attr != NULL; attr = attr->next) {

0e05808dc59a321566303084c84b9826a4353cefrederpj if (attr->ns == APR_XML_NS_DAV_ID) {

0e05808dc59a321566303084c84b9826a4353cefrederpj if (strcmp(attr->name, "name") == 0)