src/server/webdav/multistatus.c

Sun, 26 Jan 2020 10:13:11 +0100

author
Olaf Wintermann <olaf.wintermann@gmail.com>
date
Sun, 26 Jan 2020 10:13:11 +0100
branch
webdav
changeset 242
c337a7ac82a8
parent 241
4adad7faf452
child 251
f727a21497bb
permissions
-rw-r--r--

implement webdav_proppatch

211
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
1 /*
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
2 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
3 *
231
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
4 * Copyright 2020 Olaf Wintermann. All rights reserved.
211
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
5 *
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
6 * Redistribution and use in source and binary forms, with or without
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
7 * modification, are permitted provided that the following conditions are met:
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
8 *
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
9 * 1. Redistributions of source code must retain the above copyright
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
10 * notice, this list of conditions and the following disclaimer.
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
11 *
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
12 * 2. Redistributions in binary form must reproduce the above copyright
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
13 * notice, this list of conditions and the following disclaimer in the
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
14 * documentation and/or other materials provided with the distribution.
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
15 *
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
16 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
17 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
20 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
21 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
22 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
23 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
24 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
25 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
26 * POSSIBILITY OF SUCH DAMAGE.
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
27 */
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
28
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
29 #include <stdio.h>
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
30 #include <stdlib.h>
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
31
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
32 #include "../daemon/session.h"
233
c5985d2fc19a add test for webdav_propfind() that checks if the response is valid xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 231
diff changeset
33 #include "../daemon/protocol.h"
231
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
34 #include "../util/platform.h"
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
35
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
36 #include <ucx/string.h>
211
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
37
233
c5985d2fc19a add test for webdav_propfind() that checks if the response is valid xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 231
diff changeset
38 #include "multistatus.h"
217
8ed14d76db42 add backend chaining
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 211
diff changeset
39
233
c5985d2fc19a add test for webdav_propfind() that checks if the response is valid xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 231
diff changeset
40 #include "operation.h"
c5985d2fc19a add test for webdav_propfind() that checks if the response is valid xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 231
diff changeset
41 #include "xml.h"
211
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
42
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
43 #define MULTISTATUS_BUFFER_LENGTH 2048
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
44
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
45 Multistatus* multistatus_response(Session *sn, Request *rq) {
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
46 Multistatus *ms = pool_malloc(sn->pool, sizeof(Multistatus));
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
47 if(!ms) {
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
48 return NULL;
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
49 }
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
50 ZERO(ms, sizeof(Multistatus));
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
51 ms->response.addresource = multistatus_addresource;
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
52 ms->sn = sn;
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
53 ms->rq = rq;
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
54 ms->namespaces = ucx_map_new_a(session_get_allocator(ms->sn), 8);
239
d5031c30022c make multistatus response ready for proppatch requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 238
diff changeset
55 ms->proppatch = FALSE;
211
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
56 if(!ms->namespaces) {
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
57 return NULL;
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
58 }
231
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
59 if(ucx_map_cstr_put(ms->namespaces, "D", webdav_dav_namespace())) {
211
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
60 return NULL;
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
61 }
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
62 return ms;
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
63 }
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
64
231
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
65 static int send_xml_root(Multistatus *ms, Writer *out) {
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
66 writer_puts(out, S("<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n"
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
67 "<D:multistatus"));
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
68
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
69 // write the namespaces definitions
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
70 // key is the namespace prefix
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
71 // the map always contains the "DAV:" namespace with the prefix "D"
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
72 UcxMapIterator i = ucx_map_iterator(ms->namespaces);
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
73 WSNamespace *ns;
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
74 UCX_MAP_FOREACH(key, ns, i) {
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
75 writer_puts(out, S(" xmlns:"));
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
76 writer_put(out, key.data, key.len);
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
77 writer_puts(out, S("=\""));
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
78 writer_puts(out, sstr((char*)ns->href));
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
79 writer_puts(out, S("\""));
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
80 }
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
81
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
82 writer_puts(out, S(">\n"));
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
83
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
84 return out->error;
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
85 }
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
86
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
87 static void send_nsdef(WSNamespace *ns, Writer *out) {
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
88 writer_puts(out, S(" xmlns:"));
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
89 writer_puts(out, sstr((char*)ns->prefix));
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
90 writer_puts(out, S("=\""));
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
91 writer_puts(out, sstr((char*)ns->href));
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
92 writer_putc(out, '\"');
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
93 }
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
94
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
95 static int send_property(
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
96 Multistatus *ms,
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
97 WebdavProperty *property,
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
98 WebdavNSList *nsdef,
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
99 WSBool writeContent,
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
100 Writer *out)
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
101 {
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
102 // write: "<prefix:name"
238
e820d433f405 fix multistatus response and add propfind tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 237
diff changeset
103 writer_putc(out, '<');
231
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
104 writer_puts(out, sstr((char*)property->namespace->prefix));
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
105 writer_putc(out, ':');
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
106 writer_puts(out, sstr((char*)property->name));
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
107
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
108 // check if the namespace is already defined
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
109 WSBool need_nsdef = TRUE;
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
110 WSNamespace *ns = ucx_map_cstr_get(
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
111 ms->namespaces,
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
112 (char*)property->namespace->prefix);
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
113 if(ns && !strcmp(
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
114 (const char*)ns->href,
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
115 (const char*)property->namespace->href))
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
116 {
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
117 need_nsdef = FALSE; // prefix and href are the same, no need for nsdef
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
118 }
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
119
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
120 // send definition for the element's namespace
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
121 if(need_nsdef) {
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
122 send_nsdef(property->namespace, out);
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
123 }
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
124
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
125 // send additional namespace definitions required for the value
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
126 WebdavNSList *def = nsdef;
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
127 while(def) {
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
128 send_nsdef(def->namespace, out);
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
129 def = def->next;
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
130 }
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
131
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
132 // send xml lang attribute
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
133 if(property->lang) {
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
134 writer_puts(out, S(" xml:lang=\""));
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
135 writer_puts(out, sstr((char*)property->lang));
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
136 writer_putc(out, '\"');
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
137 }
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
138
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
139 // end property tag and write content
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
140 if(writeContent) {
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
141 writer_putc(out, '>');
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
142
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
143 // content
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
144 switch(property->vtype) {
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
145 case WS_VALUE_NO_TYPE: break;
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
146 case WS_VALUE_XML_NODE: {
233
c5985d2fc19a add test for webdav_propfind() that checks if the response is valid xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 231
diff changeset
147 wsxml_write_nodes_without_nsdef(
c5985d2fc19a add test for webdav_propfind() that checks if the response is valid xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 231
diff changeset
148 ms->sn->pool,
c5985d2fc19a add test for webdav_propfind() that checks if the response is valid xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 231
diff changeset
149 out,
c5985d2fc19a add test for webdav_propfind() that checks if the response is valid xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 231
diff changeset
150 property->value.node);
231
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
151 break;
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
152 }
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
153 case WS_VALUE_XML_DATA: {
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
154 // only write data, data->namespaces is already handled
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
155 writer_put(
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
156 out,
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
157 property->value.data->data,
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
158 property->value.data->length);
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
159 break;
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
160 }
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
161 case WS_VALUE_TEXT: {
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
162 // asume the text is already escaped
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
163 writer_put(
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
164 out,
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
165 property->value.text.str,
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
166 property->value.text.length);
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
167 break;
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
168 }
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
169 }
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
170
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
171 // end tag
233
c5985d2fc19a add test for webdav_propfind() that checks if the response is valid xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 231
diff changeset
172 writer_puts(out, S("</"));
231
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
173 writer_puts(out, sstr((char*)property->namespace->prefix));
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
174 writer_putc(out, ':');
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
175 writer_puts(out, sstr((char*)property->name));
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
176 writer_putc(out, '>');
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
177 } else {
233
c5985d2fc19a add test for webdav_propfind() that checks if the response is valid xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 231
diff changeset
178 writer_puts(out, S("/>"));
231
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
179 }
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
180
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
181 return out->error;
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
182 }
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
183
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
184 static int send_response_tag(Multistatus *ms, MSResponse *rp, Writer *out) {
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
185 writer_puts(out, S(" <D:response>\n"
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
186 " <D:href>"));
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
187 writer_puts(out, sstr(rp->resource.href));
233
c5985d2fc19a add test for webdav_propfind() that checks if the response is valid xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 231
diff changeset
188 writer_puts(out, S("</D:href>\n"));
231
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
189
242
c337a7ac82a8 implement webdav_proppatch
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 241
diff changeset
190 WSBool writeContent = ms->proppatch ? FALSE : TRUE;
c337a7ac82a8 implement webdav_proppatch
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 241
diff changeset
191
231
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
192 if(rp->plist_begin) {
233
c5985d2fc19a add test for webdav_propfind() that checks if the response is valid xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 231
diff changeset
193 writer_puts(out, S(" <D:propstat>\n"
231
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
194 " <D:prop>\n"));
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
195 // send properties
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
196 PropertyOkList *p = rp->plist_begin;
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
197 while(p) {
233
c5985d2fc19a add test for webdav_propfind() that checks if the response is valid xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 231
diff changeset
198 writer_puts(out, S(" "));
242
c337a7ac82a8 implement webdav_proppatch
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 241
diff changeset
199 if(send_property(ms, p->property, p->nsdef, writeContent, out)) {
231
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
200 return out->error;
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
201 }
242
c337a7ac82a8 implement webdav_proppatch
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 241
diff changeset
202 writer_puts(out, S("\n"));
231
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
203 p = p->next;
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
204 }
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
205
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
206 writer_puts(out, S(" </D:prop>\n"
233
c5985d2fc19a add test for webdav_propfind() that checks if the response is valid xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 231
diff changeset
207 " <D:status>HTTP/1.1 200 OK</D:status>\n"
231
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
208 " </D:propstat>\n"));
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
209 }
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
210
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
211 // send error properties
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
212 PropertyErrorList *error = rp->errors;
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
213 while(error) {
233
c5985d2fc19a add test for webdav_propfind() that checks if the response is valid xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 231
diff changeset
214 writer_puts(out, S(" <D:propstat>\n"
c5985d2fc19a add test for webdav_propfind() that checks if the response is valid xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 231
diff changeset
215 " <D:prop>\n"));
c5985d2fc19a add test for webdav_propfind() that checks if the response is valid xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 231
diff changeset
216
231
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
217 WebdavPList *errprop = error->begin;
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
218 while(errprop) {
233
c5985d2fc19a add test for webdav_propfind() that checks if the response is valid xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 231
diff changeset
219 writer_puts(out, S(" "));
231
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
220 if(send_property(ms, errprop->property, NULL, FALSE, out)) {
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
221 return out->error;
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
222 }
238
e820d433f405 fix multistatus response and add propfind tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 237
diff changeset
223 writer_putc(out, '\n');
231
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
224 errprop = errprop->next;
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
225 }
233
c5985d2fc19a add test for webdav_propfind() that checks if the response is valid xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 231
diff changeset
226
c5985d2fc19a add test for webdav_propfind() that checks if the response is valid xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 231
diff changeset
227 char statuscode[8];
c5985d2fc19a add test for webdav_propfind() that checks if the response is valid xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 231
diff changeset
228 int sclen = snprintf(statuscode, 8, "%d ", error->status);
c5985d2fc19a add test for webdav_propfind() that checks if the response is valid xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 231
diff changeset
229 if(sclen > 4) {
c5985d2fc19a add test for webdav_propfind() that checks if the response is valid xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 231
diff changeset
230 statuscode[0] = '5';
c5985d2fc19a add test for webdav_propfind() that checks if the response is valid xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 231
diff changeset
231 statuscode[1] = '0';
c5985d2fc19a add test for webdav_propfind() that checks if the response is valid xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 231
diff changeset
232 statuscode[2] = '0';
c5985d2fc19a add test for webdav_propfind() that checks if the response is valid xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 231
diff changeset
233 statuscode[3] = ' ';
c5985d2fc19a add test for webdav_propfind() that checks if the response is valid xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 231
diff changeset
234 sclen = 4;
c5985d2fc19a add test for webdav_propfind() that checks if the response is valid xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 231
diff changeset
235 }
c5985d2fc19a add test for webdav_propfind() that checks if the response is valid xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 231
diff changeset
236 writer_puts(out, S(" </D:prop>\n"
c5985d2fc19a add test for webdav_propfind() that checks if the response is valid xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 231
diff changeset
237 " <D:status>HTTP/1.1 "));
c5985d2fc19a add test for webdav_propfind() that checks if the response is valid xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 231
diff changeset
238 writer_put(out, statuscode, sclen);
c5985d2fc19a add test for webdav_propfind() that checks if the response is valid xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 231
diff changeset
239 const char *status_msg = protocol_status_message(error->status);
c5985d2fc19a add test for webdav_propfind() that checks if the response is valid xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 231
diff changeset
240 if(status_msg) {
c5985d2fc19a add test for webdav_propfind() that checks if the response is valid xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 231
diff changeset
241 writer_put(out, status_msg, strlen(status_msg));
c5985d2fc19a add test for webdav_propfind() that checks if the response is valid xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 231
diff changeset
242 } else {
c5985d2fc19a add test for webdav_propfind() that checks if the response is valid xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 231
diff changeset
243 writer_puts(out, S("Server Error"));
c5985d2fc19a add test for webdav_propfind() that checks if the response is valid xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 231
diff changeset
244 }
c5985d2fc19a add test for webdav_propfind() that checks if the response is valid xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 231
diff changeset
245 writer_puts(out, S("</D:status>\n"
c5985d2fc19a add test for webdav_propfind() that checks if the response is valid xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 231
diff changeset
246 " </D:propstat>\n"));
c5985d2fc19a add test for webdav_propfind() that checks if the response is valid xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 231
diff changeset
247
c5985d2fc19a add test for webdav_propfind() that checks if the response is valid xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 231
diff changeset
248
231
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
249 error = error->next;
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
250 }
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
251
233
c5985d2fc19a add test for webdav_propfind() that checks if the response is valid xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 231
diff changeset
252 // end response tag
c5985d2fc19a add test for webdav_propfind() that checks if the response is valid xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 231
diff changeset
253 writer_puts(out, S(" </D:response>\n"));
c5985d2fc19a add test for webdav_propfind() that checks if the response is valid xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 231
diff changeset
254
231
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
255 return out->error;
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
256 }
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
257
211
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
258 int multistatus_send(Multistatus *ms, SYS_NETFD net) {
233
c5985d2fc19a add test for webdav_propfind() that checks if the response is valid xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 231
diff changeset
259 // start http response
c5985d2fc19a add test for webdav_propfind() that checks if the response is valid xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 231
diff changeset
260 protocol_status(ms->sn, ms->rq, 207, NULL);
c5985d2fc19a add test for webdav_propfind() that checks if the response is valid xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 231
diff changeset
261 protocol_start_response(ms->sn, ms->rq);
c5985d2fc19a add test for webdav_propfind() that checks if the response is valid xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 231
diff changeset
262
211
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
263 char buffer[MULTISTATUS_BUFFER_LENGTH];
230
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
264 // create a writer, that flushes the buffer when it is filled
211
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
265 Writer writer;
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
266 Writer *out = &writer;
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
267 writer_init(out, net, buffer, MULTISTATUS_BUFFER_LENGTH);
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
268
231
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
269 // send the xml root element with namespace defs
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
270 if(send_xml_root(ms, out)) {
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
271 return 1;
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
272 }
211
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
273
231
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
274 // send response tags
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
275 MSResponse *response = ms->first;
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
276 while(response) {
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
277 if(send_response_tag(ms, response, out)) {
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
278 return 1;
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
279 }
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
280 response = response->next;
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
281 }
230
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
282
233
c5985d2fc19a add test for webdav_propfind() that checks if the response is valid xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 231
diff changeset
283 // end multistatus
c5985d2fc19a add test for webdav_propfind() that checks if the response is valid xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 231
diff changeset
284 writer_puts(out, S("</D:multistatus>\n"));
c5985d2fc19a add test for webdav_propfind() that checks if the response is valid xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 231
diff changeset
285
c5985d2fc19a add test for webdav_propfind() that checks if the response is valid xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 231
diff changeset
286 writer_flush(out);
c5985d2fc19a add test for webdav_propfind() that checks if the response is valid xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 231
diff changeset
287
230
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
288 return 0;
211
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
289 }
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
290
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
291 WebdavResource * multistatus_addresource(
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
292 WebdavResponse *response,
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
293 const char *path)
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
294 {
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
295 Multistatus *ms = (Multistatus*)response;
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
296 MSResponse *res = pool_malloc(ms->sn->pool, sizeof(MSResponse));
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
297 if(!res) {
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
298 return NULL;
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
299 }
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
300 ZERO(res, sizeof(MSResponse));
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
301
222
5f05e56cb8e2 create namespace definition lists when properties are added to a multistatus response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 217
diff changeset
302 // set href
223
bbaec8415c10 add xml tree iterator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 222
diff changeset
303 res->resource.href = pool_strdup(ms->sn->pool, path);
226
49adcbd7d473 msresponse_addproperty: add support for xmlNode property values and add check to make sure, properties are only added once
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 223
diff changeset
304 if(!res->resource.href) {
49adcbd7d473 msresponse_addproperty: add support for xmlNode property values and add check to make sure, properties are only added once
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 223
diff changeset
305 return NULL;
49adcbd7d473 msresponse_addproperty: add support for xmlNode property values and add check to make sure, properties are only added once
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 223
diff changeset
306 }
222
5f05e56cb8e2 create namespace definition lists when properties are added to a multistatus response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 217
diff changeset
307
241
4adad7faf452 add proppatch op
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 239
diff changeset
308 res->resource.err = 0;
4adad7faf452 add proppatch op
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 239
diff changeset
309
222
5f05e56cb8e2 create namespace definition lists when properties are added to a multistatus response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 217
diff changeset
310 // add resource funcs
211
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
311 res->resource.addproperty = msresponse_addproperty;
217
8ed14d76db42 add backend chaining
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 211
diff changeset
312 res->resource.close = msresponse_close;
211
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
313
226
49adcbd7d473 msresponse_addproperty: add support for xmlNode property values and add check to make sure, properties are only added once
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 223
diff changeset
314 res->properties = ucx_map_new_a(session_get_allocator(ms->sn), 32);
49adcbd7d473 msresponse_addproperty: add support for xmlNode property values and add check to make sure, properties are only added once
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 223
diff changeset
315 if(!res->properties) {
49adcbd7d473 msresponse_addproperty: add support for xmlNode property values and add check to make sure, properties are only added once
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 223
diff changeset
316 return NULL;
49adcbd7d473 msresponse_addproperty: add support for xmlNode property values and add check to make sure, properties are only added once
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 223
diff changeset
317 }
49adcbd7d473 msresponse_addproperty: add support for xmlNode property values and add check to make sure, properties are only added once
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 223
diff changeset
318
211
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
319 res->multistatus = ms;
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
320 res->errors = NULL;
217
8ed14d76db42 add backend chaining
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 211
diff changeset
321 res->resource.isclosed = 0;
8ed14d76db42 add backend chaining
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 211
diff changeset
322 res->closing = 0;
211
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
323
222
5f05e56cb8e2 create namespace definition lists when properties are added to a multistatus response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 217
diff changeset
324 // add new resource to the resource list
211
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
325 if(ms->current) {
222
5f05e56cb8e2 create namespace definition lists when properties are added to a multistatus response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 217
diff changeset
326 // before adding a new resource, the current resource must be closed
217
8ed14d76db42 add backend chaining
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 211
diff changeset
327 if(!ms->current->resource.isclosed) {
8ed14d76db42 add backend chaining
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 211
diff changeset
328 msresponse_close((WebdavResource*)ms->current);
8ed14d76db42 add backend chaining
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 211
diff changeset
329 }
211
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
330 ms->current->next = res;
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
331 } else {
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
332 ms->first = res;
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
333 }
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
334 ms->current = res;
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
335
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
336 return (WebdavResource*)res;
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
337 }
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
338
230
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
339 static int oklist_add(
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
340 pool_handle_t *pool,
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
341 PropertyOkList **begin,
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
342 PropertyOkList **end,
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
343 WebdavProperty *property,
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
344 WebdavNSList *nsdef)
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
345 {
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
346 PropertyOkList *newelm = pool_malloc(pool, sizeof(PropertyOkList));
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
347 if(!newelm) {
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
348 return 1;
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
349 }
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
350 newelm->property = property;
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
351 newelm->nsdef = nsdef;
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
352 newelm->next = NULL;
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
353 if(*end) {
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
354 (*end)->next = newelm;
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
355 } else {
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
356 *begin = newelm;
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
357 }
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
358 *end = newelm;
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
359 return 0;
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
360 }
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
361
211
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
362 int msresponse_addproperty(
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
363 WebdavResource *res,
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
364 WebdavProperty *property,
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
365 int status)
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
366 {
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
367 MSResponse *response = (MSResponse*)res;
227
3c23855f7b46 remove nsdef from WebdavProperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 226
diff changeset
368 Session *sn = response->multistatus->sn;
217
8ed14d76db42 add backend chaining
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 211
diff changeset
369 if(response->resource.isclosed) {
211
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
370 log_ereport(
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
371 LOG_WARN,
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
372 "%s",
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
373 "webdav: cannot add property to closed response tag");
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
374 return 0;
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
375 }
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
376
222
5f05e56cb8e2 create namespace definition lists when properties are added to a multistatus response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 217
diff changeset
377 // some WebdavProperty checks to make sure nothing explodes
5f05e56cb8e2 create namespace definition lists when properties are added to a multistatus response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 217
diff changeset
378 if(!property->namespace || !property->namespace->href) {
5f05e56cb8e2 create namespace definition lists when properties are added to a multistatus response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 217
diff changeset
379 // error: namespace is required
5f05e56cb8e2 create namespace definition lists when properties are added to a multistatus response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 217
diff changeset
380 log_ereport(
5f05e56cb8e2 create namespace definition lists when properties are added to a multistatus response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 217
diff changeset
381 LOG_FAILURE,
5f05e56cb8e2 create namespace definition lists when properties are added to a multistatus response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 217
diff changeset
382 "%s",
5f05e56cb8e2 create namespace definition lists when properties are added to a multistatus response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 217
diff changeset
383 "webdav: property '%s' has no namespace",
5f05e56cb8e2 create namespace definition lists when properties are added to a multistatus response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 217
diff changeset
384 property->name);
5f05e56cb8e2 create namespace definition lists when properties are added to a multistatus response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 217
diff changeset
385 return 1;
5f05e56cb8e2 create namespace definition lists when properties are added to a multistatus response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 217
diff changeset
386 }
5f05e56cb8e2 create namespace definition lists when properties are added to a multistatus response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 217
diff changeset
387
226
49adcbd7d473 msresponse_addproperty: add support for xmlNode property values and add check to make sure, properties are only added once
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 223
diff changeset
388 // check if the property was already added to the resource
227
3c23855f7b46 remove nsdef from WebdavProperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 226
diff changeset
389 UcxAllocator *a = session_get_allocator(sn);
226
49adcbd7d473 msresponse_addproperty: add support for xmlNode property values and add check to make sure, properties are only added once
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 223
diff changeset
390 sstr_t key = sstrcat_a(
49adcbd7d473 msresponse_addproperty: add support for xmlNode property values and add check to make sure, properties are only added once
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 223
diff changeset
391 a,
49adcbd7d473 msresponse_addproperty: add support for xmlNode property values and add check to make sure, properties are only added once
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 223
diff changeset
392 3,
49adcbd7d473 msresponse_addproperty: add support for xmlNode property values and add check to make sure, properties are only added once
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 223
diff changeset
393 sstr((char*)property->namespace->href),
49adcbd7d473 msresponse_addproperty: add support for xmlNode property values and add check to make sure, properties are only added once
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 223
diff changeset
394 S("\0"),
49adcbd7d473 msresponse_addproperty: add support for xmlNode property values and add check to make sure, properties are only added once
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 223
diff changeset
395 sstr((char*)property->name));
49adcbd7d473 msresponse_addproperty: add support for xmlNode property values and add check to make sure, properties are only added once
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 223
diff changeset
396 if(ucx_map_sstr_get(response->properties, key)) {
49adcbd7d473 msresponse_addproperty: add support for xmlNode property values and add check to make sure, properties are only added once
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 223
diff changeset
397 a->free(a->pool, key.ptr);
49adcbd7d473 msresponse_addproperty: add support for xmlNode property values and add check to make sure, properties are only added once
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 223
diff changeset
398 return 0;
49adcbd7d473 msresponse_addproperty: add support for xmlNode property values and add check to make sure, properties are only added once
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 223
diff changeset
399 }
49adcbd7d473 msresponse_addproperty: add support for xmlNode property values and add check to make sure, properties are only added once
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 223
diff changeset
400 if(ucx_map_sstr_put(response->properties, key, property)) {
49adcbd7d473 msresponse_addproperty: add support for xmlNode property values and add check to make sure, properties are only added once
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 223
diff changeset
401 return 1; // OOM
49adcbd7d473 msresponse_addproperty: add support for xmlNode property values and add check to make sure, properties are only added once
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 223
diff changeset
402 }
49adcbd7d473 msresponse_addproperty: add support for xmlNode property values and add check to make sure, properties are only added once
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 223
diff changeset
403 a->free(a->pool, key.ptr);
49adcbd7d473 msresponse_addproperty: add support for xmlNode property values and add check to make sure, properties are only added once
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 223
diff changeset
404
231
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
405 // list of namespace definitions for this property
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
406 WebdavNSList *nsdef_begin = NULL;
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
407 WebdavNSList *nsdef_end = NULL;
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
408
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
409 // add namespace of this property to the namespace map
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
410 // the namespace map will be used for global namespace definitions
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
411 if(property->namespace->prefix) {
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
412 WSNamespace *ns = ucx_map_cstr_get(
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
413 response->multistatus->namespaces,
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
414 (const char*)property->namespace->prefix);
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
415 if(!ns) {
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
416 // prefix is not in use -> we can add the namespace to the ns map
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
417 int err = ucx_map_cstr_put(
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
418 response->multistatus->namespaces,
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
419 (const char*)property->namespace->prefix,
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
420 property->namespace);
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
421 if(err) {
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
422 return 1; // OOM
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
423 }
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
424 } else if(
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
425 strcmp((const char*)property->namespace->href,
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
426 (const char*)ns->href))
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
427 {
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
428 // global namespace != local namespace
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
429 // therefore we need a namespace definition in this element
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
430
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
431 // ns-prefix != property-prefix -> add ns to nsdef
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
432 if(webdav_nslist_add(
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
433 sn->pool,
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
434 &nsdef_begin,
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
435 &nsdef_end,
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
436 property->namespace))
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
437 {
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
438 return 1; // OOM
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
439 }
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
440 }
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
441 }
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
442
239
d5031c30022c make multistatus response ready for proppatch requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 238
diff changeset
443 if(response->multistatus->proppatch && response->errors) {
d5031c30022c make multistatus response ready for proppatch requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 238
diff changeset
444 // in a proppatch request all operations must succeed
d5031c30022c make multistatus response ready for proppatch requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 238
diff changeset
445 // if we have an error, the property update status code must be
d5031c30022c make multistatus response ready for proppatch requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 238
diff changeset
446 // 424 Failed Dependency
d5031c30022c make multistatus response ready for proppatch requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 238
diff changeset
447 status = 424;
d5031c30022c make multistatus response ready for proppatch requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 238
diff changeset
448 }
d5031c30022c make multistatus response ready for proppatch requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 238
diff changeset
449
222
5f05e56cb8e2 create namespace definition lists when properties are added to a multistatus response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 217
diff changeset
450 // error properties will be added to a separate list
5f05e56cb8e2 create namespace definition lists when properties are added to a multistatus response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 217
diff changeset
451 if(status != 200) {
211
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
452 return msresponse_addproperror(response, property, status);
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
453 }
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
454
230
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
455 // add all namespaces used by this property to the nsdef list
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
456 WebdavNSList *nslist = NULL;
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
457 if(property->vtype == WS_VALUE_XML_NODE) {
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
458 // iterate over xml tree and collect all namespaces
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
459 int err = 0;
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
460 nslist = wsxml_get_required_namespaces(
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
461 response->multistatus->sn->pool,
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
462 property->value.node,
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
463 &err);
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
464 if(err) {
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
465 return 1; // OOM
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
466 }
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
467 } else if(property->vtype == WS_VALUE_XML_DATA) {
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
468 // xml data contains a list of all used namespaces
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
469 nslist = property->value.data->namespaces;
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
470 } // other value types don't contain xml namespaces
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
471
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
472 while(nslist) {
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
473 // only add the namespace to the definitions list, if it isn't a
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
474 // property namespace, because the prop ns is already added
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
475 // to the element's def list or global definitions list
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
476 if(strcmp(
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
477 (const char*)nslist->namespace->prefix,
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
478 (const char*)property->namespace->prefix))
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
479 {
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
480 // ns-prefix != property-prefix -> add ns to nsdef
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
481 if(webdav_nslist_add(
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
482 sn->pool,
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
483 &nsdef_begin,
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
484 &nsdef_end,
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
485 nslist->namespace))
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
486 {
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
487 return 1; // OOM
231
4714468b9b7e implement multistatus writer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
488 }
230
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
489 }
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
490 nslist = nslist->next;
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
491 }
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
492
211
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
493 // add property to the list
230
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
494 if(oklist_add(
227
3c23855f7b46 remove nsdef from WebdavProperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 226
diff changeset
495 sn->pool,
3c23855f7b46 remove nsdef from WebdavProperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 226
diff changeset
496 &response->plist_begin,
3c23855f7b46 remove nsdef from WebdavProperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 226
diff changeset
497 &response->plist_end,
230
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
498 property,
ca50e1ebdc4d readd namespace handling to msresponse_addproperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
499 nsdef_begin))
227
3c23855f7b46 remove nsdef from WebdavProperty
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 226
diff changeset
500 {
211
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
501 return 1;
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
502 }
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
503 return 0;
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
504 }
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
505
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
506 int msresponse_addproperror(
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
507 MSResponse *response,
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
508 WebdavProperty *property,
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
509 int statuscode)
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
510 {
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
511 pool_handle_t *pool = response->multistatus->sn->pool;
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
512 UcxAllocator *a = session_get_allocator(response->multistatus->sn);
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
513
241
4adad7faf452 add proppatch op
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 239
diff changeset
514 response->resource.err++;
4adad7faf452 add proppatch op
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 239
diff changeset
515
211
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
516 // MSResponse contains a list of properties for each status code
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
517 // at first find the list for this status code
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
518 PropertyErrorList *errlist = NULL;
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
519 PropertyErrorList *list = response->errors;
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
520 PropertyErrorList *last = NULL;
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
521 while(list) {
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
522 if(list->status == statuscode) {
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
523 errlist = list;
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
524 break;
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
525 }
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
526 last = list;
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
527 list = list->next;
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
528 }
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
529
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
530 if(!errlist) {
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
531 // no list available for this statuscode
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
532 PropertyErrorList *newelm = pool_malloc(pool,
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
533 sizeof(PropertyErrorList));
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
534 if(!newelm) {
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
535 return 1;
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
536 }
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
537 newelm->begin = NULL;
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
538 newelm->end = NULL;
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
539 newelm->next = NULL;
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
540 newelm->status = statuscode;
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
541
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
542 if(last) {
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
543 last->next = newelm;
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
544 } else {
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
545 response->errors = newelm;
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
546 }
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
547 errlist = newelm;
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
548 }
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
549
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
550 // we have the list -> add the new element
229
73cb1c98ef7d replace UcxList with WebdavPList in the multistatus object
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 227
diff changeset
551 if(webdav_plist_add(pool, &errlist->begin, &errlist->end, property)) {
211
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
552 return 1;
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
553 }
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
554 return 0;
2160585200ac add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
555 }
217
8ed14d76db42 add backend chaining
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 211
diff changeset
556
8ed14d76db42 add backend chaining
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 211
diff changeset
557 int msresponse_close(WebdavResource *res) {
8ed14d76db42 add backend chaining
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 211
diff changeset
558 MSResponse *response = (MSResponse*)res;
8ed14d76db42 add backend chaining
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 211
diff changeset
559 if(response->closing) {
8ed14d76db42 add backend chaining
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 211
diff changeset
560 return 0; // close already in progress
8ed14d76db42 add backend chaining
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 211
diff changeset
561 }
239
d5031c30022c make multistatus response ready for proppatch requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 238
diff changeset
562 Multistatus *ms = response->multistatus;
217
8ed14d76db42 add backend chaining
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 211
diff changeset
563
8ed14d76db42 add backend chaining
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 211
diff changeset
564 int ret = REQ_PROCEED;
239
d5031c30022c make multistatus response ready for proppatch requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 238
diff changeset
565 WebdavOperation *op = ms->response.op;
d5031c30022c make multistatus response ready for proppatch requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 238
diff changeset
566 if(op->response_close(op, res)) {
217
8ed14d76db42 add backend chaining
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 211
diff changeset
567 ret = REQ_ABORTED;
8ed14d76db42 add backend chaining
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 211
diff changeset
568 }
8ed14d76db42 add backend chaining
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 211
diff changeset
569
237
ee1680ef1ef2 handle missing properties in multistatus.c
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 233
diff changeset
570 // add missing properties with status code 404
239
d5031c30022c make multistatus response ready for proppatch requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 238
diff changeset
571 UcxAllocator *a = session_get_allocator(ms->sn);
d5031c30022c make multistatus response ready for proppatch requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 238
diff changeset
572 WebdavPList *pl = ms->response.op->reqprops;
237
ee1680ef1ef2 handle missing properties in multistatus.c
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 233
diff changeset
573 while(pl) {
ee1680ef1ef2 handle missing properties in multistatus.c
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 233
diff changeset
574 sstr_t key = sstrcat_a(
ee1680ef1ef2 handle missing properties in multistatus.c
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 233
diff changeset
575 a,
ee1680ef1ef2 handle missing properties in multistatus.c
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 233
diff changeset
576 3,
ee1680ef1ef2 handle missing properties in multistatus.c
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 233
diff changeset
577 sstr((char*)pl->property->namespace->href),
ee1680ef1ef2 handle missing properties in multistatus.c
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 233
diff changeset
578 S("\0"),
ee1680ef1ef2 handle missing properties in multistatus.c
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 233
diff changeset
579 sstr((char*)pl->property->name));
ee1680ef1ef2 handle missing properties in multistatus.c
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 233
diff changeset
580 if(!ucx_map_sstr_get(response->properties, key)) {
ee1680ef1ef2 handle missing properties in multistatus.c
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 233
diff changeset
581 // property was not added to this response
239
d5031c30022c make multistatus response ready for proppatch requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 238
diff changeset
582 if(ms->proppatch) {
d5031c30022c make multistatus response ready for proppatch requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 238
diff changeset
583 if(msresponse_addproperror(response, pl->property, 424)) {
d5031c30022c make multistatus response ready for proppatch requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 238
diff changeset
584 ret = REQ_ABORTED;
d5031c30022c make multistatus response ready for proppatch requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 238
diff changeset
585 break;
d5031c30022c make multistatus response ready for proppatch requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 238
diff changeset
586 }
d5031c30022c make multistatus response ready for proppatch requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 238
diff changeset
587 } else {
d5031c30022c make multistatus response ready for proppatch requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 238
diff changeset
588 if(msresponse_addproperror(response, pl->property, 404)) {
d5031c30022c make multistatus response ready for proppatch requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 238
diff changeset
589 ret = REQ_ABORTED;
d5031c30022c make multistatus response ready for proppatch requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 238
diff changeset
590 break;
d5031c30022c make multistatus response ready for proppatch requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 238
diff changeset
591 }
237
ee1680ef1ef2 handle missing properties in multistatus.c
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 233
diff changeset
592 }
ee1680ef1ef2 handle missing properties in multistatus.c
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 233
diff changeset
593 }
ee1680ef1ef2 handle missing properties in multistatus.c
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 233
diff changeset
594
ee1680ef1ef2 handle missing properties in multistatus.c
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 233
diff changeset
595 pl = pl->next;
ee1680ef1ef2 handle missing properties in multistatus.c
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 233
diff changeset
596 }
ee1680ef1ef2 handle missing properties in multistatus.c
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 233
diff changeset
597
239
d5031c30022c make multistatus response ready for proppatch requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 238
diff changeset
598 if(ms->proppatch && response->errors) {
d5031c30022c make multistatus response ready for proppatch requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 238
diff changeset
599 // a proppatch response must succeed entirely
d5031c30022c make multistatus response ready for proppatch requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 238
diff changeset
600 // if we have a single error prop, move all props with status 200
d5031c30022c make multistatus response ready for proppatch requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 238
diff changeset
601 // to the error list
d5031c30022c make multistatus response ready for proppatch requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 238
diff changeset
602 PropertyOkList *elm = response->plist_begin;
d5031c30022c make multistatus response ready for proppatch requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 238
diff changeset
603 PropertyOkList *nextelm;
d5031c30022c make multistatus response ready for proppatch requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 238
diff changeset
604 while(elm) {
d5031c30022c make multistatus response ready for proppatch requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 238
diff changeset
605 if(msresponse_addproperror(response, elm->property, 424)) {
d5031c30022c make multistatus response ready for proppatch requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 238
diff changeset
606 return 1;
d5031c30022c make multistatus response ready for proppatch requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 238
diff changeset
607 }
d5031c30022c make multistatus response ready for proppatch requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 238
diff changeset
608 nextelm = elm->next;
d5031c30022c make multistatus response ready for proppatch requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 238
diff changeset
609 pool_free(response->multistatus->sn->pool, elm);
d5031c30022c make multistatus response ready for proppatch requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 238
diff changeset
610 elm = nextelm;
d5031c30022c make multistatus response ready for proppatch requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 238
diff changeset
611 }
d5031c30022c make multistatus response ready for proppatch requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 238
diff changeset
612 response->plist_begin = NULL;
d5031c30022c make multistatus response ready for proppatch requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 238
diff changeset
613 response->plist_end = NULL;
d5031c30022c make multistatus response ready for proppatch requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 238
diff changeset
614 }
d5031c30022c make multistatus response ready for proppatch requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 238
diff changeset
615
226
49adcbd7d473 msresponse_addproperty: add support for xmlNode property values and add check to make sure, properties are only added once
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 223
diff changeset
616 // we don't need the properties anymore
49adcbd7d473 msresponse_addproperty: add support for xmlNode property values and add check to make sure, properties are only added once
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 223
diff changeset
617 ucx_map_free(response->properties);
49adcbd7d473 msresponse_addproperty: add support for xmlNode property values and add check to make sure, properties are only added once
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 223
diff changeset
618
217
8ed14d76db42 add backend chaining
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 211
diff changeset
619 response->resource.isclosed = TRUE;
8ed14d76db42 add backend chaining
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 211
diff changeset
620 response->closing = FALSE;
8ed14d76db42 add backend chaining
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 211
diff changeset
621 return ret;
8ed14d76db42 add backend chaining
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 211
diff changeset
622 }

mercurial