Sun, 21 May 2023 11:52:06 +0200
fix dav-sync crash
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1 | /* |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
2 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
3 | * |
364
3769ba002fd1
updates copyright date
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
347
diff
changeset
|
4 | * Copyright 2018 Olaf Wintermann. All rights reserved. |
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
5 | * |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
6 | * Redistribution and use in source and binary forms, with or without |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
7 | * modification, are permitted provided that the following conditions are met: |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
8 | * |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
9 | * 1. Redistributions of source code must retain the above copyright |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
10 | * notice, this list of conditions and the following disclaimer. |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
11 | * |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
12 | * 2. Redistributions in binary form must reproduce the above copyright |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
13 | * notice, this list of conditions and the following disclaimer in the |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
14 | * documentation and/or other materials provided with the distribution. |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
15 | * |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
16 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
17 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
18 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
19 | * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
20 | * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
88625853ae74
new webdav api + repository and key configuration + aes 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 |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
26 | * POSSIBILITY OF SUCH DAMAGE. |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
27 | */ |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
28 | |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
29 | #include <stdio.h> |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
30 | #include <stdlib.h> |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
31 | #include <string.h> |
8
4503498deb22
creates a .dav dir if it doesn't exist
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
7
diff
changeset
|
32 | #include <sys/types.h> |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
33 | #include <cx/hash_map.h> |
8
4503498deb22
creates a .dav dir if it doesn't exist
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
7
diff
changeset
|
34 | #include <errno.h> |
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
35 | #include <libxml/tree.h> |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
36 | |
470
6bf798ad3aec
adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
37 | #include "pwd.h" |
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
38 | #include "config.h" |
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
39 | #include "main.h" |
734
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
40 | #include "pwd.h" |
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
41 | #include <libidav/utils.h> |
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
42 | |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
43 | #define xstreq(a,b) xmlStrEqual(BAD_CAST a, BAD_CAST b) |
73
41e88442ad4e
ssl version is now configurable
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
43
diff
changeset
|
44 | #define xstrEQ(a,b) !xmlStrcasecmp(BAD_CAST a, BAD_CAST b) |
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
45 | |
254
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
46 | #define print_error(lineno, ...) \ |
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
47 | do {\ |
254
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
48 | fprintf(stderr, "Error (config.xml line %u): ", lineno); \ |
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
49 | fprintf(stderr, __VA_ARGS__); \ |
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
50 | fprintf(stderr, "Abort.\n"); \ |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
51 | } while(0); |
254
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
52 | #define print_warning(lineno, ...) \ |
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
53 | do {\ |
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
54 | fprintf(stderr, "Warning (config.xml line %u): ", lineno); \ |
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
55 | fprintf(stderr, __VA_ARGS__); \ |
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
56 | } while(0); |
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
57 | |
32 | 58 | #ifdef _WIN32 |
59 | #define ENV_HOME getenv("USERPROFILE") | |
60 | #else | |
61 | #define ENV_HOME getenv("HOME") | |
62 | #endif /* _WIN32 */ | |
63 | ||
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
64 | static CxMap *repos; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
65 | static CxMap *keys; |
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
66 | |
470
6bf798ad3aec
adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
67 | static PwdStore *pstore; |
6bf798ad3aec
adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
68 | |
730
83f832e345e0
implement secretstore config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
729
diff
changeset
|
69 | static char *secretstore_unlock_cmd; |
83f832e345e0
implement secretstore config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
729
diff
changeset
|
70 | static char *secretstore_lock_cmd; |
729
5433f0f3dd48
disable error in case of unknown config elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
606
diff
changeset
|
71 | |
215
781aee172901
dav-sync add-directory shows list of repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
72 | int check_config_dir(void) { |
32 | 73 | char *file = util_concat_path(ENV_HOME, ".dav"); |
8
4503498deb22
creates a .dav dir if it doesn't exist
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
7
diff
changeset
|
74 | int ret = 0; |
32 | 75 | if(util_mkdir(file, S_IRWXU)) { |
8
4503498deb22
creates a .dav dir if it doesn't exist
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
7
diff
changeset
|
76 | if(errno != EEXIST) { |
4503498deb22
creates a .dav dir if it doesn't exist
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
7
diff
changeset
|
77 | ret = 1; |
4503498deb22
creates a .dav dir if it doesn't exist
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
7
diff
changeset
|
78 | } |
4503498deb22
creates a .dav dir if it doesn't exist
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
7
diff
changeset
|
79 | } |
4503498deb22
creates a .dav dir if it doesn't exist
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
7
diff
changeset
|
80 | free(file); |
4503498deb22
creates a .dav dir if it doesn't exist
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
7
diff
changeset
|
81 | return ret; |
4503498deb22
creates a .dav dir if it doesn't exist
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
7
diff
changeset
|
82 | } |
4503498deb22
creates a .dav dir if it doesn't exist
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
7
diff
changeset
|
83 | |
40
a95ee94b9204
supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
38
diff
changeset
|
84 | static DavContext *context; |
a95ee94b9204
supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
38
diff
changeset
|
85 | |
142
0c0ccb7f71ba
startup doesn't override broken config.xml anymore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
86 | void create_default_config(char *file) { |
0c0ccb7f71ba
startup doesn't override broken config.xml anymore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
87 | xmlDoc *doc = xmlNewDoc(BAD_CAST "1.0"); |
0c0ccb7f71ba
startup doesn't override broken config.xml anymore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
88 | xmlNode *root = xmlNewNode(NULL, BAD_CAST "configuration"); |
0c0ccb7f71ba
startup doesn't override broken config.xml anymore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
89 | xmlDocSetRootElement(doc, root); |
0c0ccb7f71ba
startup doesn't override broken config.xml anymore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
90 | xmlSaveFormatFileEnc(file, doc, "UTF-8", 1); |
0c0ccb7f71ba
startup doesn't override broken config.xml anymore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
91 | xmlFreeDoc(doc); |
0c0ccb7f71ba
startup doesn't override broken config.xml anymore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
92 | } |
0c0ccb7f71ba
startup doesn't override broken config.xml anymore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
93 | |
296
bb49953b1cf8
dav-sync writes the locktoken to a file now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
295
diff
changeset
|
94 | char* config_file_path(char *name) { |
bb49953b1cf8
dav-sync writes the locktoken to a file now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
295
diff
changeset
|
95 | char *davd = util_concat_path(ENV_HOME, ".dav"); |
bb49953b1cf8
dav-sync writes the locktoken to a file now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
295
diff
changeset
|
96 | if(!davd) { |
bb49953b1cf8
dav-sync writes the locktoken to a file now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
295
diff
changeset
|
97 | return NULL; |
bb49953b1cf8
dav-sync writes the locktoken to a file now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
295
diff
changeset
|
98 | } |
bb49953b1cf8
dav-sync writes the locktoken to a file now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
295
diff
changeset
|
99 | char *path = util_concat_path(davd, name); |
bb49953b1cf8
dav-sync writes the locktoken to a file now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
295
diff
changeset
|
100 | free(davd); |
bb49953b1cf8
dav-sync writes the locktoken to a file now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
295
diff
changeset
|
101 | return path; |
bb49953b1cf8
dav-sync writes the locktoken to a file now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
295
diff
changeset
|
102 | } |
bb49953b1cf8
dav-sync writes the locktoken to a file now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
295
diff
changeset
|
103 | |
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
104 | int load_config(DavContext *ctx) { |
40
a95ee94b9204
supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
38
diff
changeset
|
105 | context = ctx; |
36 | 106 | // TODO: free the config somewhere |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
107 | repos = cxHashMapCreate(cxDefaultAllocator, CX_STORE_POINTERS, 16); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
108 | keys = cxHashMapCreate(cxDefaultAllocator, CX_STORE_POINTERS, 16); |
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
109 | |
472
08d2d1263429
new secrets store file format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
470
diff
changeset
|
110 | char *pwfile = util_concat_path(ENV_HOME, ".dav/secrets.crypt"); |
470
6bf798ad3aec
adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
111 | pstore = pwdstore_open(pwfile); |
6bf798ad3aec
adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
112 | free(pwfile); |
6bf798ad3aec
adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
113 | |
32 | 114 | char *file = util_concat_path(ENV_HOME, ".dav/config.xml"); |
142
0c0ccb7f71ba
startup doesn't override broken config.xml anymore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
115 | |
0c0ccb7f71ba
startup doesn't override broken config.xml anymore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
116 | struct stat s; |
0c0ccb7f71ba
startup doesn't override broken config.xml anymore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
117 | if(stat(file, &s)) { |
0c0ccb7f71ba
startup doesn't override broken config.xml anymore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
118 | switch(errno) { |
0c0ccb7f71ba
startup doesn't override broken config.xml anymore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
119 | case ENOENT: { |
294
dd5c0ebdf54f
fixes dav startup without .dav dir
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
254
diff
changeset
|
120 | return 0; |
142
0c0ccb7f71ba
startup doesn't override broken config.xml anymore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
121 | } |
0c0ccb7f71ba
startup doesn't override broken config.xml anymore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
122 | default: { |
0c0ccb7f71ba
startup doesn't override broken config.xml anymore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
123 | perror("Cannot load config.xml"); |
0c0ccb7f71ba
startup doesn't override broken config.xml anymore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
124 | } |
0c0ccb7f71ba
startup doesn't override broken config.xml anymore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
125 | } |
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
126 | return 1; |
6
9c64d2a3d101
creates an empty configuration file if needed
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
127 | } |
142
0c0ccb7f71ba
startup doesn't override broken config.xml anymore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
128 | |
0c0ccb7f71ba
startup doesn't override broken config.xml anymore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
129 | xmlDoc *doc = xmlReadFile(file, NULL, 0); |
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
130 | free(file); |
142
0c0ccb7f71ba
startup doesn't override broken config.xml anymore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
131 | if(!doc) { |
0c0ccb7f71ba
startup doesn't override broken config.xml anymore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
132 | fprintf(stderr, "Cannot load config.xml\n"); |
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
133 | return 1; |
142
0c0ccb7f71ba
startup doesn't override broken config.xml anymore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
134 | } |
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
135 | |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
136 | xmlNode *xml_root = xmlDocGetRootElement(doc); |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
137 | xmlNode *node = xml_root->children; |
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
138 | int ret = 0; |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
139 | while(node && !ret) { |
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
140 | if(node->type == XML_ELEMENT_NODE) { |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
141 | if(xstreq(node->name, "repository")) { |
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
142 | ret = load_repository(node); |
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
143 | } else if(xstreq(node->name, "key")) { |
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
144 | ret = load_key(node); |
36 | 145 | } else if (xstreq(node->name, "http-proxy")) { |
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
146 | ret = load_proxy(ctx->http_proxy, node, HTTP_PROXY); |
36 | 147 | } else if (xstreq(node->name, "https-proxy")) { |
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
148 | ret = load_proxy(ctx->https_proxy, node, HTTPS_PROXY); |
317
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
149 | } else if (xstreq(node->name, "namespace")) { |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
150 | ret = load_namespace(node); |
730
83f832e345e0
implement secretstore config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
729
diff
changeset
|
151 | } else if (xstreq(node->name, "secretstore")) { |
83f832e345e0
implement secretstore config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
729
diff
changeset
|
152 | ret = load_secretstore(node); |
735
74a6e2d4fb1f
reactivate error in case of unknown config elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
734
diff
changeset
|
153 | } else { |
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
154 | fprintf(stderr, "Unknown config element: %s\n", node->name); |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
155 | ret = 1; |
735
74a6e2d4fb1f
reactivate error in case of unknown config elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
734
diff
changeset
|
156 | } |
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
157 | } |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
158 | node = node->next; |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
159 | } |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
160 | |
9 | 161 | xmlFreeDoc(doc); |
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
162 | return ret; |
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
163 | } |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
164 | |
215
781aee172901
dav-sync add-directory shows list of repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
165 | void free_config(void) { |
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
166 | if(repos) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
167 | CxIterator i = cxMapIteratorValues(repos); |
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
168 | Repository *repo; |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
169 | cx_foreach(Repository*, repo, i) { |
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
170 | if(repo->default_key) { |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
171 | free(repo->default_key); |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
172 | } |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
173 | if(repo->name) { |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
174 | free(repo->name); |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
175 | } |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
176 | if(repo->password) { |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
177 | free(repo->password); |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
178 | } |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
179 | if(repo->url) { |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
180 | free(repo->url); |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
181 | } |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
182 | if(repo->user) { |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
183 | free(repo->user); |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
184 | } |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
185 | if(repo->cert) { |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
186 | free(repo->cert); |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
187 | } |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
188 | free(repo); |
74
da079dc0724c
fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
73
diff
changeset
|
189 | } |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
190 | cxMapDestroy(repos); |
74
da079dc0724c
fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
73
diff
changeset
|
191 | } |
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
192 | if(keys) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
193 | cxMapDestroy(keys); |
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
194 | } |
74
da079dc0724c
fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
73
diff
changeset
|
195 | } |
da079dc0724c
fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
73
diff
changeset
|
196 | |
215
781aee172901
dav-sync add-directory shows list of repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
197 | Repository* repository_new(void) { |
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
198 | Repository *repo = calloc(1, sizeof(Repository)); |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
199 | repo->encrypt_name = false; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
200 | repo->encrypt_content = false; |
606
aa49966e4e85
add new session flags for properties encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
472
diff
changeset
|
201 | repo->encrypt_properties = false; |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
202 | repo->decrypt_name = false; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
203 | repo->decrypt_content = true; |
606
aa49966e4e85
add new session flags for properties encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
472
diff
changeset
|
204 | repo->decrypt_properties = false; |
199
f448fc8c9191
enabled cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
198
diff
changeset
|
205 | repo->verification = true; |
73
41e88442ad4e
ssl version is now configurable
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
43
diff
changeset
|
206 | repo->ssl_version = CURL_SSLVERSION_DEFAULT; |
154
3cfb4670d9e6
added possibility to configure authentication methods via coma separated list in config.xml
Mike Becker <universe@uap-core.de>
parents:
150
diff
changeset
|
207 | repo->authmethods = CURLAUTH_BASIC; |
119
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
208 | return repo; |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
209 | } |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
210 | |
254
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
211 | static int repo_add_config(Repository *repo, const xmlNode* node) { |
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
212 | unsigned short lineno = node->line; |
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
213 | char *key = (char*)node->name; |
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
214 | char *value = util_xml_get_text(node); |
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
215 | |
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
216 | /* every key needs a value */ |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
217 | if(!value) { |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
218 | /* TODO: maybe this should only be reported, if the key is valid |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
219 | * But this makes the code very ugly. |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
220 | */ |
254
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
221 | print_error(lineno, "missing value for config element: %s\n", key); |
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
222 | return 1; |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
223 | } |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
224 | |
119
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
225 | if(xstreq(key, "name")) { |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
226 | repo->name = strdup(value); |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
227 | } else if(xstreq(key, "url")) { |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
228 | repo->url = strdup(value); |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
229 | } else if(xstreq(key, "user")) { |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
230 | repo->user = strdup(value); |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
231 | } else if(xstreq(key, "password")) { |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
232 | repo->password = util_base64decode(value); |
470
6bf798ad3aec
adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
233 | } else if(xstreq(key, "stored-user")) { |
6bf798ad3aec
adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
234 | repo->stored_user = strdup(value); |
119
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
235 | } else if(xstreq(key, "default-key")) { |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
236 | repo->default_key = strdup(value); |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
237 | } else if(xstreq(key, "full-encryption")) { |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
238 | if(util_getboolean(value)) { |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
239 | repo->encrypt_name = true; |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
240 | repo->encrypt_content = true; |
606
aa49966e4e85
add new session flags for properties encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
472
diff
changeset
|
241 | repo->encrypt_properties = true; |
119
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
242 | repo->decrypt_name = true; |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
243 | repo->decrypt_content = true; |
606
aa49966e4e85
add new session flags for properties encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
472
diff
changeset
|
244 | repo->decrypt_properties = true; |
119
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
245 | } |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
246 | } else if(xstreq(key, "content-encryption")) { |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
247 | if(util_getboolean(value)) { |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
248 | repo->encrypt_content = true; |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
249 | repo->decrypt_content = true; |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
250 | } else { |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
251 | repo->encrypt_content = false; |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
252 | } |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
253 | } else if(xstreq(key, "decrypt-content")) { |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
254 | repo->decrypt_content = util_getboolean(value); |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
255 | } else if(xstreq(key, "decrypt-name")) { |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
256 | repo->decrypt_name = util_getboolean(value); |
199
f448fc8c9191
enabled cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
198
diff
changeset
|
257 | } else if(xstreq(key, "cert")) { |
f448fc8c9191
enabled cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
198
diff
changeset
|
258 | char *configdir = util_concat_path(ENV_HOME, ".dav"); |
f448fc8c9191
enabled cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
198
diff
changeset
|
259 | char *certfile = util_concat_path(configdir, value); |
f448fc8c9191
enabled cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
198
diff
changeset
|
260 | repo->cert = certfile; |
f448fc8c9191
enabled cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
198
diff
changeset
|
261 | free(configdir); |
f448fc8c9191
enabled cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
198
diff
changeset
|
262 | } else if(xstreq(key, "verification")) { |
f448fc8c9191
enabled cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
198
diff
changeset
|
263 | repo->verification = util_getboolean(value); |
119
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
264 | } else if(xstreq(key, "ssl-version")) { |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
265 | if(xstrEQ(value, "TLSv1")) { |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
266 | repo->ssl_version = CURL_SSLVERSION_TLSv1; |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
267 | } else if(xstrEQ(value, "SSLv2")) { |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
268 | repo->ssl_version = CURL_SSLVERSION_SSLv2; |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
269 | } else if(xstrEQ(value, "SSLv3")) { |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
270 | repo->ssl_version = CURL_SSLVERSION_SSLv3; |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
271 | } |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
272 | #if LIBCURL_VERSION_MAJOR >= 7 |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
273 | #if LIBCURL_VERSION_MINOR >= 34 |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
274 | else if(xstrEQ(value, "TLSv1.0")) { |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
275 | repo->ssl_version = CURL_SSLVERSION_TLSv1_0; |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
276 | } else if(xstrEQ(value, "TLSv1.1")) { |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
277 | repo->ssl_version = CURL_SSLVERSION_TLSv1_1; |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
278 | } else if(xstrEQ(value, "TLSv1.2")) { |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
279 | repo->ssl_version = CURL_SSLVERSION_TLSv1_2; |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
280 | } |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
281 | #endif |
295
8ac7b8d56115
adds TLSv1.3 config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
294
diff
changeset
|
282 | #if LIBCURL_VERSION_MINOR >= 52 |
8ac7b8d56115
adds TLSv1.3 config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
294
diff
changeset
|
283 | else if(xstrEQ(value, "TLSv1.3")) { |
8ac7b8d56115
adds TLSv1.3 config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
294
diff
changeset
|
284 | repo->ssl_version = CURL_SSLVERSION_TLSv1_3; |
8ac7b8d56115
adds TLSv1.3 config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
294
diff
changeset
|
285 | } |
8ac7b8d56115
adds TLSv1.3 config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
294
diff
changeset
|
286 | #endif |
119
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
287 | #endif |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
288 | else { |
254
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
289 | print_warning(lineno, "unknown ssl version: %s\n", value); |
119
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
290 | } |
154
3cfb4670d9e6
added possibility to configure authentication methods via coma separated list in config.xml
Mike Becker <universe@uap-core.de>
parents:
150
diff
changeset
|
291 | } else if(xstreq(key, "authmethods")) { |
3cfb4670d9e6
added possibility to configure authentication methods via coma separated list in config.xml
Mike Becker <universe@uap-core.de>
parents:
150
diff
changeset
|
292 | repo->authmethods = CURLAUTH_NONE; |
347
b6ff6be7aa91
adds config option to disable certain commands for specific syncdirs and fixes authmethod config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
321
diff
changeset
|
293 | const char *delims = " \t\r\n"; |
154
3cfb4670d9e6
added possibility to configure authentication methods via coma separated list in config.xml
Mike Becker <universe@uap-core.de>
parents:
150
diff
changeset
|
294 | char *meths = strdup(value); |
3cfb4670d9e6
added possibility to configure authentication methods via coma separated list in config.xml
Mike Becker <universe@uap-core.de>
parents:
150
diff
changeset
|
295 | char *meth = strtok(meths, delims); |
3cfb4670d9e6
added possibility to configure authentication methods via coma separated list in config.xml
Mike Becker <universe@uap-core.de>
parents:
150
diff
changeset
|
296 | while (meth) { |
347
b6ff6be7aa91
adds config option to disable certain commands for specific syncdirs and fixes authmethod config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
321
diff
changeset
|
297 | if(xstrEQ(meth, "basic")) { |
154
3cfb4670d9e6
added possibility to configure authentication methods via coma separated list in config.xml
Mike Becker <universe@uap-core.de>
parents:
150
diff
changeset
|
298 | repo->authmethods |= CURLAUTH_BASIC; |
347
b6ff6be7aa91
adds config option to disable certain commands for specific syncdirs and fixes authmethod config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
321
diff
changeset
|
299 | } else if(xstrEQ(meth, "digest")) { |
154
3cfb4670d9e6
added possibility to configure authentication methods via coma separated list in config.xml
Mike Becker <universe@uap-core.de>
parents:
150
diff
changeset
|
300 | repo->authmethods |= CURLAUTH_DIGEST; |
347
b6ff6be7aa91
adds config option to disable certain commands for specific syncdirs and fixes authmethod config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
321
diff
changeset
|
301 | } else if(xstrEQ(meth, "negotiate")) { |
154
3cfb4670d9e6
added possibility to configure authentication methods via coma separated list in config.xml
Mike Becker <universe@uap-core.de>
parents:
150
diff
changeset
|
302 | repo->authmethods |= CURLAUTH_GSSNEGOTIATE; |
347
b6ff6be7aa91
adds config option to disable certain commands for specific syncdirs and fixes authmethod config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
321
diff
changeset
|
303 | } else if(xstrEQ(meth, "ntlm")) { |
154
3cfb4670d9e6
added possibility to configure authentication methods via coma separated list in config.xml
Mike Becker <universe@uap-core.de>
parents:
150
diff
changeset
|
304 | repo->authmethods |= CURLAUTH_NTLM; |
347
b6ff6be7aa91
adds config option to disable certain commands for specific syncdirs and fixes authmethod config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
321
diff
changeset
|
305 | } else if(xstrEQ(meth, "any")) { |
154
3cfb4670d9e6
added possibility to configure authentication methods via coma separated list in config.xml
Mike Becker <universe@uap-core.de>
parents:
150
diff
changeset
|
306 | repo->authmethods = CURLAUTH_ANY; |
347
b6ff6be7aa91
adds config option to disable certain commands for specific syncdirs and fixes authmethod config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
321
diff
changeset
|
307 | } else if(xstrEQ(meth, "none")) { |
154
3cfb4670d9e6
added possibility to configure authentication methods via coma separated list in config.xml
Mike Becker <universe@uap-core.de>
parents:
150
diff
changeset
|
308 | /* skip */ |
3cfb4670d9e6
added possibility to configure authentication methods via coma separated list in config.xml
Mike Becker <universe@uap-core.de>
parents:
150
diff
changeset
|
309 | } else { |
254
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
310 | print_warning(lineno, |
347
b6ff6be7aa91
adds config option to disable certain commands for specific syncdirs and fixes authmethod config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
321
diff
changeset
|
311 | "unknown authentication method: %s\n", meth); |
154
3cfb4670d9e6
added possibility to configure authentication methods via coma separated list in config.xml
Mike Becker <universe@uap-core.de>
parents:
150
diff
changeset
|
312 | } |
3cfb4670d9e6
added possibility to configure authentication methods via coma separated list in config.xml
Mike Becker <universe@uap-core.de>
parents:
150
diff
changeset
|
313 | meth = strtok(NULL, delims); |
3cfb4670d9e6
added possibility to configure authentication methods via coma separated list in config.xml
Mike Becker <universe@uap-core.de>
parents:
150
diff
changeset
|
314 | } |
3cfb4670d9e6
added possibility to configure authentication methods via coma separated list in config.xml
Mike Becker <universe@uap-core.de>
parents:
150
diff
changeset
|
315 | free(meths); |
119
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
316 | } else { |
254
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
317 | print_error(lineno, "unkown repository config element: %s\n", key); |
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
318 | return 1; |
119
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
319 | } |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
320 | return 0; |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
321 | } |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
322 | |
254
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
323 | int load_repository(const xmlNode *reponode) { |
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
324 | Repository *repo = repository_new(); |
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
325 | { |
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
326 | xmlNode *node = reponode->children; |
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
327 | int ret = 0; |
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
328 | while(node && !ret) { |
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
329 | if(node->type == XML_ELEMENT_NODE) { |
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
330 | ret = repo_add_config(repo, node); |
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
331 | } |
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
332 | node = node->next; |
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
333 | } |
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
334 | if(ret) { |
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
335 | free(repo); |
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
336 | return 1; |
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
337 | } |
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
338 | } |
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
339 | |
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
340 | if(!repo->name) { |
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
341 | print_error(reponode->line, "missing name for repository.\n"); |
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
342 | return 1; |
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
343 | } |
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
344 | if(!repo->url) { |
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
345 | print_error(reponode->line, |
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
346 | "missing url for repository '%s'.\n", repo->name); |
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
347 | return 1; |
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
348 | } |
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
349 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
350 | cxMapPut(repos, cx_hash_key_str(repo->name), repo); |
254
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
351 | return 0; |
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
352 | } |
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
353 | |
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
354 | int load_proxy(DavProxy *proxy, const xmlNode *proxynode, int type) { |
36 | 355 | const char *stype; |
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
356 | if(type == HTTPS_PROXY) { |
36 | 357 | stype = "https"; |
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
358 | } else if(type == HTTP_PROXY) { |
36 | 359 | stype = "http"; |
360 | } | |
361 | ||
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
362 | if(!proxy) { |
254
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
363 | // no xml error - so report this directly via fprintf |
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
364 | fprintf(stderr, "no memory reserved for %s proxy.\n", stype); |
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
365 | return 1; |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
366 | } |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
367 | |
36 | 368 | xmlNode *node = proxynode->children; |
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
369 | int ret = 0; |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
370 | while(node && !ret) { |
36 | 371 | if(node->type == XML_ELEMENT_NODE) { |
372 | char *value = util_xml_get_text(node); | |
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
373 | int reportmissingvalue = 0; |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
374 | if(xstreq(node->name, "url")) { |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
375 | if(!(reportmissingvalue = !value)) { |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
376 | proxy->url = strdup(value); |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
377 | } |
36 | 378 | } else if(xstreq(node->name, "user")) { |
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
379 | if(!(reportmissingvalue = !value)) { |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
380 | proxy->username = strdup(value); |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
381 | } |
36 | 382 | } else if(xstreq(node->name, "password")) { |
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
383 | if(!(reportmissingvalue = !value)) { |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
384 | proxy->password = util_base64decode(value); |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
385 | } |
36 | 386 | } else if(xstreq(node->name, "no")) { |
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
387 | if(!(reportmissingvalue = !value)) { |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
388 | proxy->no_proxy = strdup(value); |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
389 | } |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
390 | } else { |
254
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
391 | print_error(node->line, |
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
392 | "invalid element for proxy config: %s\n", node->name); |
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
393 | ret = 1; |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
394 | } |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
395 | if (reportmissingvalue) { |
254
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
396 | print_error(node->line, |
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
397 | "missing value for proxy configuration element: %s\n", |
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
398 | node->name); |
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
399 | ret = 1; |
36 | 400 | } |
401 | } | |
402 | node = node->next; | |
403 | } | |
404 | ||
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
405 | if(!ret && !proxy->url) { |
254
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
406 | print_error(proxynode->line, "missing url for %s proxy.\n", stype); |
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
407 | return 1; |
36 | 408 | } |
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
409 | |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
410 | return ret; |
36 | 411 | } |
412 | ||
254
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
413 | int load_key(const xmlNode *keynode) { |
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
414 | xmlNode *node = keynode->children; |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
415 | Key *key = calloc(1, sizeof(Key)); |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
416 | key->type = KEY_AES256; |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
417 | |
150
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
418 | int error = 0; |
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
419 | while(node) { |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
420 | if(node->type == XML_ELEMENT_NODE) { |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
421 | char *value = util_xml_get_text(node); |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
422 | if(!value) { |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
423 | // next |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
424 | } else if(xstreq(node->name, "name")) { |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
425 | key->name = strdup(value); |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
426 | } else if(xstreq(node->name, "file")) { |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
427 | // load key file |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
428 | cxmutstr key_data = load_key_file(value); |
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
429 | if(key_data.length > 0) { |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
430 | key->data = key_data.ptr; |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
431 | key->length = key_data.length; |
150
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
432 | } else { |
254
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
433 | print_error(node->line, |
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
434 | "cannot get key from file: %s\n", value); |
150
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
435 | error = 1; |
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
436 | } |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
437 | } else if(xstreq(node->name, "type")) { |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
438 | if(!strcmp(value, "aes128")) { |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
439 | key->type = KEY_AES128; |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
440 | } else if(!strcmp(value, "aes256")) { |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
441 | key->type = KEY_AES256; |
228
c0175372c35d
removed password keys
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
224
diff
changeset
|
442 | } else { |
254
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
443 | print_error(node->line, "unknown key type %s\n", value); |
228
c0175372c35d
removed password keys
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
224
diff
changeset
|
444 | error = 1; |
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
445 | } |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
446 | } |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
447 | |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
448 | } |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
449 | node = node->next; |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
450 | } |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
451 | |
150
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
452 | if(!error && key->name) { |
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
453 | error = 0; |
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
454 | size_t expected_length = 0; |
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
455 | if(key->type == KEY_AES128) { |
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
456 | expected_length = 16; |
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
457 | } |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
458 | if(key->type == KEY_AES256) { |
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
459 | expected_length = 32; |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
460 | } |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
461 | if(key->length < expected_length) { |
254
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
462 | print_error(keynode->line, "key %s is too small (%zu < %zu)\n", |
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
463 | key->name, |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
464 | key->length, |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
465 | expected_length); |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
466 | error = 1; |
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
467 | } |
150
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
468 | |
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
469 | // add key to context |
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
470 | if(!error) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
471 | cxMapPut(keys, cx_hash_key_str(key->name), key); |
150
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
472 | dav_context_add_key(context, key); |
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
473 | } |
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
474 | } |
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
475 | |
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
476 | // cleanup |
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
477 | if(error) { |
147
458a8dc68048
added password based keys and fixed crash when keys are missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
142
diff
changeset
|
478 | if(key->data) { |
458a8dc68048
added password based keys and fixed crash when keys are missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
142
diff
changeset
|
479 | free(key->data); |
458a8dc68048
added password based keys and fixed crash when keys are missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
142
diff
changeset
|
480 | } |
150
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
481 | free(key); |
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
482 | return 1; |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
483 | } else { |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
484 | return 0; |
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
485 | } |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
486 | } |
88625853ae74
new webdav api + repository and key configuration + aes 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:
735
diff
changeset
|
488 | cxmutstr load_key_file(const char *filename) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
489 | cxmutstr k; |
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
490 | k.ptr = NULL; |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
491 | k.length = 0; |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
492 | |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
493 | FILE *file = NULL; |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
494 | if(filename[0] == '/') { |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
495 | file = fopen(filename, "r"); |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
496 | } else { |
32 | 497 | char *path = util_concat_path(ENV_HOME, ".dav/"); |
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
498 | char *p2 = util_concat_path(path, filename); |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
499 | file = fopen(p2, "r"); |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
500 | free(path); |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
501 | free(p2); |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
502 | } |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
503 | |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
504 | if(!file) { |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
505 | return k; |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
506 | } |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
507 | |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
508 | char *data = malloc(256); |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
509 | size_t r = fread(data, 1, 256, file); |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
510 | k.ptr = data; |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
511 | k.length = r; |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
512 | |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
513 | fclose(file); |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
514 | return k; |
317
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
515 | } |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
516 | |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
517 | static char* get_attr_content(xmlNode *node) { |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
518 | // TODO: remove code duplication (util_xml_get_text) |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
519 | while(node) { |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
520 | if(node->type == XML_TEXT_NODE) { |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
521 | return (char*)node->content; |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
522 | } |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
523 | node = node->next; |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
524 | } |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
525 | return NULL; |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
526 | } |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
527 | |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
528 | int load_namespace(const xmlNode *node) { |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
529 | const char *prefix = NULL; |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
530 | const char *uri = NULL; |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
531 | |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
532 | xmlAttr *attr = node->properties; |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
533 | while(attr) { |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
534 | if(attr->type == XML_ATTRIBUTE_NODE) { |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
535 | char *value = get_attr_content(attr->children); |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
536 | if(!value) { |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
537 | print_error( |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
538 | node->line, |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
539 | "missing value for attribute %s\n", (char*)attr->name); |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
540 | return 1; |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
541 | } |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
542 | if(xstreq(attr->name, "prefix")) { |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
543 | prefix = value; |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
544 | } else if(xstreq(attr->name, "uri")) { |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
545 | uri = value; |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
546 | } else { |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
547 | print_error( |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
548 | node->line, |
321
eb8885a87866
adds namespace config element to XSD + fixes error message for duplicate namespace prefixes
Mike Becker <universe@uap-core.de>
parents:
319
diff
changeset
|
549 | "unexpected attribute %s\n", (char*)attr->name); |
317
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
550 | return 1; |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
551 | } |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
552 | } |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
553 | attr = attr->next; |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
554 | } |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
555 | |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
556 | if(!prefix) { |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
557 | print_error(node->line, "missing prefix attribute\n"); |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
558 | return 1; |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
559 | } |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
560 | if(!uri) { |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
561 | print_error(node->line, "missing uri attribute\n"); |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
562 | return 1; |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
563 | } |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
564 | |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
565 | if(dav_get_namespace(context, prefix)) { |
321
eb8885a87866
adds namespace config element to XSD + fixes error message for duplicate namespace prefixes
Mike Becker <universe@uap-core.de>
parents:
319
diff
changeset
|
566 | print_error(node->line, "namespace prefix '%s' already used\n", prefix); |
317
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
567 | return 1; |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
568 | } |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
569 | |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
570 | return dav_add_namespace(context, prefix, uri); |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
571 | } |
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
572 | |
730
83f832e345e0
implement secretstore config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
729
diff
changeset
|
573 | int load_secretstore(const xmlNode *node) { |
83f832e345e0
implement secretstore config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
729
diff
changeset
|
574 | // currently only one secretstore is supported |
83f832e345e0
implement secretstore config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
729
diff
changeset
|
575 | |
731
e0358fa1a3b1
implement secretstore unlock command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
730
diff
changeset
|
576 | if(!pstore) { |
e0358fa1a3b1
implement secretstore unlock command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
730
diff
changeset
|
577 | return 0; |
e0358fa1a3b1
implement secretstore unlock command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
730
diff
changeset
|
578 | } |
e0358fa1a3b1
implement secretstore unlock command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
730
diff
changeset
|
579 | |
730
83f832e345e0
implement secretstore config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
729
diff
changeset
|
580 | node = node->children; |
83f832e345e0
implement secretstore config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
729
diff
changeset
|
581 | int error = 0; |
83f832e345e0
implement secretstore config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
729
diff
changeset
|
582 | while(node) { |
83f832e345e0
implement secretstore config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
729
diff
changeset
|
583 | if(node->type == XML_ELEMENT_NODE) { |
83f832e345e0
implement secretstore config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
729
diff
changeset
|
584 | char *value = util_xml_get_text(node); |
83f832e345e0
implement secretstore config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
729
diff
changeset
|
585 | if(value) { |
83f832e345e0
implement secretstore config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
729
diff
changeset
|
586 | if(xstreq(node->name, "unlock-command")) { |
731
e0358fa1a3b1
implement secretstore unlock command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
730
diff
changeset
|
587 | pstore->unlock_cmd = strdup(value); |
730
83f832e345e0
implement secretstore config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
729
diff
changeset
|
588 | } else if(xstreq(node->name, "lock-command")) { |
731
e0358fa1a3b1
implement secretstore unlock command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
730
diff
changeset
|
589 | pstore->lock_cmd = strdup(value); |
730
83f832e345e0
implement secretstore config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
729
diff
changeset
|
590 | } |
83f832e345e0
implement secretstore config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
729
diff
changeset
|
591 | } |
83f832e345e0
implement secretstore config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
729
diff
changeset
|
592 | } |
83f832e345e0
implement secretstore config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
729
diff
changeset
|
593 | node = node->next; |
83f832e345e0
implement secretstore config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
729
diff
changeset
|
594 | } |
83f832e345e0
implement secretstore config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
729
diff
changeset
|
595 | |
83f832e345e0
implement secretstore config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
729
diff
changeset
|
596 | return error; |
83f832e345e0
implement secretstore config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
729
diff
changeset
|
597 | } |
83f832e345e0
implement secretstore config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
729
diff
changeset
|
598 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
599 | Repository* get_repository(cxstring name) { |
38
b855f76e965b
code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
600 | if(!name.ptr) { |
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
601 | return NULL; |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
602 | } |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
603 | return cxMapGet(repos, cx_hash_key(name.ptr, name.length)); |
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
604 | } |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
605 | |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
606 | int get_repository_flags(Repository *repo) { |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
607 | int flags = 0; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
608 | if(repo->decrypt_content) { |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
609 | flags |= DAV_SESSION_DECRYPT_CONTENT; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
610 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
611 | if(repo->decrypt_name) { |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
612 | flags |= DAV_SESSION_DECRYPT_NAME; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
613 | } |
606
aa49966e4e85
add new session flags for properties encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
472
diff
changeset
|
614 | if(repo->decrypt_properties) { |
aa49966e4e85
add new session flags for properties encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
472
diff
changeset
|
615 | flags |= DAV_SESSION_DECRYPT_PROPERTIES; |
aa49966e4e85
add new session flags for properties encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
472
diff
changeset
|
616 | } |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
617 | if(repo->encrypt_content) { |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
618 | flags |= DAV_SESSION_ENCRYPT_CONTENT; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
619 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
620 | if(repo->encrypt_name) { |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
621 | flags |= DAV_SESSION_ENCRYPT_NAME; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
622 | } |
606
aa49966e4e85
add new session flags for properties encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
472
diff
changeset
|
623 | if(repo->encrypt_properties) { |
aa49966e4e85
add new session flags for properties encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
472
diff
changeset
|
624 | flags |= DAV_SESSION_ENCRYPT_PROPERTIES; |
aa49966e4e85
add new session flags for properties encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
472
diff
changeset
|
625 | } |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
626 | return flags; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
627 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
628 | |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
629 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
630 | Key* get_key(const char *name) { |
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
631 | if(!name) { |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
632 | return NULL; |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
633 | } |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
634 | return cxMapGet(keys, cx_hash_key_str(name)); |
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
635 | } |
36 | 636 | |
194
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
637 | int add_repository(Repository *repo) { |
319
2433b5969d44
disables automatic creation of .dav directory in dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
317
diff
changeset
|
638 | if(check_config_dir()) { |
2433b5969d44
disables automatic creation of .dav directory in dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
317
diff
changeset
|
639 | fprintf(stderr, "Cannot create .dav directory\n"); |
2433b5969d44
disables automatic creation of .dav directory in dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
317
diff
changeset
|
640 | return 1; |
2433b5969d44
disables automatic creation of .dav directory in dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
317
diff
changeset
|
641 | } |
2433b5969d44
disables automatic creation of .dav directory in dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
317
diff
changeset
|
642 | |
194
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
643 | char *file = util_concat_path(ENV_HOME, ".dav/config.xml"); |
319
2433b5969d44
disables automatic creation of .dav directory in dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
317
diff
changeset
|
644 | struct stat s; |
2433b5969d44
disables automatic creation of .dav directory in dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
317
diff
changeset
|
645 | if(stat(file, &s)) { |
2433b5969d44
disables automatic creation of .dav directory in dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
317
diff
changeset
|
646 | switch(errno) { |
2433b5969d44
disables automatic creation of .dav directory in dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
317
diff
changeset
|
647 | case ENOENT: { |
2433b5969d44
disables automatic creation of .dav directory in dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
317
diff
changeset
|
648 | create_default_config(file); |
2433b5969d44
disables automatic creation of .dav directory in dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
317
diff
changeset
|
649 | break; |
2433b5969d44
disables automatic creation of .dav directory in dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
317
diff
changeset
|
650 | } |
2433b5969d44
disables automatic creation of .dav directory in dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
317
diff
changeset
|
651 | default: { |
2433b5969d44
disables automatic creation of .dav directory in dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
317
diff
changeset
|
652 | perror("Cannot load config.xml"); |
2433b5969d44
disables automatic creation of .dav directory in dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
317
diff
changeset
|
653 | free(file); |
2433b5969d44
disables automatic creation of .dav directory in dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
317
diff
changeset
|
654 | return 1; |
2433b5969d44
disables automatic creation of .dav directory in dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
317
diff
changeset
|
655 | } |
2433b5969d44
disables automatic creation of .dav directory in dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
317
diff
changeset
|
656 | } |
2433b5969d44
disables automatic creation of .dav directory in dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
317
diff
changeset
|
657 | } |
2433b5969d44
disables automatic creation of .dav directory in dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
317
diff
changeset
|
658 | |
194
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
659 | xmlDoc *doc = xmlReadFile(file, NULL, 0); |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
660 | if(!doc) { |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
661 | free(file); |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
662 | fprintf(stderr, "Cannot load config.xml\n"); |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
663 | return 1; |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
664 | } |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
665 | |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
666 | xmlNode *root = xmlDocGetRootElement(doc); |
398
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
667 | if(!root) { |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
668 | fprintf(stderr, "Missing root node in config.xml\n"); |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
669 | xmlFreeDoc(doc); |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
670 | free(file); |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
671 | return 1; |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
672 | } |
194
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
673 | |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
674 | xmlNode *repoNode = xmlNewNode(NULL, BAD_CAST "repository"); |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
675 | xmlNodeAddContent(repoNode, BAD_CAST "\n\t\t"); |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
676 | xmlNewTextChild(repoNode, NULL, BAD_CAST "name", BAD_CAST repo->name); |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
677 | xmlNodeAddContent(repoNode, BAD_CAST "\n\t\t"); |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
678 | xmlNewTextChild(repoNode, NULL, BAD_CAST "url", BAD_CAST repo->url); |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
679 | xmlNodeAddContent(repoNode, BAD_CAST "\n"); |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
680 | if(repo->user) { |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
681 | xmlNodeAddContent(repoNode, BAD_CAST "\t\t"); |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
682 | xmlNewChild(repoNode, NULL, BAD_CAST "user", BAD_CAST repo->user); |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
683 | xmlNodeAddContent(repoNode, BAD_CAST "\n"); |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
684 | if(repo->password) { |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
685 | char *pwenc = util_base64encode( |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
686 | repo->password, |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
687 | strlen(repo->password)); |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
688 | xmlNodeAddContent(repoNode, BAD_CAST "\t\t"); |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
689 | xmlNewTextChild(repoNode, NULL, BAD_CAST "password", BAD_CAST pwenc); |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
690 | free(pwenc); |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
691 | xmlNodeAddContent(repoNode, BAD_CAST "\n"); |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
692 | } |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
693 | } |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
694 | xmlNodeAddContent(repoNode, BAD_CAST "\t"); |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
695 | |
205
bf756f6c3581
fixed some warnings and wrong usage of curl_easy_getinfo
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
696 | xmlNodeAddContent(root, BAD_CAST "\n\t"); |
194
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
697 | xmlAddChild(root, repoNode); |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
698 | xmlNodeAddContent(root, BAD_CAST "\n"); |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
699 | |
398
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
700 | int ret = (xmlSaveFormatFileEnc(file, doc, "UTF-8", 1) == -1) ? 1 : 0; |
194
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
701 | xmlFreeDoc(doc); |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
702 | free(file); |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
703 | |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
704 | return ret; |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
705 | } |
198
44054c452de1
added list-repositories and list-directories commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
194
diff
changeset
|
706 | |
398
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
707 | int remove_repository(Repository *repo) { |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
708 | char *file = util_concat_path(ENV_HOME, ".dav/config.xml"); |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
709 | struct stat s; |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
710 | if(stat(file, &s)) { |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
711 | perror("Cannot access config.xml"); |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
712 | free(file); |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
713 | return 1; |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
714 | } |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
715 | |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
716 | xmlDoc *doc = xmlReadFile(file, NULL, 0); |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
717 | if(!doc) { |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
718 | free(file); |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
719 | fprintf(stderr, "Cannot load config.xml\n"); |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
720 | return 1; |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
721 | } |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
722 | |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
723 | xmlNodePtr root = xmlDocGetRootElement(doc); |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
724 | if(!root) { |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
725 | fprintf(stderr, "Missing root node in config.xml\n"); |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
726 | xmlFreeDoc(doc); |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
727 | free(file); |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
728 | return 1; |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
729 | } |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
730 | |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
731 | xmlNodePtr repoNode = root->children; |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
732 | xmlNodePtr matchedRepoNode = NULL; |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
733 | while(!matchedRepoNode && repoNode) { |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
734 | if(repoNode->type == XML_ELEMENT_NODE |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
735 | && xstreq(repoNode->name, "repository")) { |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
736 | xmlNodePtr nameNode = repoNode->children; |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
737 | while(!matchedRepoNode && nameNode) { |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
738 | if (nameNode->type == XML_ELEMENT_NODE |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
739 | && xstreq(nameNode->name, "name")) { |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
740 | char *reponame = util_xml_get_text(nameNode); |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
741 | if(!strcmp(repo->name, reponame)) { |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
742 | matchedRepoNode = repoNode; |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
743 | } |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
744 | } |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
745 | nameNode = nameNode->next; |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
746 | } |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
747 | } |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
748 | repoNode = repoNode->next; |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
749 | } |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
750 | |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
751 | if(matchedRepoNode) { |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
752 | xmlNodePtr prev = matchedRepoNode->prev; |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
753 | xmlNodePtr next = matchedRepoNode->next; |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
754 | if(prev && prev->type == XML_TEXT_NODE) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
755 | cxstring content = cx_str((char*)prev->content); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
756 | cxstring lf = cx_strrchr(content, '\n'); |
398
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
757 | if(lf.length > 0) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
758 | content.length = lf.ptr - content.ptr; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
759 | char* newcontent = cx_strdup(content).ptr; |
405
6b85d745e402
fixes some char type mismatch warnings
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
398
diff
changeset
|
760 | xmlNodeSetContent(prev, (xmlChar*)newcontent); |
398
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
761 | free(newcontent); |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
762 | } |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
763 | } |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
764 | if(next && next->type == XML_TEXT_NODE) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
765 | cxstring lf = cx_strchr(cx_str((char*)next->content), '\n'); |
398
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
766 | if(lf.length > 0) { |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
767 | char* newcontent = malloc(lf.length); |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
768 | memcpy(newcontent, lf.ptr+1, lf.length-1); |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
769 | newcontent[lf.length-1] = '\0'; |
405
6b85d745e402
fixes some char type mismatch warnings
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
398
diff
changeset
|
770 | xmlNodeSetContent(next, (xmlChar*)newcontent); |
398
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
771 | free(newcontent); |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
772 | } |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
773 | } |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
774 | |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
775 | xmlUnlinkNode(matchedRepoNode); |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
776 | xmlFreeNode(matchedRepoNode); |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
777 | } |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
778 | |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
779 | int ret = (xmlSaveFormatFileEnc(file, doc, "UTF-8", 1) == -1) ? 1 : 0; |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
780 | xmlFreeDoc(doc); |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
781 | free(file); |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
782 | |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
783 | return ret; |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
784 | } |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
785 | |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
786 | int list_repositories(void) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
787 | CxIterator i = cxMapIteratorValues(repos); |
198
44054c452de1
added list-repositories and list-directories commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
194
diff
changeset
|
788 | Repository *repo; |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
789 | cx_foreach(Repository *, repo, i) { |
198
44054c452de1
added list-repositories and list-directories commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
194
diff
changeset
|
790 | printf("%s\n", repo->name); |
44054c452de1
added list-repositories and list-directories commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
194
diff
changeset
|
791 | } |
44054c452de1
added list-repositories and list-directories commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
194
diff
changeset
|
792 | return 0; |
44054c452de1
added list-repositories and list-directories commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
194
diff
changeset
|
793 | } |
215
781aee172901
dav-sync add-directory shows list of repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
794 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
795 | CxIterator get_repositories(void) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
796 | return cxMapIteratorValues(repos); |
215
781aee172901
dav-sync add-directory shows list of repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
797 | } |
470
6bf798ad3aec
adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
798 | |
6bf798ad3aec
adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
799 | PwdStore* get_pwdstore(void) { |
6bf798ad3aec
adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
800 | return pstore; |
6bf798ad3aec
adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
801 | } |
6bf798ad3aec
adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
802 | |
6bf798ad3aec
adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
803 | int pwdstore_save(PwdStore *pwdstore) { |
732
b0eb645cd26e
fix error in dav add-user, if .dav dir doesn't exists
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
731
diff
changeset
|
804 | if(check_config_dir()) { |
b0eb645cd26e
fix error in dav add-user, if .dav dir doesn't exists
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
731
diff
changeset
|
805 | return 1; |
b0eb645cd26e
fix error in dav add-user, if .dav dir doesn't exists
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
731
diff
changeset
|
806 | } |
b0eb645cd26e
fix error in dav add-user, if .dav dir doesn't exists
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
731
diff
changeset
|
807 | |
472
08d2d1263429
new secrets store file format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
470
diff
changeset
|
808 | char *pwfile = util_concat_path(ENV_HOME, ".dav/secrets.crypt"); |
470
6bf798ad3aec
adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
809 | int ret = pwdstore_store(pwdstore, pwfile); |
6bf798ad3aec
adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
810 | free(pwfile); |
6bf798ad3aec
adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
811 | return ret; |
6bf798ad3aec
adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
812 | } |
734
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
813 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
814 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
815 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
816 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
817 | Repository* url2repo_s(cxstring url, char **path) { |
734
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
818 | *path = NULL; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
819 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
820 | int s; |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
821 | if(cx_strprefix(url, CX_STR("http://"))) { |
734
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
822 | s = 7; |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
823 | } else if(cx_strprefix(url, CX_STR("https://"))) { |
734
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
824 | s = 8; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
825 | } else { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
826 | s = 1; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
827 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
828 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
829 | // split URL into repository and path |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
830 | cxstring r = cx_strsubs(url, s); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
831 | cxstring p = cx_strchr(r, '/'); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
832 | r = cx_strsubsl(url, 0, url.length-p.length); |
734
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
833 | if(p.length == 0) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
834 | p = cx_strn("/", 1); |
734
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
835 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
836 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
837 | Repository *repo = get_repository(r); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
838 | if(repo) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
839 | *path = cx_strdup(p).ptr; |
734
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
840 | } else { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
841 | // TODO: who is responsible for freeing this repository? |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
842 | // how can the callee know, if he has to call free()? |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
843 | repo = calloc(1, sizeof(Repository)); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
844 | repo->name = strdup(""); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
845 | repo->decrypt_content = true; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
846 | repo->verification = true; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
847 | repo->authmethods = CURLAUTH_BASIC; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
848 | 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:
735
diff
changeset
|
849 | repo->url = cx_strdup(url).ptr; |
734
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
850 | *path = strdup("/"); |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
851 | } else if (cx_strchr(url, '/').length > 0) { |
734
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
852 | // TODO: fix the following workaround after |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
853 | // fixing the inconsistent behavior of util_url_*() |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
854 | repo->url = util_url_base_s(url); |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
855 | cxmutstr truncated = cx_strdup(url); |
734
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
856 | *path = strdup(util_url_path(truncated.ptr)); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
857 | free(truncated.ptr); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
858 | } else { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
859 | repo->url = cx_strdup(url).ptr; |
734
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
860 | *path = strdup("/"); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
861 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
862 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
863 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
864 | return repo; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
865 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
866 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
867 | Repository* url2repo(const char *url, char **path) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
868 | return url2repo_s(cx_str(url), path); |
734
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
869 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
870 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
871 | static int decrypt_secrets(CmdArgs *a, PwdStore *secrets) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
872 | if(cmd_getoption(a, "noinput")) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
873 | return 1; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
874 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
875 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
876 | char *ps_password = NULL; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
877 | if(secrets->unlock_cmd && strlen(secrets->unlock_cmd) > 0) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
878 | CxBuffer *cmd_out = cxBufferCreate(NULL, 128, cxDefaultAllocator, CX_BUFFER_FREE_CONTENTS|CX_BUFFER_AUTO_EXTEND); |
734
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
879 | if(!util_exec_command(secrets->unlock_cmd, cmd_out)) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
880 | // command successful, get first line from output without newline |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
881 | // and use that as password for the secretstore |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
882 | size_t len = 0; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
883 | for(size_t i=0;i<=cmd_out->size;i++) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
884 | if(i == cmd_out->size || cmd_out->space[i] == '\n') { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
885 | len = i; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
886 | break; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
887 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
888 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
889 | if(len > 0) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
890 | ps_password = malloc(len + 1); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
891 | memcpy(ps_password, cmd_out->space, len); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
892 | ps_password[len] = 0; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
893 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
894 | } |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
895 | cxBufferFree(cmd_out); |
734
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
896 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
897 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
898 | if(!ps_password) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
899 | ps_password = util_password_input("Master password: "); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
900 | if(!ps_password) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
901 | return 1; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
902 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
903 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
904 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
905 | if(pwdstore_setpassword(secrets, ps_password)) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
906 | fprintf(stderr, "Error: cannot create key from password\n"); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
907 | return 1; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
908 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
909 | if(pwdstore_decrypt(secrets)) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
910 | fprintf(stderr, "Error: cannot decrypt secrets store\n"); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
911 | return 1; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
912 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
913 | return 0; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
914 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
915 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
916 | typedef struct CredLocation { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
917 | char *id; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
918 | char *location; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
919 | } CredLocation; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
920 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
921 | static int cmp_url_cred_entry(CredLocation *e1, CredLocation *e2, void *n) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
922 | return strcmp(e2->location, e1->location); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
923 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
924 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
925 | static void free_cred_location(CredLocation *c) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
926 | // c->id is not a copy, therefore we don't have to free it |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
927 | free(c->location); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
928 | free(c); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
929 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
930 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
931 | static int get_stored_credentials(CmdArgs *a, char *credid, char **user, char **password) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
932 | if(!credid) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
933 | return 0; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
934 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
935 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
936 | PwdStore *secrets = get_pwdstore(); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
937 | if(!secrets) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
938 | fprintf(stderr, "Error: no secrets store available\n"); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
939 | return 0; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
940 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
941 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
942 | if(pwdstore_has_id(secrets, credid)) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
943 | if(!secrets->isdecrypted) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
944 | if(decrypt_secrets(a, secrets)) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
945 | return 0; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
946 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
947 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
948 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
949 | PwdEntry *s_cred = pwdstore_get(secrets, credid); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
950 | if(s_cred) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
951 | *user = s_cred->user; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
952 | *password = s_cred->password; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
953 | return 1; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
954 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
955 | } else { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
956 | fprintf(stderr, "Error: credentials id '%s' not found\n", credid); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
957 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
958 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
959 | return 0; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
960 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
961 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
962 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
963 | static int get_location_credentials(CmdArgs *a, Repository *repo, char *path, char **user, char **password) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
964 | PwdStore *secrets = get_pwdstore(); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
965 | if(!secrets) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
966 | return 0; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
967 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
968 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
969 | /* |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
970 | * The list secrets->location contains urls or repo names as |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
971 | * location strings. We need a list, that contains only urls |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
972 | */ |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
973 | CxList *locations = cxLinkedListCreate(cxDefaultAllocator, (cx_compare_func)cmp_url_cred_entry, CX_STORE_POINTERS); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
974 | locations->simple_destructor = (cx_destructor_func)free_cred_location; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
975 | CxIterator i = cxListIterator(secrets->locations); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
976 | cx_foreach(PwdIndexEntry*, e, i) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
977 | CxIterator entry_iter = cxListIterator(e->locations); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
978 | cx_foreach(char *, loc, entry_iter) { |
734
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
979 | char *path; |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
980 | Repository *r = url2repo(loc, &path); |
734
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
981 | CredLocation *urlentry = calloc(1, sizeof(CredLocation)); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
982 | urlentry->id = e->id; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
983 | urlentry->location = util_concat_path(r->url, path); |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
984 | cxListAdd(locations, urlentry); |
734
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
985 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
986 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
987 | // the list must be sorted |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
988 | cxListSort(locations); |
734
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
989 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
990 | // create full request url string and remove protocol prefix |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
991 | cxmutstr req_url_proto = cx_mutstr(util_concat_path(repo->url, path)); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
992 | cxstring req_url = cx_strcast(req_url_proto); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
993 | if(cx_strprefix(req_url, CX_STR("http://"))) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
994 | req_url = cx_strsubs(req_url, 7); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
995 | } else if(cx_strprefix(req_url, CX_STR("https://"))) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
996 | req_url = cx_strsubs(req_url, 8); |
734
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
997 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
998 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
999 | // iterate over sorted locations and check if a location is a prefix |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1000 | // of the requested url |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1001 | char *id = NULL; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1002 | int ret = 0; |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
1003 | i = cxListIterator(locations); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
1004 | cx_foreach(CredLocation*, cred, i) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
1005 | cxstring cred_url = cx_str(cred->location); |
734
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1006 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1007 | // remove protocol prefix |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
1008 | if(cx_strprefix(cred_url, CX_STR("http://"))) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
1009 | cred_url = cx_strsubs(cred_url, 7); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
1010 | } else if(cx_strprefix(cred_url, CX_STR("https://"))) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
1011 | cred_url = cx_strsubs(cred_url, 8); |
734
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1012 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1013 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
1014 | if(cx_strprefix(req_url, cred_url)) { |
734
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1015 | id = cred->id; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1016 | break; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1017 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1018 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1019 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1020 | // if an id is found and we can access the decrypted secret store |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1021 | // we can set the user/password |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1022 | if(id && (secrets->isdecrypted || !decrypt_secrets(a, secrets))) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1023 | PwdEntry *cred = pwdstore_get(secrets, id); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1024 | if(cred) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1025 | *user = cred->user; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1026 | *password = cred->password; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1027 | ret = 1; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1028 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1029 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1030 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1031 | free(req_url_proto.ptr); |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
1032 | cxListDestroy(locations); |
734
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1033 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1034 | return ret; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1035 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1036 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1037 | DavSession* connect_to_repo(DavContext *ctx, Repository *repo, char *path, dav_auth_func authfunc, CmdArgs *a) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1038 | char *user = repo->user; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1039 | char *password = repo->password; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1040 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1041 | if(!user && !password) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1042 | if(!get_stored_credentials(a, repo->stored_user, &user, &password)) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1043 | get_location_credentials(a, repo, path, &user, &password); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1044 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1045 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1046 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1047 | DavSession *sn = dav_session_new_auth(ctx, repo->url, user, password); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1048 | sn->flags = get_repository_flags(repo); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1049 | sn->key = dav_context_get_key(ctx, repo->default_key); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1050 | curl_easy_setopt(sn->handle, CURLOPT_HTTPAUTH, repo->authmethods); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1051 | curl_easy_setopt(sn->handle, CURLOPT_SSLVERSION, repo->ssl_version); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1052 | if(repo->cert) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1053 | curl_easy_setopt(sn->handle, CURLOPT_CAINFO, repo->cert); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1054 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1055 | if(!repo->verification || cmd_getoption(a, "insecure")) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1056 | curl_easy_setopt(sn->handle, CURLOPT_SSL_VERIFYPEER, 0); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1057 | curl_easy_setopt(sn->handle, CURLOPT_SSL_VERIFYHOST, 0); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1058 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1059 | if(!cmd_getoption(a, "noinput")) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1060 | dav_session_set_authcallback(sn, authfunc, repo); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1061 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1062 | return sn; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1063 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1064 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1065 | int request_auth(DavSession *sn, void *userdata) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1066 | Repository *repo = userdata; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1067 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1068 | char *user = NULL; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1069 | char ubuf[256]; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1070 | if(repo->user) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1071 | user = repo->user; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1072 | } else { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1073 | fprintf(stderr, "User: "); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1074 | fflush(stderr); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1075 | user = fgets(ubuf, 256, stdin); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1076 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1077 | if(!user) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1078 | return 0; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1079 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1080 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1081 | char *password = util_password_input("Password: "); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1082 | if(!password || strlen(password) == 0) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1083 | return 0; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1084 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1085 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1086 | size_t ulen = strlen(user); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1087 | if(user[ulen-1] == '\n') { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1088 | user[ulen-1] = '\0'; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1089 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1090 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1091 | dav_session_set_auth(sn, user, password); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1092 | free(password); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1093 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1094 | return 0; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1095 | } |