/* hooks we should use for processing (based on the target resource) */
const dav_hooks_db *db_hooks;
- const dav_hooks_vsn *vsn_hooks;
};
"getcontenttype",
"getcontentlanguage",
"lockdiscovery",
- "resourcetype",
"supportedlock",
- "supported-method-set",
- "supported-live-property-set",
- "supported-report-set",
NULL /* sentinel */
};
DAV_PROPID_CORE_getcontenttype = DAV_PROPID_CORE,
DAV_PROPID_CORE_getcontentlanguage,
DAV_PROPID_CORE_lockdiscovery,
- DAV_PROPID_CORE_resourcetype,
DAV_PROPID_CORE_supportedlock,
- DAV_PROPID_CORE_supported_method_set,
- DAV_PROPID_CORE_supported_live_property_set,
- DAV_PROPID_CORE_supported_report_set,
DAV_PROPID_CORE_UNKNOWN
};
/* these are defined as read-only */
if (propid == DAV_PROPID_CORE_lockdiscovery
- || propid == DAV_PROPID_CORE_resourcetype
#if DAV_DISABLE_WRITEABLE_PROPS
|| propid == DAV_PROPID_CORE_getcontenttype
|| propid == DAV_PROPID_CORE_getcontentlanguage
#endif
|| propid == DAV_PROPID_CORE_supportedlock
- || propid == DAV_PROPID_CORE_supported_method_set
- || propid == DAV_PROPID_CORE_supported_live_property_set
- || propid == DAV_PROPID_CORE_supported_report_set) {
+ ) {
return 0;
}
switch (propid) {
- case DAV_PROPID_CORE_resourcetype:
- switch (propdb->resource->type) {
- case DAV_RESOURCE_TYPE_VERSION:
- if (propdb->resource->baselined) {
- value = "<D:baseline/>";
- break;
- }
- /* fall through */
- case DAV_RESOURCE_TYPE_REGULAR:
- case DAV_RESOURCE_TYPE_WORKING:
- if (propdb->resource->collection) {
- value = "<D:collection/>";
- }
- else {
- /* ### should we denote lock-null resources? */
-
- value = ""; /* becomes: <D:resourcetype/> */
- }
- break;
- case DAV_RESOURCE_TYPE_HISTORY:
- value = "<D:version-history/>";
- break;
- case DAV_RESOURCE_TYPE_WORKSPACE:
- value = "<D:collection/>";
- break;
- case DAV_RESOURCE_TYPE_ACTIVITY:
- value = "<D:activity/>";
- break;
-
- default:
- /* ### bad juju */
- break;
- }
- break;
-
case DAV_PROPID_CORE_lockdiscovery:
if (propdb->lockdb != NULL) {
dav_lock *locks;
}
break;
- case DAV_PROPID_CORE_supported_method_set:
- /* ### leverage code from dav_method_options ### */
- break;
-
- case DAV_PROPID_CORE_supported_live_property_set:
- /* ### insert all live property names ### */
- break;
-
- case DAV_PROPID_CORE_supported_report_set:
- if (propdb->vsn_hooks != NULL) {
- const dav_report_elem *reports;
-
- if ((err = (*propdb->vsn_hooks->avail_reports)(propdb->resource, &reports)) != NULL) {
- return dav_push_error(propdb->r->pool, err->status, 0,
- "DAV:supported-report-set could not be determined "
- "due to a problem fetching the available reports "
- "for this resource.",
- err);
- }
-
- if (reports == NULL)
- break;
-
- value = "";
-
- for (; reports->nmspace != NULL; ++reports) {
- /* Note: we presume reports->namespace is properly XML/URL quoted */
- char *v = apr_psprintf(propdb->p, "<%s xmlns=\"%s\"/>" DEBUG_CR,
- reports->name, reports->nmspace);
- /* This isn't very memory-efficient, but there should only be a small
- * number of reports
- */
- value = apr_pstrcat(propdb->p, value, v, NULL);
- }
- }
- break;
-
case DAV_PROPID_CORE_getcontenttype:
if (propdb->subreq == NULL) {
dav_do_prop_subreq(propdb);
propdb->ns_xlate = ns_xlate;
propdb->db_hooks = DAV_GET_HOOKS_PROPDB(r);
- propdb->vsn_hooks = DAV_GET_HOOKS_VSN(r);
propdb->lockdb = lockdb;
ap_text_header hdr = { 0 };
ap_text_header hdr_ns = { 0 };
dav_get_props_result result = { 0 };
- int found_resourcetype = 0;
int found_contenttype = 0;
int found_contentlang = 0;
int unused_inserted;
goto next_key;
/*
- ** See if this is the <DAV:resourcetype> property. We need to
- ** know whether it was found (and therefore, whether to supply
- ** a default later).
- **
** We also look for <DAV:getcontenttype> and
** <DAV:getcontentlanguage>. If they are not stored as dead
** properties, then we need to perform a subrequest to get
colon = strchr(key.dptr + 2, ':');
}
- if (colon[1] == 'r'
- && strcmp(colon + 1, "resourcetype") == 0) {
-
- found_resourcetype = 1;
- }
- else if (colon[1] == 'g') {
+ if (colon[1] == 'g') {
if (strcmp(colon + 1, "getcontenttype") == 0) {
found_contenttype = 1;
}
(void)dav_insert_coreprop(propdb,
DAV_PROPID_CORE_lockdiscovery, "lockdiscovery",
getvals, &hdr, &unused_inserted);
- (void)dav_insert_coreprop(propdb,
- DAV_PROPID_CORE_supported_method_set, "supported-method-set",
- getvals, &hdr, &unused_inserted);
- (void)dav_insert_coreprop(propdb,
- DAV_PROPID_CORE_supported_live_property_set, "supported-live-property-set",
- getvals, &hdr, &unused_inserted);
- (void)dav_insert_coreprop(propdb,
- DAV_PROPID_CORE_supported_report_set, "supported-report-set",
- getvals, &hdr, &unused_inserted);
-
- /* if the resourcetype wasn't stored, then prepare one */
- if (!found_resourcetype) {
- /* ### should be handling the return error here */
- (void)dav_insert_coreprop(propdb,
- DAV_PROPID_CORE_resourcetype, "resourcetype",
- getvals, &hdr, &unused_inserted);
- }
/* if we didn't find these, then do the whole subreq thing. */
if (!found_contenttype) {
--- /dev/null
+/* ====================================================================
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ * if any, must include the following acknowledgment:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowledgment may appear in the software itself,
+ * if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Apache" and "Apache Software Foundation" must
+ * not be used to endorse or promote products derived from this
+ * software without prior written permission. For written
+ * permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ * nor may "Apache" appear in their name, without prior written
+ * permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+
+#include "httpd.h"
+#include "util_xml.h"
+#include "apr_strings.h"
+
+#include "mod_dav.h"
+
+/* forward-declare */
+static const dav_hooks_liveprop dav_core_hooks_liveprop;
+
+/*
+** The namespace URIs that we use. There will only ever be "DAV:".
+*/
+static const char * const dav_core_namespace_uris[] =
+{
+ "DAV:",
+ NULL /* sentinel */
+};
+
+/*
+** Define each of the core properties that this provider will handle.
+** Note that all of them are in the DAV: namespace, which has a
+** provider-local index of 0.
+*/
+static const dav_liveprop_spec dav_core_props[] =
+{
+ { 0, "comment", DAV_PROPID_comment, 1 },
+ { 0, "creator-displayname", DAV_PROPID_creator_displayname, 1 },
+ { 0, "displayname", DAV_PROPID_displayname, 1 },
+ { 0, "resourcetype", DAV_PROPID_resourcetype, 0 },
+ { 0, "source", DAV_PROPID_source, 1 },
+ { 0, "supported-live-property-set",
+ DAV_PROPID_supported_live_property_set, 0 },
+ { 0, "supported-method-set", DAV_PROPID_supported_method_set, 0 },
+ { 0, "supported-report-set", DAV_PROPID_supported_report_set, 0 },
+
+ { 0 } /* sentinel */
+};
+
+static const dav_liveprop_group dav_core_liveprop_group =
+{
+ dav_core_props,
+ dav_core_namespace_uris,
+ &dav_core_hooks_liveprop
+};
+
+static dav_prop_insert dav_core_insert_prop(const dav_resource *resource,
+ int propid, int insvalue,
+ ap_text_header *phdr)
+{
+ const char *value;
+ const char *s;
+ dav_prop_insert which;
+ apr_pool_t *p = resource->pool;
+ const dav_liveprop_spec *info;
+ int global_ns;
+
+ switch (propid)
+ {
+ case DAV_PROPID_resourcetype:
+ switch (resource->type) {
+ case DAV_RESOURCE_TYPE_VERSION:
+ if (resource->baselined) {
+ value = "<D:baseline/>";
+ break;
+ }
+ /* fall through */
+ case DAV_RESOURCE_TYPE_REGULAR:
+ case DAV_RESOURCE_TYPE_WORKING:
+ if (resource->collection) {
+ value = "<D:collection/>";
+ }
+ else {
+ /* ### should we denote lock-null resources? */
+
+ value = ""; /* becomes: <D:resourcetype/> */
+ }
+ break;
+ case DAV_RESOURCE_TYPE_HISTORY:
+ value = "<D:version-history/>";
+ break;
+ case DAV_RESOURCE_TYPE_WORKSPACE:
+ value = "<D:collection/>";
+ break;
+ case DAV_RESOURCE_TYPE_ACTIVITY:
+ value = "<D:activity/>";
+ break;
+
+ default:
+ /* ### bad juju */
+ return DAV_PROP_INSERT_NOTDEF;
+ }
+ break;
+
+ case DAV_PROPID_supported_live_property_set:
+ /* ### insert all live property names ### */
+ break;
+
+ case DAV_PROPID_supported_method_set:
+ /* ### leverage code from dav_method_options ### */
+ break;
+
+ case DAV_PROPID_supported_report_set:
+#if 0
+ {
+ /* ### where to get "r" ??? */
+ const dav_hooks_vsn *vsn_hooks = dav_get_vsn_hooks(r);
+
+ if (vsn_hooks != NULL) {
+ const dav_report_elem *reports;
+ dav_error *err;
+
+ if ((err = (*vsn_hooks->avail_reports)(resource,
+ &reports)) != NULL) {
+ err = dav_push_error(p, err->status, 0,
+ "DAV:supported-report-set could not "
+ "be determined due to a problem "
+ "fetching the available reports "
+ "for this resource.",
+ err);
+ /* ### can't return err... sigh. punt for now. */
+ return DAV_PROP_INSERT_NOTDEF;
+ }
+
+ value = "";
+
+ if (reports == NULL) {
+ /* no reports are defined. break with value="" */
+ break;
+ }
+
+ for (; reports->nmspace != NULL; ++reports) {
+ /* Note: presume reports->namespace is XML/URL quoted */
+ const char *v = apr_psprintf(p, "<%s xmlns=\"%s\"/>" DEBUG_CR,
+ reports->name, reports->nmspace);
+
+ /* This isn't very memory-efficient, but there should only
+ be a small number of reports */
+ value = apr_pstrcat(p, value, v, NULL);
+ }
+ }
+ break;
+ }
+#endif
+ /* above code disabled. FALLTHROUGH */
+
+ case DAV_PROPID_comment:
+ case DAV_PROPID_creator_displayname:
+ case DAV_PROPID_displayname:
+ case DAV_PROPID_source:
+ default:
+ /*
+ ** This property is known, but not defined as a liveprop. However,
+ ** it may be a dead property.
+ */
+ return DAV_PROP_INSERT_NOTDEF;
+ }
+
+ /* assert: value != NULL */
+
+ /* get the information and global NS index for the property */
+ global_ns = dav_get_liveprop_info(propid, &dav_core_liveprop_group, &info);
+
+ /* assert: info != NULL && info->name != NULL */
+
+ if (insvalue) {
+ s = apr_psprintf(p, "<lp%d:%s>%s</lp%d:%s>" DEBUG_CR,
+ global_ns, info->name, value, global_ns, info->name);
+ which = DAV_PROP_INSERT_VALUE;
+ }
+ else {
+ s = apr_psprintf(p, "<lp%d:%s/>" DEBUG_CR, global_ns, info->name);
+ which = DAV_PROP_INSERT_NAME;
+ }
+ ap_text_append(p, phdr, s);
+
+ /* we inserted a name or value (this prop is done) */
+ return which;
+}
+
+static int dav_core_is_writable(const dav_resource *resource, int propid)
+{
+ const dav_liveprop_spec *info;
+
+ (void) dav_get_liveprop_info(propid, &dav_core_liveprop_group, &info);
+ return info->is_writable;
+}
+
+static dav_error * dav_core_patch_validate(const dav_resource *resource,
+ const ap_xml_elem *elem,
+ int operation, void **context,
+ int *defer_to_dead)
+{
+ /* all of our writeable props go in the dead prop database */
+ *defer_to_dead = 1;
+
+ return NULL;
+}
+
+static const dav_hooks_liveprop dav_core_hooks_liveprop = {
+ dav_core_insert_prop,
+ dav_core_is_writable,
+ dav_core_namespace_uris,
+ dav_core_patch_validate,
+ NULL, /* patch_exec */
+ NULL, /* patch_commit */
+ NULL, /* patch_rollback */
+};
+
+int dav_core_find_liveprop(request_rec *r, const char *ns_uri,
+ const char *name,
+ const dav_hooks_liveprop **hooks)
+{
+ return dav_do_find_liveprop(ns_uri, name, &dav_core_liveprop_group, hooks);
+}
+
+void dav_core_insert_all_liveprops(request_rec *r,
+ const dav_resource *resource,
+ int insvalue, ap_text_header *phdr)
+{
+ (void) dav_core_insert_prop(resource, DAV_PROPID_resourcetype,
+ insvalue, phdr);
+ (void) dav_core_insert_prop(resource,
+ DAV_PROPID_supported_live_property_set,
+ insvalue, phdr);
+ (void) dav_core_insert_prop(resource, DAV_PROPID_supported_method_set,
+ insvalue, phdr);
+ (void) dav_core_insert_prop(resource, DAV_PROPID_supported_report_set,
+ insvalue, phdr);
+}
+
+void dav_core_register_uris(apr_pool_t *p)
+{
+ /* register the namespace URIs */
+ dav_register_liveprop_group(p, &dav_core_liveprop_group);
+}
projects / apache / commitdiff