Sat, 08 Nov 2025 23:06:11 +0100
update ucx
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1 | /* |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
2 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
3 | * |
|
361
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
355
diff
changeset
|
4 | * Copyright 2018 Olaf Wintermann. All rights reserved. |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
5 | * |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
6 | * Redistribution and use in source and binary forms, with or without |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
7 | * modification, are permitted provided that the following conditions are met: |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
8 | * |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
9 | * 1. Redistributions of source code must retain the above copyright |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
10 | * notice, this list of conditions and the following disclaimer. |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
11 | * |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
12 | * 2. Redistributions in binary form must reproduce the above copyright |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
13 | * notice, this list of conditions and the following disclaimer in the |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
14 | * documentation and/or other materials provided with the distribution. |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
15 | * |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
16 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
17 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
18 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
19 | * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
20 | * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
|
0bbbb0341606
some code cleanup and bug fixes
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 |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
26 | * POSSIBILITY OF SUCH DAMAGE. |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
27 | */ |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
28 | |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
29 | #include <stdio.h> |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
30 | #include <stdlib.h> |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
31 | #include <string.h> |
|
182
ca07f14f7bfe
added override option for copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
181
diff
changeset
|
32 | #include <stdbool.h> |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
33 | #include <libxml/tree.h> |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
34 | |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
35 | #include "utils.h" |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
36 | #include "session.h" |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
37 | #include "methods.h" |
|
40
a95ee94b9204
supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
33
diff
changeset
|
38 | #include "crypto.h" |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
39 | #include <cx/buffer.h> |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
40 | #include <cx/hash_map.h> |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
41 | #include <cx/printf.h> |
|
807
b41630ecc481
add support for progress callbacks in dav_store()
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
789
diff
changeset
|
42 | #include <cx/mempool.h> |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
43 | #include <cx/array_list.h> |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
44 | |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
45 | #include "resource.h" |
|
331
9ca1e4706acc
adds initial support for xml properties in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
315
diff
changeset
|
46 | #include "xml.h" |
|
139
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
47 | #include "davqlexec.h" |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
48 | |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
49 | #define xstreq(a,b) xmlStrEqual(BAD_CAST a, BAD_CAST b) |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
50 | |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
51 | DavResource* dav_resource_new(DavSession *sn, const char *path) { |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
52 | //char *href = util_url_path(url); |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
53 | //DavResource *res = dav_resource_new_href(sn, href); |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
54 | char *parent = util_parent_path(path); |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
55 | const char *name = util_resource_name(path); |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
56 | char *href = dav_session_create_plain_href(sn, path); |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
57 | |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
58 | DavResource *res = dav_resource_new_full(sn, parent, name, href); |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
59 | free(parent); |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
60 | return res; |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
61 | } |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
62 | |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
63 | DavResource* dav_resource_new_child(DavSession *sn, DavResource *parent, const char *name) { |
|
42
6518b035a9df
added some api functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
41
diff
changeset
|
64 | char *path = util_concat_path(parent->path, name); |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
65 | char *href = dav_session_create_plain_href(sn, path); |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
66 | DavResource *res = dav_resource_new_full(sn, parent->path, name, href); |
|
42
6518b035a9df
added some api functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
41
diff
changeset
|
67 | free(path); |
|
6518b035a9df
added some api functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
41
diff
changeset
|
68 | return res; |
|
6518b035a9df
added some api functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
41
diff
changeset
|
69 | } |
|
6518b035a9df
added some api functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
41
diff
changeset
|
70 | |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
71 | |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
72 | DavResource* dav_resource_new_href(DavSession *sn, const char *href) { |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
73 | DavResource *res = cxCalloc(sn->mp->allocator, 1, sizeof(DavResource)); |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
74 | res->session = sn; |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
75 | |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
76 | // set name, path and href |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
77 | resource_set_info(res, href); |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
78 | |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
79 | // initialize resource data |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
80 | res->data = resource_data_new(sn); |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
81 | |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
82 | return res; |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
83 | } |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
84 | |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
85 | DavResource* dav_resource_new_full(DavSession *sn, const char *parent_path, const char *name, char *href) { |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
86 | cxstring n = cx_str(name); |
|
268
2610eecfc5e5
adds resource name validation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
261
diff
changeset
|
87 | // the name must not contain path separators |
|
518
cca3e7aa30ed
fix null pointer dereferenciation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
505
diff
changeset
|
88 | if(n.length > 0 && href) { |
|
280
6d8784bee427
fixes dav_resource_new_full
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
269
diff
changeset
|
89 | for(int i=0;i<n.length-1;i++) { |
|
6d8784bee427
fixes dav_resource_new_full
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
269
diff
changeset
|
90 | char c = n.ptr[i]; |
|
6d8784bee427
fixes dav_resource_new_full
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
269
diff
changeset
|
91 | if(c == '/' || c == '\\') { |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
92 | n = cx_str(util_resource_name(href)); |
|
280
6d8784bee427
fixes dav_resource_new_full
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
269
diff
changeset
|
93 | break; |
|
6d8784bee427
fixes dav_resource_new_full
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
269
diff
changeset
|
94 | } |
|
268
2610eecfc5e5
adds resource name validation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
261
diff
changeset
|
95 | } |
|
2610eecfc5e5
adds resource name validation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
261
diff
changeset
|
96 | } |
|
2610eecfc5e5
adds resource name validation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
261
diff
changeset
|
97 | // remove trailing '/' |
|
2610eecfc5e5
adds resource name validation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
261
diff
changeset
|
98 | if(n.length > 0 && n.ptr[n.length-1] == '/') { |
|
2610eecfc5e5
adds resource name validation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
261
diff
changeset
|
99 | n.length--; |
|
2610eecfc5e5
adds resource name validation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
261
diff
changeset
|
100 | } |
|
2610eecfc5e5
adds resource name validation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
261
diff
changeset
|
101 | |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
102 | DavResource *res = cxCalloc(sn->mp->allocator, 1, sizeof(DavResource)); |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
103 | res->session = sn; |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
104 | |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
105 | // set name, path and href |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
106 | res->name = cx_strdup_a(sn->mp->allocator, n).ptr; |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
107 | |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
108 | char *path = util_concat_path(parent_path, name); |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
109 | res->path = dav_session_strdup(sn, path); |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
110 | |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
111 | res->href = href; |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
112 | |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
113 | // initialize resource data |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
114 | res->data = resource_data_new(sn); |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
115 | |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
116 | // cache href/path |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
117 | if(href) { |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
118 | dav_session_cache_path(sn, cx_str(path), cx_str(href)); |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
119 | } |
|
74
da079dc0724c
fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
70
diff
changeset
|
120 | free(path); |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
121 | |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
122 | return res; |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
123 | } |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
124 | |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
125 | void resource_free_properties(DavSession *sn, CxMap *properties) { |
|
609
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
126 | if(!properties) return; |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
127 | |
|
854
1c8401ece69e
update ucx to version 3.1
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
852
diff
changeset
|
128 | CxMapIterator i = cxMapIteratorValues(properties); |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
129 | cx_foreach(DavProperty*, property, i) { |
|
348
b79fb94f9e0a
davqlexec handles xml properties now (not really, but it doesn't destroy everything)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
130 | // TODO: free everything |
|
609
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
131 | dav_session_free(sn, property); |
|
134
4bccc18820e8
implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
100
diff
changeset
|
132 | } |
| 852 | 133 | cxMapFree(properties); |
|
134
4bccc18820e8
implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
100
diff
changeset
|
134 | } |
|
4bccc18820e8
implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
100
diff
changeset
|
135 | |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
136 | void dav_resource_free(DavResource *res) { |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
137 | DavSession *sn = res->session; |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
138 | |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
139 | dav_session_free(sn, res->name); |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
140 | dav_session_free(sn, res->path); |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
141 | if(res->href) { |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
142 | dav_session_free(sn, res->href); |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
143 | } |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
144 | |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
145 | DavResourceData *data = res->data; |
|
134
4bccc18820e8
implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
100
diff
changeset
|
146 | resource_free_properties(sn, data->properties); |
|
609
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
147 | resource_free_properties(sn, data->crypto_properties); |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
148 | |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
149 | if(data->set) { |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
150 | CxIterator i = cxListIterator(data->set); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
151 | cx_foreach(DavProperty *, p, i) { |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
152 | dav_session_free(sn, p->ns->name); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
153 | if(p->ns->prefix) { |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
154 | dav_session_free(sn, p->ns->prefix); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
155 | } |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
156 | dav_session_free(sn, p->ns); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
157 | |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
158 | dav_session_free(sn, p->name); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
159 | dav_free_xml_node_sn(sn, p->value); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
160 | dav_session_free(sn, p); |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
161 | } |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
162 | } |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
163 | |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
164 | if(data->remove) { |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
165 | CxIterator i = cxListIterator(data->remove); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
166 | cx_foreach(DavProperty *, p, i) { |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
167 | dav_session_free(sn, p->ns->name); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
168 | if(p->ns->prefix) { |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
169 | dav_session_free(sn, p->ns->prefix); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
170 | } |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
171 | dav_session_free(sn, p->ns); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
172 | |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
173 | dav_session_free(sn, p->name); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
174 | dav_session_free(sn, p); |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
175 | } |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
176 | } |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
177 | |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
178 | if(data->crypto_set) { |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
179 | CxIterator i = cxListIterator(data->crypto_set); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
180 | cx_foreach(DavProperty *, p, i) { |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
181 | dav_session_free(sn, p->ns->name); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
182 | if(p->ns->prefix) { |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
183 | dav_session_free(sn, p->ns->prefix); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
184 | } |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
185 | dav_session_free(sn, p->ns); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
186 | |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
187 | dav_session_free(sn, p->name); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
188 | dav_free_xml_node_sn(sn, p->value); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
189 | dav_session_free(sn, p); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
190 | } |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
191 | } |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
192 | |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
193 | if(data->crypto_remove) { |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
194 | CxIterator i = cxListIterator(data->crypto_remove); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
195 | cx_foreach(DavProperty *, p, i) { |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
196 | dav_session_free(sn, p->ns->name); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
197 | if(p->ns->prefix) { |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
198 | dav_session_free(sn, p->ns->prefix); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
199 | } |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
200 | dav_session_free(sn, p->ns); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
201 | |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
202 | dav_session_free(sn, p->name); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
203 | dav_session_free(sn, p); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
204 | } |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
205 | } |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
206 | |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
207 | if(!data->read && data->content) { |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
208 | dav_session_free(sn, data->content); |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
209 | } |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
210 | dav_session_free(sn, data); |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
211 | |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
212 | dav_session_free(sn, res); |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
213 | } |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
214 | |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
215 | void dav_resource_free_all(DavResource *res) { |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
216 | DavResource *child = res->children; |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
217 | dav_resource_free(res); |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
218 | while(child) { |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
219 | DavResource *next = child->next; |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
220 | dav_resource_free_all(child); |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
221 | child = next; |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
222 | } |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
223 | } |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
224 | |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
225 | void resource_set_href(DavResource *res, cxstring href) { |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
226 | res->href = cx_strdup_a(res->session->mp->allocator, href).ptr; |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
227 | } |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
228 | |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
229 | void resource_set_info(DavResource *res, const char *href_str) { |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
230 | char *url_str = NULL; |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
231 | curl_easy_getinfo(res->session->handle, CURLINFO_EFFECTIVE_URL, &url_str); |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
232 | cxstring name = cx_str(util_resource_name(href_str)); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
233 | cxstring href = cx_str(href_str); |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
234 | |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
235 | cxstring base_href = cx_str(util_url_path(res->session->base_url)); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
236 | cxstring path = cx_strsubs(href, base_href.length - 1); |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
237 | |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
238 | const CxAllocator *a = res->session->mp->allocator; |
|
40
a95ee94b9204
supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
33
diff
changeset
|
239 | CURL *handle = res->session->handle; |
|
a95ee94b9204
supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
33
diff
changeset
|
240 | |
|
a95ee94b9204
supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
33
diff
changeset
|
241 | int nlen = 0; |
|
a95ee94b9204
supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
33
diff
changeset
|
242 | char *uname = curl_easy_unescape(handle, name.ptr, name.length , &nlen); |
|
a95ee94b9204
supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
33
diff
changeset
|
243 | int plen = 0; |
|
a95ee94b9204
supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
33
diff
changeset
|
244 | char *upath = curl_easy_unescape(handle, path.ptr, path.length, &plen); |
|
a95ee94b9204
supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
33
diff
changeset
|
245 | |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
246 | res->name = cx_strdup_a(a, cx_strn(uname, nlen)).ptr; |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
247 | res->href = cx_strdup_a(a, href).ptr; |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
248 | res->path = cx_strdup_a(a, cx_strn(upath, plen)).ptr; |
|
40
a95ee94b9204
supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
33
diff
changeset
|
249 | |
|
a95ee94b9204
supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
33
diff
changeset
|
250 | curl_free(uname); |
|
a95ee94b9204
supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
33
diff
changeset
|
251 | curl_free(upath); |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
252 | } |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
253 | |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
254 | DavResourceData* resource_data_new(DavSession *sn) { |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
255 | DavResourceData *data = cxMalloc( |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
256 | sn->mp->allocator, |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
257 | sizeof(DavResourceData)); |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
258 | if(!data) { |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
259 | return NULL; |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
260 | } |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
261 | data->properties = cxHashMapCreate(sn->mp->allocator, CX_STORE_POINTERS, 32); |
|
609
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
262 | data->crypto_properties = NULL; |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
263 | data->set = NULL; |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
264 | data->remove = NULL; |
|
609
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
265 | data->crypto_set = NULL; |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
266 | data->crypto_remove = NULL; |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
267 | data->read = NULL; |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
268 | data->content = NULL; |
|
478
baa63fef5c5c
fixes redirects
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
477
diff
changeset
|
269 | data->seek = NULL; |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
270 | data->length = 0; |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
271 | return data; |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
272 | } |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
273 | |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
274 | char* dav_resource_get_href(DavResource *resource) { |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
275 | if(!resource->href) { |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
276 | resource->href = dav_session_get_href( |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
277 | resource->session, |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
278 | resource->path); |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
279 | } |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
280 | return resource->href; |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
281 | } |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
282 | |
|
609
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
283 | void resource_add_prop(DavResource *res, const char *ns, const char *name, DavXmlNode *val) { |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
284 | DavSession *sn = res->session; |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
285 | |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
286 | DavNamespace *namespace = dav_session_malloc(sn, sizeof(DavNamespace)); |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
287 | namespace->prefix = NULL; |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
288 | namespace->name = dav_session_strdup(sn, ns); |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
289 | |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
290 | DavProperty *prop = dav_session_malloc(sn, sizeof(DavProperty)); |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
291 | prop->name = dav_session_strdup(sn, name); |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
292 | prop->ns = namespace; |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
293 | prop->value = val; |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
294 | |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
295 | cxmutstr keystr = dav_property_key(ns, name); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
296 | CxHashKey key = cx_hash_key(keystr.ptr, keystr.length); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
297 | cxMapPut(((DavResourceData*)res->data)->properties, key, prop); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
298 | free(keystr.ptr); |
|
609
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
299 | } |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
300 | |
| 505 | 301 | void resource_add_property(DavResource *res, const char *ns, const char *name, xmlNode *val) { |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
302 | if(!val) { |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
303 | return; |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
304 | } |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
305 | |
|
609
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
306 | resource_add_prop(res, ns, name, dav_convert_xml(res->session, val)); |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
307 | } |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
308 | |
|
331
9ca1e4706acc
adds initial support for xml properties in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
315
diff
changeset
|
309 | void resource_add_string_property(DavResource *res, char *ns, char *name, char *val) { |
|
9ca1e4706acc
adds initial support for xml properties in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
315
diff
changeset
|
310 | if(!val) { |
|
9ca1e4706acc
adds initial support for xml properties in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
315
diff
changeset
|
311 | return; |
|
9ca1e4706acc
adds initial support for xml properties in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
315
diff
changeset
|
312 | } |
|
9ca1e4706acc
adds initial support for xml properties in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
315
diff
changeset
|
313 | |
|
609
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
314 | resource_add_prop(res, ns, name, dav_text_node(res->session, val)); |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
315 | } |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
316 | |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
317 | void resource_set_crypto_properties(DavResource *res, CxMap *cprops) { |
|
609
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
318 | DavResourceData *data = res->data; |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
319 | resource_free_properties(res->session, data->crypto_properties); |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
320 | data->crypto_properties = cprops; |
|
331
9ca1e4706acc
adds initial support for xml properties in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
315
diff
changeset
|
321 | } |
|
9ca1e4706acc
adds initial support for xml properties in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
315
diff
changeset
|
322 | |
| 505 | 323 | DavXmlNode* resource_get_property(DavResource *res, const char *ns, const char *name) { |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
324 | cxmutstr keystr = dav_property_key(ns, name); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
325 | CxHashKey key = cx_hash_key(keystr.ptr, keystr.length); |
|
609
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
326 | DavXmlNode *ret = resource_get_property_k(res, key); |
| 505 | 327 | free(keystr.ptr); |
|
609
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
328 | |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
329 | return ret; |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
330 | } |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
331 | |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
332 | DavXmlNode* resource_get_encrypted_property(DavResource *res, const char *ns, const char *name) { |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
333 | cxmutstr keystr = dav_property_key(ns, name); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
334 | CxHashKey key = cx_hash_key(keystr.ptr, keystr.length); |
|
609
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
335 | DavXmlNode *ret = resource_get_encrypted_property_k(res, key); |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
336 | free(keystr.ptr); |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
337 | |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
338 | return ret; |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
339 | } |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
340 | |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
341 | DavXmlNode* resource_get_property_k(DavResource *res, CxHashKey key) { |
|
139
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
342 | DavResourceData *data = (DavResourceData*)res->data; |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
343 | DavProperty *property = cxMapGet(data->properties, key); |
|
609
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
344 | |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
345 | return property ? property->value : NULL; |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
346 | } |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
347 | |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
348 | DavXmlNode* resource_get_encrypted_property_k(DavResource *res, CxHashKey key) { |
|
609
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
349 | DavResourceData *data = (DavResourceData*)res->data; |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
350 | DavProperty *property = cxMapGet(data->crypto_properties, key); |
|
609
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
351 | |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
352 | return property ? property->value : NULL; |
|
139
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
353 | } |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
354 | |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
355 | cxmutstr dav_property_key(const char *ns, const char *name) { |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
356 | return dav_property_key_a(cxDefaultAllocator, ns, name); |
|
139
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
357 | } |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
358 | |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
359 | cxmutstr dav_property_key_a(const CxAllocator *a, const char *ns, const char *name) { |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
360 | cxstring ns_str = cx_str(ns); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
361 | cxstring name_str = cx_str(name); |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
362 | |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
363 | return cx_strcat_a(a, 4, ns_str, CX_STR("\0"), name_str, CX_STR("\0")); |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
364 | } |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
365 | |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
366 | |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
367 | |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
368 | |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
369 | void resource_add_child(DavResource *parent, DavResource *child) { |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
370 | child->next = NULL; |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
371 | if(parent->children) { |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
372 | DavResource *last = parent->children; |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
373 | while(last->next) { |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
374 | last = last->next; |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
375 | } |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
376 | last->next = child; |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
377 | child->prev = last; |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
378 | } else { |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
379 | child->prev = NULL; |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
380 | parent->children = child; |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
381 | } |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
382 | child->parent = parent; |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
383 | } |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
384 | |
|
139
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
385 | static int resource_cmp(DavResource *res1, DavResource *res2, DavOrderCriterion *cr) { |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
386 | if(!(res1 && res2)) { |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
387 | return 0; |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
388 | } |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
389 | |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
390 | int ret; |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
391 | if(cr->type == 0) { |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
392 | switch(cr->column.resprop) { |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
393 | case DAVQL_RES_NAME: { |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
394 | ret = strcmp(res1->name, res2->name); |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
395 | break; |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
396 | } |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
397 | case DAVQL_RES_PATH: { |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
398 | ret = strcmp(res1->path, res2->path); |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
399 | break; |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
400 | } |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
401 | case DAVQL_RES_HREF: { |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
402 | ret = strcmp(res1->href, res2->href); |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
403 | break; |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
404 | } |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
405 | case DAVQL_RES_CONTENTLENGTH: { |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
406 | int c = res1->contentlength == res2->contentlength; |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
407 | ret = c ? 0 : (res1->contentlength < res2->contentlength?-1:1); |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
408 | break; |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
409 | } |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
410 | case DAVQL_RES_CONTENTTYPE: { |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
411 | ret = strcmp(res1->contenttype, res2->contenttype); |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
412 | break; |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
413 | } |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
414 | case DAVQL_RES_CREATIONDATE: { |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
415 | int c = res1->creationdate == res2->creationdate; |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
416 | ret = c ? 0 : (res1->creationdate < res2->creationdate?-1:1); |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
417 | break; |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
418 | } |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
419 | case DAVQL_RES_LASTMODIFIED: { |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
420 | int c = res1->lastmodified == res2->lastmodified; |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
421 | ret = c ? 0 : (res1->lastmodified < res2->lastmodified?-1:1); |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
422 | break; |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
423 | } |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
424 | case DAVQL_RES_ISCOLLECTION: { |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
425 | int c = res1->iscollection == res2->iscollection; |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
426 | ret = c ? 0 : (res1->iscollection < res2->iscollection?-1:1); |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
427 | break; |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
428 | } |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
429 | default: ret = 0; |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
430 | } |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
431 | } else if(cr->type == 1) { |
|
331
9ca1e4706acc
adds initial support for xml properties in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
315
diff
changeset
|
432 | DavXmlNode *xvalue1 = resource_get_property_k(res1, cr->column.property); |
|
9ca1e4706acc
adds initial support for xml properties in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
315
diff
changeset
|
433 | DavXmlNode *xvalue2 = resource_get_property_k(res2, cr->column.property); |
|
9ca1e4706acc
adds initial support for xml properties in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
315
diff
changeset
|
434 | char *value1 = dav_xml_getstring(xvalue1); |
|
9ca1e4706acc
adds initial support for xml properties in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
315
diff
changeset
|
435 | char *value2 = dav_xml_getstring(xvalue2); |
|
139
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
436 | if(!value1) { |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
437 | ret = value2 ? -1 : 0; |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
438 | } else if(!value2) { |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
439 | ret = value1 ? 1 : 0; |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
440 | } else { |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
441 | ret = strcmp(value1, value2); |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
442 | } |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
443 | } else { |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
444 | return 0; |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
445 | } |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
446 | |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
447 | return cr->descending ? -ret : ret; |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
448 | } |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
449 | |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
450 | void resource_add_ordered_child(DavResource *parent, DavResource *child, CxList *ordercr) { |
|
139
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
451 | if(!ordercr) { |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
452 | resource_add_child(parent, child); |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
453 | return; |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
454 | } |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
455 | |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
456 | child->parent = parent; |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
457 | |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
458 | if(!parent->children) { |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
459 | child->next = NULL; |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
460 | child->prev = NULL; |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
461 | parent->children = child; |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
462 | } else { |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
463 | DavResource *resource = parent->children; |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
464 | while(resource) { |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
465 | int r = 0; |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
466 | CxIterator i = cxListIterator(ordercr); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
467 | cx_foreach(DavOrderCriterion*, cr, i) { |
|
139
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
468 | r = resource_cmp(child, resource, cr); |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
469 | if(r != 0) { |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
470 | break; |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
471 | } |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
472 | } |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
473 | |
| 140 | 474 | if(r < 0) { |
|
139
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
475 | // insert child before resource |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
476 | child->prev = resource->prev; |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
477 | child->next = resource; |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
478 | if(resource->prev) { |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
479 | resource->prev->next = child; |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
480 | } else { |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
481 | parent->children = child; |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
482 | } |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
483 | resource->prev = child; |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
484 | break; |
| 140 | 485 | } if(!resource->next) { |
| 486 | // append child | |
| 487 | child->prev = resource; | |
| 488 | child->next = NULL; | |
| 489 | resource->next = child; | |
| 490 | break; | |
|
139
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
491 | } else { |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
492 | resource = resource->next; |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
493 | } |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
494 | } |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
495 | } |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
496 | } |
|
c6424aebcf5e
implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
497 | |
|
331
9ca1e4706acc
adds initial support for xml properties in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
315
diff
changeset
|
498 | char* dav_get_string_property(DavResource *res, char *name) { |
|
9ca1e4706acc
adds initial support for xml properties in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
315
diff
changeset
|
499 | char *pns; |
|
9ca1e4706acc
adds initial support for xml properties in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
315
diff
changeset
|
500 | char *pname; |
|
9ca1e4706acc
adds initial support for xml properties in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
315
diff
changeset
|
501 | dav_get_property_namespace_str(res->session->context, name, &pns, &pname); |
|
9ca1e4706acc
adds initial support for xml properties in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
315
diff
changeset
|
502 | if(!pns || !pname) { |
|
9ca1e4706acc
adds initial support for xml properties in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
315
diff
changeset
|
503 | return NULL; |
|
9ca1e4706acc
adds initial support for xml properties in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
315
diff
changeset
|
504 | } |
|
9ca1e4706acc
adds initial support for xml properties in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
315
diff
changeset
|
505 | return dav_get_string_property_ns(res, pns, pname); |
|
9ca1e4706acc
adds initial support for xml properties in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
315
diff
changeset
|
506 | } |
|
9ca1e4706acc
adds initial support for xml properties in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
315
diff
changeset
|
507 | |
|
9ca1e4706acc
adds initial support for xml properties in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
315
diff
changeset
|
508 | char* dav_get_string_property_ns(DavResource *res, char *ns, char *name) { |
|
9ca1e4706acc
adds initial support for xml properties in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
315
diff
changeset
|
509 | DavXmlNode *prop = dav_get_property_ns(res, ns, name); |
|
9ca1e4706acc
adds initial support for xml properties in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
315
diff
changeset
|
510 | if(!prop) { |
|
9ca1e4706acc
adds initial support for xml properties in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
315
diff
changeset
|
511 | return NULL; |
|
9ca1e4706acc
adds initial support for xml properties in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
315
diff
changeset
|
512 | } |
|
9ca1e4706acc
adds initial support for xml properties in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
315
diff
changeset
|
513 | return dav_xml_getstring(prop); |
|
9ca1e4706acc
adds initial support for xml properties in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
315
diff
changeset
|
514 | } |
|
9ca1e4706acc
adds initial support for xml properties in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
315
diff
changeset
|
515 | |
|
9ca1e4706acc
adds initial support for xml properties in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
315
diff
changeset
|
516 | DavXmlNode* dav_get_property(DavResource *res, char *name) { |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
517 | char *pns; |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
518 | char *pname; |
|
134
4bccc18820e8
implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
100
diff
changeset
|
519 | dav_get_property_namespace_str(res->session->context, name, &pns, &pname); |
|
269
c89633916e36
fixes crash when using invalid namespace prefix
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
268
diff
changeset
|
520 | if(!pns || !pname) { |
|
c89633916e36
fixes crash when using invalid namespace prefix
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
268
diff
changeset
|
521 | return NULL; |
|
c89633916e36
fixes crash when using invalid namespace prefix
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
268
diff
changeset
|
522 | } |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
523 | return dav_get_property_ns(res, pns, pname); |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
524 | } |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
525 | |
|
609
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
526 | static DavXmlNode* get_property_ns(DavResource *res, DavBool encrypted, const char *ns, const char *name) { |
|
269
c89633916e36
fixes crash when using invalid namespace prefix
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
268
diff
changeset
|
527 | if(!ns || !name) { |
|
c89633916e36
fixes crash when using invalid namespace prefix
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
268
diff
changeset
|
528 | return NULL; |
|
c89633916e36
fixes crash when using invalid namespace prefix
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
268
diff
changeset
|
529 | } |
|
609
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
530 | |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
531 | DavResourceData *data = res->data; |
|
609
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
532 | |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
533 | DavXmlNode *property = NULL; |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
534 | CxList *remove_list = NULL; |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
535 | CxList *set_list = NULL; |
|
609
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
536 | |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
537 | if(encrypted) { |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
538 | // check if crypto_properties because it will only be created |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
539 | // if the resource has encrypted properties |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
540 | if(!data->crypto_properties) { |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
541 | return NULL; |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
542 | } |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
543 | property = resource_get_encrypted_property(res, ns, name); |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
544 | remove_list = data->crypto_remove; |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
545 | set_list = data->crypto_set; |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
546 | } else { |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
547 | property = resource_get_property(res, ns, name); |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
548 | remove_list = data->remove; |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
549 | set_list = data->set; |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
550 | } |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
551 | |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
552 | // resource_get_property only returns persistent properties |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
553 | // check the remove and set list |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
554 | if(property && remove_list) { |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
555 | // if the property is in the remove list, we return NULL |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
556 | CxIterator i = cxListIterator(remove_list); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
557 | cx_foreach(DavProperty*, p, i) { |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
558 | if(!strcmp(p->name, name) && !strcmp(p->ns->name, ns)) { |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
559 | return NULL; |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
560 | } |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
561 | } |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
562 | } |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
563 | |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
564 | // the set list contains property updates |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
565 | // we return an updated property if possible |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
566 | if(set_list) { |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
567 | CxIterator i = cxListIterator(set_list); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
568 | cx_foreach(DavProperty*, p, i) { |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
569 | if(!strcmp(p->name, name) && !strcmp(p->ns->name, ns)) { |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
570 | return p->value; // TODO: fix |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
571 | } |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
572 | } |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
573 | } |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
574 | |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
575 | // no property update |
|
609
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
576 | |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
577 | return property; |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
578 | } |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
579 | |
|
609
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
580 | DavXmlNode* dav_get_property_ns(DavResource *res, const char *ns, const char *name) { |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
581 | DavXmlNode *property_value = get_property_ns(res, FALSE, ns, name); |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
582 | |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
583 | if(!property_value && DAV_DECRYPT_PROPERTIES(res->session)) { |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
584 | property_value = get_property_ns(res, TRUE, ns, name); |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
585 | } |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
586 | |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
587 | return property_value; |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
588 | } |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
589 | |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
590 | DavXmlNode* dav_get_encrypted_property_ns(DavResource *res, const char *ns, const char *name) { |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
591 | return get_property_ns(res, TRUE, ns, name); |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
592 | } |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
593 | |
|
605
bbc66c72661a
add new api for encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
589
diff
changeset
|
594 | static DavProperty* createprop(DavSession *sn, const char *ns, const char *name) { |
|
bbc66c72661a
add new api for encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
589
diff
changeset
|
595 | DavProperty *property = dav_session_malloc(sn, sizeof(DavProperty)); |
|
bbc66c72661a
add new api for encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
589
diff
changeset
|
596 | property->name = dav_session_strdup(sn, name); |
|
bbc66c72661a
add new api for encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
589
diff
changeset
|
597 | property->value = NULL; |
|
bbc66c72661a
add new api for encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
589
diff
changeset
|
598 | |
|
bbc66c72661a
add new api for encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
589
diff
changeset
|
599 | DavNamespace *namespace = dav_session_malloc(sn, sizeof(DavNamespace)); |
|
bbc66c72661a
add new api for encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
589
diff
changeset
|
600 | namespace->prefix = NULL; |
|
bbc66c72661a
add new api for encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
589
diff
changeset
|
601 | namespace->name = dav_session_strdup(sn, ns); |
|
bbc66c72661a
add new api for encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
589
diff
changeset
|
602 | |
|
bbc66c72661a
add new api for encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
589
diff
changeset
|
603 | property->ns = namespace; |
|
bbc66c72661a
add new api for encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
589
diff
changeset
|
604 | |
|
bbc66c72661a
add new api for encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
589
diff
changeset
|
605 | return property; |
|
bbc66c72661a
add new api for encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
589
diff
changeset
|
606 | } |
|
bbc66c72661a
add new api for encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
589
diff
changeset
|
607 | |
|
822
f9e40f5c6daf
fix dav_set_string_property crash if an unknown namespace prefix was specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
816
diff
changeset
|
608 | int dav_set_string_property(DavResource *res, char *name, char *value) { |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
609 | char *pns; |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
610 | char *pname; |
|
134
4bccc18820e8
implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
100
diff
changeset
|
611 | dav_get_property_namespace_str(res->session->context, name, &pns, &pname); |
|
822
f9e40f5c6daf
fix dav_set_string_property crash if an unknown namespace prefix was specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
816
diff
changeset
|
612 | if(!pns) { |
|
f9e40f5c6daf
fix dav_set_string_property crash if an unknown namespace prefix was specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
816
diff
changeset
|
613 | res->session->errorstr = "Property namespace not found"; |
|
f9e40f5c6daf
fix dav_set_string_property crash if an unknown namespace prefix was specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
816
diff
changeset
|
614 | return 1; |
|
f9e40f5c6daf
fix dav_set_string_property crash if an unknown namespace prefix was specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
816
diff
changeset
|
615 | } |
|
361
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
355
diff
changeset
|
616 | dav_set_string_property_ns(res, pns, pname, value); |
|
822
f9e40f5c6daf
fix dav_set_string_property crash if an unknown namespace prefix was specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
816
diff
changeset
|
617 | return 0; |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
618 | } |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
619 | |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
620 | static int add2propertylist(const CxAllocator *a, CxList **list, DavProperty *property) { |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
621 | if(!*list) { |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
622 | CxList *newlist = cxLinkedListCreate(a, NULL, CX_STORE_POINTERS); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
623 | if(!newlist) { |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
624 | return 1; |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
625 | } |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
626 | *list = newlist; |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
627 | } |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
628 | cxListAdd(*list, property); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
629 | return 0; |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
630 | } |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
631 | |
|
361
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
355
diff
changeset
|
632 | void dav_set_string_property_ns(DavResource *res, char *ns, char *name, char *value) { |
|
609
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
633 | DavSession *sn = res->session; |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
634 | const CxAllocator *a = res->session->mp->allocator; |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
635 | DavResourceData *data = res->data; |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
636 | |
|
605
bbc66c72661a
add new api for encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
589
diff
changeset
|
637 | DavProperty *property = createprop(res->session, ns, name); |
|
331
9ca1e4706acc
adds initial support for xml properties in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
315
diff
changeset
|
638 | property->value = dav_text_node(res->session, value); |
|
40
a95ee94b9204
supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
33
diff
changeset
|
639 | |
|
609
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
640 | if(DAV_ENCRYPT_PROPERTIES(sn) && dav_namespace_is_encrypted(sn->context, ns)) { |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
641 | add2propertylist(a, &data->crypto_set, property); |
|
609
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
642 | } else { |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
643 | add2propertylist(a, &data->set, property); |
|
609
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
644 | } |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
645 | } |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
646 | |
|
361
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
355
diff
changeset
|
647 | void dav_set_property(DavResource *res, char *name, DavXmlNode *value) { |
|
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
355
diff
changeset
|
648 | char *pns; |
|
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
355
diff
changeset
|
649 | char *pname; |
|
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
355
diff
changeset
|
650 | dav_get_property_namespace_str(res->session->context, name, &pns, &pname); |
|
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
355
diff
changeset
|
651 | dav_set_property_ns(res, pns, pname, value); |
|
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
355
diff
changeset
|
652 | } |
|
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
355
diff
changeset
|
653 | |
|
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
355
diff
changeset
|
654 | void dav_set_property_ns(DavResource *res, char *ns, char *name, DavXmlNode *value) { |
|
609
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
655 | DavSession *sn = res->session; |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
656 | const CxAllocator *a = sn->mp->allocator; |
|
361
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
355
diff
changeset
|
657 | DavResourceData *data = res->data; |
|
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
355
diff
changeset
|
658 | |
|
609
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
659 | DavProperty *property = createprop(sn, ns, name); |
|
736
40be8db6fe45
fix dav-sync push creating finfo elements without using the mempool, which could lead to crashes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
728
diff
changeset
|
660 | // TODO: this function should copy the value |
|
40be8db6fe45
fix dav-sync push creating finfo elements without using the mempool, which could lead to crashes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
728
diff
changeset
|
661 | // but we also need a function, that doesn't create a copy |
|
40be8db6fe45
fix dav-sync push creating finfo elements without using the mempool, which could lead to crashes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
728
diff
changeset
|
662 | property->value = value; |
|
361
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
355
diff
changeset
|
663 | |
|
609
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
664 | if(DAV_ENCRYPT_PROPERTIES(sn) && dav_namespace_is_encrypted(sn->context, ns)) { |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
665 | add2propertylist(a, &data->crypto_set, property); |
|
609
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
666 | } else { |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
667 | add2propertylist(a, &data->set, property); |
|
609
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
668 | } |
|
361
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
355
diff
changeset
|
669 | } |
|
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
355
diff
changeset
|
670 | |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
671 | void dav_remove_property(DavResource *res, char *name) { |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
672 | char *pns; |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
673 | char *pname; |
|
134
4bccc18820e8
implemented execution of field list expressions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
100
diff
changeset
|
674 | dav_get_property_namespace_str(res->session->context, name, &pns, &pname); |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
675 | dav_remove_property_ns(res, pns, pname); |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
676 | } |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
677 | |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
678 | void dav_remove_property_ns(DavResource *res, char *ns, char *name) { |
|
609
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
679 | DavSession *sn = res->session; |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
680 | DavResourceData *data = res->data; |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
681 | const CxAllocator *a = res->session->mp->allocator; |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
682 | |
|
605
bbc66c72661a
add new api for encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
589
diff
changeset
|
683 | DavProperty *property = createprop(res->session, ns, name); |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
684 | |
|
609
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
685 | if(DAV_ENCRYPT_PROPERTIES(sn) && dav_namespace_is_encrypted(sn->context, ns)) { |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
686 | add2propertylist(a, &data->crypto_remove, property); |
|
609
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
687 | } else { |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
688 | add2propertylist(a, &data->remove, property); |
|
609
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
689 | } |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
690 | } |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
691 | |
|
605
bbc66c72661a
add new api for encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
589
diff
changeset
|
692 | void dav_set_encrypted_property_ns(DavResource *res, char *ns, char *name, DavXmlNode *value) { |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
693 | const CxAllocator *a = res->session->mp->allocator; |
|
605
bbc66c72661a
add new api for encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
589
diff
changeset
|
694 | DavResourceData *data = res->data; |
|
bbc66c72661a
add new api for encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
589
diff
changeset
|
695 | |
|
bbc66c72661a
add new api for encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
589
diff
changeset
|
696 | DavProperty *property = createprop(res->session, ns, name); |
|
bbc66c72661a
add new api for encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
589
diff
changeset
|
697 | property->value = value; // TODO: copy node? |
|
bbc66c72661a
add new api for encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
589
diff
changeset
|
698 | |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
699 | add2propertylist(a, &data->crypto_set, property); |
|
605
bbc66c72661a
add new api for encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
589
diff
changeset
|
700 | } |
|
bbc66c72661a
add new api for encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
589
diff
changeset
|
701 | |
|
bbc66c72661a
add new api for encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
589
diff
changeset
|
702 | void dav_set_encrypted_string_property_ns(DavResource *res, char *ns, char *name, char *value) { |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
703 | const CxAllocator *a = res->session->mp->allocator; |
|
605
bbc66c72661a
add new api for encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
589
diff
changeset
|
704 | DavResourceData *data = res->data; |
|
bbc66c72661a
add new api for encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
589
diff
changeset
|
705 | |
|
bbc66c72661a
add new api for encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
589
diff
changeset
|
706 | DavProperty *property = createprop(res->session, ns, name); |
|
bbc66c72661a
add new api for encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
589
diff
changeset
|
707 | property->value = dav_text_node(res->session, value); |
|
bbc66c72661a
add new api for encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
589
diff
changeset
|
708 | |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
709 | add2propertylist(a, &data->crypto_set, property); |
|
605
bbc66c72661a
add new api for encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
589
diff
changeset
|
710 | } |
|
bbc66c72661a
add new api for encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
589
diff
changeset
|
711 | |
|
bbc66c72661a
add new api for encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
589
diff
changeset
|
712 | void dav_remove_encrypted_property_ns(DavResource *res, char *ns, char *name) { |
|
bbc66c72661a
add new api for encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
589
diff
changeset
|
713 | DavResourceData *data = res->data; |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
714 | const CxAllocator *a = res->session->mp->allocator; |
|
605
bbc66c72661a
add new api for encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
589
diff
changeset
|
715 | |
|
bbc66c72661a
add new api for encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
589
diff
changeset
|
716 | DavProperty *property = createprop(res->session, ns, name); |
|
bbc66c72661a
add new api for encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
589
diff
changeset
|
717 | |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
718 | add2propertylist(a, &data->crypto_remove, property); |
|
605
bbc66c72661a
add new api for encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
589
diff
changeset
|
719 | } |
|
bbc66c72661a
add new api for encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
589
diff
changeset
|
720 | |
|
84
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
721 | static int compare_propname(const void *a, const void *b) { |
|
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
722 | const DavPropName *p1 = a; |
|
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
723 | const DavPropName *p2 = b; |
|
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
724 | |
|
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
725 | int result = strcmp(p1->ns, p2->ns); |
|
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
726 | if(result) { |
|
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
727 | return result; |
|
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
728 | } else { |
|
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
729 | return strcmp(p1->name, p2->name); |
|
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
730 | } |
|
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
731 | } |
|
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
732 | |
|
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
733 | DavPropName* dav_get_property_names(DavResource *res, size_t *count) { |
|
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
734 | DavResourceData *data = res->data; |
|
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
735 | |
|
816
839fefbdedc7
compatibility with UCX 3.1 plus several minor code fixes
Mike Becker <universe@uap-core.de>
parents:
807
diff
changeset
|
736 | *count = cxMapSize(data->properties); |
|
84
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
737 | DavPropName *names = dav_session_calloc( |
|
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
738 | res->session, |
|
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
739 | *count, |
|
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
740 | sizeof(DavPropName)); |
|
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
741 | |
|
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
742 | |
|
854
1c8401ece69e
update ucx to version 3.1
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
852
diff
changeset
|
743 | CxMapIterator i = cxMapIteratorValues(data->properties); |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
744 | cx_foreach(DavProperty*, value, i) { |
|
816
839fefbdedc7
compatibility with UCX 3.1 plus several minor code fixes
Mike Becker <universe@uap-core.de>
parents:
807
diff
changeset
|
745 | DavPropName *name = &names[i.index]; |
|
609
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
746 | name->ns = value->ns->name; |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
747 | name->name = value->name; |
|
84
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
748 | } |
|
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
749 | |
|
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
750 | qsort(names, *count, sizeof(DavPropName), compare_propname); |
|
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
751 | |
|
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
752 | return names; |
|
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
753 | } |
|
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
754 | |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
755 | |
|
478
baa63fef5c5c
fixes redirects
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
477
diff
changeset
|
756 | void dav_set_content(DavResource *res, void *stream, dav_read_func read_func, dav_seek_func seek_func) { |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
757 | DavResourceData *data = res->data; |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
758 | data->content = stream; |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
759 | data->read = read_func; |
|
478
baa63fef5c5c
fixes redirects
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
477
diff
changeset
|
760 | data->seek = seek_func; |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
761 | data->length = 0; |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
762 | } |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
763 | |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
764 | void dav_set_content_data(DavResource *res, char *content, size_t length) { |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
765 | DavSession *sn = res->session; |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
766 | DavResourceData *data = res->data; |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
767 | data->content = dav_session_malloc(sn, length); |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
768 | memcpy(data->content, content, length); |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
769 | data->read = NULL; |
|
478
baa63fef5c5c
fixes redirects
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
477
diff
changeset
|
770 | data->seek = NULL; |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
771 | data->length = length; |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
772 | } |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
773 | |
|
178
e137883e620f
using content-length header in dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
155
diff
changeset
|
774 | void dav_set_content_length(DavResource *res, size_t length) { |
|
e137883e620f
using content-length header in dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
155
diff
changeset
|
775 | DavResourceData *data = res->data; |
|
e137883e620f
using content-length header in dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
155
diff
changeset
|
776 | data->length = length; |
|
e137883e620f
using content-length header in dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
155
diff
changeset
|
777 | } |
|
e137883e620f
using content-length header in dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
155
diff
changeset
|
778 | |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
779 | |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
780 | int dav_load(DavResource *res) { |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
781 | CxBuffer *rqbuf = create_allprop_propfind_request(); |
|
135
664aeaec8d25
replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
134
diff
changeset
|
782 | int ret = dav_propfind(res->session, res, rqbuf); |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
783 | cxBufferFree(rqbuf); |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
784 | return ret; |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
785 | } |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
786 | |
|
298
755b8198b071
dav get-property shouldn't send an allprop propfind request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
280
diff
changeset
|
787 | int dav_load_prop(DavResource *res, DavPropName *properties, size_t numprop) { |
|
869
cece9ef3547f
use cxMempoolCreateSimple instead of cxMempoolCreate
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
857
diff
changeset
|
788 | CxMempool *mp = cxMempoolCreateSimple(64); |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
789 | const CxAllocator *a = mp->allocator; |
|
298
755b8198b071
dav get-property shouldn't send an allprop propfind request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
280
diff
changeset
|
790 | |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
791 | CxList *proplist = cxArrayListCreate(a, NULL, sizeof(DavProperty), numprop); |
|
298
755b8198b071
dav get-property shouldn't send an allprop propfind request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
280
diff
changeset
|
792 | for(size_t i=0;i<numprop;i++) { |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
793 | DavProperty p; |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
794 | p.name = properties[i].name; |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
795 | p.ns = cxMalloc(a, sizeof(DavNamespace)); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
796 | p.ns->name = properties[i].ns; |
|
298
755b8198b071
dav get-property shouldn't send an allprop propfind request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
280
diff
changeset
|
797 | if(!strcmp(properties[i].ns, "DAV:")) { |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
798 | p.ns->prefix = "D"; |
|
298
755b8198b071
dav get-property shouldn't send an allprop propfind request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
280
diff
changeset
|
799 | } else { |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
800 | p.ns->prefix = cx_asprintf_a(a, "x%d", (int)i).ptr; |
|
298
755b8198b071
dav get-property shouldn't send an allprop propfind request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
280
diff
changeset
|
801 | } |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
802 | p.value = NULL; |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
803 | cxListAdd(proplist, &p); |
|
298
755b8198b071
dav get-property shouldn't send an allprop propfind request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
280
diff
changeset
|
804 | } |
|
755b8198b071
dav get-property shouldn't send an allprop propfind request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
280
diff
changeset
|
805 | |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
806 | CxBuffer *rqbuf = create_propfind_request(res->session, proplist, "propfind", 0); |
|
298
755b8198b071
dav get-property shouldn't send an allprop propfind request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
280
diff
changeset
|
807 | int ret = dav_propfind(res->session, res, rqbuf); |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
808 | cxBufferFree(rqbuf); |
| 852 | 809 | cxMempoolFree(mp); |
|
298
755b8198b071
dav get-property shouldn't send an allprop propfind request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
280
diff
changeset
|
810 | return ret; |
|
755b8198b071
dav get-property shouldn't send an allprop propfind request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
280
diff
changeset
|
811 | } |
|
755b8198b071
dav get-property shouldn't send an allprop propfind request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
280
diff
changeset
|
812 | |
|
555
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
813 | |
|
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
814 | static void init_hash_stream(HashStream *hstr, void *stream, dav_read_func readfn, dav_seek_func seekfn) { |
|
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
815 | hstr->sha = NULL; |
|
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
816 | hstr->stream = stream; |
|
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
817 | hstr->read = readfn; |
|
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
818 | hstr->seek = seekfn; |
|
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
819 | hstr->error = 0; |
|
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
820 | } |
|
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
821 | |
|
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
822 | static size_t dav_read_h(void *buf, size_t size, size_t nelm, void *stream) { |
|
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
823 | HashStream *s = stream; |
|
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
824 | if(!s->sha) { |
|
857
03982275f29b
use newer openssl hashing functions to fix warnings
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
856
diff
changeset
|
825 | s->sha = dav_sha256_create(); |
|
555
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
826 | } |
|
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
827 | |
|
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
828 | size_t r = s->read(buf, size, nelm, s->stream); |
|
857
03982275f29b
use newer openssl hashing functions to fix warnings
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
856
diff
changeset
|
829 | dav_sha256_update(s->sha, buf, r); |
|
555
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
830 | return r; |
|
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
831 | } |
|
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
832 | |
|
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
833 | static int dav_seek_h(void *stream, long offset, int whence) { |
|
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
834 | HashStream *s = stream; |
|
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
835 | if(offset == 0 && whence == SEEK_SET) { |
|
558
1a9e6a5c1e79
fixes several signedness issues
Mike Becker <universe@uap-core.de>
parents:
555
diff
changeset
|
836 | unsigned char buf[DAV_SHA256_DIGEST_LENGTH]; |
|
872
d24de29ad1fe
fix memory management in hashing functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
869
diff
changeset
|
837 | dav_sha256_final_free(s->sha, buf); |
|
555
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
838 | s->sha = NULL; |
|
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
839 | } else { |
|
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
840 | s->error = 1; |
|
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
841 | } |
|
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
842 | return s->seek(s->stream, offset, whence); |
|
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
843 | } |
|
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
844 | |
|
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
845 | |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
846 | int dav_store(DavResource *res) { |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
847 | DavSession *sn = res->session; |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
848 | DavResourceData *data = res->data; |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
849 | |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
850 | util_set_url(sn, dav_resource_get_href(res)); |
|
208
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
851 | |
|
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
852 | DavLock *lock = dav_get_lock(sn, res->path); |
|
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
853 | char *locktoken = lock ? lock->token : NULL; |
|
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
854 | |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
855 | // store content |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
856 | if(data->content) { |
|
807
b41630ecc481
add support for progress callbacks in dav_store()
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
789
diff
changeset
|
857 | curl_easy_setopt(sn->handle, CURLOPT_XFERINFOFUNCTION, dav_session_put_progress); |
|
b41630ecc481
add support for progress callbacks in dav_store()
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
789
diff
changeset
|
858 | curl_easy_setopt(sn->handle, CURLOPT_XFERINFODATA, res); |
|
b41630ecc481
add support for progress callbacks in dav_store()
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
789
diff
changeset
|
859 | curl_easy_setopt(sn->handle, CURLOPT_NOPROGRESS, 0L); |
|
b41630ecc481
add support for progress callbacks in dav_store()
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
789
diff
changeset
|
860 | |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
861 | int encryption = DAV_ENCRYPT_CONTENT(sn) && sn->key; |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
862 | CURLcode ret; |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
863 | if(encryption) { |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
864 | AESEncrypter *enc = NULL; |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
865 | CxBuffer *buf = NULL; |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
866 | if(data->read) { |
|
478
baa63fef5c5c
fixes redirects
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
477
diff
changeset
|
867 | enc = aes_encrypter_new( |
|
baa63fef5c5c
fixes redirects
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
477
diff
changeset
|
868 | sn->key, |
|
baa63fef5c5c
fixes redirects
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
477
diff
changeset
|
869 | data->content, |
|
baa63fef5c5c
fixes redirects
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
477
diff
changeset
|
870 | data->read, |
|
baa63fef5c5c
fixes redirects
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
477
diff
changeset
|
871 | data->seek); |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
872 | } else { |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
873 | buf = cxBufferCreate(data->content, data->length, cxDefaultAllocator, 0); |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
874 | buf->size = data->length; |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
875 | enc = aes_encrypter_new( |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
876 | sn->key, |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
877 | buf, |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
878 | (dav_read_func)cxBufferRead, |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
879 | (dav_seek_func)cxBufferSeek); |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
880 | } |
|
208
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
881 | |
|
150
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
146
diff
changeset
|
882 | // put resource |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
883 | ret = do_put_request( |
|
354
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
349
diff
changeset
|
884 | sn, |
|
208
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
885 | locktoken, |
|
227
bf485439222a
fixed locking in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
225
diff
changeset
|
886 | TRUE, |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
887 | enc, |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
888 | (dav_read_func)aes_read, |
|
478
baa63fef5c5c
fixes redirects
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
477
diff
changeset
|
889 | (dav_seek_func)aes_encrypter_reset, |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
890 | 0); |
|
150
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
146
diff
changeset
|
891 | |
|
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
146
diff
changeset
|
892 | // get sha256 hash |
|
555
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
893 | dav_get_hash(&enc->sha256, (unsigned char*)data->hash); |
|
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
894 | char *enc_hash = aes_encrypt(data->hash, DAV_SHA256_DIGEST_LENGTH, sn->key); |
|
150
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
146
diff
changeset
|
895 | |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
896 | aes_encrypter_close(enc); |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
897 | if(buf) { |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
898 | cxBufferFree(buf); |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
899 | } |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
900 | |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
901 | // add crypto properties |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
902 | // TODO: store the properties later |
|
150
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
146
diff
changeset
|
903 | if(resource_add_crypto_info(sn, res->href, res->name, enc_hash)) { |
|
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
146
diff
changeset
|
904 | free(enc_hash); |
|
807
b41630ecc481
add support for progress callbacks in dav_store()
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
789
diff
changeset
|
905 | curl_easy_setopt(sn->handle, CURLOPT_XFERINFOFUNCTION, NULL); |
|
b41630ecc481
add support for progress callbacks in dav_store()
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
789
diff
changeset
|
906 | curl_easy_setopt(sn->handle, CURLOPT_NOPROGRESS, 1L); |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
907 | return 1; |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
908 | } |
|
331
9ca1e4706acc
adds initial support for xml properties in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
315
diff
changeset
|
909 | resource_add_string_property(res, DAV_NS, "crypto-hash", enc_hash); |
|
150
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
146
diff
changeset
|
910 | free(enc_hash); |
|
555
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
911 | } else if((sn->flags & DAV_SESSION_STORE_HASH) == DAV_SESSION_STORE_HASH) { |
|
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
912 | HashStream hstr; |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
913 | CxBuffer *iobuf = NULL; |
|
555
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
914 | if(!data->read) { |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
915 | iobuf = cxBufferCreate(data->content, data->length, cxDefaultAllocator, 0); |
|
555
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
916 | iobuf->size = data->length; |
|
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
917 | init_hash_stream( |
|
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
918 | &hstr, |
|
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
919 | iobuf, |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
920 | (dav_read_func)cxBufferRead, |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
921 | (dav_seek_func)cxBufferSeek); |
|
555
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
922 | } else { |
|
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
923 | init_hash_stream( |
|
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
924 | &hstr, |
|
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
925 | data->content, |
|
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
926 | data->read, |
|
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
927 | data->seek); |
|
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
928 | } |
|
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
929 | |
|
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
930 | ret = do_put_request( |
|
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
931 | sn, |
|
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
932 | locktoken, |
|
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
933 | TRUE, |
|
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
934 | &hstr, |
|
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
935 | dav_read_h, |
|
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
936 | (dav_seek_func)dav_seek_h, |
|
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
937 | data->length); |
|
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
938 | |
|
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
939 | if(hstr.sha) { |
|
872
d24de29ad1fe
fix memory management in hashing functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
869
diff
changeset
|
940 | dav_sha256_final_free(hstr.sha, (unsigned char*)data->hash); |
|
558
1a9e6a5c1e79
fixes several signedness issues
Mike Becker <universe@uap-core.de>
parents:
555
diff
changeset
|
941 | char *hash = util_hexstr((unsigned char*)data->hash, 32); |
|
555
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
942 | dav_set_string_property_ns(res, DAV_NS, "content-hash", hash); |
|
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
943 | free(hash); |
|
c9ada14ee90e
add session flag for content hash creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
944 | } |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
945 | } else { |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
946 | ret = do_put_request( |
|
354
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
349
diff
changeset
|
947 | sn, |
|
208
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
948 | locktoken, |
|
227
bf485439222a
fixed locking in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
225
diff
changeset
|
949 | TRUE, |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
950 | data->content, |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
951 | data->read, |
|
478
baa63fef5c5c
fixes redirects
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
477
diff
changeset
|
952 | data->seek, |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
953 | data->length); |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
954 | } |
|
807
b41630ecc481
add support for progress callbacks in dav_store()
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
789
diff
changeset
|
955 | |
|
b41630ecc481
add support for progress callbacks in dav_store()
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
789
diff
changeset
|
956 | curl_easy_setopt(sn->handle, CURLOPT_XFERINFOFUNCTION, NULL); |
|
b41630ecc481
add support for progress callbacks in dav_store()
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
789
diff
changeset
|
957 | curl_easy_setopt(sn->handle, CURLOPT_NOPROGRESS, 1L); |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
958 | |
|
205
bf756f6c3581
fixed some warnings and wrong usage of curl_easy_getinfo
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
186
diff
changeset
|
959 | long status = 0; |
|
40
a95ee94b9204
supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
33
diff
changeset
|
960 | curl_easy_getinfo(sn->handle, CURLINFO_RESPONSE_CODE, &status); |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
961 | if(ret == CURLE_OK && (status >= 200 && status < 300)) { |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
962 | res->session->error = 0; |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
963 | // cleanup node data |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
964 | if(!data->read) { |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
965 | cxFree(sn->mp->allocator, data->content); |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
966 | } |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
967 | data->content = NULL; |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
968 | data->read = NULL; |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
969 | data->length = 0; |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
970 | } else { |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
971 | dav_session_set_error(sn, ret, status); |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
972 | return 1; |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
973 | } |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
974 | } |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
975 | |
|
609
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
976 | // generate crypto-prop content |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
977 | if(DAV_ENCRYPT_PROPERTIES(sn) && sn->key && (data->crypto_set || data->crypto_remove)) { |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
978 | DavResource *crypto_res = dav_resource_new_href(sn, res->href); |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
979 | int ret = 1; |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
980 | |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
981 | if(crypto_res) { |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
982 | CxBuffer *rqbuf = create_cryptoprop_propfind_request(); |
|
609
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
983 | ret = dav_propfind(res->session, res, rqbuf); |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
984 | cxBufferFree(rqbuf); |
|
609
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
985 | } |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
986 | |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
987 | if(!ret) { |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
988 | DavXmlNode *crypto_prop_node = dav_get_property_ns(crypto_res, DAV_NS, "crypto-prop"); |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
989 | CxMap *crypto_props = parse_crypto_prop(sn, sn->key, crypto_prop_node); |
|
609
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
990 | if(!crypto_props) { |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
991 | // resource hasn't encrypted properties yet |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
992 | crypto_props = cxHashMapCreate(cxDefaultAllocator, CX_STORE_POINTERS, 32); // create new map |
|
609
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
993 | } |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
994 | |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
995 | // remove all properties |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
996 | if(data->crypto_remove) { |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
997 | CxIterator i = cxListIterator(data->crypto_remove); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
998 | cx_foreach(DavProperty *, property, i) { |
|
816
839fefbdedc7
compatibility with UCX 3.1 plus several minor code fixes
Mike Becker <universe@uap-core.de>
parents:
807
diff
changeset
|
999 | if(cxMapSize(crypto_props) == 0) { |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1000 | break; // map already empty, can't remove any more |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1001 | } |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1002 | |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1003 | cxmutstr key = dav_property_key(property->ns->name, property->name); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1004 | DavProperty *existing_prop = cxMapGet(crypto_props, cx_hash_key(key.ptr, key.length)); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1005 | if(existing_prop) { |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1006 | // TODO: free existing_prop |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1007 | } |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1008 | free(key.ptr); |
|
609
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
1009 | } |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
1010 | } |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
1011 | |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
1012 | // set properties |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1013 | if(data->crypto_set) { |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1014 | CxIterator i = cxListIterator(data->crypto_set); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1015 | cx_foreach(DavProperty *, property, i) { |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1016 | cxmutstr keystr = dav_property_key(property->ns->name, property->name); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1017 | CxHashKey key = cx_hash_key(keystr.ptr, keystr.length); |
| 852 | 1018 | DavProperty *existing_prop = NULL; |
| 1019 | cxMapRemoveAndGet(crypto_props, key, &existing_prop); | |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1020 | cxMapPut(crypto_props, key, property); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1021 | if(existing_prop) { |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1022 | // TODO: free existing_prop |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1023 | } |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1024 | free(keystr.ptr); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1025 | } |
|
609
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
1026 | } |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
1027 | |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
1028 | DavXmlNode *crypto_prop_value = create_crypto_prop(sn, crypto_props); |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
1029 | if(crypto_prop_value) { |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
1030 | DavProperty *new_crypto_prop = createprop(sn, DAV_NS, "crypto-prop"); |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
1031 | new_crypto_prop->value = crypto_prop_value; |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1032 | add2propertylist(sn->mp->allocator, &data->set, new_crypto_prop); |
|
609
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
1033 | } |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
1034 | |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
1035 | dav_resource_free(crypto_res); |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
1036 | } |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
1037 | |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
1038 | if(ret) { |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
1039 | return 1; |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
1040 | } |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
1041 | } |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
1042 | |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1043 | // store properties |
|
223
cbbdf207e67e
fixed some bugs in dav_create() and dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
222
diff
changeset
|
1044 | int r = 0; |
|
cbbdf207e67e
fixed some bugs in dav_create() and dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
222
diff
changeset
|
1045 | sn->error = DAV_OK; |
|
850
bbe2925eb590
revert property set/remove list changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
848
diff
changeset
|
1046 | if(data->set || data->remove > 0) { |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1047 | CxBuffer *request = create_proppatch_request(data); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1048 | CxBuffer *response = cxBufferCreate(NULL, 1024, cxDefaultAllocator, CX_BUFFER_FREE_CONTENTS|CX_BUFFER_AUTO_EXTEND); |
|
181
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
178
diff
changeset
|
1049 | //printf("request:\n%.*s\n\n", request->pos, request->space); |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1050 | |
|
354
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
349
diff
changeset
|
1051 | CURLcode ret = do_proppatch_request(sn, locktoken, request, response); |
|
205
bf756f6c3581
fixed some warnings and wrong usage of curl_easy_getinfo
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
186
diff
changeset
|
1052 | long status = 0; |
|
40
a95ee94b9204
supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
33
diff
changeset
|
1053 | curl_easy_getinfo (sn->handle, CURLINFO_RESPONSE_CODE, &status); |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1054 | if(ret == CURLE_OK && status == 207) { |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1055 | //printf("%s\n", response->space); |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1056 | // TODO: parse response |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1057 | // TODO: cleanup node data correctly |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1058 | data->set = NULL; |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1059 | data->remove = NULL; |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1060 | } else { |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1061 | dav_session_set_error(sn, ret, status); |
|
223
cbbdf207e67e
fixed some bugs in dav_create() and dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
222
diff
changeset
|
1062 | r = -1; |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1063 | } |
|
223
cbbdf207e67e
fixed some bugs in dav_create() and dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
222
diff
changeset
|
1064 | |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1065 | cxBufferFree(request); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1066 | cxBufferFree(response); |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1067 | } |
|
609
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
1068 | |
|
223
cbbdf207e67e
fixed some bugs in dav_create() and dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
222
diff
changeset
|
1069 | return r; |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1070 | } |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1071 | |
|
477
9a406db6729b
makes libidav compatible with libcurl < 7.32
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
475
diff
changeset
|
1072 | #if LIBCURL_VERSION_MAJOR >= 7 && LIBCURL_VERSION_MINOR >= 32 |
|
9a406db6729b
makes libidav compatible with libcurl < 7.32
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
475
diff
changeset
|
1073 | static void set_progressfunc(DavResource *res) { |
|
9a406db6729b
makes libidav compatible with libcurl < 7.32
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
475
diff
changeset
|
1074 | CURL *handle = res->session->handle; |
|
9a406db6729b
makes libidav compatible with libcurl < 7.32
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
475
diff
changeset
|
1075 | curl_easy_setopt(handle, CURLOPT_XFERINFOFUNCTION, dav_session_get_progress); |
|
9a406db6729b
makes libidav compatible with libcurl < 7.32
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
475
diff
changeset
|
1076 | curl_easy_setopt(handle, CURLOPT_XFERINFODATA, res); |
|
9a406db6729b
makes libidav compatible with libcurl < 7.32
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
475
diff
changeset
|
1077 | curl_easy_setopt(handle, CURLOPT_NOPROGRESS, 0L); |
|
9a406db6729b
makes libidav compatible with libcurl < 7.32
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
475
diff
changeset
|
1078 | } |
|
9a406db6729b
makes libidav compatible with libcurl < 7.32
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
475
diff
changeset
|
1079 | |
|
9a406db6729b
makes libidav compatible with libcurl < 7.32
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
475
diff
changeset
|
1080 | static void unset_progressfunc(DavResource *res) { |
|
9a406db6729b
makes libidav compatible with libcurl < 7.32
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
475
diff
changeset
|
1081 | CURL *handle = res->session->handle; |
|
9a406db6729b
makes libidav compatible with libcurl < 7.32
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
475
diff
changeset
|
1082 | curl_easy_setopt(handle, CURLOPT_XFERINFOFUNCTION, NULL); |
|
9a406db6729b
makes libidav compatible with libcurl < 7.32
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
475
diff
changeset
|
1083 | curl_easy_setopt(handle, CURLOPT_XFERINFODATA, NULL); |
|
9a406db6729b
makes libidav compatible with libcurl < 7.32
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
475
diff
changeset
|
1084 | curl_easy_setopt(handle, CURLOPT_NOPROGRESS, 1L); |
|
9a406db6729b
makes libidav compatible with libcurl < 7.32
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
475
diff
changeset
|
1085 | } |
|
9a406db6729b
makes libidav compatible with libcurl < 7.32
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
475
diff
changeset
|
1086 | #else |
|
9a406db6729b
makes libidav compatible with libcurl < 7.32
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
475
diff
changeset
|
1087 | static void set_progressfunc(DavResource *res) { |
|
9a406db6729b
makes libidav compatible with libcurl < 7.32
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
475
diff
changeset
|
1088 | |
|
9a406db6729b
makes libidav compatible with libcurl < 7.32
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
475
diff
changeset
|
1089 | } |
|
9a406db6729b
makes libidav compatible with libcurl < 7.32
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
475
diff
changeset
|
1090 | static void unset_progressfunc(DavResource *res) { |
|
9a406db6729b
makes libidav compatible with libcurl < 7.32
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
475
diff
changeset
|
1091 | |
|
9a406db6729b
makes libidav compatible with libcurl < 7.32
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
475
diff
changeset
|
1092 | } |
|
9a406db6729b
makes libidav compatible with libcurl < 7.32
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
475
diff
changeset
|
1093 | #endif |
|
9a406db6729b
makes libidav compatible with libcurl < 7.32
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
475
diff
changeset
|
1094 | |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1095 | int dav_get_content(DavResource *res, void *stream, dav_write_func write_fnc) { |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1096 | DavSession *sn = res->session; |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1097 | CURL *handle = sn->handle; |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1098 | util_set_url(res->session, dav_resource_get_href(res)); |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1099 | |
|
144
c2c02c9b3be4
dav-sync detects broken uploads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
143
diff
changeset
|
1100 | // check encryption |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1101 | AESDecrypter *dec = NULL; |
|
151
a316613205dc
fixed some memory leaks, content verification and dav info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
150
diff
changeset
|
1102 | DavKey *key = NULL; |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1103 | if(DAV_DECRYPT_CONTENT(sn)) { |
|
331
9ca1e4706acc
adds initial support for xml properties in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
315
diff
changeset
|
1104 | char *keyname = dav_get_string_property_ns(res, DAV_NS, "crypto-key"); |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1105 | if(keyname) { |
|
151
a316613205dc
fixed some memory leaks, content verification and dav info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
150
diff
changeset
|
1106 | key = dav_context_get_key(sn->context, keyname); |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1107 | if(key) { |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1108 | dec = aes_decrypter_new(key, stream, write_fnc); |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1109 | stream = dec; |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1110 | write_fnc = (dav_write_func)aes_write; |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1111 | } |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1112 | } |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1113 | } |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1114 | |
|
74
da079dc0724c
fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
70
diff
changeset
|
1115 | curl_easy_setopt(handle, CURLOPT_HTTPHEADER, NULL); |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1116 | curl_easy_setopt(handle, CURLOPT_CUSTOMREQUEST, NULL); |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1117 | curl_easy_setopt(handle, CURLOPT_UPLOAD, 0L); |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1118 | |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1119 | curl_easy_setopt(handle, CURLOPT_WRITEFUNCTION, write_fnc); |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1120 | curl_easy_setopt(handle, CURLOPT_WRITEDATA, stream); |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1121 | |
|
355
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
1122 | if(sn->get_progress) { |
|
477
9a406db6729b
makes libidav compatible with libcurl < 7.32
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
475
diff
changeset
|
1123 | set_progressfunc(res); |
|
355
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
1124 | } |
|
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
1125 | |
|
354
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
349
diff
changeset
|
1126 | long status = 0; |
|
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
349
diff
changeset
|
1127 | CURLcode ret = dav_session_curl_perform(sn, &status); |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1128 | |
|
355
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
1129 | if(sn->get_progress) { |
|
477
9a406db6729b
makes libidav compatible with libcurl < 7.32
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
475
diff
changeset
|
1130 | unset_progressfunc(res); |
|
355
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
1131 | } |
|
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
1132 | |
|
150
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
146
diff
changeset
|
1133 | char *hash = NULL; |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1134 | if(dec) { |
|
207
de23f8881e9f
fixed hash verification and head requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
1135 | aes_decrypter_shutdown(dec); // get final bytes |
|
de23f8881e9f
fixed hash verification and head requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
1136 | |
|
150
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
146
diff
changeset
|
1137 | // get hash |
|
349
0b4ecadaf3f9
ports openssl code to commoncrypto (macos)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
348
diff
changeset
|
1138 | unsigned char sha[DAV_SHA256_DIGEST_LENGTH]; |
|
150
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
146
diff
changeset
|
1139 | dav_get_hash(&dec->sha256, sha); |
|
349
0b4ecadaf3f9
ports openssl code to commoncrypto (macos)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
348
diff
changeset
|
1140 | hash = util_hexstr(sha, DAV_SHA256_DIGEST_LENGTH); |
|
150
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
146
diff
changeset
|
1141 | |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1142 | aes_decrypter_close(dec); |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1143 | } |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1144 | |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1145 | if(ret == CURLE_OK && (status >= 200 && status < 300)) { |
|
150
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
146
diff
changeset
|
1146 | int verify_failed = 0; |
|
151
a316613205dc
fixed some memory leaks, content verification and dav info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
150
diff
changeset
|
1147 | if(DAV_DECRYPT_CONTENT(sn) && key) { |
|
150
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
146
diff
changeset
|
1148 | // try to verify the content |
|
331
9ca1e4706acc
adds initial support for xml properties in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
315
diff
changeset
|
1149 | char *res_hash = dav_get_string_property_ns(res, DAV_NS, "crypto-hash"); |
|
150
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
146
diff
changeset
|
1150 | |
|
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
146
diff
changeset
|
1151 | if(res_hash) { |
|
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
146
diff
changeset
|
1152 | size_t len = 0; |
|
151
a316613205dc
fixed some memory leaks, content verification and dav info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
150
diff
changeset
|
1153 | char *dec_hash = aes_decrypt(res_hash, &len, key); |
|
542
060a8cda7f62
adds wrapper functions for setting/getting the content hash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
1154 | char *hex_hash = util_hexstr((unsigned char*)dec_hash, len); |
|
150
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
146
diff
changeset
|
1155 | if(strcmp(hash, hex_hash)) { |
|
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
146
diff
changeset
|
1156 | verify_failed = 1; |
|
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
146
diff
changeset
|
1157 | } |
|
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
146
diff
changeset
|
1158 | free(dec_hash); |
|
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
146
diff
changeset
|
1159 | free(hex_hash); |
|
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
146
diff
changeset
|
1160 | } |
|
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
146
diff
changeset
|
1161 | } |
|
151
a316613205dc
fixed some memory leaks, content verification and dav info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
150
diff
changeset
|
1162 | if(hash) { |
|
a316613205dc
fixed some memory leaks, content verification and dav info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
150
diff
changeset
|
1163 | free(hash); |
|
a316613205dc
fixed some memory leaks, content verification and dav info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
150
diff
changeset
|
1164 | } |
|
150
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
146
diff
changeset
|
1165 | |
|
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
146
diff
changeset
|
1166 | if(verify_failed) { |
|
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
146
diff
changeset
|
1167 | res->session->error = DAV_CONTENT_VERIFICATION_ERROR; |
|
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
146
diff
changeset
|
1168 | return 1; |
|
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
146
diff
changeset
|
1169 | } |
|
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
146
diff
changeset
|
1170 | |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1171 | res->session->error = DAV_OK; |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1172 | return 0; |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1173 | } else { |
|
151
a316613205dc
fixed some memory leaks, content verification and dav info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
150
diff
changeset
|
1174 | if(hash) { |
|
a316613205dc
fixed some memory leaks, content verification and dav info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
150
diff
changeset
|
1175 | free(hash); |
|
a316613205dc
fixed some memory leaks, content verification and dav info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
150
diff
changeset
|
1176 | } |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1177 | dav_session_set_error(res->session, ret, status); |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1178 | return 1; |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1179 | } |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1180 | } |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1181 | |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1182 | DavResource* dav_create_child(DavResource *parent, char *name) { |
|
42
6518b035a9df
added some api functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
41
diff
changeset
|
1183 | DavResource *res = dav_resource_new_child(parent->session, parent, name); |
|
6518b035a9df
added some api functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
41
diff
changeset
|
1184 | if(dav_create(res)) { |
|
225
a297c2e28fa1
improved error handling in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
223
diff
changeset
|
1185 | dav_resource_free(res); |
|
42
6518b035a9df
added some api functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
41
diff
changeset
|
1186 | return NULL; |
|
6518b035a9df
added some api functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
41
diff
changeset
|
1187 | } else { |
|
6518b035a9df
added some api functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
41
diff
changeset
|
1188 | return res; |
|
6518b035a9df
added some api functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
41
diff
changeset
|
1189 | } |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1190 | } |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1191 | |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1192 | int dav_delete(DavResource *res) { |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1193 | CURL *handle = res->session->handle; |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1194 | util_set_url(res->session, dav_resource_get_href(res)); |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1195 | |
|
208
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1196 | DavLock *lock = dav_get_lock(res->session, res->path); |
|
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1197 | char *locktoken = lock ? lock->token : NULL; |
|
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1198 | |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1199 | CxBuffer *response = cxBufferCreate(NULL, 4096, cxDefaultAllocator, CX_BUFFER_FREE_CONTENTS|CX_BUFFER_AUTO_EXTEND); |
|
354
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
349
diff
changeset
|
1200 | CURLcode ret = do_delete_request(res->session, locktoken, response); |
|
205
bf756f6c3581
fixed some warnings and wrong usage of curl_easy_getinfo
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
186
diff
changeset
|
1201 | long status = 0; |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1202 | curl_easy_getinfo (handle, CURLINFO_RESPONSE_CODE, &status); |
|
223
cbbdf207e67e
fixed some bugs in dav_create() and dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
222
diff
changeset
|
1203 | int r = 0; |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1204 | if(ret == CURLE_OK && (status >= 200 && status < 300)) { |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1205 | res->session->error = DAV_OK; |
|
525
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
518
diff
changeset
|
1206 | res->exists = 0; |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1207 | |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1208 | // TODO: parse response |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1209 | // TODO: free res |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1210 | } else { |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1211 | dav_session_set_error(res->session, ret, status); |
|
223
cbbdf207e67e
fixed some bugs in dav_create() and dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
222
diff
changeset
|
1212 | r = 1; |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1213 | } |
|
223
cbbdf207e67e
fixed some bugs in dav_create() and dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
222
diff
changeset
|
1214 | |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1215 | cxBufferFree(response); |
|
223
cbbdf207e67e
fixed some bugs in dav_create() and dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
222
diff
changeset
|
1216 | return r; |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1217 | } |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1218 | |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1219 | static int create_ancestors(DavSession *sn, char *href, char *path) { |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1220 | CURL *handle = sn->handle; |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1221 | CURLcode code; |
|
208
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1222 | |
|
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1223 | DavLock *lock = dav_get_lock(sn, path); |
|
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1224 | char *locktoken = lock ? lock->token : NULL; |
|
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1225 | |
|
205
bf756f6c3581
fixed some warnings and wrong usage of curl_easy_getinfo
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
186
diff
changeset
|
1226 | long status = 0; |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1227 | int ret = 0; |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1228 | |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1229 | if(strlen(path) <= 1) { |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1230 | return 0; |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1231 | } |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1232 | |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1233 | char *p = util_parent_path(path); |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1234 | char *h = util_parent_path(href); |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1235 | |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1236 | for(int i=0;i<2;i++) { |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1237 | util_set_url(sn, h); |
|
354
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
349
diff
changeset
|
1238 | code = do_mkcol_request(sn, locktoken); |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1239 | curl_easy_getinfo(handle, CURLINFO_RESPONSE_CODE, &status); |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1240 | if(status == 201) { |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1241 | // resource successfully created |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1242 | char *name = (char*)util_resource_name(p); |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1243 | int len = strlen(name); |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1244 | if(name[len - 1] == '/') { |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1245 | name[len - 1] = '\0'; |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1246 | } |
|
150
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
146
diff
changeset
|
1247 | if(resource_add_crypto_info(sn, h, name, NULL)) { |
|
225
a297c2e28fa1
improved error handling in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
223
diff
changeset
|
1248 | sn->error = DAV_ERROR; |
|
a297c2e28fa1
improved error handling in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
223
diff
changeset
|
1249 | dav_session_set_errstr(sn, "Cannot set crypto properties for ancestor"); |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1250 | } |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1251 | break; |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1252 | } else if(status == 405) { |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1253 | // parent already exists |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1254 | break; |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1255 | } else if(status == 409) { |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1256 | // parent doesn't exist |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1257 | if(create_ancestors(sn, h, p)) { |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1258 | ret = 1; |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1259 | break; |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1260 | } |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1261 | } else { |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1262 | dav_session_set_error(sn, code, status); |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1263 | ret = 1; |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1264 | break; |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1265 | } |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1266 | } |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1267 | |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1268 | free(p); |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1269 | free(h); |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1270 | return ret; |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1271 | } |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1272 | |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1273 | static int create_resource(DavResource *res, int *status) { |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1274 | DavSession *sn = res->session; |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1275 | CURL *handle = sn->handle; |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1276 | util_set_url(sn, dav_resource_get_href(res)); |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1277 | |
|
208
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1278 | DavLock *lock = dav_get_lock(res->session, res->path); |
|
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1279 | char *locktoken = lock ? lock->token : NULL; |
|
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1280 | |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1281 | CURLcode code; |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1282 | if(res->iscollection) { |
|
354
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
349
diff
changeset
|
1283 | code = do_mkcol_request(sn, locktoken); |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1284 | } else { |
|
478
baa63fef5c5c
fixes redirects
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
477
diff
changeset
|
1285 | code = do_put_request(sn, locktoken, TRUE, "", NULL, NULL, 0); |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1286 | } |
|
205
bf756f6c3581
fixed some warnings and wrong usage of curl_easy_getinfo
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
186
diff
changeset
|
1287 | long s = 0; |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1288 | curl_easy_getinfo(handle, CURLINFO_RESPONSE_CODE, &s); |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1289 | *status = s; |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1290 | if(code == CURLE_OK && (s >= 200 && s < 300)) { |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1291 | sn->error = DAV_OK; |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1292 | // if the session has encrypted file names, add crypto infos |
|
225
a297c2e28fa1
improved error handling in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
223
diff
changeset
|
1293 | if(!resource_add_crypto_info(sn, res->href, res->name, NULL)) { |
|
a297c2e28fa1
improved error handling in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
223
diff
changeset
|
1294 | // do a minimal propfind request |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1295 | CxBuffer *rqbuf = create_propfind_request(sn, NULL, "propfind", 0); |
|
225
a297c2e28fa1
improved error handling in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
223
diff
changeset
|
1296 | int ret = dav_propfind(sn, res, rqbuf); |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1297 | cxBufferFree(rqbuf); |
|
225
a297c2e28fa1
improved error handling in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
223
diff
changeset
|
1298 | return ret; |
|
a297c2e28fa1
improved error handling in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
223
diff
changeset
|
1299 | } else { |
|
a297c2e28fa1
improved error handling in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
223
diff
changeset
|
1300 | return 1; |
|
a297c2e28fa1
improved error handling in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
223
diff
changeset
|
1301 | } |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1302 | } else { |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1303 | dav_session_set_error(sn, code, s); |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1304 | return 1; |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1305 | } |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1306 | } |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1307 | |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1308 | int dav_create(DavResource *res) { |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1309 | int status; |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1310 | if(!create_resource(res, &status)) { |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1311 | // resource successfully created |
|
525
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
518
diff
changeset
|
1312 | res->exists = 1; |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1313 | return 0; |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1314 | } |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1315 | |
|
441
99c26b1b7327
improves compatibility with owncloud/nextcloud when uploading files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
361
diff
changeset
|
1316 | if(status == 403 || status == 409 || status == 404) { |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1317 | // create intermediate collections |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1318 | if(create_ancestors(res->session, res->href, res->path)) { |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1319 | return 1; |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1320 | } |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1321 | } |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1322 | |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1323 | return create_resource(res, &status); |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1324 | } |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1325 | |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1326 | int dav_exists(DavResource *res) { |
|
713
a1c36a6410f6
reimplement dav_exists by using dav_load_prop
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
609
diff
changeset
|
1327 | if(!dav_load_prop(res, NULL, 0)) { |
|
525
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
518
diff
changeset
|
1328 | res->exists = 1; |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1329 | return 1; |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1330 | } else { |
|
713
a1c36a6410f6
reimplement dav_exists by using dav_load_prop
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
609
diff
changeset
|
1331 | if(res->session->error == DAV_NOT_FOUND) { |
|
525
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
518
diff
changeset
|
1332 | res->exists = 0; |
|
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
518
diff
changeset
|
1333 | } |
|
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1334 | return 0; |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1335 | } |
|
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1336 | } |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1337 | |
|
186
05d11fbcaeb3
improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1338 | static int dav_cp_mv_url(DavResource *res, char *desturl, _Bool copy, _Bool override) { |
|
181
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
178
diff
changeset
|
1339 | DavSession *sn = res->session; |
|
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
178
diff
changeset
|
1340 | CURL *handle = sn->handle; |
|
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
178
diff
changeset
|
1341 | util_set_url(sn, dav_resource_get_href(res)); |
|
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
178
diff
changeset
|
1342 | |
|
236
6b4ce32d0c4e
copy/move with lock tokens works now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
227
diff
changeset
|
1343 | DavLock *lock = dav_get_lock(sn, res->path); |
|
6b4ce32d0c4e
copy/move with lock tokens works now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
227
diff
changeset
|
1344 | char *locktoken = lock ? lock->token : NULL; |
|
6b4ce32d0c4e
copy/move with lock tokens works now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
227
diff
changeset
|
1345 | |
|
354
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
349
diff
changeset
|
1346 | CURLcode ret = do_copy_move_request(sn, desturl, locktoken, copy, override); |
|
181
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
178
diff
changeset
|
1347 | |
|
205
bf756f6c3581
fixed some warnings and wrong usage of curl_easy_getinfo
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
186
diff
changeset
|
1348 | long status = 0; |
|
181
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
178
diff
changeset
|
1349 | curl_easy_getinfo (handle, CURLINFO_RESPONSE_CODE, &status); |
|
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
178
diff
changeset
|
1350 | if(ret == CURLE_OK && (status >= 200 && status < 300)) { |
|
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
178
diff
changeset
|
1351 | return 0; |
|
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
178
diff
changeset
|
1352 | } else { |
|
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
178
diff
changeset
|
1353 | dav_session_set_error(sn, ret, status); |
|
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
178
diff
changeset
|
1354 | return 1; |
|
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
178
diff
changeset
|
1355 | } |
|
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
178
diff
changeset
|
1356 | } |
|
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
178
diff
changeset
|
1357 | |
|
186
05d11fbcaeb3
improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1358 | static int dav_cp_mv(DavResource *res, char *newpath, _Bool copy, _Bool override) { |
|
05d11fbcaeb3
improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1359 | char *dest = dav_session_get_href(res->session, newpath); |
|
05d11fbcaeb3
improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1360 | char *desturl = util_get_url(res->session, dest); |
|
05d11fbcaeb3
improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1361 | dav_session_free(res->session, dest); |
|
05d11fbcaeb3
improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1362 | |
|
05d11fbcaeb3
improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1363 | int ret = dav_cp_mv_url(res, desturl, copy, override); |
|
05d11fbcaeb3
improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1364 | free(desturl); |
|
05d11fbcaeb3
improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1365 | return ret; |
|
05d11fbcaeb3
improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1366 | } |
|
05d11fbcaeb3
improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1367 | |
|
181
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
178
diff
changeset
|
1368 | int dav_copy(DavResource *res, char *newpath) { |
|
182
ca07f14f7bfe
added override option for copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
181
diff
changeset
|
1369 | return dav_cp_mv(res, newpath, true, false); |
|
181
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
178
diff
changeset
|
1370 | } |
|
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
178
diff
changeset
|
1371 | |
|
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
178
diff
changeset
|
1372 | int dav_move(DavResource *res, char *newpath) { |
|
182
ca07f14f7bfe
added override option for copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
181
diff
changeset
|
1373 | return dav_cp_mv(res, newpath, false, false); |
|
ca07f14f7bfe
added override option for copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
181
diff
changeset
|
1374 | } |
|
ca07f14f7bfe
added override option for copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
181
diff
changeset
|
1375 | |
|
ca07f14f7bfe
added override option for copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
181
diff
changeset
|
1376 | int dav_copy_o(DavResource *res, char *newpath, DavBool override) { |
|
ca07f14f7bfe
added override option for copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
181
diff
changeset
|
1377 | return dav_cp_mv(res, newpath, true, override); |
|
ca07f14f7bfe
added override option for copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
181
diff
changeset
|
1378 | } |
|
ca07f14f7bfe
added override option for copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
181
diff
changeset
|
1379 | |
|
ca07f14f7bfe
added override option for copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
181
diff
changeset
|
1380 | int dav_move_o(DavResource *res, char *newpath, DavBool override) { |
|
ca07f14f7bfe
added override option for copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
181
diff
changeset
|
1381 | return dav_cp_mv(res, newpath, false, override); |
|
181
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
178
diff
changeset
|
1382 | } |
|
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
178
diff
changeset
|
1383 | |
|
186
05d11fbcaeb3
improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1384 | int dav_copyto(DavResource *res, char *url, DavBool override) { |
|
05d11fbcaeb3
improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1385 | return dav_cp_mv_url(res, url, true, override); |
|
05d11fbcaeb3
improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1386 | } |
|
05d11fbcaeb3
improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1387 | |
|
05d11fbcaeb3
improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1388 | int dav_moveto(DavResource *res, char *url, DavBool override) { |
|
05d11fbcaeb3
improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1389 | return dav_cp_mv_url(res, url, false, override); |
|
05d11fbcaeb3
improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1390 | } |
|
05d11fbcaeb3
improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1391 | |
|
208
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1392 | int dav_lock(DavResource *res) { |
|
315
7db4dbf4e6f9
adds lock timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
298
diff
changeset
|
1393 | return dav_lock_t(res, 0); |
|
7db4dbf4e6f9
adds lock timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
298
diff
changeset
|
1394 | } |
|
7db4dbf4e6f9
adds lock timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
298
diff
changeset
|
1395 | |
|
7db4dbf4e6f9
adds lock timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
298
diff
changeset
|
1396 | int dav_lock_t(DavResource *res, time_t timeout) { |
|
207
de23f8881e9f
fixed hash verification and head requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
1397 | DavSession *sn = res->session; |
|
de23f8881e9f
fixed hash verification and head requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
1398 | CURL *handle = sn->handle; |
|
de23f8881e9f
fixed hash verification and head requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
1399 | util_set_url(sn, dav_resource_get_href(res)); |
|
de23f8881e9f
fixed hash verification and head requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
1400 | |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1401 | CxBuffer *request = create_lock_request(); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1402 | CxBuffer *response = cxBufferCreate(NULL, 512, cxDefaultAllocator, CX_BUFFER_FREE_CONTENTS|CX_BUFFER_AUTO_EXTEND); |
|
354
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
349
diff
changeset
|
1403 | CURLcode ret = do_lock_request(sn, request, response, timeout); |
|
207
de23f8881e9f
fixed hash verification and head requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
1404 | |
|
de23f8881e9f
fixed hash verification and head requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
1405 | //printf("\nlock\n"); |
|
de23f8881e9f
fixed hash verification and head requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
1406 | //printf("%.*s\n\n", request->size, request->space); |
|
de23f8881e9f
fixed hash verification and head requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
1407 | //printf("%.*s\n\n", response->size, response->space); |
|
de23f8881e9f
fixed hash verification and head requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
1408 | |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1409 | cxBufferFree(request); |
|
222
7b73058d782e
fixed some memory leaks in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
208
diff
changeset
|
1410 | |
|
207
de23f8881e9f
fixed hash verification and head requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
1411 | long status = 0; |
|
de23f8881e9f
fixed hash verification and head requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
1412 | curl_easy_getinfo (handle, CURLINFO_RESPONSE_CODE, &status); |
|
de23f8881e9f
fixed hash verification and head requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
1413 | if(ret == CURLE_OK && (status >= 200 && status < 300)) { |
|
de23f8881e9f
fixed hash verification and head requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
1414 | LockDiscovery lock; |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1415 | int parse_error = parse_lock_response(sn, response, &lock); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1416 | cxBufferFree(response); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1417 | if(parse_error) { |
|
207
de23f8881e9f
fixed hash verification and head requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
1418 | sn->error = DAV_ERROR; |
|
208
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1419 | return -1; |
|
207
de23f8881e9f
fixed hash verification and head requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
1420 | } |
|
de23f8881e9f
fixed hash verification and head requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
1421 | |
|
208
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1422 | DavLock *l = dav_create_lock(sn, lock.locktoken, lock.timeout); |
|
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1423 | free(lock.locktoken); |
|
207
de23f8881e9f
fixed hash verification and head requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
1424 | free(lock.timeout); |
|
208
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1425 | |
|
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1426 | int r = 0; |
|
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1427 | if(res->iscollection) { |
|
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1428 | r = dav_add_collection_lock(sn, res->path, l); |
|
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1429 | } else { |
|
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1430 | r = dav_add_resource_lock(sn, res->path, l); |
|
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1431 | } |
|
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1432 | |
|
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1433 | if(r == 0) { |
|
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1434 | return 0; |
|
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1435 | } else { |
|
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1436 | (void)dav_unlock(res); |
|
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1437 | sn->error = DAV_ERROR; |
|
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1438 | dav_destroy_lock(sn, l); |
|
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1439 | return -1; |
|
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1440 | } |
|
207
de23f8881e9f
fixed hash verification and head requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
1441 | } else { |
|
de23f8881e9f
fixed hash verification and head requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
1442 | dav_session_set_error(sn, ret, status); |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1443 | cxBufferFree(response); |
|
208
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1444 | return -1; |
|
207
de23f8881e9f
fixed hash verification and head requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
1445 | } |
|
de23f8881e9f
fixed hash verification and head requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
1446 | } |
|
de23f8881e9f
fixed hash verification and head requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
1447 | |
|
208
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1448 | int dav_unlock(DavResource *res) { |
|
207
de23f8881e9f
fixed hash verification and head requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
1449 | DavSession *sn = res->session; |
|
de23f8881e9f
fixed hash verification and head requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
1450 | CURL *handle = sn->handle; |
|
de23f8881e9f
fixed hash verification and head requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
1451 | util_set_url(sn, dav_resource_get_href(res)); |
|
de23f8881e9f
fixed hash verification and head requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
1452 | |
|
208
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1453 | DavLock *lock = dav_get_lock(res->session, res->path); |
|
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1454 | if(!lock) { |
|
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1455 | sn->error = DAV_ERROR; |
|
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1456 | return -1; |
|
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1457 | } |
|
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1458 | |
|
354
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
349
diff
changeset
|
1459 | CURLcode ret = do_unlock_request(sn, lock->token); |
|
207
de23f8881e9f
fixed hash verification and head requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
1460 | long status = 0; |
|
de23f8881e9f
fixed hash verification and head requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
1461 | curl_easy_getinfo (handle, CURLINFO_RESPONSE_CODE, &status); |
|
de23f8881e9f
fixed hash verification and head requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
1462 | if(ret == CURLE_OK && (status >= 200 && status < 300)) { |
|
208
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1463 | dav_remove_lock(sn, res->path, lock); |
|
207
de23f8881e9f
fixed hash verification and head requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
1464 | } else { |
|
de23f8881e9f
fixed hash verification and head requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
1465 | dav_session_set_error(sn, ret, status); |
|
de23f8881e9f
fixed hash verification and head requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
1466 | return 1; |
|
de23f8881e9f
fixed hash verification and head requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
1467 | } |
|
de23f8881e9f
fixed hash verification and head requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
1468 | |
|
de23f8881e9f
fixed hash verification and head requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
1469 | return 0; |
|
de23f8881e9f
fixed hash verification and head requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
1470 | } |
|
de23f8881e9f
fixed hash verification and head requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
1471 | |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1472 | |
| 505 | 1473 | int resource_add_crypto_info(DavSession *sn, const char *href, const char *name, const char *hash) { |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1474 | if(!DAV_IS_ENCRYPTED(sn)) { |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1475 | return 0; |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1476 | } |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1477 | |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1478 | CxBuffer *request = create_crypto_proppatch_request(sn, sn->key, name, hash); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1479 | CxBuffer *response = cxBufferCreate(NULL, 1024, cxDefaultAllocator, CX_BUFFER_FREE_CONTENTS|CX_BUFFER_AUTO_EXTEND); |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1480 | |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1481 | util_set_url(sn, href); |
|
208
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1482 | // TODO: lock |
|
354
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
349
diff
changeset
|
1483 | CURLcode ret = do_proppatch_request(sn, NULL, request, response); |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1484 | cxBufferFree(request); |
|
205
bf756f6c3581
fixed some warnings and wrong usage of curl_easy_getinfo
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
186
diff
changeset
|
1485 | long status = 0; |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1486 | curl_easy_getinfo (sn->handle, CURLINFO_RESPONSE_CODE, &status); |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1487 | if(ret == CURLE_OK && status == 207) { |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1488 | // TODO: parse response |
|
150
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
146
diff
changeset
|
1489 | sn->error = DAV_OK; |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1490 | cxBufferFree(response); |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1491 | return 0; |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1492 | } else { |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1493 | dav_session_set_error(sn, ret, status); |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1494 | cxBufferFree(response); |
|
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1495 | return 1; |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1496 | } |
|
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
42
diff
changeset
|
1497 | } |
|
587
3c917df041b8
add func for creating the content of crypto-prop properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
558
diff
changeset
|
1498 | |
|
3c917df041b8
add func for creating the content of crypto-prop properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
558
diff
changeset
|
1499 | /* ----------------------------- crypto-prop ----------------------------- */ |
|
3c917df041b8
add func for creating the content of crypto-prop properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
558
diff
changeset
|
1500 | |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1501 | DavXmlNode* create_crypto_prop(DavSession *sn, CxMap *properties) { |
|
587
3c917df041b8
add func for creating the content of crypto-prop properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
558
diff
changeset
|
1502 | if(!sn->key) { |
|
3c917df041b8
add func for creating the content of crypto-prop properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
558
diff
changeset
|
1503 | return NULL; |
|
3c917df041b8
add func for creating the content of crypto-prop properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
558
diff
changeset
|
1504 | } |
|
3c917df041b8
add func for creating the content of crypto-prop properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
558
diff
changeset
|
1505 | |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1506 | CxBuffer *content = cxBufferCreate(NULL, 2048, cxDefaultAllocator, CX_BUFFER_FREE_CONTENTS|CX_BUFFER_AUTO_EXTEND); |
|
587
3c917df041b8
add func for creating the content of crypto-prop properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
558
diff
changeset
|
1507 | |
|
3c917df041b8
add func for creating the content of crypto-prop properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
558
diff
changeset
|
1508 | // create an xml document containing all properties |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1509 | CxMap *nsmap = cxHashMapCreate(cxDefaultAllocator, CX_STORE_POINTERS, 8); |
|
816
839fefbdedc7
compatibility with UCX 3.1 plus several minor code fixes
Mike Becker <universe@uap-core.de>
parents:
807
diff
changeset
|
1510 | cxDefineDestructor(nsmap, free); |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1511 | cxMapPut(nsmap, cx_hash_key_str("DAV:"), strdup("D")); |
|
587
3c917df041b8
add func for creating the content of crypto-prop properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
558
diff
changeset
|
1512 | |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1513 | cxBufferPutString(content, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1514 | cxBufferPutString(content, "<D:prop xmlns:D=\"DAV:\">\n"); |
|
587
3c917df041b8
add func for creating the content of crypto-prop properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
558
diff
changeset
|
1515 | |
|
854
1c8401ece69e
update ucx to version 3.1
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
852
diff
changeset
|
1516 | CxMapIterator i = cxMapIteratorValues(properties); |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1517 | cx_foreach(DavProperty*, prop, i) { |
|
587
3c917df041b8
add func for creating the content of crypto-prop properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
558
diff
changeset
|
1518 | DavXmlNode pnode; |
|
3c917df041b8
add func for creating the content of crypto-prop properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
558
diff
changeset
|
1519 | pnode.type = DAV_XML_ELEMENT; |
|
3c917df041b8
add func for creating the content of crypto-prop properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
558
diff
changeset
|
1520 | pnode.namespace = prop->ns->name; |
|
3c917df041b8
add func for creating the content of crypto-prop properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
558
diff
changeset
|
1521 | pnode.name = prop->name; |
|
3c917df041b8
add func for creating the content of crypto-prop properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
558
diff
changeset
|
1522 | pnode.prev = NULL; |
|
3c917df041b8
add func for creating the content of crypto-prop properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
558
diff
changeset
|
1523 | pnode.next = NULL; |
|
3c917df041b8
add func for creating the content of crypto-prop properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
558
diff
changeset
|
1524 | pnode.children = prop->value; |
|
3c917df041b8
add func for creating the content of crypto-prop properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
558
diff
changeset
|
1525 | pnode.parent = NULL; |
|
3c917df041b8
add func for creating the content of crypto-prop properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
558
diff
changeset
|
1526 | pnode.attributes = NULL; |
|
3c917df041b8
add func for creating the content of crypto-prop properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
558
diff
changeset
|
1527 | pnode.content = NULL; |
|
3c917df041b8
add func for creating the content of crypto-prop properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
558
diff
changeset
|
1528 | pnode.contentlength = 0; |
|
3c917df041b8
add func for creating the content of crypto-prop properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
558
diff
changeset
|
1529 | |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1530 | dav_print_node(content, (cx_write_func)cxBufferWrite, nsmap, &pnode); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1531 | cxBufferPut(content, '\n'); |
|
587
3c917df041b8
add func for creating the content of crypto-prop properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
558
diff
changeset
|
1532 | } |
|
3c917df041b8
add func for creating the content of crypto-prop properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
558
diff
changeset
|
1533 | |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1534 | cxBufferPutString(content, "</D:prop>"); |
|
587
3c917df041b8
add func for creating the content of crypto-prop properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
558
diff
changeset
|
1535 | |
| 852 | 1536 | cxMapFree(nsmap); |
|
587
3c917df041b8
add func for creating the content of crypto-prop properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
558
diff
changeset
|
1537 | |
|
3c917df041b8
add func for creating the content of crypto-prop properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
558
diff
changeset
|
1538 | // encrypt xml document |
|
3c917df041b8
add func for creating the content of crypto-prop properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
558
diff
changeset
|
1539 | char *crypto_prop_content = aes_encrypt(content->space, content->size, sn->key); |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1540 | cxBufferDestroy(content); |
|
587
3c917df041b8
add func for creating the content of crypto-prop properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
558
diff
changeset
|
1541 | |
|
3c917df041b8
add func for creating the content of crypto-prop properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
558
diff
changeset
|
1542 | DavXmlNode *ret = NULL; |
|
3c917df041b8
add func for creating the content of crypto-prop properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
558
diff
changeset
|
1543 | if(crypto_prop_content) { |
|
3c917df041b8
add func for creating the content of crypto-prop properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
558
diff
changeset
|
1544 | ret = dav_text_node(sn, crypto_prop_content); |
|
3c917df041b8
add func for creating the content of crypto-prop properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
558
diff
changeset
|
1545 | free(crypto_prop_content); |
|
3c917df041b8
add func for creating the content of crypto-prop properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
558
diff
changeset
|
1546 | } |
|
3c917df041b8
add func for creating the content of crypto-prop properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
558
diff
changeset
|
1547 | return ret; |
|
3c917df041b8
add func for creating the content of crypto-prop properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
558
diff
changeset
|
1548 | } |
|
3c917df041b8
add func for creating the content of crypto-prop properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
558
diff
changeset
|
1549 | |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1550 | CxMap* parse_crypto_prop(DavSession *sn, DavKey *key, DavXmlNode *node) { |
|
589
2514559a6367
add function for decrypting and parsing crypto-prop elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
587
diff
changeset
|
1551 | if(!node || node->type != DAV_XML_TEXT || node->contentlength == 0) { |
|
2514559a6367
add function for decrypting and parsing crypto-prop elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
587
diff
changeset
|
1552 | return NULL; |
|
2514559a6367
add function for decrypting and parsing crypto-prop elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
587
diff
changeset
|
1553 | } |
|
587
3c917df041b8
add func for creating the content of crypto-prop properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
558
diff
changeset
|
1554 | |
|
609
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
1555 | return parse_crypto_prop_str(sn, key, node->content); |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
1556 | } |
|
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
1557 | |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1558 | CxMap* parse_crypto_prop_str(DavSession *sn, DavKey *key, const char *content) { |
|
589
2514559a6367
add function for decrypting and parsing crypto-prop elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
587
diff
changeset
|
1559 | size_t len = 0; |
|
609
dc3d70848c7c
implement encrypted properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
605
diff
changeset
|
1560 | char *dec_str = aes_decrypt(content, &len, key); |
|
589
2514559a6367
add function for decrypting and parsing crypto-prop elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
587
diff
changeset
|
1561 | |
|
2514559a6367
add function for decrypting and parsing crypto-prop elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
587
diff
changeset
|
1562 | xmlDoc *doc = xmlReadMemory(dec_str, len, NULL, NULL, 0); |
|
2514559a6367
add function for decrypting and parsing crypto-prop elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
587
diff
changeset
|
1563 | free(dec_str); |
|
2514559a6367
add function for decrypting and parsing crypto-prop elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
587
diff
changeset
|
1564 | if(!doc) { |
|
2514559a6367
add function for decrypting and parsing crypto-prop elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
587
diff
changeset
|
1565 | return NULL; |
|
2514559a6367
add function for decrypting and parsing crypto-prop elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
587
diff
changeset
|
1566 | } |
|
2514559a6367
add function for decrypting and parsing crypto-prop elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
587
diff
changeset
|
1567 | |
|
2514559a6367
add function for decrypting and parsing crypto-prop elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
587
diff
changeset
|
1568 | int err = 0; |
|
2514559a6367
add function for decrypting and parsing crypto-prop elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
587
diff
changeset
|
1569 | xmlNode *xml_root = xmlDocGetRootElement(doc); |
|
2514559a6367
add function for decrypting and parsing crypto-prop elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
587
diff
changeset
|
1570 | if(xml_root) { |
|
2514559a6367
add function for decrypting and parsing crypto-prop elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
587
diff
changeset
|
1571 | if( |
|
2514559a6367
add function for decrypting and parsing crypto-prop elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
587
diff
changeset
|
1572 | !xml_root->ns || |
|
2514559a6367
add function for decrypting and parsing crypto-prop elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
587
diff
changeset
|
1573 | !xstreq(xml_root->name, "prop") || |
|
2514559a6367
add function for decrypting and parsing crypto-prop elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
587
diff
changeset
|
1574 | !xstreq(xml_root->ns->href, "DAV:")) |
|
2514559a6367
add function for decrypting and parsing crypto-prop elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
587
diff
changeset
|
1575 | { |
|
2514559a6367
add function for decrypting and parsing crypto-prop elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
587
diff
changeset
|
1576 | err = 1; |
|
2514559a6367
add function for decrypting and parsing crypto-prop elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
587
diff
changeset
|
1577 | } |
|
2514559a6367
add function for decrypting and parsing crypto-prop elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
587
diff
changeset
|
1578 | } else { |
|
2514559a6367
add function for decrypting and parsing crypto-prop elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
587
diff
changeset
|
1579 | err = 1; |
|
2514559a6367
add function for decrypting and parsing crypto-prop elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
587
diff
changeset
|
1580 | } |
|
2514559a6367
add function for decrypting and parsing crypto-prop elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
587
diff
changeset
|
1581 | |
|
2514559a6367
add function for decrypting and parsing crypto-prop elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
587
diff
changeset
|
1582 | if(err) { |
|
2514559a6367
add function for decrypting and parsing crypto-prop elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
587
diff
changeset
|
1583 | xmlFreeDoc(doc); |
|
2514559a6367
add function for decrypting and parsing crypto-prop elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
587
diff
changeset
|
1584 | return NULL; |
|
2514559a6367
add function for decrypting and parsing crypto-prop elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
587
diff
changeset
|
1585 | } |
|
2514559a6367
add function for decrypting and parsing crypto-prop elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
587
diff
changeset
|
1586 | |
|
2514559a6367
add function for decrypting and parsing crypto-prop elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
587
diff
changeset
|
1587 | // ready to get the properties |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
736
diff
changeset
|
1588 | CxMap *map = cxHashMapCreate(cxDefaultAllocator, CX_STORE_POINTERS, 32); |
|
589
2514559a6367
add function for decrypting and parsing crypto-prop elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
587
diff
changeset
|
1589 | xmlNode *n = xml_root->children; |
|
2514559a6367
add function for decrypting and parsing crypto-prop elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
587
diff
changeset
|
1590 | while(n) { |
|
2514559a6367
add function for decrypting and parsing crypto-prop elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
587
diff
changeset
|
1591 | if(n->type == XML_ELEMENT_NODE && n->ns && n->ns->href) { |
|
2514559a6367
add function for decrypting and parsing crypto-prop elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
587
diff
changeset
|
1592 | DavProperty *property = dav_session_malloc(sn, sizeof(DavProperty)); |
|
2514559a6367
add function for decrypting and parsing crypto-prop elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
587
diff
changeset
|
1593 | property->name = dav_session_strdup(sn, (const char*)n->name); |
|
2514559a6367
add function for decrypting and parsing crypto-prop elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
587
diff
changeset
|
1594 | property->ns = dav_session_malloc(sn, sizeof(DavNamespace)); |
|
2514559a6367
add function for decrypting and parsing crypto-prop elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
587
diff
changeset
|
1595 | property->ns->name = dav_session_strdup(sn, (const char*)n->ns->href); |
|
2514559a6367
add function for decrypting and parsing crypto-prop elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
587
diff
changeset
|
1596 | property->ns->prefix = n->ns->prefix ? |
|
2514559a6367
add function for decrypting and parsing crypto-prop elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
587
diff
changeset
|
1597 | dav_session_strdup(sn, (const char*)n->ns->prefix) : NULL; |
|
2514559a6367
add function for decrypting and parsing crypto-prop elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
587
diff
changeset
|
1598 | property->value = n->children ? dav_convert_xml(sn, n->children) : NULL; |
|
2514559a6367
add function for decrypting and parsing crypto-prop elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
587
diff
changeset
|
1599 | |
|
816
839fefbdedc7
compatibility with UCX 3.1 plus several minor code fixes
Mike Becker <universe@uap-core.de>
parents:
807
diff
changeset
|
1600 | cxmutstr propkey = dav_property_key(property->ns->name, property->name); |
| 889 | 1601 | cxMapPut(map, propkey, property); |
|
816
839fefbdedc7
compatibility with UCX 3.1 plus several minor code fixes
Mike Becker <universe@uap-core.de>
parents:
807
diff
changeset
|
1602 | cx_strfree(&propkey); |
|
589
2514559a6367
add function for decrypting and parsing crypto-prop elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
587
diff
changeset
|
1603 | } |
|
2514559a6367
add function for decrypting and parsing crypto-prop elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
587
diff
changeset
|
1604 | n = n->next; |
|
2514559a6367
add function for decrypting and parsing crypto-prop elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
587
diff
changeset
|
1605 | } |
|
2514559a6367
add function for decrypting and parsing crypto-prop elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
587
diff
changeset
|
1606 | |
|
2514559a6367
add function for decrypting and parsing crypto-prop elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
587
diff
changeset
|
1607 | xmlFreeDoc(doc); |
|
816
839fefbdedc7
compatibility with UCX 3.1 plus several minor code fixes
Mike Becker <universe@uap-core.de>
parents:
807
diff
changeset
|
1608 | if(cxMapSize(map) == 0) { |
| 852 | 1609 | cxMapFree(map); |
|
589
2514559a6367
add function for decrypting and parsing crypto-prop elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
587
diff
changeset
|
1610 | return NULL; |
|
2514559a6367
add function for decrypting and parsing crypto-prop elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
587
diff
changeset
|
1611 | } |
|
2514559a6367
add function for decrypting and parsing crypto-prop elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
587
diff
changeset
|
1612 | return map; |
|
587
3c917df041b8
add func for creating the content of crypto-prop properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
558
diff
changeset
|
1613 | } |
| 728 | 1614 | |
| 1615 | ||
| 1616 | /* ----------------------------- streams ----------------------------- */ | |
| 1617 | ||
| 1618 | static size_t in_write(const char *ptr, size_t size, size_t nitems, void *in_stream) { | |
| 1619 | DavInputStream *in = in_stream; | |
| 1620 | size_t len = size * nitems; | |
| 1621 | ||
| 1622 | if(in->alloc < len) { | |
| 1623 | char *newb = realloc(in->buffer, len); | |
| 1624 | if(!newb) { | |
| 1625 | if(in->buffer) free(in->buffer); | |
| 1626 | in->eof = 1; | |
| 1627 | return 0; | |
| 1628 | } | |
| 1629 | ||
| 1630 | in->buffer = newb; | |
| 1631 | in->alloc = len; | |
| 1632 | } | |
| 1633 | ||
| 1634 | memcpy(in->buffer, ptr, len); | |
| 1635 | ||
| 1636 | in->size = len; | |
| 1637 | in->pos = 0; | |
| 1638 | ||
| 1639 | return nitems; | |
| 1640 | } | |
| 1641 | ||
|
789
378b5ab86f77
add new build system for windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
747
diff
changeset
|
1642 | /* |
| 728 | 1643 | DavInputStream* dav_inputstream_open(DavResource *res) { |
| 1644 | DavSession *sn = res->session; | |
| 1645 | ||
| 1646 | DavInputStream *in = dav_session_malloc(sn, sizeof(DavInputStream)); | |
| 1647 | if(!in) { | |
| 1648 | return NULL; | |
| 1649 | } | |
| 1650 | memset(in, 0, sizeof(DavInputStream)); | |
| 1651 | ||
| 1652 | in->res = res; | |
| 1653 | ||
| 1654 | in->c = curl_easy_duphandle(sn->handle); | |
| 1655 | char *url = util_get_url(sn, dav_resource_get_href(res)); | |
| 1656 | curl_easy_setopt(in->c, CURLOPT_URL, url); | |
| 1657 | free(url); | |
| 1658 | ||
| 1659 | in->m = curl_multi_init(); | |
| 1660 | ||
| 1661 | curl_easy_setopt(in->c, CURLOPT_HTTPHEADER, NULL); | |
| 1662 | curl_easy_setopt(in->c, CURLOPT_CUSTOMREQUEST, NULL); | |
| 1663 | curl_easy_setopt(in->c, CURLOPT_UPLOAD, 0L); | |
| 1664 | ||
| 1665 | curl_multi_add_handle(in->m, in->c); | |
| 1666 | ||
| 1667 | dav_write_func write_fnc = (dav_write_func)in_write; | |
| 1668 | void *stream = in; | |
| 1669 | ||
| 1670 | // check encryption | |
| 1671 | AESDecrypter *dec = NULL; | |
| 1672 | DavKey *key = NULL; | |
| 1673 | if(DAV_DECRYPT_CONTENT(sn)) { | |
| 1674 | char *keyname = dav_get_string_property_ns(res, DAV_NS, "crypto-key"); | |
| 1675 | if(keyname) { | |
| 1676 | key = dav_context_get_key(sn->context, keyname); | |
| 1677 | if(key) { | |
| 1678 | dec = aes_decrypter_new(key, stream, write_fnc); | |
| 1679 | stream = dec; | |
| 1680 | write_fnc = (dav_write_func)aes_write; | |
| 1681 | } | |
| 1682 | } | |
| 1683 | } | |
| 1684 | ||
| 1685 | curl_easy_setopt(in->c, CURLOPT_WRITEFUNCTION, write_fnc); | |
| 1686 | curl_easy_setopt(in->c, CURLOPT_WRITEDATA, stream); | |
| 1687 | ||
| 1688 | in->dec = dec; | |
| 1689 | ||
| 1690 | return in; | |
| 1691 | } | |
| 1692 | ||
| 1693 | size_t dav_read(void *buf, size_t size, size_t nitems, DavInputStream *in) { | |
| 1694 | size_t len = in->size - in->pos; | |
| 1695 | size_t rl = size * nitems; | |
| 1696 | if(len > 0) { | |
| 1697 | len = rl > len ? len : rl; | |
| 1698 | len -= len % size; | |
| 1699 | memcpy(buf, in->buffer + in->pos, len); | |
| 1700 | in->pos += len; | |
| 1701 | return len / size; | |
| 1702 | } | |
| 1703 | in->size = 0; | |
| 1704 | ||
| 1705 | if(in->eof) { | |
| 1706 | if(in->dec) { | |
| 1707 | aes_decrypter_shutdown(in->dec); // get final bytes | |
| 1708 | aes_decrypter_close(in->dec); | |
| 1709 | in->dec = NULL; | |
| 1710 | } else { | |
| 1711 | return 0; | |
| 1712 | } | |
| 1713 | } else { | |
| 1714 | int running; | |
| 1715 | while(!in->eof && in->size == 0) { | |
| 1716 | CURLMcode r = curl_multi_perform(in->m, &running); | |
| 1717 | if(r != CURLM_OK || running == 0) { | |
| 1718 | in->eof = 1; | |
| 1719 | break; | |
| 1720 | } | |
| 1721 | ||
| 1722 | int numfds; | |
| 1723 | if(curl_multi_poll(in->m, NULL, 0, 5000, &numfds) != CURLM_OK) { | |
| 1724 | in->eof = 1; | |
| 1725 | } | |
| 1726 | } | |
| 1727 | } | |
| 1728 | ||
| 1729 | return in->size > 0 ? dav_read(buf, size, nitems, in) : 0; | |
| 1730 | } | |
| 1731 | ||
| 1732 | void dav_inputstream_close(DavInputStream *in) { | |
| 1733 | curl_multi_cleanup(in->m); | |
| 1734 | curl_easy_cleanup(in->c); | |
| 1735 | if(in->buffer) free(in->buffer); | |
| 1736 | dav_session_free(in->res->session, in); | |
| 1737 | } | |
| 1738 | ||
| 1739 | ||
| 1740 | static size_t out_read(char *ptr, size_t size, size_t nitems, void *out_stream) { | |
| 1741 | DavOutputStream *out = out_stream; | |
| 1742 | size_t len = size * nitems; | |
| 1743 | size_t available = out->size - out->pos; | |
| 1744 | if(available == 0) { | |
| 1745 | return 0; | |
| 1746 | } | |
| 1747 | ||
| 1748 | size_t r = len > available ? available : len; | |
| 1749 | r -= r % size; | |
| 1750 | memcpy(ptr, out->buffer + out->pos, r); | |
| 1751 | ||
| 1752 | out->pos += r; | |
| 1753 | ||
| 1754 | return r / size; | |
| 1755 | } | |
| 1756 | ||
| 1757 | static size_t dummy_write(void *buf, size_t s, size_t n, void *data) { | |
| 1758 | return s*n; | |
| 1759 | } | |
| 1760 | ||
| 1761 | DavOutputStream* dav_outputstream_open(DavResource *res) { | |
| 1762 | DavSession *sn = res->session; | |
| 1763 | ||
| 1764 | DavOutputStream *out = dav_session_malloc(sn, sizeof(DavOutputStream)); | |
| 1765 | if(!out) { | |
| 1766 | return NULL; | |
| 1767 | } | |
| 1768 | memset(out, 0, sizeof(DavOutputStream)); | |
| 1769 | ||
| 1770 | out->res = res; | |
| 1771 | ||
| 1772 | out->c = curl_easy_duphandle(sn->handle); | |
| 1773 | char *url = util_get_url(sn, dav_resource_get_href(res)); | |
| 1774 | curl_easy_setopt(out->c, CURLOPT_URL, url); | |
| 1775 | free(url); | |
| 1776 | ||
| 1777 | out->m = curl_multi_init(); | |
| 1778 | curl_multi_add_handle(out->m, out->c); | |
| 1779 | ||
| 1780 | void *stream = out; | |
| 1781 | dav_read_func read_fnc = (dav_read_func)out_read; | |
| 1782 | ||
| 1783 | // if encryption or hashing in enabled, we need a stream wrapper | |
| 1784 | if(DAV_ENCRYPT_CONTENT(sn) && sn->key) { | |
| 1785 | AESEncrypter *enc = aes_encrypter_new(sn->key, out, (dav_read_func)out_read, NULL); | |
| 1786 | out->enc = enc; | |
| 1787 | stream = enc; | |
| 1788 | read_fnc = (dav_read_func)aes_read; | |
| 1789 | } else if((sn->flags & DAV_SESSION_STORE_HASH) == DAV_SESSION_STORE_HASH) { | |
| 1790 | HashStream *hstr = dav_session_malloc(sn, sizeof(HashStream)); | |
| 1791 | out->hstr = hstr; | |
| 1792 | init_hash_stream(hstr, out, (dav_read_func)out_read, NULL); | |
| 1793 | stream = hstr; | |
| 1794 | read_fnc = (dav_read_func)dav_read_h; | |
| 1795 | } | |
| 1796 | ||
| 1797 | curl_easy_setopt(out->c, CURLOPT_HEADERFUNCTION, NULL); | |
| 1798 | curl_easy_setopt(out->c, CURLOPT_HTTPHEADER, NULL); | |
| 1799 | curl_easy_setopt(out->c, CURLOPT_CUSTOMREQUEST, NULL); | |
| 1800 | curl_easy_setopt(out->c, CURLOPT_UPLOAD, 1L); | |
| 1801 | curl_easy_setopt(out->c, CURLOPT_READFUNCTION, read_fnc); | |
| 1802 | curl_easy_setopt(out->c, CURLOPT_READDATA, stream); | |
| 1803 | curl_easy_setopt(out->c, CURLOPT_SEEKFUNCTION, NULL); | |
| 1804 | curl_easy_setopt(out->c, CURLOPT_INFILESIZE, -1); | |
| 1805 | curl_easy_setopt(out->c, CURLOPT_INFILESIZE_LARGE, -1L); | |
| 1806 | ||
| 1807 | curl_easy_setopt(out->c, CURLOPT_WRITEFUNCTION, dummy_write); | |
| 1808 | curl_easy_setopt(out->c, CURLOPT_WRITEDATA, NULL); | |
| 1809 | ||
| 1810 | return out; | |
| 1811 | } | |
| 1812 | ||
| 1813 | size_t dav_write(const void *buf, size_t size, size_t nitems, DavOutputStream *out) { | |
| 1814 | if(out->eof) return 0; | |
| 1815 | ||
| 1816 | out->buffer = buf; | |
| 1817 | out->size = size * nitems; | |
| 1818 | out->pos = 0; | |
| 1819 | ||
| 1820 | int running; | |
| 1821 | while(!out->eof && (out->size == 0 || out->size - out->pos > 0)) { | |
| 1822 | CURLMcode r = curl_multi_perform(out->m, &running); | |
| 1823 | if(r != CURLM_OK || running == 0) { | |
| 1824 | out->eof = 1; | |
| 1825 | break; | |
| 1826 | } | |
| 1827 | ||
| 1828 | int numfds; | |
| 1829 | if(curl_multi_poll(out->m, NULL, 0, 5000, &numfds) != CURLM_OK) { | |
| 1830 | out->eof = 1; | |
| 1831 | } | |
| 1832 | } | |
| 1833 | ||
| 1834 | return (out->size - out->pos) / size; | |
| 1835 | } | |
| 1836 | ||
| 1837 | int dav_outputstream_close(DavOutputStream *out) { | |
| 1838 | DavSession *sn = out->res->session; | |
| 1839 | DavResource *res = out->res; | |
| 1840 | DavResourceData *data = res->data; | |
| 1841 | ||
| 1842 | int ret = 0; | |
| 1843 | ||
| 1844 | dav_write(NULL, 1, 0, out); | |
| 1845 | ||
| 1846 | curl_multi_cleanup(out->m); | |
| 1847 | curl_easy_cleanup(out->c); | |
| 1848 | ||
| 1849 | int store = 0; | |
| 1850 | if(out->enc) { | |
| 1851 | // get sha256 hash | |
| 1852 | char hash[32]; | |
| 1853 | dav_get_hash(&out->enc->sha256, (unsigned char*)data->hash); | |
| 1854 | aes_encrypter_close(out->enc); | |
| 1855 | char *enc_hash = aes_encrypt(hash, DAV_SHA256_DIGEST_LENGTH, sn->key); | |
| 1856 | // add crypto properties | |
| 1857 | if(resource_add_crypto_info(sn, out->res->href, out->res->name, enc_hash)) { | |
| 1858 | ret = 1; | |
| 1859 | } | |
| 1860 | free(enc_hash); | |
| 1861 | } else if(out->hstr) { | |
| 1862 | dav_hash_final(out->hstr->sha, (unsigned char*)data->hash); | |
| 1863 | char *hash = util_hexstr((unsigned char*)data->hash, 32); | |
| 1864 | dav_set_string_property_ns(res, DAV_NS, "content-hash", hash); | |
| 1865 | free(hash); | |
| 1866 | dav_session_free(sn, out->hstr); | |
| 1867 | store = 1; | |
| 1868 | } | |
| 1869 | ||
| 1870 | if(store) { | |
| 1871 | ret = dav_store(out->res); | |
| 1872 | } | |
| 1873 | ||
| 1874 | dav_session_free(out->res->session, out); | |
| 1875 | ||
| 1876 | return ret; | |
| 1877 | } | |
| 1878 | ||
|
789
378b5ab86f77
add new build system for windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
747
diff
changeset
|
1879 | */ |