shift some processing of "core" WebDAV properties out of the generic (81019eac) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP Apache Httpd

modules/dav/fs/repos.c

+1 −24

Original line number	Diff line number	Diff line
		@@ -187,20 +187,6 @@ static const dav_liveprop_spec dav_fs_props[] =
		0 /* handled special in dav_fs_is_writeable */
		},

		/* ### these aren't FS specific */
		{
		DAV_FS_URI_DAV,
		"displayname",
		DAV_PROPID_displayname,
		1,
		},
		{
		DAV_FS_URI_DAV,
		"source",
		DAV_PROPID_source,
		1,
		},

		{ 0 } /* sentinel */
		};

		@@ -1743,10 +1729,6 @@ static dav_prop_insert dav_fs_insert_prop(const dav_resource *resource,
		** None of FS provider properties are defined if the resource does not
		** exist. Just bail for this case.
		**
		** Note that DAV:displayname and DAV:source will be stored as dead
		** properties; the NOTDEF return code indicates that dav_props.c should
		** look there for the value.
		**
		** Even though we state that the FS properties are not defined, the
		** client cannot store dead values -- we deny that thru the is_writeable
		** hook function.
		@@ -1804,13 +1786,8 @@ static dav_prop_insert dav_fs_insert_prop(const dav_resource *resource,
		break;
		#endif /* WIN32 */

		case DAV_PROPID_displayname:
		case DAV_PROPID_source:
		default:
		/*
		** This property is not defined. However, it may be a dead
		** property.
		*/
		/* ### what the heck was this property? */
		return DAV_PROP_INSERT_NOTDEF;
		}

modules/dav/main/config.m4

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@ dnl modules enabled in this directory by default

		APACHE_MODPATH_INIT(dav/main)

		dav_objects="mod_dav.lo props.lo util.lo util_lock.lo liveprop.lo providers.lo"
		dav_objects="mod_dav.lo props.lo util.lo util_lock.lo liveprop.lo providers.lo std_liveprop.lo"

		APACHE_MODULE(dav, WebDAV protocol handling, $dav_objects, , no)

modules/dav/main/mod_dav.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -4006,6 +4006,13 @@ static void register_hooks(void)
		{
		ap_hook_post_config(dav_init_handler, NULL, NULL, AP_HOOK_MIDDLE);
		ap_hook_type_checker(dav_type_checker, NULL, NULL, AP_HOOK_FIRST);

		ap_hook_find_liveprop(dav_core_find_liveprop, NULL, NULL, AP_HOOK_LAST);
		ap_hook_insert_all_liveprops(dav_core_insert_all_liveprops,
		NULL, NULL, AP_HOOK_MIDDLE);

		/* ### damn. need a pool. */
		dav_core_register_uris(NULL);
		}

		/*---------------------------------------------------------------------------

modules/dav/main/mod_dav.h

+13 −0

Original line number	Diff line number	Diff line
		@@ -825,6 +825,19 @@ int dav_get_liveprop_ns_count(void);
		/* ### docco */
		void dav_add_all_liveprop_xmlns(apr_pool_t p, ap_text_header phdr);

		/*
		** The following three functions are part of mod_dav's internal handling
		** for the core WebDAV properties. They are not part of mod_dav's API.
		*/
		int dav_core_find_liveprop(request_rec r, const char ns_uri,
		const char *name,
		const dav_hooks_liveprop **hooks);
		void dav_core_insert_all_liveprops(request_rec *r,
		const dav_resource *resource,
		int insvalue, ap_text_header *phdr);
		void dav_core_register_uris(apr_pool_t *p);


		/*
		** Standard WebDAV Property Identifiers
		**

modules/dav/main/props.c

+2 −114

Original line number	Diff line number	Diff line
		@@ -267,7 +267,6 @@ struct dav_propdb {

		/* hooks we should use for processing (based on the target resource) */
		const dav_hooks_db *db_hooks;
		const dav_hooks_vsn *vsn_hooks;

		};

		@@ -278,11 +277,7 @@ static const char * const dav_core_props[] =
		"getcontenttype",
		"getcontentlanguage",
		"lockdiscovery",
		"resourcetype",
		"supportedlock",
		"supported-method-set",
		"supported-live-property-set",
		"supported-report-set",

		NULL /* sentinel */
		};
		@@ -290,11 +285,7 @@ enum {
		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
		};
		@@ -382,15 +373,12 @@ static int dav_rw_liveprop(dav_propdb propdb, dav_elem_private priv)

		/* 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;
		}
		@@ -435,41 +423,6 @@ static dav_error * dav_insert_coreprop(dav_propdb *propdb,

		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;
		@@ -507,43 +460,6 @@ static dav_error * dav_insert_coreprop(dav_propdb *propdb,
		}
		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);
		@@ -1005,7 +921,6 @@ dav_error dav_open_propdb(request_rec r, dav_lockdb *lockdb,
		propdb->ns_xlate = ns_xlate;

		propdb->db_hooks = DAV_GET_HOOKS_PROPDB(r);
		propdb->vsn_hooks = DAV_GET_HOOKS_VSN(r);

		propdb->lockdb = lockdb;

		@@ -1059,7 +974,6 @@ dav_get_props_result dav_get_allprops(dav_propdb *propdb, int getvals)
		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;
		@@ -1087,10 +1001,6 @@ dav_get_props_result dav_get_allprops(dav_propdb *propdb, int getvals)
		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
		@@ -1110,12 +1020,7 @@ dav_get_props_result dav_get_allprops(dav_propdb *propdb, int getvals)
		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;
		}
		@@ -1166,23 +1071,6 @@ dav_get_props_result dav_get_allprops(dav_propdb *propdb, int getvals)
		(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) {