Thu, 23 May 2024 23:23:36 +0200
merge branch ucx-3.1
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1 | /* |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
2 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
3 | * |
404
5c08b8e14df8
updates copyright notice
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
355
diff
changeset
|
4 | * Copyright 2018 Olaf Wintermann. All rights reserved. |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
5 | * |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
6 | * Redistribution and use in source and binary forms, with or without |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
7 | * modification, are permitted provided that the following conditions are met: |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
8 | * |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
9 | * 1. Redistributions of source code must retain the above copyright |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
10 | * notice, this list of conditions and the following disclaimer. |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
11 | * |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
12 | * 2. Redistributions in binary form must reproduce the above copyright |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
13 | * notice, this list of conditions and the following disclaimer in the |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
14 | * documentation and/or other materials provided with the distribution. |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
15 | * |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
16 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
17 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
18 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
19 | * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
20 | * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
03076907b58a
added file name encryption
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 |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
26 | * POSSIBILITY OF SUCH DAMAGE. |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
27 | */ |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
28 | |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
29 | #include <stdio.h> |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
30 | #include <stdlib.h> |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
31 | #include <string.h> |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
32 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
33 | #include <cx/buffer.h> |
816
839fefbdedc7
compatibility with UCX 3.1 plus several minor code fixes
Mike Becker <universe@uap-core.de>
parents:
806
diff
changeset
|
34 | #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:
742
diff
changeset
|
35 | #include <cx/hash_map.h> |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
36 | |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
37 | #include "utils.h" |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
38 | #include "session.h" |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
39 | #include "resource.h" |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
40 | #include "methods.h" |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
41 | |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
42 | DavSession* dav_session_new(DavContext *context, char *base_url) { |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
43 | if(!base_url) { |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
44 | return NULL; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
45 | } |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
46 | cxstring url = cx_str(base_url); |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
47 | if(url.length == 0) { |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
48 | return NULL; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
49 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
50 | DavSession *sn = malloc(sizeof(DavSession)); |
355
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
51 | memset(sn, 0, sizeof(DavSession)); |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
52 | sn->mp = cxBasicMempoolCreate(DAV_SESSION_MEMPOOL_SIZE); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
53 | sn->pathcache = cxHashMapCreate(sn->mp->allocator, CX_STORE_POINTERS, DAV_PATH_CACHE_SIZE); |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
54 | sn->key = NULL; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
55 | sn->errorstr = NULL; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
56 | sn->error = DAV_OK; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
57 | sn->flags = 0; |
497
411bd1098175
fixes DavSession creation in dav-sync with enabled encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
496
diff
changeset
|
58 | |
411bd1098175
fixes DavSession creation in dav-sync with enabled encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
496
diff
changeset
|
59 | dav_session_set_baseurl(sn, base_url); |
411bd1098175
fixes DavSession creation in dav-sync with enabled encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
496
diff
changeset
|
60 | |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
61 | sn->handle = curl_easy_init(); |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
62 | curl_easy_setopt(sn->handle, CURLOPT_FOLLOWLOCATION, 1L); |
208
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
63 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
64 | // lock manager is created on-demand |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
65 | sn->locks = NULL; |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
66 | |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
67 | // set proxy |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
68 | DavProxy *proxy = cx_strprefix(url, CX_STR("https")) ? context->https_proxy |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
69 | : context->http_proxy; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
70 | |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
71 | if (proxy->url) { |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
72 | curl_easy_setopt(sn->handle, CURLOPT_PROXY, proxy->url); |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
73 | if (proxy->username) { |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
74 | curl_easy_setopt(sn->handle, CURLOPT_PROXYUSERNAME, |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
75 | proxy->username); |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
76 | if (proxy->password) { |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
77 | curl_easy_setopt(sn->handle, CURLOPT_PROXYPASSWORD, |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
78 | proxy->password); |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
79 | } else { |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
80 | // TODO: prompt |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
81 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
82 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
83 | if(proxy->no_proxy) { |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
84 | curl_easy_setopt(sn->handle, CURLOPT_NOPROXY, |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
85 | proxy->no_proxy); |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
86 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
87 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
88 | |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
89 | // set url |
420
ad419882e06e
sets curl default protocol to http
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
404
diff
changeset
|
90 | #if LIBCURL_VERSION_NUM >= 0x072D00 |
ad419882e06e
sets curl default protocol to http
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
404
diff
changeset
|
91 | curl_easy_setopt(sn->handle, CURLOPT_DEFAULT_PROTOCOL, "http"); |
ad419882e06e
sets curl default protocol to http
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
404
diff
changeset
|
92 | #endif |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
93 | curl_easy_setopt(sn->handle, CURLOPT_URL, base_url); |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
94 | |
68
f6d3db6113d3
added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents:
43
diff
changeset
|
95 | // add to context |
805
bff983370565
make DavContext mt-safe
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
796
diff
changeset
|
96 | dav_context_add_session(context, sn); |
68
f6d3db6113d3
added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents:
43
diff
changeset
|
97 | sn->context = context; |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
98 | |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
99 | return sn; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
100 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
101 | |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
102 | DavSession* dav_session_new_auth( |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
103 | DavContext *context, |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
104 | char *base_url, |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
105 | char *user, |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
106 | char *password) |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
107 | { |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
108 | DavSession *sn = dav_session_new(context, base_url); |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
109 | if(!sn) { |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
110 | return NULL; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
111 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
112 | dav_session_set_auth(sn, user, password); |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
113 | return sn; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
114 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
115 | |
806
673a803d2203
fix session dup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
805
diff
changeset
|
116 | DavSession* dav_session_clone(DavSession *sn) { |
673a803d2203
fix session dup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
805
diff
changeset
|
117 | CURL *newhandle = curl_easy_duphandle(sn->handle); |
673a803d2203
fix session dup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
805
diff
changeset
|
118 | |
673a803d2203
fix session dup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
805
diff
changeset
|
119 | DavSession *newsn = malloc(sizeof(DavSession)); |
673a803d2203
fix session dup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
805
diff
changeset
|
120 | memset(newsn, 0, sizeof(DavSession)); |
673a803d2203
fix session dup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
805
diff
changeset
|
121 | newsn->mp = cxBasicMempoolCreate(DAV_SESSION_MEMPOOL_SIZE); |
673a803d2203
fix session dup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
805
diff
changeset
|
122 | newsn->pathcache = cxHashMapCreate(sn->mp->allocator, CX_STORE_POINTERS, DAV_PATH_CACHE_SIZE); |
673a803d2203
fix session dup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
805
diff
changeset
|
123 | newsn->key = sn->key; |
673a803d2203
fix session dup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
805
diff
changeset
|
124 | newsn->errorstr = NULL; |
673a803d2203
fix session dup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
805
diff
changeset
|
125 | newsn->error = DAV_OK; |
673a803d2203
fix session dup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
805
diff
changeset
|
126 | newsn->flags = 0; |
673a803d2203
fix session dup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
805
diff
changeset
|
127 | |
673a803d2203
fix session dup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
805
diff
changeset
|
128 | newsn->handle = newhandle; |
673a803d2203
fix session dup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
805
diff
changeset
|
129 | |
673a803d2203
fix session dup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
805
diff
changeset
|
130 | newsn->base_url = cx_strdup_a(newsn->mp->allocator, cx_str(sn->base_url)).ptr; |
673a803d2203
fix session dup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
805
diff
changeset
|
131 | newsn->auth_prompt = sn->auth_prompt; |
673a803d2203
fix session dup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
805
diff
changeset
|
132 | newsn->authprompt_userdata = sn->authprompt_userdata; |
673a803d2203
fix session dup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
805
diff
changeset
|
133 | newsn->logfunc = sn->logfunc; |
673a803d2203
fix session dup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
805
diff
changeset
|
134 | newsn->get_progress = sn->get_progress; |
673a803d2203
fix session dup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
805
diff
changeset
|
135 | newsn->put_progress = sn->put_progress; |
673a803d2203
fix session dup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
805
diff
changeset
|
136 | newsn->progress_userdata = sn->progress_userdata; |
673a803d2203
fix session dup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
805
diff
changeset
|
137 | |
673a803d2203
fix session dup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
805
diff
changeset
|
138 | // add to context |
673a803d2203
fix session dup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
805
diff
changeset
|
139 | dav_context_add_session(sn->context, newsn); |
673a803d2203
fix session dup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
805
diff
changeset
|
140 | newsn->context = sn->context; |
673a803d2203
fix session dup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
805
diff
changeset
|
141 | |
673a803d2203
fix session dup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
805
diff
changeset
|
142 | return newsn; |
673a803d2203
fix session dup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
805
diff
changeset
|
143 | } |
673a803d2203
fix session dup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
805
diff
changeset
|
144 | |
796
81e0f67386a6
remove old config loader
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
790
diff
changeset
|
145 | void dav_session_set_auth(DavSession *sn, const char *user, const char *password) { |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
146 | if(user && password) { |
796
81e0f67386a6
remove old config loader
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
790
diff
changeset
|
147 | dav_session_set_auth_s(sn, cx_str(user), cx_str(password)); |
81e0f67386a6
remove old config loader
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
790
diff
changeset
|
148 | } |
81e0f67386a6
remove old config loader
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
790
diff
changeset
|
149 | } |
81e0f67386a6
remove old config loader
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
790
diff
changeset
|
150 | |
81e0f67386a6
remove old config loader
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
790
diff
changeset
|
151 | void dav_session_set_auth_s(DavSession *sn, cxstring user, cxstring password) { |
81e0f67386a6
remove old config loader
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
790
diff
changeset
|
152 | if(user.length > 0 && password.length > 0) { |
81e0f67386a6
remove old config loader
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
790
diff
changeset
|
153 | size_t upwdlen = user.length + password.length + 2; |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
154 | char *upwdbuf = malloc(upwdlen); |
796
81e0f67386a6
remove old config loader
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
790
diff
changeset
|
155 | snprintf(upwdbuf, upwdlen, "%.*s:%.*s", (int)user.length, user.ptr, (int)password.length, password.ptr); |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
156 | curl_easy_setopt(sn->handle, CURLOPT_USERPWD, upwdbuf); |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
157 | free(upwdbuf); |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
158 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
159 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
160 | |
497
411bd1098175
fixes DavSession creation in dav-sync with enabled encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
496
diff
changeset
|
161 | void dav_session_set_baseurl(DavSession *sn, char *base_url) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
162 | const CxAllocator *a = sn->mp->allocator; |
497
411bd1098175
fixes DavSession creation in dav-sync with enabled encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
496
diff
changeset
|
163 | if(sn->base_url) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
164 | cxFree(a, sn->base_url); |
497
411bd1098175
fixes DavSession creation in dav-sync with enabled encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
496
diff
changeset
|
165 | } |
411bd1098175
fixes DavSession creation in dav-sync with enabled encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
496
diff
changeset
|
166 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
167 | cxstring url = cx_str(base_url); |
497
411bd1098175
fixes DavSession creation in dav-sync with enabled encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
496
diff
changeset
|
168 | if(url.ptr[url.length - 1] == '/') { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
169 | cxmutstr url_m = cx_strdup_a(a, cx_str(base_url)); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
170 | sn->base_url = url_m.ptr; |
497
411bd1098175
fixes DavSession creation in dav-sync with enabled encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
496
diff
changeset
|
171 | } else { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
172 | char *url_str = cxMalloc(a, url.length + 2); |
497
411bd1098175
fixes DavSession creation in dav-sync with enabled encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
496
diff
changeset
|
173 | memcpy(url_str, base_url, url.length); |
411bd1098175
fixes DavSession creation in dav-sync with enabled encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
496
diff
changeset
|
174 | url_str[url.length] = '/'; |
411bd1098175
fixes DavSession creation in dav-sync with enabled encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
496
diff
changeset
|
175 | url_str[url.length + 1] = '\0'; |
411bd1098175
fixes DavSession creation in dav-sync with enabled encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
496
diff
changeset
|
176 | sn->base_url = url_str; |
411bd1098175
fixes DavSession creation in dav-sync with enabled encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
496
diff
changeset
|
177 | } |
411bd1098175
fixes DavSession creation in dav-sync with enabled encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
496
diff
changeset
|
178 | } |
411bd1098175
fixes DavSession creation in dav-sync with enabled encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
496
diff
changeset
|
179 | |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
180 | void dav_session_enable_encryption(DavSession *sn, DavKey *key, int flags) { |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
181 | sn->key = key; |
68
f6d3db6113d3
added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents:
43
diff
changeset
|
182 | // TODO: review sanity |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
183 | if(flags != 0) { |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
184 | sn->flags |= flags; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
185 | } else { |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
186 | sn->flags |= DAV_SESSION_ENCRYPT_CONTENT; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
187 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
188 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
189 | |
354
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
292
diff
changeset
|
190 | void dav_session_set_authcallback(DavSession *sn, dav_auth_func func, void *userdata) { |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
292
diff
changeset
|
191 | sn->auth_prompt = func; |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
292
diff
changeset
|
192 | sn->authprompt_userdata = userdata; |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
292
diff
changeset
|
193 | } |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
292
diff
changeset
|
194 | |
355
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
195 | void dav_session_set_progresscallback(DavSession *sn, dav_progress_func get, dav_progress_func put, void *userdata) { |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
196 | sn->get_progress = get; |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
197 | sn->put_progress = put; |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
198 | sn->progress_userdata = userdata; |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
199 | } |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
200 | |
354
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
292
diff
changeset
|
201 | CURLcode dav_session_curl_perform(DavSession *sn, long *status) { |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
292
diff
changeset
|
202 | return dav_session_curl_perform_buf(sn, NULL, NULL, status); |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
292
diff
changeset
|
203 | } |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
292
diff
changeset
|
204 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
205 | CURLcode dav_session_curl_perform_buf(DavSession *sn, CxBuffer *request, CxBuffer *response, long *status) { |
354
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
292
diff
changeset
|
206 | CURLcode ret = curl_easy_perform(sn->handle); |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
292
diff
changeset
|
207 | long http_status; |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
292
diff
changeset
|
208 | curl_easy_getinfo(sn->handle, CURLINFO_RESPONSE_CODE, &http_status); |
788
9b9420041d8e
add request/response body to verbose output / add DavSession logfunc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
777
diff
changeset
|
209 | if(ret == CURLE_OK) { |
9b9420041d8e
add request/response body to verbose output / add DavSession logfunc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
777
diff
changeset
|
210 | if(sn->logfunc) { |
9b9420041d8e
add request/response body to verbose output / add DavSession logfunc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
777
diff
changeset
|
211 | char *log_method; |
9b9420041d8e
add request/response body to verbose output / add DavSession logfunc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
777
diff
changeset
|
212 | char *log_url; |
9b9420041d8e
add request/response body to verbose output / add DavSession logfunc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
777
diff
changeset
|
213 | curl_easy_getinfo(sn->handle, CURLINFO_EFFECTIVE_URL, &log_url); |
9b9420041d8e
add request/response body to verbose output / add DavSession logfunc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
777
diff
changeset
|
214 | curl_easy_getinfo(sn->handle, CURLINFO_EFFECTIVE_METHOD , &log_method); |
9b9420041d8e
add request/response body to verbose output / add DavSession logfunc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
777
diff
changeset
|
215 | char *log_reqbody = NULL; |
9b9420041d8e
add request/response body to verbose output / add DavSession logfunc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
777
diff
changeset
|
216 | size_t log_reqbodylen = 0; |
9b9420041d8e
add request/response body to verbose output / add DavSession logfunc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
777
diff
changeset
|
217 | char *log_rpbody = NULL; |
9b9420041d8e
add request/response body to verbose output / add DavSession logfunc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
777
diff
changeset
|
218 | size_t log_rpbodylen = 0; |
354
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
292
diff
changeset
|
219 | if(request) { |
788
9b9420041d8e
add request/response body to verbose output / add DavSession logfunc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
777
diff
changeset
|
220 | log_reqbody = request->space; |
9b9420041d8e
add request/response body to verbose output / add DavSession logfunc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
777
diff
changeset
|
221 | log_reqbodylen = request->size; |
354
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
292
diff
changeset
|
222 | } |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
292
diff
changeset
|
223 | if(response) { |
788
9b9420041d8e
add request/response body to verbose output / add DavSession logfunc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
777
diff
changeset
|
224 | log_rpbody = response->space; |
9b9420041d8e
add request/response body to verbose output / add DavSession logfunc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
777
diff
changeset
|
225 | log_rpbodylen = response->size; |
354
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
292
diff
changeset
|
226 | } |
788
9b9420041d8e
add request/response body to verbose output / add DavSession logfunc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
777
diff
changeset
|
227 | sn->logfunc(sn, log_method, log_url, log_reqbody, log_reqbodylen, http_status, log_rpbody, log_rpbodylen); |
354
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
292
diff
changeset
|
228 | } |
788
9b9420041d8e
add request/response body to verbose output / add DavSession logfunc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
777
diff
changeset
|
229 | |
9b9420041d8e
add request/response body to verbose output / add DavSession logfunc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
777
diff
changeset
|
230 | if(http_status == 401 && sn->auth_prompt) { |
9b9420041d8e
add request/response body to verbose output / add DavSession logfunc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
777
diff
changeset
|
231 | if(!sn->auth_prompt(sn, sn->authprompt_userdata)) { |
9b9420041d8e
add request/response body to verbose output / add DavSession logfunc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
777
diff
changeset
|
232 | if(request) { |
9b9420041d8e
add request/response body to verbose output / add DavSession logfunc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
777
diff
changeset
|
233 | cxBufferSeek(request, 0, SEEK_SET); |
9b9420041d8e
add request/response body to verbose output / add DavSession logfunc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
777
diff
changeset
|
234 | } |
9b9420041d8e
add request/response body to verbose output / add DavSession logfunc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
777
diff
changeset
|
235 | if(response) { |
9b9420041d8e
add request/response body to verbose output / add DavSession logfunc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
777
diff
changeset
|
236 | cxBufferSeek(response, 0, SEEK_SET); |
9b9420041d8e
add request/response body to verbose output / add DavSession logfunc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
777
diff
changeset
|
237 | } |
9b9420041d8e
add request/response body to verbose output / add DavSession logfunc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
777
diff
changeset
|
238 | ret = curl_easy_perform(sn->handle); |
9b9420041d8e
add request/response body to verbose output / add DavSession logfunc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
777
diff
changeset
|
239 | curl_easy_getinfo(sn->handle, CURLINFO_RESPONSE_CODE, &http_status); |
9b9420041d8e
add request/response body to verbose output / add DavSession logfunc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
777
diff
changeset
|
240 | } |
9b9420041d8e
add request/response body to verbose output / add DavSession logfunc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
777
diff
changeset
|
241 | } |
9b9420041d8e
add request/response body to verbose output / add DavSession logfunc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
777
diff
changeset
|
242 | |
354
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
292
diff
changeset
|
243 | } |
788
9b9420041d8e
add request/response body to verbose output / add DavSession logfunc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
777
diff
changeset
|
244 | |
354
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
292
diff
changeset
|
245 | if(status) { |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
292
diff
changeset
|
246 | *status = http_status; |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
292
diff
changeset
|
247 | } |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
292
diff
changeset
|
248 | return ret; |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
292
diff
changeset
|
249 | } |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
292
diff
changeset
|
250 | |
355
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
251 | int dav_session_get_progress(void *clientp, curl_off_t dltotal, curl_off_t dlnow, curl_off_t ultotal, curl_off_t ulnow) { |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
252 | DavResource *res = clientp; |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
253 | DavSession *sn = res->session; |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
254 | if(sn->get_progress) { |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
255 | sn->get_progress(res, (int64_t)dltotal, (int64_t)dlnow, sn->progress_userdata); |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
256 | } |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
257 | return 0; |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
258 | } |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
259 | |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
260 | int dav_session_put_progress(void *clientp, curl_off_t dltotal, curl_off_t dlnow, curl_off_t ultotal, curl_off_t ulnow) { |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
261 | DavResource *res = clientp; |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
262 | DavSession *sn = res->session; |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
263 | if(sn->put_progress) { |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
264 | sn->put_progress(res, (int64_t)ultotal, (int64_t)ulnow, sn->progress_userdata); |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
265 | } |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
266 | return 0; |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
267 | } |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
268 | |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
269 | void dav_session_set_error(DavSession *sn, CURLcode c, int status) { |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
270 | if(status > 0) { |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
271 | switch(status) { |
100
f4127c4d1018
improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
272 | default: { |
f4127c4d1018
improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
273 | switch(c) { |
f4127c4d1018
improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
274 | default: sn->error = DAV_ERROR; |
f4127c4d1018
improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
275 | } |
f4127c4d1018
improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
276 | break; |
f4127c4d1018
improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
277 | } |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
278 | case 401: sn->error = DAV_UNAUTHORIZED; break; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
279 | case 403: sn->error = DAV_FORBIDDEN; break; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
280 | case 404: sn->error = DAV_NOT_FOUND; break; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
281 | case 405: sn->error = DAV_METHOD_NOT_ALLOWED; break; |
238
b167226fb804
added support for error codes 407,413,414 and 511
Mike Becker <universe@uap-core.de>
parents:
225
diff
changeset
|
282 | case 407: sn->error = DAV_PROXY_AUTH_REQUIRED; break; |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
283 | case 409: sn->error = DAV_CONFLICT; break; |
491
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
437
diff
changeset
|
284 | case 412: sn->error = DAV_PRECONDITION_FAILED; break; |
238
b167226fb804
added support for error codes 407,413,414 and 511
Mike Becker <universe@uap-core.de>
parents:
225
diff
changeset
|
285 | case 413: sn->error = DAV_REQUEST_ENTITY_TOO_LARGE; break; |
b167226fb804
added support for error codes 407,413,414 and 511
Mike Becker <universe@uap-core.de>
parents:
225
diff
changeset
|
286 | case 414: sn->error = DAV_REQUEST_URL_TOO_LONG; break; |
207
de23f8881e9f
fixed hash verification and head requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
287 | case 423: sn->error = DAV_LOCKED; break; |
238
b167226fb804
added support for error codes 407,413,414 and 511
Mike Becker <universe@uap-core.de>
parents:
225
diff
changeset
|
288 | case 511: sn->error = DAV_NET_AUTH_REQUIRED; break; |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
289 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
290 | } else { |
100
f4127c4d1018
improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
291 | switch(c) { |
f4127c4d1018
improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
292 | case CURLE_UNSUPPORTED_PROTOCOL: sn->error = DAV_UNSUPPORTED_PROTOCOL; break; |
f4127c4d1018
improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
293 | case CURLE_COULDNT_RESOLVE_PROXY: sn->error = DAV_COULDNT_RESOLVE_PROXY; break; |
f4127c4d1018
improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
294 | case CURLE_COULDNT_RESOLVE_HOST: sn->error = DAV_COULDNT_RESOLVE_HOST; break; |
f4127c4d1018
improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
295 | case CURLE_COULDNT_CONNECT: sn->error = DAV_COULDNT_CONNECT; break; |
f4127c4d1018
improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
296 | case CURLE_OPERATION_TIMEDOUT: sn->error = DAV_TIMEOUT; break; |
f4127c4d1018
improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
297 | case CURLE_SSL_CONNECT_ERROR: |
f4127c4d1018
improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
298 | case CURLE_PEER_FAILED_VERIFICATION: |
f4127c4d1018
improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
299 | case CURLE_SSL_ENGINE_NOTFOUND: |
f4127c4d1018
improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
300 | case CURLE_SSL_ENGINE_SETFAILED: |
f4127c4d1018
improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
301 | case CURLE_SSL_CERTPROBLEM: |
f4127c4d1018
improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
302 | case CURLE_SSL_CIPHER: |
742
7e67689241fd
new build system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
601
diff
changeset
|
303 | //#ifndef CURLE_SSL_CACERT |
7e67689241fd
new build system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
601
diff
changeset
|
304 | // case CURLE_SSL_CACERT: |
7e67689241fd
new build system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
601
diff
changeset
|
305 | //#endif |
100
f4127c4d1018
improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
306 | case CURLE_SSL_CACERT_BADFILE: |
f4127c4d1018
improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
307 | case CURLE_SSL_SHUTDOWN_FAILED: |
f4127c4d1018
improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
308 | case CURLE_SSL_CRL_BADFILE: |
f4127c4d1018
improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
309 | case CURLE_SSL_ISSUER_ERROR: sn->error = DAV_SSL_ERROR; break; |
f4127c4d1018
improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
310 | default: sn->error = DAV_ERROR; break; |
f4127c4d1018
improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
311 | } |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
312 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
313 | if(c != CURLE_OK) { |
225
a297c2e28fa1
improved error handling in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
222
diff
changeset
|
314 | dav_session_set_errstr(sn, curl_easy_strerror(c)); |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
315 | } else { |
225
a297c2e28fa1
improved error handling in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
222
diff
changeset
|
316 | dav_session_set_errstr(sn, NULL); |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
317 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
318 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
319 | |
225
a297c2e28fa1
improved error handling in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
222
diff
changeset
|
320 | void dav_session_set_errstr(DavSession *sn, const char *str) { |
a297c2e28fa1
improved error handling in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
222
diff
changeset
|
321 | if(sn->errorstr) { |
a297c2e28fa1
improved error handling in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
222
diff
changeset
|
322 | dav_session_free(sn, sn->errorstr); |
a297c2e28fa1
improved error handling in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
222
diff
changeset
|
323 | } |
a297c2e28fa1
improved error handling in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
222
diff
changeset
|
324 | char *errstr = NULL; |
a297c2e28fa1
improved error handling in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
222
diff
changeset
|
325 | if(str) { |
a297c2e28fa1
improved error handling in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
222
diff
changeset
|
326 | errstr = dav_session_strdup(sn, str); |
a297c2e28fa1
improved error handling in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
222
diff
changeset
|
327 | } |
a297c2e28fa1
improved error handling in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
222
diff
changeset
|
328 | sn->errorstr = errstr; |
a297c2e28fa1
improved error handling in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
222
diff
changeset
|
329 | } |
a297c2e28fa1
improved error handling in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
222
diff
changeset
|
330 | |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
331 | void dav_session_destroy(DavSession *sn) { |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
332 | // remove session from context |
805
bff983370565
make DavContext mt-safe
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
796
diff
changeset
|
333 | if (dav_context_remove_session(sn->context, sn)) { |
bff983370565
make DavContext mt-safe
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
796
diff
changeset
|
334 | fprintf(stderr, "Error: session not found in ctx->sessions\n"); |
790
7110b37f2a6b
fix dav_context_destroy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
788
diff
changeset
|
335 | dav_session_destructor(sn); |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
336 | } |
790
7110b37f2a6b
fix dav_context_destroy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
788
diff
changeset
|
337 | } |
7110b37f2a6b
fix dav_context_destroy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
788
diff
changeset
|
338 | |
7110b37f2a6b
fix dav_context_destroy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
788
diff
changeset
|
339 | void dav_session_destructor(DavSession *sn) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
340 | cxMempoolDestroy(sn->mp); |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
341 | curl_easy_cleanup(sn->handle); |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
342 | free(sn); |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
343 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
344 | |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
345 | |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
346 | void* dav_session_malloc(DavSession *sn, size_t size) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
347 | return cxMalloc(sn->mp->allocator, size); |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
348 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
349 | |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
350 | void* dav_session_calloc(DavSession *sn, size_t nelm, size_t size) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
351 | return cxCalloc(sn->mp->allocator, nelm, size); |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
352 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
353 | |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
354 | void* dav_session_realloc(DavSession *sn, void *ptr, size_t size) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
355 | return cxRealloc(sn->mp->allocator, ptr, size); |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
356 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
357 | |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
358 | void dav_session_free(DavSession *sn, void *ptr) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
359 | cxFree(sn->mp->allocator, ptr); |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
360 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
361 | |
225
a297c2e28fa1
improved error handling in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
222
diff
changeset
|
362 | char* dav_session_strdup(DavSession *sn, const char *str) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
363 | return cx_strdup_a(sn->mp->allocator, cx_str((char*)str)).ptr; |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
364 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
365 | |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
366 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
367 | char* dav_session_create_plain_href(DavSession *sn, const char *path) { |
437
70c7d8e437f9
fixes that decrypt-name can decrypt a path and not only the name
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
420
diff
changeset
|
368 | if(!DAV_ENCRYPT_NAME(sn) && !DAV_DECRYPT_NAME(sn)) { |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
369 | // non encrypted file names |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
370 | char *url = util_path_to_url(sn, path); |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
371 | char *href = dav_session_strdup(sn, util_url_path(url)); |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
372 | free(url); |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
373 | return href; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
374 | } else { |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
375 | return NULL; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
376 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
377 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
378 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
379 | char* dav_session_get_href(DavSession *sn, const char *path) { |
437
70c7d8e437f9
fixes that decrypt-name can decrypt a path and not only the name
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
420
diff
changeset
|
380 | if(DAV_DECRYPT_NAME(sn) || DAV_ENCRYPT_NAME(sn)) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
381 | cxstring p = cx_str(path); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
382 | CxBuffer href; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
383 | CxBuffer pbuf; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
384 | cxBufferInit(&href, NULL, 256, cxDefaultAllocator, CX_BUFFER_FREE_CONTENTS|CX_BUFFER_AUTO_EXTEND); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
385 | cxBufferInit(&pbuf, NULL, 256, cxDefaultAllocator, CX_BUFFER_FREE_CONTENTS|CX_BUFFER_AUTO_EXTEND); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
386 | |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
387 | int start = 0; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
388 | int begin = 0; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
389 | |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
390 | // check path cache |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
391 | char *cp = strdup(path); |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
392 | //printf("cp: %s\n", cp); |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
393 | while(strlen(cp) > 1) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
394 | char *cached = cxMapGet(sn->pathcache, cx_hash_key_str(cp)); |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
395 | if(cached) { |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
396 | start = strlen(cp); |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
397 | begin = start; |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
398 | cxBufferPutString(&href, cached); |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
399 | break; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
400 | } else { |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
401 | // check, if the parent path is cached |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
402 | char *f = cp; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
403 | cp = util_parent_path(cp); |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
404 | free(f); |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
405 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
406 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
407 | free(cp); |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
408 | if(href.pos == 0) { |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
409 | // if there are no cached elements we have to add the base url path |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
410 | // to the href buffer |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
411 | cxBufferPutString(&href, util_url_path(sn->base_url)); |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
412 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
413 | |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
414 | // create resource for name lookup |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
415 | cxmutstr rp = cx_strdup(cx_strn(path, start)); |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
416 | DavResource *root = dav_resource_new(sn, rp.ptr); |
150
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
417 | free(rp.ptr); |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
418 | resource_set_href(root, cx_strn(href.space, href.pos)); |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
419 | |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
420 | // create request buffer for propfind requests |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
421 | CxBuffer *rqbuf = create_basic_propfind_request(); |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
422 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
423 | cxstring remaining = cx_strsubs(p, start); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
424 | CxStrtokCtx elms = cx_strtok(remaining, CX_STR("/"), INT_MAX); |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
425 | DavResource *res = root; |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
426 | cxBufferPutString(&pbuf, res->path); |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
427 | // iterate over all remaining path elements |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
428 | cxstring elm; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
429 | while(cx_strtok_next(&elms, &elm)) { |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
430 | if(elm.length > 0) { |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
431 | //printf("elm: %.*s\n", elm.length, elm.ptr); |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
432 | DavResource *child = dav_find_child(sn, res, rqbuf, elm.ptr); |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
433 | |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
434 | // if necessary add a path separator |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
435 | if(pbuf.space[pbuf.pos-1] != '/') { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
436 | if(href.space[href.pos-1] != '/') { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
437 | cxBufferPut(&href, '/'); |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
438 | } |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
439 | cxBufferPut(&pbuf, '/'); |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
440 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
441 | // add last path/href to the cache |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
442 | cxstring pp = cx_strn(pbuf.space, pbuf.size); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
443 | cxstring hh = cx_strn(href.space, href.size); |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
444 | dav_session_cache_path(sn, pp, hh); |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
445 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
446 | cxBufferWrite(elm.ptr, 1, elm.length, &pbuf); |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
447 | if(child) { |
591
793af8666b3a
fixes missing url encoding in dav_session_get_href() with enabled name decryption
Mike Becker <universe@uap-core.de>
parents:
505
diff
changeset
|
448 | // href is already URL encoded, so don't encode again |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
449 | cxBufferPutString(&href, util_resource_name(child->href)); |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
450 | res = child; |
496
5979ea04175e
fixes dav_session_get_href() generating random names when encrypt-name is disabled
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
491
diff
changeset
|
451 | } else if(DAV_ENCRYPT_NAME(sn)) { |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
452 | char *random_name = util_random_str(); |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
453 | cxBufferPutString(&href, random_name); |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
454 | free(random_name); |
496
5979ea04175e
fixes dav_session_get_href() generating random names when encrypt-name is disabled
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
491
diff
changeset
|
455 | } else { |
591
793af8666b3a
fixes missing url encoding in dav_session_get_href() with enabled name decryption
Mike Becker <universe@uap-core.de>
parents:
505
diff
changeset
|
456 | // path is not URL encoded, so we have to do this here |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
457 | cxstring resname = cx_str(util_resource_name((const char*)path)); |
600
8e7f02fd7b9b
fixes incorrect URL encoding of the trailing slash for collection names
Mike Becker <universe@uap-core.de>
parents:
591
diff
changeset
|
458 | // the name of collections ends with |
8e7f02fd7b9b
fixes incorrect URL encoding of the trailing slash for collection names
Mike Becker <universe@uap-core.de>
parents:
591
diff
changeset
|
459 | // a trailing slash, which MUST NOT be encoded |
8e7f02fd7b9b
fixes incorrect URL encoding of the trailing slash for collection names
Mike Becker <universe@uap-core.de>
parents:
591
diff
changeset
|
460 | if(resname.ptr[resname.length-1] == '/') { |
8e7f02fd7b9b
fixes incorrect URL encoding of the trailing slash for collection names
Mike Becker <universe@uap-core.de>
parents:
591
diff
changeset
|
461 | char *esc = curl_easy_escape(sn->handle, |
8e7f02fd7b9b
fixes incorrect URL encoding of the trailing slash for collection names
Mike Becker <universe@uap-core.de>
parents:
591
diff
changeset
|
462 | resname.ptr, resname.length-1); |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
463 | cxBufferWrite(esc, 1, strlen(esc), &href); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
464 | cxBufferPut(&href, '/'); |
600
8e7f02fd7b9b
fixes incorrect URL encoding of the trailing slash for collection names
Mike Becker <universe@uap-core.de>
parents:
591
diff
changeset
|
465 | curl_free(esc); |
8e7f02fd7b9b
fixes incorrect URL encoding of the trailing slash for collection names
Mike Becker <universe@uap-core.de>
parents:
591
diff
changeset
|
466 | } else { |
8e7f02fd7b9b
fixes incorrect URL encoding of the trailing slash for collection names
Mike Becker <universe@uap-core.de>
parents:
591
diff
changeset
|
467 | char *esc = curl_easy_escape(sn->handle, |
8e7f02fd7b9b
fixes incorrect URL encoding of the trailing slash for collection names
Mike Becker <universe@uap-core.de>
parents:
591
diff
changeset
|
468 | resname.ptr, resname.length); |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
469 | cxBufferWrite(esc, 1, strlen(esc), &href); |
600
8e7f02fd7b9b
fixes incorrect URL encoding of the trailing slash for collection names
Mike Becker <universe@uap-core.de>
parents:
591
diff
changeset
|
470 | curl_free(esc); |
8e7f02fd7b9b
fixes incorrect URL encoding of the trailing slash for collection names
Mike Becker <universe@uap-core.de>
parents:
591
diff
changeset
|
471 | } |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
472 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
473 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
474 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
475 | |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
476 | // if necessary add a path separator |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
477 | if(p.ptr[p.length-1] == '/') { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
478 | if(href.space[href.pos-1] != '/') { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
479 | cxBufferPut(&href, '/'); |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
480 | } |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
481 | cxBufferPut(&pbuf, '/'); |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
482 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
483 | // add the final path to the cache |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
484 | cxstring pp = cx_strn(pbuf.space, pbuf.size); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
485 | cxstring hh = cx_strn(href.space, href.size); |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
486 | dav_session_cache_path(sn, pp, hh); |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
487 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
488 | cxmutstr href_str = cx_strdup_a( |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
489 | sn->mp->allocator, |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
490 | cx_strn(href.space, href.size)); |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
491 | |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
492 | // cleanup |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
493 | dav_resource_free_all(root); |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
494 | cxBufferFree(rqbuf); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
495 | |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
496 | cxBufferDestroy(&pbuf); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
497 | cxBufferDestroy(&href); |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
498 | |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
499 | return href_str.ptr; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
500 | } else { |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
501 | return dav_session_create_plain_href(sn, path); |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
502 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
503 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
504 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
505 | DavResource* dav_find_child(DavSession *sn, DavResource *res, CxBuffer *rqbuf, const char *name) { |
135
664aeaec8d25
replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
506 | if(res && !dav_propfind(sn, res, rqbuf)) { |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
507 | DavResource *child = res->children; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
508 | while(child) { |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
509 | if(!strcmp(child->name, name)) { |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
510 | return child; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
511 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
512 | child = child->next; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
513 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
514 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
515 | return NULL; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
516 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
517 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
518 | void dav_session_cache_path(DavSession *sn, cxstring path, cxstring href) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
519 | CxHashKey path_key = cx_hash_key(path.ptr, path.length); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
520 | char *elm = cxMapGet(sn->pathcache, path_key); |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
521 | if(!elm) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
522 | cxmutstr href_s = cx_strdup_a(sn->mp->allocator, href); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
523 | cxMapPut(sn->pathcache, path_key, href_s.ptr); |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
524 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
525 | } |
208
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
526 | |
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
527 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
528 | DavLock* dav_create_lock(DavSession *sn, const char *token, char *timeout) { |
208
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
529 | DavLock *lock = dav_session_malloc(sn, sizeof(DavLock)); |
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
530 | lock->path = NULL; |
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
531 | lock->token = dav_session_strdup(sn, token); |
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
532 | |
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
533 | // TODO: timeout |
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
534 | |
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
535 | return lock; |
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
536 | } |
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
537 | |
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
538 | void dav_destroy_lock(DavSession *sn, DavLock *lock) { |
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
539 | dav_session_free(sn, lock->token); |
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
540 | if(lock->path) { |
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
541 | dav_session_free(sn, lock->path); |
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
542 | } |
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
543 | dav_session_free(sn, lock); |
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
544 | } |
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
545 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
546 | |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
547 | static int dav_lock_cmp(void const *left, void const *right) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
548 | const DavLock *l = left; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
549 | const DavLock *r = right; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
550 | return strcmp(l->path, r->path); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
551 | } |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
552 | |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
553 | static int create_lock_manager(DavSession *sn) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
554 | // create lock manager |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
555 | DavLockManager *locks = cxMalloc(sn->mp->allocator, sizeof(DavLockManager)); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
556 | locks->resource_locks = cxHashMapCreate(sn->mp->allocator, CX_STORE_POINTERS, 16); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
557 | locks->collection_locks = cxLinkedListCreate(sn->mp->allocator, dav_lock_cmp, CX_STORE_POINTERS); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
558 | sn->locks = locks; |
208
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
559 | return 0; |
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
560 | } |
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
561 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
562 | static DavLockManager* get_lock_manager(DavSession *sn) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
563 | DavLockManager *locks = sn->locks; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
564 | if(!locks) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
565 | if(create_lock_manager(sn)) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
566 | return NULL; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
567 | } |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
568 | locks = sn->locks; |
208
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
569 | } |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
570 | return locks; |
208
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
571 | } |
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
572 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
573 | int dav_add_resource_lock(DavSession *sn, const char *path, DavLock *lock) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
574 | DavLockManager *locks = get_lock_manager(sn); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
575 | if(!locks) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
576 | return -1; |
208
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
577 | } |
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
578 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
579 | CxHashKey path_key = cx_hash_key_str(path); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
580 | if(cxMapGet(locks->resource_locks, path_key)) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
581 | return -1; |
208
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
582 | } |
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
583 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
584 | cxMapPut(locks->resource_locks, path_key, lock); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
585 | return 0; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
586 | } |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
587 | |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
588 | int dav_add_collection_lock(DavSession *sn, const char *path, DavLock *lock) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
589 | DavLockManager *locks = get_lock_manager(sn); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
590 | if(!locks) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
591 | return -1; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
592 | } |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
593 | |
777
15006651a5d1
fix dav_add_collection_lock() setting the lock path
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
747
diff
changeset
|
594 | lock->path = dav_session_strdup(sn, path); |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
595 | cxListAdd(locks->collection_locks, lock); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
596 | cxListSort(locks->collection_locks); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
597 | |
208
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
598 | return 0; |
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
599 | } |
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
600 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
601 | DavLock* dav_get_lock(DavSession *sn, const char *path) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
602 | DavLockManager *locks = get_lock_manager(sn); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
603 | if(!locks) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
604 | return NULL; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
605 | } |
208
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
606 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
607 | cxstring p = cx_str(path); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
608 | |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
609 | DavLock *lock = cxMapGet(locks->resource_locks, cx_hash_key(p.ptr, p.length)); |
208
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
610 | if(lock) { |
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
611 | return lock; |
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
612 | } |
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
613 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
614 | CxIterator i = cxListIterator(locks->collection_locks); |
777
15006651a5d1
fix dav_add_collection_lock() setting the lock path
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
747
diff
changeset
|
615 | cx_foreach(DavLock*, col_lock, i) { |
15006651a5d1
fix dav_add_collection_lock() setting the lock path
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
747
diff
changeset
|
616 | int cmd = strcmp(path, col_lock->path); |
208
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
617 | if(cmd == 0) { |
777
15006651a5d1
fix dav_add_collection_lock() setting the lock path
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
747
diff
changeset
|
618 | return col_lock; |
15006651a5d1
fix dav_add_collection_lock() setting the lock path
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
747
diff
changeset
|
619 | } else if(cx_strprefix(p, cx_str(col_lock->path))) { |
15006651a5d1
fix dav_add_collection_lock() setting the lock path
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
747
diff
changeset
|
620 | return col_lock; |
208
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
621 | } else if(cmd > 0) { |
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
622 | break; |
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
623 | } |
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
624 | } |
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
625 | |
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
626 | return NULL; |
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
627 | } |
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
628 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
629 | void dav_remove_lock(DavSession *sn, const char *path, DavLock *lock) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
630 | DavLockManager *locks = get_lock_manager(sn); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
631 | if(!locks) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
632 | return; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
633 | } |
208
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
634 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
742
diff
changeset
|
635 | if(cxMapRemoveAndGet(locks->resource_locks, cx_hash_key_str(path))) { |
208
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
636 | return; |
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
637 | } |
816
839fefbdedc7
compatibility with UCX 3.1 plus several minor code fixes
Mike Becker <universe@uap-core.de>
parents:
806
diff
changeset
|
638 | |
839fefbdedc7
compatibility with UCX 3.1 plus several minor code fixes
Mike Becker <universe@uap-core.de>
parents:
806
diff
changeset
|
639 | cxListFindRemove(locks->collection_locks, lock); |
208
1fb26aca5093
added API for webdav locking
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
640 | } |