Sun, 08 Aug 2021 16:49:47 +0200
add support for the secret store to dav-sync
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> |
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
33 | #include <ucx/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 | ||
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
64 | static UcxMap *repos; |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
65 | static UcxMap *keys; |
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 |
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
107 | repos = ucx_map_new(16); |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
108 | keys = ucx_map_new(16); |
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); |
83f832e345e0
implement secretstore config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
729
diff
changeset
|
153 | } |
83f832e345e0
implement secretstore config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
729
diff
changeset
|
154 | /* 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
|
155 | 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
|
156 | ret = 1; |
729
5433f0f3dd48
disable error in case of unknown config elements
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
606
diff
changeset
|
157 | } */ |
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
158 | } |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
159 | node = node->next; |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
160 | } |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
161 | |
9 | 162 | 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
|
163 | return ret; |
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
164 | } |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
165 | |
215
781aee172901
dav-sync add-directory shows list of repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
166 | 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
|
167 | if(repos) { |
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 | UcxMapIterator i = ucx_map_iterator(repos); |
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
|
169 | UcxKey k; |
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 | Repository *repo; |
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 | UCX_MAP_FOREACH(k, repo, i) { |
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 | 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
|
173 | 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
|
174 | } |
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 | 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
|
176 | 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
|
177 | } |
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 | 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
|
179 | 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
|
180 | } |
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 | 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
|
182 | 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
|
183 | } |
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 | 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
|
185 | 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
|
186 | } |
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 | 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
|
188 | 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
|
189 | } |
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
|
190 | free(repo); |
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 | ucx_map_free(repos); |
74
da079dc0724c
fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
73
diff
changeset
|
193 | } |
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 | if(keys) { |
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
|
195 | ucx_map_free(keys); |
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
|
196 | } |
74
da079dc0724c
fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
73
diff
changeset
|
197 | } |
da079dc0724c
fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
73
diff
changeset
|
198 | |
215
781aee172901
dav-sync add-directory shows list of repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
199 | Repository* repository_new(void) { |
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
200 | Repository *repo = calloc(1, sizeof(Repository)); |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
201 | repo->encrypt_name = false; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
202 | repo->encrypt_content = false; |
606
aa49966e4e85
add new session flags for properties encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
472
diff
changeset
|
203 | repo->encrypt_properties = false; |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
204 | repo->decrypt_name = false; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
205 | repo->decrypt_content = true; |
606
aa49966e4e85
add new session flags for properties encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
472
diff
changeset
|
206 | repo->decrypt_properties = false; |
199
f448fc8c9191
enabled cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
198
diff
changeset
|
207 | repo->verification = true; |
73
41e88442ad4e
ssl version is now configurable
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
43
diff
changeset
|
208 | 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
|
209 | repo->authmethods = CURLAUTH_BASIC; |
119
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
210 | return repo; |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
211 | } |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
212 | |
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
|
213 | 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
|
214 | 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
|
215 | 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
|
216 | 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
|
217 | |
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
|
218 | /* 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
|
219 | 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
|
220 | /* 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
|
221 | * 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
|
222 | */ |
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
|
223 | 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
|
224 | 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
|
225 | } |
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
|
226 | |
119
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
227 | if(xstreq(key, "name")) { |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
228 | repo->name = strdup(value); |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
229 | } else if(xstreq(key, "url")) { |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
230 | repo->url = strdup(value); |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
231 | } else if(xstreq(key, "user")) { |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
232 | repo->user = strdup(value); |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
233 | } else if(xstreq(key, "password")) { |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
234 | repo->password = util_base64decode(value); |
470
6bf798ad3aec
adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
235 | } else if(xstreq(key, "stored-user")) { |
6bf798ad3aec
adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
236 | repo->stored_user = strdup(value); |
119
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
237 | } else if(xstreq(key, "default-key")) { |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
238 | repo->default_key = strdup(value); |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
239 | } else if(xstreq(key, "full-encryption")) { |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
240 | if(util_getboolean(value)) { |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
241 | repo->encrypt_name = true; |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
242 | repo->encrypt_content = true; |
606
aa49966e4e85
add new session flags for properties encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
472
diff
changeset
|
243 | repo->encrypt_properties = true; |
119
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
244 | repo->decrypt_name = true; |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
245 | repo->decrypt_content = true; |
606
aa49966e4e85
add new session flags for properties encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
472
diff
changeset
|
246 | repo->decrypt_properties = true; |
119
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
247 | } |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
248 | } else if(xstreq(key, "content-encryption")) { |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
249 | if(util_getboolean(value)) { |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
250 | repo->encrypt_content = true; |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
251 | repo->decrypt_content = true; |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
252 | } else { |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
253 | repo->encrypt_content = false; |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
254 | } |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
255 | } else if(xstreq(key, "decrypt-content")) { |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
256 | repo->decrypt_content = util_getboolean(value); |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
257 | } else if(xstreq(key, "decrypt-name")) { |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
258 | repo->decrypt_name = util_getboolean(value); |
199
f448fc8c9191
enabled cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
198
diff
changeset
|
259 | } else if(xstreq(key, "cert")) { |
f448fc8c9191
enabled cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
198
diff
changeset
|
260 | char *configdir = util_concat_path(ENV_HOME, ".dav"); |
f448fc8c9191
enabled cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
198
diff
changeset
|
261 | char *certfile = util_concat_path(configdir, value); |
f448fc8c9191
enabled cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
198
diff
changeset
|
262 | repo->cert = certfile; |
f448fc8c9191
enabled cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
198
diff
changeset
|
263 | free(configdir); |
f448fc8c9191
enabled cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
198
diff
changeset
|
264 | } else if(xstreq(key, "verification")) { |
f448fc8c9191
enabled cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
198
diff
changeset
|
265 | repo->verification = util_getboolean(value); |
119
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
266 | } else if(xstreq(key, "ssl-version")) { |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
267 | if(xstrEQ(value, "TLSv1")) { |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
268 | repo->ssl_version = CURL_SSLVERSION_TLSv1; |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
269 | } else if(xstrEQ(value, "SSLv2")) { |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
270 | repo->ssl_version = CURL_SSLVERSION_SSLv2; |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
271 | } else if(xstrEQ(value, "SSLv3")) { |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
272 | repo->ssl_version = CURL_SSLVERSION_SSLv3; |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
273 | } |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
274 | #if LIBCURL_VERSION_MAJOR >= 7 |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
275 | #if LIBCURL_VERSION_MINOR >= 34 |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
276 | else if(xstrEQ(value, "TLSv1.0")) { |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
277 | repo->ssl_version = CURL_SSLVERSION_TLSv1_0; |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
278 | } else if(xstrEQ(value, "TLSv1.1")) { |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
279 | repo->ssl_version = CURL_SSLVERSION_TLSv1_1; |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
280 | } else if(xstrEQ(value, "TLSv1.2")) { |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
281 | repo->ssl_version = CURL_SSLVERSION_TLSv1_2; |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
282 | } |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
283 | #endif |
295
8ac7b8d56115
adds TLSv1.3 config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
294
diff
changeset
|
284 | #if LIBCURL_VERSION_MINOR >= 52 |
8ac7b8d56115
adds TLSv1.3 config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
294
diff
changeset
|
285 | else if(xstrEQ(value, "TLSv1.3")) { |
8ac7b8d56115
adds TLSv1.3 config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
294
diff
changeset
|
286 | repo->ssl_version = CURL_SSLVERSION_TLSv1_3; |
8ac7b8d56115
adds TLSv1.3 config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
294
diff
changeset
|
287 | } |
8ac7b8d56115
adds TLSv1.3 config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
294
diff
changeset
|
288 | #endif |
119
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
289 | #endif |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
290 | 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
|
291 | 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
|
292 | } |
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
|
293 | } 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
|
294 | 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
|
295 | 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
|
296 | 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
|
297 | 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
|
298 | 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
|
299 | 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
|
300 | 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
|
301 | } 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
|
302 | 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
|
303 | } 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
|
304 | 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
|
305 | } 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
|
306 | 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
|
307 | } 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
|
308 | 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
|
309 | } 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
|
310 | /* 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
|
311 | } 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
|
312 | 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
|
313 | "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
|
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 | 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
|
316 | } |
3cfb4670d9e6
added possibility to configure authentication methods via coma separated list in config.xml
Mike Becker <universe@uap-core.de>
parents:
150
diff
changeset
|
317 | free(meths); |
119
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
318 | } 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
|
319 | 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
|
320 | return 1; |
119
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 | return 0; |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
323 | } |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
324 | |
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
|
325 | 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
|
326 | 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
|
327 | { |
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 | 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
|
329 | 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
|
330 | 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
|
331 | 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
|
332 | 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
|
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 | 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
|
335 | } |
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 | 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
|
337 | 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
|
338 | 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
|
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 | } |
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 | |
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 | 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
|
343 | 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
|
344 | 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
|
345 | } |
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 | 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
|
347 | 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
|
348 | "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
|
349 | 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
|
350 | } |
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 | |
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 | ucx_map_cstr_put(repos, repo->name, 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
|
353 | 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
|
354 | } |
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
|
355 | |
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
|
356 | int load_proxy(DavProxy *proxy, const xmlNode *proxynode, int type) { |
36 | 357 | 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
|
358 | if(type == HTTPS_PROXY) { |
36 | 359 | 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
|
360 | } else if(type == HTTP_PROXY) { |
36 | 361 | stype = "http"; |
362 | } | |
363 | ||
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
|
364 | 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
|
365 | // 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
|
366 | 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
|
367 | 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
|
368 | } |
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 | |
36 | 370 | 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
|
371 | 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
|
372 | while(node && !ret) { |
36 | 373 | if(node->type == XML_ELEMENT_NODE) { |
374 | 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
|
375 | 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
|
376 | 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
|
377 | 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
|
378 | 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
|
379 | } |
36 | 380 | } 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
|
381 | 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
|
382 | 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
|
383 | } |
36 | 384 | } 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
|
385 | 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
|
386 | 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
|
387 | } |
36 | 388 | } 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
|
389 | 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
|
390 | 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
|
391 | } |
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
|
392 | } 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
|
393 | 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
|
394 | "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
|
395 | 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
|
396 | } |
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
|
397 | 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
|
398 | 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
|
399 | "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
|
400 | 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
|
401 | ret = 1; |
36 | 402 | } |
403 | } | |
404 | node = node->next; | |
405 | } | |
406 | ||
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 | 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
|
408 | 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
|
409 | return 1; |
36 | 410 | } |
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
|
411 | |
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
|
412 | return ret; |
36 | 413 | } |
414 | ||
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
|
415 | 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
|
416 | xmlNode *node = keynode->children; |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
417 | 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
|
418 | key->type = KEY_AES256; |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
419 | |
150
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
420 | int error = 0; |
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
421 | while(node) { |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
422 | 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
|
423 | 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
|
424 | if(!value) { |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
425 | // next |
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, "name")) { |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
427 | key->name = strdup(value); |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
428 | } 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
|
429 | // load key file |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
430 | sstr_t key_data = load_key_file(value); |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
431 | if(key_data.length > 0) { |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
432 | key->data = key_data.ptr; |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
433 | key->length = key_data.length; |
150
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
434 | } 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
|
435 | 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
|
436 | "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
|
437 | error = 1; |
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
438 | } |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
439 | } 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
|
440 | if(!strcmp(value, "aes128")) { |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
441 | key->type = KEY_AES128; |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
442 | } else if(!strcmp(value, "aes256")) { |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
443 | key->type = KEY_AES256; |
228
c0175372c35d
removed password keys
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
224
diff
changeset
|
444 | } 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
|
445 | 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
|
446 | error = 1; |
5
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 | |
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 | node = node->next; |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
452 | } |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
453 | |
150
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
454 | if(!error && key->name) { |
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
455 | 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
|
456 | 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
|
457 | 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
|
458 | expected_length = 16; |
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
459 | } |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
460 | 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
|
461 | 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
|
462 | } |
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 | 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
|
464 | 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
|
465 | 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
|
466 | 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
|
467 | 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
|
468 | error = 1; |
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
469 | } |
150
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
470 | |
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
471 | // add key to context |
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
472 | if(!error) { |
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
473 | ucx_map_cstr_put(keys, key->name, key); |
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
474 | dav_context_add_key(context, key); |
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 | } |
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
477 | |
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
478 | // cleanup |
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
479 | 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
|
480 | 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
|
481 | 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
|
482 | } |
150
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
483 | 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
|
484 | 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
|
485 | } 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
|
486 | return 0; |
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
487 | } |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
488 | } |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
489 | |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
490 | sstr_t load_key_file(char *filename) { |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
491 | sstr_t k; |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
492 | k.ptr = NULL; |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
493 | k.length = 0; |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
494 | |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
495 | FILE *file = NULL; |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
496 | if(filename[0] == '/') { |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
497 | file = fopen(filename, "r"); |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
498 | } else { |
32 | 499 | 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
|
500 | 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
|
501 | file = fopen(p2, "r"); |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
502 | free(path); |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
503 | free(p2); |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
504 | } |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
505 | |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
506 | if(!file) { |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
507 | return k; |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
508 | } |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
509 | |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
510 | char *data = malloc(256); |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
511 | 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
|
512 | k.ptr = data; |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
513 | k.length = r; |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
514 | |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
515 | fclose(file); |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
516 | return k; |
317
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
517 | } |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
518 | |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
519 | static char* get_attr_content(xmlNode *node) { |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
520 | // TODO: remove code duplication (util_xml_get_text) |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
521 | while(node) { |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
522 | if(node->type == XML_TEXT_NODE) { |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
523 | return (char*)node->content; |
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 | node = node->next; |
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 | return NULL; |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
528 | } |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
529 | |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
530 | int load_namespace(const xmlNode *node) { |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
531 | const char *prefix = NULL; |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
532 | const char *uri = NULL; |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
533 | |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
534 | xmlAttr *attr = node->properties; |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
535 | while(attr) { |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
536 | if(attr->type == XML_ATTRIBUTE_NODE) { |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
537 | char *value = get_attr_content(attr->children); |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
538 | if(!value) { |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
539 | print_error( |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
540 | node->line, |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
541 | "missing value for attribute %s\n", (char*)attr->name); |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
542 | return 1; |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
543 | } |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
544 | if(xstreq(attr->name, "prefix")) { |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
545 | prefix = value; |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
546 | } else if(xstreq(attr->name, "uri")) { |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
547 | uri = value; |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
548 | } else { |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
549 | print_error( |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
550 | 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
|
551 | "unexpected attribute %s\n", (char*)attr->name); |
317
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
552 | return 1; |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
553 | } |
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 | attr = attr->next; |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
556 | } |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
557 | |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
558 | if(!prefix) { |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
559 | print_error(node->line, "missing prefix attribute\n"); |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
560 | return 1; |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
561 | } |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
562 | if(!uri) { |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
563 | print_error(node->line, "missing uri attribute\n"); |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
564 | return 1; |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
565 | } |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
566 | |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
567 | 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
|
568 | 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
|
569 | return 1; |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
570 | } |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
571 | |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
572 | return dav_add_namespace(context, prefix, uri); |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
573 | } |
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
574 | |
730
83f832e345e0
implement secretstore config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
729
diff
changeset
|
575 | int load_secretstore(const xmlNode *node) { |
83f832e345e0
implement secretstore config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
729
diff
changeset
|
576 | // currently only one secretstore is supported |
83f832e345e0
implement secretstore config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
729
diff
changeset
|
577 | |
731
e0358fa1a3b1
implement secretstore unlock command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
730
diff
changeset
|
578 | if(!pstore) { |
e0358fa1a3b1
implement secretstore unlock command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
730
diff
changeset
|
579 | return 0; |
e0358fa1a3b1
implement secretstore unlock command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
730
diff
changeset
|
580 | } |
e0358fa1a3b1
implement secretstore unlock command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
730
diff
changeset
|
581 | |
730
83f832e345e0
implement secretstore config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
729
diff
changeset
|
582 | node = node->children; |
83f832e345e0
implement secretstore config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
729
diff
changeset
|
583 | int error = 0; |
83f832e345e0
implement secretstore config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
729
diff
changeset
|
584 | while(node) { |
83f832e345e0
implement secretstore config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
729
diff
changeset
|
585 | if(node->type == XML_ELEMENT_NODE) { |
83f832e345e0
implement secretstore config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
729
diff
changeset
|
586 | char *value = util_xml_get_text(node); |
83f832e345e0
implement secretstore config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
729
diff
changeset
|
587 | if(value) { |
83f832e345e0
implement secretstore config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
729
diff
changeset
|
588 | if(xstreq(node->name, "unlock-command")) { |
731
e0358fa1a3b1
implement secretstore unlock command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
730
diff
changeset
|
589 | pstore->unlock_cmd = strdup(value); |
730
83f832e345e0
implement secretstore config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
729
diff
changeset
|
590 | } else if(xstreq(node->name, "lock-command")) { |
731
e0358fa1a3b1
implement secretstore unlock command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
730
diff
changeset
|
591 | pstore->lock_cmd = strdup(value); |
730
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 | } |
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 | node = node->next; |
83f832e345e0
implement secretstore config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
729
diff
changeset
|
596 | } |
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 | return error; |
83f832e345e0
implement secretstore config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
729
diff
changeset
|
599 | } |
83f832e345e0
implement secretstore config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
729
diff
changeset
|
600 | |
38
b855f76e965b
code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
601 | Repository* get_repository(sstr_t name) { |
b855f76e965b
code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
602 | if(!name.ptr) { |
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
603 | return NULL; |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
604 | } |
38
b855f76e965b
code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
605 | return ucx_map_sstr_get(repos, name); |
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
606 | } |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
607 | |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
608 | int get_repository_flags(Repository *repo) { |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
609 | int flags = 0; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
610 | if(repo->decrypt_content) { |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
611 | flags |= DAV_SESSION_DECRYPT_CONTENT; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
612 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
613 | if(repo->decrypt_name) { |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
614 | flags |= DAV_SESSION_DECRYPT_NAME; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
615 | } |
606
aa49966e4e85
add new session flags for properties encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
472
diff
changeset
|
616 | if(repo->decrypt_properties) { |
aa49966e4e85
add new session flags for properties encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
472
diff
changeset
|
617 | flags |= DAV_SESSION_DECRYPT_PROPERTIES; |
aa49966e4e85
add new session flags for properties encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
472
diff
changeset
|
618 | } |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
619 | if(repo->encrypt_content) { |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
620 | flags |= DAV_SESSION_ENCRYPT_CONTENT; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
621 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
622 | if(repo->encrypt_name) { |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
623 | flags |= DAV_SESSION_ENCRYPT_NAME; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
624 | } |
606
aa49966e4e85
add new session flags for properties encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
472
diff
changeset
|
625 | if(repo->encrypt_properties) { |
aa49966e4e85
add new session flags for properties encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
472
diff
changeset
|
626 | flags |= DAV_SESSION_ENCRYPT_PROPERTIES; |
aa49966e4e85
add new session flags for properties encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
472
diff
changeset
|
627 | } |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
628 | return flags; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
629 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
630 | |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
631 | |
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
632 | Key* get_key(char *name) { |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
633 | if(!name) { |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
634 | return NULL; |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
635 | } |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
636 | return ucx_map_cstr_get(keys, name); |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
637 | } |
36 | 638 | |
194
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
639 | 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
|
640 | if(check_config_dir()) { |
2433b5969d44
disables automatic creation of .dav directory in dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
317
diff
changeset
|
641 | 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
|
642 | return 1; |
2433b5969d44
disables automatic creation of .dav directory in dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
317
diff
changeset
|
643 | } |
2433b5969d44
disables automatic creation of .dav directory in dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
317
diff
changeset
|
644 | |
194
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
645 | 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
|
646 | struct stat s; |
2433b5969d44
disables automatic creation of .dav directory in dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
317
diff
changeset
|
647 | if(stat(file, &s)) { |
2433b5969d44
disables automatic creation of .dav directory in dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
317
diff
changeset
|
648 | switch(errno) { |
2433b5969d44
disables automatic creation of .dav directory in dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
317
diff
changeset
|
649 | case ENOENT: { |
2433b5969d44
disables automatic creation of .dav directory in dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
317
diff
changeset
|
650 | create_default_config(file); |
2433b5969d44
disables automatic creation of .dav directory in dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
317
diff
changeset
|
651 | break; |
2433b5969d44
disables automatic creation of .dav directory in dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
317
diff
changeset
|
652 | } |
2433b5969d44
disables automatic creation of .dav directory in dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
317
diff
changeset
|
653 | default: { |
2433b5969d44
disables automatic creation of .dav directory in dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
317
diff
changeset
|
654 | perror("Cannot load config.xml"); |
2433b5969d44
disables automatic creation of .dav directory in dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
317
diff
changeset
|
655 | free(file); |
2433b5969d44
disables automatic creation of .dav directory in dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
317
diff
changeset
|
656 | return 1; |
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 | } |
2433b5969d44
disables automatic creation of .dav directory in dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
317
diff
changeset
|
659 | } |
2433b5969d44
disables automatic creation of .dav directory in dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
317
diff
changeset
|
660 | |
194
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
661 | xmlDoc *doc = xmlReadFile(file, NULL, 0); |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
662 | if(!doc) { |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
663 | free(file); |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
664 | fprintf(stderr, "Cannot load config.xml\n"); |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
665 | return 1; |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
666 | } |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
667 | |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
668 | xmlNode *root = xmlDocGetRootElement(doc); |
398
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
669 | if(!root) { |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
670 | fprintf(stderr, "Missing root node in config.xml\n"); |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
671 | xmlFreeDoc(doc); |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
672 | free(file); |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
673 | return 1; |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
674 | } |
194
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
675 | |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
676 | xmlNode *repoNode = xmlNewNode(NULL, BAD_CAST "repository"); |
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 "name", BAD_CAST repo->name); |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
679 | xmlNodeAddContent(repoNode, BAD_CAST "\n\t\t"); |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
680 | 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
|
681 | xmlNodeAddContent(repoNode, BAD_CAST "\n"); |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
682 | if(repo->user) { |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
683 | xmlNodeAddContent(repoNode, BAD_CAST "\t\t"); |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
684 | 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
|
685 | xmlNodeAddContent(repoNode, BAD_CAST "\n"); |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
686 | if(repo->password) { |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
687 | char *pwenc = util_base64encode( |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
688 | repo->password, |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
689 | strlen(repo->password)); |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
690 | xmlNodeAddContent(repoNode, BAD_CAST "\t\t"); |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
691 | 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
|
692 | free(pwenc); |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
693 | xmlNodeAddContent(repoNode, BAD_CAST "\n"); |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
694 | } |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
695 | } |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
696 | xmlNodeAddContent(repoNode, BAD_CAST "\t"); |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
697 | |
205
bf756f6c3581
fixed some warnings and wrong usage of curl_easy_getinfo
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
698 | xmlNodeAddContent(root, BAD_CAST "\n\t"); |
194
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
699 | xmlAddChild(root, repoNode); |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
700 | xmlNodeAddContent(root, BAD_CAST "\n"); |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
701 | |
398
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
702 | 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
|
703 | xmlFreeDoc(doc); |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
704 | free(file); |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
705 | |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
706 | return ret; |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
707 | } |
198
44054c452de1
added list-repositories and list-directories commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
194
diff
changeset
|
708 | |
398
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
709 | int remove_repository(Repository *repo) { |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
710 | 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
|
711 | struct stat s; |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
712 | if(stat(file, &s)) { |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
713 | perror("Cannot access config.xml"); |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
714 | free(file); |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
715 | return 1; |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
716 | } |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
717 | |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
718 | xmlDoc *doc = xmlReadFile(file, NULL, 0); |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
719 | if(!doc) { |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
720 | free(file); |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
721 | fprintf(stderr, "Cannot load config.xml\n"); |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
722 | return 1; |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
723 | } |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
724 | |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
725 | xmlNodePtr root = xmlDocGetRootElement(doc); |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
726 | if(!root) { |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
727 | fprintf(stderr, "Missing root node in config.xml\n"); |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
728 | xmlFreeDoc(doc); |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
729 | free(file); |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
730 | return 1; |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
731 | } |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
732 | |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
733 | xmlNodePtr repoNode = root->children; |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
734 | xmlNodePtr matchedRepoNode = NULL; |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
735 | while(!matchedRepoNode && repoNode) { |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
736 | if(repoNode->type == XML_ELEMENT_NODE |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
737 | && xstreq(repoNode->name, "repository")) { |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
738 | xmlNodePtr nameNode = repoNode->children; |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
739 | while(!matchedRepoNode && nameNode) { |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
740 | if (nameNode->type == XML_ELEMENT_NODE |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
741 | && xstreq(nameNode->name, "name")) { |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
742 | char *reponame = util_xml_get_text(nameNode); |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
743 | if(!strcmp(repo->name, reponame)) { |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
744 | matchedRepoNode = repoNode; |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
745 | } |
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 | nameNode = nameNode->next; |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
748 | } |
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 | repoNode = repoNode->next; |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
751 | } |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
752 | |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
753 | if(matchedRepoNode) { |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
754 | xmlNodePtr prev = matchedRepoNode->prev; |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
755 | xmlNodePtr next = matchedRepoNode->next; |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
756 | if(prev && prev->type == XML_TEXT_NODE) { |
405
6b85d745e402
fixes some char type mismatch warnings
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
398
diff
changeset
|
757 | sstr_t content = sstr((char*)prev->content); |
398
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
758 | sstr_t lf = sstrrchr(content, '\n'); |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
759 | if(lf.length > 0) { |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
760 | *lf.ptr = '\0'; |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
761 | char* newcontent = sstrdup(content).ptr; |
405
6b85d745e402
fixes some char type mismatch warnings
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
398
diff
changeset
|
762 | xmlNodeSetContent(prev, (xmlChar*)newcontent); |
398
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
763 | free(newcontent); |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
764 | } |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
765 | } |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
766 | if(next && next->type == XML_TEXT_NODE) { |
405
6b85d745e402
fixes some char type mismatch warnings
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
398
diff
changeset
|
767 | sstr_t lf = sstrchr(sstr((char*)next->content), '\n'); |
398
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
768 | if(lf.length > 0) { |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
769 | char* newcontent = malloc(lf.length); |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
770 | memcpy(newcontent, lf.ptr+1, lf.length-1); |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
771 | newcontent[lf.length-1] = '\0'; |
405
6b85d745e402
fixes some char type mismatch warnings
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
398
diff
changeset
|
772 | xmlNodeSetContent(next, (xmlChar*)newcontent); |
398
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
773 | free(newcontent); |
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 | } |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
776 | |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
777 | xmlUnlinkNode(matchedRepoNode); |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
778 | xmlFreeNode(matchedRepoNode); |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
779 | } |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
780 | |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
781 | 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
|
782 | xmlFreeDoc(doc); |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
783 | free(file); |
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 | return ret; |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
786 | } |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
787 | |
26fdeed98cd7
adds remove-repository command
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
788 | int list_repositories(void) { |
198
44054c452de1
added list-repositories and list-directories commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
194
diff
changeset
|
789 | UcxMapIterator i = ucx_map_iterator(repos); |
44054c452de1
added list-repositories and list-directories commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
194
diff
changeset
|
790 | Repository *repo; |
44054c452de1
added list-repositories and list-directories commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
194
diff
changeset
|
791 | UCX_MAP_FOREACH(key, repo, i) { |
44054c452de1
added list-repositories and list-directories commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
194
diff
changeset
|
792 | printf("%s\n", repo->name); |
44054c452de1
added list-repositories and list-directories commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
194
diff
changeset
|
793 | } |
44054c452de1
added list-repositories and list-directories commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
194
diff
changeset
|
794 | return 0; |
44054c452de1
added list-repositories and list-directories commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
194
diff
changeset
|
795 | } |
215
781aee172901
dav-sync add-directory shows list of repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
796 | |
781aee172901
dav-sync add-directory shows list of repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
797 | UcxList* get_repositories(void) { |
781aee172901
dav-sync add-directory shows list of repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
798 | UcxList *list = NULL; |
781aee172901
dav-sync add-directory shows list of repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
799 | UcxMapIterator i = ucx_map_iterator(repos); |
781aee172901
dav-sync add-directory shows list of repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
800 | Repository *repo; |
781aee172901
dav-sync add-directory shows list of repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
801 | UCX_MAP_FOREACH(key, repo, i) { |
781aee172901
dav-sync add-directory shows list of repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
802 | list = ucx_list_append(list, repo); |
781aee172901
dav-sync add-directory shows list of repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
803 | } |
781aee172901
dav-sync add-directory shows list of repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
804 | return list; |
781aee172901
dav-sync add-directory shows list of repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
805 | } |
470
6bf798ad3aec
adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
806 | |
6bf798ad3aec
adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
807 | PwdStore* get_pwdstore(void) { |
6bf798ad3aec
adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
808 | return pstore; |
6bf798ad3aec
adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
809 | } |
6bf798ad3aec
adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
810 | |
6bf798ad3aec
adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
811 | 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
|
812 | 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
|
813 | 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
|
814 | } |
b0eb645cd26e
fix error in dav add-user, if .dav dir doesn't exists
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
731
diff
changeset
|
815 | |
472
08d2d1263429
new secrets store file format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
470
diff
changeset
|
816 | 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
|
817 | int ret = pwdstore_store(pwdstore, pwfile); |
6bf798ad3aec
adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
818 | free(pwfile); |
6bf798ad3aec
adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
819 | return ret; |
6bf798ad3aec
adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
820 | } |
734
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
821 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
822 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
823 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
824 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
825 | Repository* url2repo_s(sstr_t url, char **path) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
826 | *path = NULL; |
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 | int s; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
829 | if(sstrprefix(url, SC("http://"))) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
830 | s = 7; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
831 | } else if(sstrprefix(url, SC("https://"))) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
832 | s = 8; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
833 | } else { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
834 | s = 1; |
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 | // split URL into repository and path |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
838 | sstr_t r = sstrsubs(url, s); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
839 | sstr_t p = sstrchr(r, '/'); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
840 | r = sstrsubsl(url, 0, url.length-p.length); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
841 | if(p.length == 0) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
842 | p = sstrn("/", 1); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
843 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
844 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
845 | 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
|
846 | if(repo) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
847 | *path = sstrdup(p).ptr; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
848 | } else { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
849 | // 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
|
850 | // 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
|
851 | 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
|
852 | repo->name = strdup(""); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
853 | repo->decrypt_content = true; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
854 | repo->verification = true; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
855 | repo->authmethods = CURLAUTH_BASIC; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
856 | if(url.ptr[url.length-1] == '/') { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
857 | repo->url = sstrdup(url).ptr; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
858 | *path = strdup("/"); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
859 | } else if (sstrchr(url, '/').length > 0) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
860 | // 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
|
861 | // 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
|
862 | repo->url = util_url_base_s(url); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
863 | sstr_t truncated = sstrdup(url); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
864 | *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
|
865 | free(truncated.ptr); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
866 | } else { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
867 | repo->url = sstrdup(url).ptr; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
868 | *path = strdup("/"); |
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 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
872 | return repo; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
873 | } |
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 | Repository* url2repo(char *url, char **path) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
876 | return url2repo_s(sstr(url), path); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
877 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
878 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
879 | 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
|
880 | 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
|
881 | return 1; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
882 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
883 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
884 | char *ps_password = NULL; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
885 | if(secrets->unlock_cmd && strlen(secrets->unlock_cmd) > 0) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
886 | UcxBuffer *cmd_out = ucx_buffer_new(NULL, 128, UCX_BUFFER_AUTOEXTEND); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
887 | 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
|
888 | // 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
|
889 | // 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
|
890 | size_t len = 0; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
891 | 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
|
892 | 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
|
893 | len = i; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
894 | break; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
895 | } |
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 | if(len > 0) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
898 | 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
|
899 | 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
|
900 | ps_password[len] = 0; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
901 | } |
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 | ucx_buffer_free(cmd_out); |
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 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
906 | if(!ps_password) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
907 | 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
|
908 | if(!ps_password) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
909 | return 1; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
910 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
911 | } |
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 | 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
|
914 | 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
|
915 | return 1; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
916 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
917 | if(pwdstore_decrypt(secrets)) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
918 | 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
|
919 | return 1; |
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 | return 0; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
922 | } |
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 | typedef struct CredLocation { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
925 | char *id; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
926 | char *location; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
927 | } CredLocation; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
928 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
929 | 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
|
930 | 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
|
931 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
932 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
933 | 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
|
934 | // 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
|
935 | free(c->location); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
936 | free(c); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
937 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
938 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
939 | 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
|
940 | if(!credid) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
941 | return 0; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
942 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
943 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
944 | PwdStore *secrets = get_pwdstore(); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
945 | if(!secrets) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
946 | 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
|
947 | return 0; |
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 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
950 | 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
|
951 | if(!secrets->isdecrypted) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
952 | 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
|
953 | return 0; |
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 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
956 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
957 | 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
|
958 | if(s_cred) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
959 | *user = s_cred->user; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
960 | *password = s_cred->password; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
961 | return 1; |
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 | } else { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
964 | 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
|
965 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
966 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
967 | return 0; |
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 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
971 | 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
|
972 | PwdStore *secrets = get_pwdstore(); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
973 | if(!secrets) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
974 | return 0; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
975 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
976 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
977 | /* |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
978 | * 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
|
979 | * 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
|
980 | */ |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
981 | UcxList *locations = NULL; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
982 | UCX_FOREACH(elm, secrets->locations) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
983 | PwdIndexEntry *e = elm->data; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
984 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
985 | UCX_FOREACH(loc, e->locations) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
986 | char *path; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
987 | Repository *r = url2repo(loc->data, &path); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
988 | 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
|
989 | urlentry->id = e->id; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
990 | urlentry->location = util_concat_path(r->url, path); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
991 | locations = ucx_list_append(locations, urlentry); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
992 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
993 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
994 | // the list must be sorted |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
995 | locations = ucx_list_sort(locations, (cmp_func)cmp_url_cred_entry, NULL); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
996 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
997 | // create full request url string and remove protocol prefix |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
998 | sstr_t req_url_proto = sstr(util_concat_path(repo->url, path)); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
999 | sstr_t req_url = req_url_proto; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1000 | if(sstrprefix(req_url, S("http://"))) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1001 | req_url = sstrsubs(req_url, 7); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1002 | } else if(sstrprefix(req_url, S("https://"))) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1003 | req_url = sstrsubs(req_url, 8); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1004 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1005 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1006 | // 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
|
1007 | // of the requested url |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1008 | char *id = NULL; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1009 | int ret = 0; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1010 | UCX_FOREACH(elm, locations) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1011 | CredLocation *cred = elm->data; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1012 | sstr_t cred_url = sstr(cred->location); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1013 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1014 | // remove protocol prefix |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1015 | if(sstrprefix(cred_url, S("http://"))) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1016 | cred_url = sstrsubs(cred_url, 7); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1017 | } else if(sstrprefix(cred_url, S("https://"))) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1018 | cred_url = sstrsubs(cred_url, 8); |
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 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1021 | if(sstrprefix(req_url, cred_url)) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1022 | id = cred->id; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1023 | break; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1024 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1025 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1026 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1027 | // 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
|
1028 | // 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
|
1029 | 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
|
1030 | 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
|
1031 | if(cred) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1032 | *user = cred->user; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1033 | *password = cred->password; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1034 | ret = 1; |
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 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1038 | free(req_url_proto.ptr); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1039 | ucx_list_free_content(locations, (ucx_destructor)free_cred_location); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1040 | ucx_list_free(locations); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1041 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1042 | return ret; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1043 | } |
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 | 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
|
1046 | char *user = repo->user; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1047 | char *password = repo->password; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1048 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1049 | if(!user && !password) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1050 | 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
|
1051 | 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
|
1052 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1053 | } |
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 | 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
|
1056 | 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
|
1057 | 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
|
1058 | 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
|
1059 | 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
|
1060 | if(repo->cert) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1061 | 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
|
1062 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1063 | 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
|
1064 | 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
|
1065 | 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
|
1066 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1067 | 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
|
1068 | 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
|
1069 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1070 | return sn; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1071 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1072 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1073 | 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
|
1074 | Repository *repo = userdata; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1075 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1076 | char *user = NULL; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1077 | char ubuf[256]; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1078 | if(repo->user) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1079 | user = repo->user; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1080 | } else { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1081 | fprintf(stderr, "User: "); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1082 | fflush(stderr); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1083 | 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
|
1084 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1085 | if(!user) { |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1086 | return 0; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1087 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1088 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1089 | 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
|
1090 | 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
|
1091 | return 0; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1092 | } |
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 | 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
|
1095 | 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
|
1096 | user[ulen-1] = '\0'; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1097 | } |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1098 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1099 | 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
|
1100 | free(password); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1101 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1102 | return 0; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
732
diff
changeset
|
1103 | } |