Sat, 01 Jun 2019 10:41:00 +0200
Added tag v1.2.4 for changeset dcf751b270dd
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1 | /* |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
2 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
3 | * |
404
5c08b8e14df8
updates copyright notice
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
372
diff
changeset
|
4 | * Copyright 2018 Olaf Wintermann. All rights reserved. |
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
5 | * |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
6 | * Redistribution and use in source and binary forms, with or without |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
7 | * modification, are permitted provided that the following conditions are met: |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
8 | * |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
9 | * 1. Redistributions of source code must retain the above copyright |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
10 | * notice, this list of conditions and the following disclaimer. |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
11 | * |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
12 | * 2. Redistributions in binary form must reproduce the above copyright |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
13 | * notice, this list of conditions and the following disclaimer in the |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
14 | * documentation and/or other materials provided with the distribution. |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
15 | * |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
16 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
17 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
18 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
19 | * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
20 | * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
26 | * POSSIBILITY OF SUCH DAMAGE. |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
27 | */ |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
28 | |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
29 | #include <time.h> |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
30 | #include <stdio.h> |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
31 | #include <stdlib.h> |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
32 | #include <string.h> |
124
41939c8f3f9c
expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
33 | #include <errno.h> |
160
ba8f1691c0ee
added parser for iso8601 dates
Mike Becker <universe@uap-core.de>
parents:
159
diff
changeset
|
34 | #include <ctype.h> |
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
35 | #include <ucx/string.h> |
40
a95ee94b9204
supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
39
diff
changeset
|
36 | #include <ucx/buffer.h> |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
37 | #include <ucx/utils.h> |
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
38 | #include <libxml/tree.h> |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
39 | #include <curl/curl.h> |
152
ff854d3df20c
fixed windows build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
151
diff
changeset
|
40 | |
153
272173064319
implemented hidden password input for windows by using conio
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
41 | #ifdef _WIN32 |
272173064319
implemented hidden password input for windows by using conio
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
42 | #include <conio.h> |
272173064319
implemented hidden password input for windows by using conio
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
43 | #define getpasswordchar() getch() |
272173064319
implemented hidden password input for windows by using conio
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
44 | #else |
147
458a8dc68048
added password based keys and fixed crash when keys are missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
124
diff
changeset
|
45 | #include <termios.h> |
153
272173064319
implemented hidden password input for windows by using conio
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
46 | #define getpasswordchar() getchar() |
152
ff854d3df20c
fixed windows build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
151
diff
changeset
|
47 | #endif |
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
48 | |
349
0b4ecadaf3f9
ports openssl code to commoncrypto (macos)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
344
diff
changeset
|
49 | #include "webdav.h" |
0b4ecadaf3f9
ports openssl code to commoncrypto (macos)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
344
diff
changeset
|
50 | #include "utils.h" |
0b4ecadaf3f9
ports openssl code to commoncrypto (macos)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
344
diff
changeset
|
51 | #include "crypto.h" |
0b4ecadaf3f9
ports openssl code to commoncrypto (macos)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
344
diff
changeset
|
52 | #include "session.h" |
0b4ecadaf3f9
ports openssl code to commoncrypto (macos)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
344
diff
changeset
|
53 | |
0b4ecadaf3f9
ports openssl code to commoncrypto (macos)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
344
diff
changeset
|
54 | /* |
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
55 | #include <openssl/hmac.h> |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
56 | #include <openssl/evp.h> |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
57 | #include <openssl/bio.h> |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
58 | #include <openssl/buffer.h> |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
59 | #include <openssl/rand.h> |
349
0b4ecadaf3f9
ports openssl code to commoncrypto (macos)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
344
diff
changeset
|
60 | */ |
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
61 | |
177
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
62 | static size_t extractval(sstr_t str, char *result, char delim) { |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
63 | size_t n = 0; |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
64 | for(size_t i = 0; i < str.length ; i++) { |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
65 | if(isdigit(str.ptr[i])) { |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
66 | result[n++] = str.ptr[i]; |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
67 | } else if(str.ptr[i] != delim) { |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
68 | return 0; |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
69 | } |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
70 | } |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
71 | result[n] = '\0'; |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
72 | return n; |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
73 | } |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
74 | |
186
05d11fbcaeb3
improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
75 | static time_t parse_iso8601(char *iso8601str) { |
160
ba8f1691c0ee
added parser for iso8601 dates
Mike Becker <universe@uap-core.de>
parents:
159
diff
changeset
|
76 | |
ba8f1691c0ee
added parser for iso8601 dates
Mike Becker <universe@uap-core.de>
parents:
159
diff
changeset
|
77 | // safety |
177
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
78 | if(!iso8601str) { |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
79 | return 0; |
160
ba8f1691c0ee
added parser for iso8601 dates
Mike Becker <universe@uap-core.de>
parents:
159
diff
changeset
|
80 | } |
ba8f1691c0ee
added parser for iso8601 dates
Mike Becker <universe@uap-core.de>
parents:
159
diff
changeset
|
81 | |
177
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
82 | // local vars |
160
ba8f1691c0ee
added parser for iso8601 dates
Mike Becker <universe@uap-core.de>
parents:
159
diff
changeset
|
83 | struct tm tparts; |
ba8f1691c0ee
added parser for iso8601 dates
Mike Becker <universe@uap-core.de>
parents:
159
diff
changeset
|
84 | memset(&tparts, 0, sizeof(struct tm)); |
ba8f1691c0ee
added parser for iso8601 dates
Mike Becker <universe@uap-core.de>
parents:
159
diff
changeset
|
85 | long val; |
177
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
86 | char conv[16]; |
160
ba8f1691c0ee
added parser for iso8601 dates
Mike Becker <universe@uap-core.de>
parents:
159
diff
changeset
|
87 | |
177
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
88 | // work on the trimmed string |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
89 | sstr_t date = sstrtrim(sstr(iso8601str)); |
160
ba8f1691c0ee
added parser for iso8601 dates
Mike Becker <universe@uap-core.de>
parents:
159
diff
changeset
|
90 | |
177
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
91 | sstr_t time = sstrchr(date, 'T'); |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
92 | if(time.length == 0) { |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
93 | return 0; |
160
ba8f1691c0ee
added parser for iso8601 dates
Mike Becker <universe@uap-core.de>
parents:
159
diff
changeset
|
94 | } |
177
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
95 | date.length = time.ptr - date.ptr; |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
96 | time.ptr++; time.length--; |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
97 | |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
98 | sstr_t tzinfo; |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
99 | if((tzinfo = sstrchr(time, 'Z')).length > 0 || |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
100 | (tzinfo = sstrchr(time, '+')).length > 0 || |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
101 | (tzinfo = sstrchr(time, '-')).length > 0) { |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
102 | |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
103 | time.length = tzinfo.ptr - time.ptr; |
160
ba8f1691c0ee
added parser for iso8601 dates
Mike Becker <universe@uap-core.de>
parents:
159
diff
changeset
|
104 | } |
ba8f1691c0ee
added parser for iso8601 dates
Mike Becker <universe@uap-core.de>
parents:
159
diff
changeset
|
105 | |
177
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
106 | // parse date |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
107 | if((date.length != 8 && date.length != 10) |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
108 | || extractval(date, conv , '-') != 8) { |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
109 | return 0; |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
110 | } |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
111 | val = atol(conv); |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
112 | if(val < 19000000L) { |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
113 | return 0; |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
114 | } |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
115 | tparts.tm_mday = val % 100; |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
116 | tparts.tm_mon = (val % 10000) / 100 - 1; |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
117 | tparts.tm_year = val / 10000 - 1900; |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
118 | |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
119 | // parse time and skip possible fractional seconds |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
120 | sstr_t frac; |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
121 | if((frac = sstrchr(time, '.')).length > 0 || |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
122 | (frac = sstrchr(time, ',')).length > 0) { |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
123 | time.length = frac.ptr - time.ptr; |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
124 | } |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
125 | if((time.length != 6 && time.length != 8) |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
126 | || extractval(time, conv , ':') != 6) { |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
127 | return 0; |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
128 | } |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
129 | val = atol(conv); |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
130 | tparts.tm_sec = val % 100; |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
131 | tparts.tm_min = (val % 10000) / 100; |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
132 | tparts.tm_hour = val / 10000; |
160
ba8f1691c0ee
added parser for iso8601 dates
Mike Becker <universe@uap-core.de>
parents:
159
diff
changeset
|
133 | |
ba8f1691c0ee
added parser for iso8601 dates
Mike Becker <universe@uap-core.de>
parents:
159
diff
changeset
|
134 | |
ba8f1691c0ee
added parser for iso8601 dates
Mike Becker <universe@uap-core.de>
parents:
159
diff
changeset
|
135 | // parse time zone (if any) |
177
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
136 | if(tzinfo.length == 0) { |
160
ba8f1691c0ee
added parser for iso8601 dates
Mike Becker <universe@uap-core.de>
parents:
159
diff
changeset
|
137 | // local time |
ba8f1691c0ee
added parser for iso8601 dates
Mike Becker <universe@uap-core.de>
parents:
159
diff
changeset
|
138 | tparts.tm_isdst = -1; |
177
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
139 | return mktime(&tparts); |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
140 | } else if(!sstrcmp(tzinfo, S("Z"))) { |
184
7ba3c97b31ff
fixed FreeBSD build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
181
diff
changeset
|
141 | #ifdef __FreeBSD__ |
7ba3c97b31ff
fixed FreeBSD build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
181
diff
changeset
|
142 | return timegm(&tparts); |
7ba3c97b31ff
fixed FreeBSD build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
181
diff
changeset
|
143 | #else |
177
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
144 | return mktime(&tparts) - timezone; |
184
7ba3c97b31ff
fixed FreeBSD build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
181
diff
changeset
|
145 | #endif |
177
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
146 | } else if(tzinfo.ptr[0] == '+' || tzinfo.ptr[0] == '-') { |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
147 | int sign = (tzinfo.ptr[0] == '+') ? -1 : 1; |
160
ba8f1691c0ee
added parser for iso8601 dates
Mike Becker <universe@uap-core.de>
parents:
159
diff
changeset
|
148 | |
177
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
149 | if(tzinfo.length > 6) { |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
150 | return 0; |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
151 | } else { |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
152 | tzinfo.ptr++; tzinfo.length--; |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
153 | extractval(tzinfo, conv, ':'); |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
154 | val = atol(conv); |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
155 | val = 60 * (val / 100) + (val % 100); |
184
7ba3c97b31ff
fixed FreeBSD build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
181
diff
changeset
|
156 | #ifdef __FreeBSD__ |
7ba3c97b31ff
fixed FreeBSD build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
181
diff
changeset
|
157 | return timegm(&tparts) + (time_t) (60 * val * sign); |
7ba3c97b31ff
fixed FreeBSD build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
181
diff
changeset
|
158 | #else |
7ba3c97b31ff
fixed FreeBSD build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
181
diff
changeset
|
159 | return mktime(&tparts) - timezone + (time_t) (60 * val * sign); |
7ba3c97b31ff
fixed FreeBSD build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
181
diff
changeset
|
160 | #endif |
177
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
161 | } |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
162 | } else { |
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
163 | return 0; |
160
ba8f1691c0ee
added parser for iso8601 dates
Mike Becker <universe@uap-core.de>
parents:
159
diff
changeset
|
164 | } |
ba8f1691c0ee
added parser for iso8601 dates
Mike Becker <universe@uap-core.de>
parents:
159
diff
changeset
|
165 | } |
ba8f1691c0ee
added parser for iso8601 dates
Mike Becker <universe@uap-core.de>
parents:
159
diff
changeset
|
166 | |
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
167 | |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
168 | time_t util_parse_creationdate(char *str) { |
160
ba8f1691c0ee
added parser for iso8601 dates
Mike Becker <universe@uap-core.de>
parents:
159
diff
changeset
|
169 | // parse a ISO-8601 date (rfc-3339) |
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
170 | // example: 2012-11-29T21:35:35Z |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
171 | if(!str) { |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
172 | return 0; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
173 | } |
160
ba8f1691c0ee
added parser for iso8601 dates
Mike Becker <universe@uap-core.de>
parents:
159
diff
changeset
|
174 | |
177
3c0734eeab33
better and better and better iso8601 parser
Mike Becker <universe@uap-core.de>
parents:
176
diff
changeset
|
175 | return parse_iso8601(str); |
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
176 | } |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
177 | |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
178 | time_t util_parse_lastmodified(char *str) { |
158
33237261321e
added fallback for util_parse_lastmodified, because some servers incorrectly use ISO-8601 dates for lastmodified - TODO: implement the ISO-8601 parsing
Mike Becker <universe@uap-core.de>
parents:
153
diff
changeset
|
179 | // parse a rfc-1123 date |
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
180 | // example: Thu, 29 Nov 2012 21:35:35 GMT |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
181 | if(!str) { |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
182 | return 0; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
183 | } else { |
158
33237261321e
added fallback for util_parse_lastmodified, because some servers incorrectly use ISO-8601 dates for lastmodified - TODO: implement the ISO-8601 parsing
Mike Becker <universe@uap-core.de>
parents:
153
diff
changeset
|
184 | time_t result = curl_getdate(str, NULL); |
33237261321e
added fallback for util_parse_lastmodified, because some servers incorrectly use ISO-8601 dates for lastmodified - TODO: implement the ISO-8601 parsing
Mike Becker <universe@uap-core.de>
parents:
153
diff
changeset
|
185 | if(result == -1) { |
329
2dc61cc5a8ac
adds error message to dav, when an invalid date format is specified for the -u option
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
186 | // fall back to the ISO-8601 format (e.g. Microsoft Sharepoint |
2dc61cc5a8ac
adds error message to dav, when an invalid date format is specified for the -u option
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
187 | // illegally uses this format for lastmodified, but also some |
2dc61cc5a8ac
adds error message to dav, when an invalid date format is specified for the -u option
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
188 | // users might want to give an ISO-8601 date) |
158
33237261321e
added fallback for util_parse_lastmodified, because some servers incorrectly use ISO-8601 dates for lastmodified - TODO: implement the ISO-8601 parsing
Mike Becker <universe@uap-core.de>
parents:
153
diff
changeset
|
189 | return util_parse_creationdate(str); |
33237261321e
added fallback for util_parse_lastmodified, because some servers incorrectly use ISO-8601 dates for lastmodified - TODO: implement the ISO-8601 parsing
Mike Becker <universe@uap-core.de>
parents:
153
diff
changeset
|
190 | } else { |
33237261321e
added fallback for util_parse_lastmodified, because some servers incorrectly use ISO-8601 dates for lastmodified - TODO: implement the ISO-8601 parsing
Mike Becker <universe@uap-core.de>
parents:
153
diff
changeset
|
191 | return result; |
33237261321e
added fallback for util_parse_lastmodified, because some servers incorrectly use ISO-8601 dates for lastmodified - TODO: implement the ISO-8601 parsing
Mike Becker <universe@uap-core.de>
parents:
153
diff
changeset
|
192 | } |
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
193 | } |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
194 | } |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
195 | |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
196 | int util_getboolean(char *v) { |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
197 | if(v[0] == 'T' || v[0] == 't') { |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
198 | return 1; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
199 | } |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
200 | return 0; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
201 | } |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
202 | |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
203 | int util_strtoint(char *str, int64_t *value) { |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
204 | char *end; |
124
41939c8f3f9c
expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
205 | errno = 0; |
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
206 | int64_t val = strtoll(str, &end, 0); |
124
41939c8f3f9c
expression compiler generates byte code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
207 | if(errno == 0) { |
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
208 | *value = val; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
209 | return 1; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
210 | } else { |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
211 | return 0; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
212 | } |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
213 | } |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
214 | |
151
a316613205dc
fixed some memory leaks, content verification and dav info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
150
diff
changeset
|
215 | char* util_url_base(char *url) { |
a316613205dc
fixed some memory leaks, content verification and dav info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
150
diff
changeset
|
216 | sstr_t u = sstr(url); |
a316613205dc
fixed some memory leaks, content verification and dav info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
150
diff
changeset
|
217 | int len = u.length; |
a316613205dc
fixed some memory leaks, content verification and dav info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
150
diff
changeset
|
218 | int slashcount = 0; |
a316613205dc
fixed some memory leaks, content verification and dav info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
150
diff
changeset
|
219 | int slmax; |
a316613205dc
fixed some memory leaks, content verification and dav info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
150
diff
changeset
|
220 | if(len > 7 && !strncasecmp(url, "http://", 7)) { |
a316613205dc
fixed some memory leaks, content verification and dav info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
150
diff
changeset
|
221 | slmax = 3; |
a316613205dc
fixed some memory leaks, content verification and dav info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
150
diff
changeset
|
222 | } else if(len > 8 && !strncasecmp(url, "https://", 8)) { |
a316613205dc
fixed some memory leaks, content verification and dav info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
150
diff
changeset
|
223 | slmax = 3; |
a316613205dc
fixed some memory leaks, content verification and dav info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
150
diff
changeset
|
224 | } else { |
a316613205dc
fixed some memory leaks, content verification and dav info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
150
diff
changeset
|
225 | slmax = 1; |
a316613205dc
fixed some memory leaks, content verification and dav info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
150
diff
changeset
|
226 | } |
a316613205dc
fixed some memory leaks, content verification and dav info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
150
diff
changeset
|
227 | char c; |
a316613205dc
fixed some memory leaks, content verification and dav info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
150
diff
changeset
|
228 | int i = 0; |
a316613205dc
fixed some memory leaks, content verification and dav info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
150
diff
changeset
|
229 | for(i=0;i<len;i++) { |
a316613205dc
fixed some memory leaks, content verification and dav info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
150
diff
changeset
|
230 | c = url[i]; |
a316613205dc
fixed some memory leaks, content verification and dav info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
150
diff
changeset
|
231 | if(c == '/') { |
a316613205dc
fixed some memory leaks, content verification and dav info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
150
diff
changeset
|
232 | slashcount++; |
a316613205dc
fixed some memory leaks, content verification and dav info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
150
diff
changeset
|
233 | if(slashcount == slmax) { |
a316613205dc
fixed some memory leaks, content verification and dav info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
150
diff
changeset
|
234 | i++; |
a316613205dc
fixed some memory leaks, content verification and dav info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
150
diff
changeset
|
235 | break; |
a316613205dc
fixed some memory leaks, content verification and dav info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
150
diff
changeset
|
236 | } |
a316613205dc
fixed some memory leaks, content verification and dav info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
150
diff
changeset
|
237 | } |
a316613205dc
fixed some memory leaks, content verification and dav info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
150
diff
changeset
|
238 | } |
a316613205dc
fixed some memory leaks, content verification and dav info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
150
diff
changeset
|
239 | sstr_t server = sstrsubsl(u, 0, i); |
a316613205dc
fixed some memory leaks, content verification and dav info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
150
diff
changeset
|
240 | server = sstrdup(server); |
a316613205dc
fixed some memory leaks, content verification and dav info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
150
diff
changeset
|
241 | return server.ptr; |
a316613205dc
fixed some memory leaks, content verification and dav info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
150
diff
changeset
|
242 | } |
a316613205dc
fixed some memory leaks, content verification and dav info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
150
diff
changeset
|
243 | |
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
244 | char* util_url_path(char *url) { |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
245 | char *path = NULL; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
246 | size_t len = strlen(url); |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
247 | int slashcount = 0; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
248 | int slmax; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
249 | if(len > 7 && !strncasecmp(url, "http://", 7)) { |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
250 | slmax = 3; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
251 | } else if(len > 8 && !strncasecmp(url, "https://", 8)) { |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
252 | slmax = 3; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
253 | } else { |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
254 | slmax = 1; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
255 | } |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
256 | char c; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
257 | for(int i=0;i<len;i++) { |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
258 | c = url[i]; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
259 | if(c == '/') { |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
260 | slashcount++; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
261 | if(slashcount == slmax) { |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
262 | path = url + i; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
263 | break; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
264 | } |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
265 | } |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
266 | } |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
267 | return path; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
268 | } |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
269 | |
66 | 270 | char* util_url_decode(DavSession *sn, char *url) { |
271 | char *unesc = curl_easy_unescape(sn->handle, url, strlen(url), NULL); | |
272 | char *ret = strdup(unesc); | |
273 | curl_free(unesc); | |
274 | return ret; | |
275 | } | |
276 | ||
170
cf054cded046
added depth header workaround for Microsoft IIS (tested with sharepoint)
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
277 | static size_t util_header_callback(char *buffer, size_t size, |
cf054cded046
added depth header workaround for Microsoft IIS (tested with sharepoint)
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
278 | size_t nitems, void *data) { |
cf054cded046
added depth header workaround for Microsoft IIS (tested with sharepoint)
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
279 | |
173
947843245525
improved util_header_callback by using sstr_t
Mike Becker <universe@uap-core.de>
parents:
170
diff
changeset
|
280 | sstr_t sbuffer = sstrn(buffer, size*nitems); |
170
cf054cded046
added depth header workaround for Microsoft IIS (tested with sharepoint)
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
281 | |
cf054cded046
added depth header workaround for Microsoft IIS (tested with sharepoint)
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
282 | UcxMap *map = (UcxMap*) data; |
cf054cded046
added depth header workaround for Microsoft IIS (tested with sharepoint)
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
283 | |
cf054cded046
added depth header workaround for Microsoft IIS (tested with sharepoint)
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
284 | // if we get a status line, clear the map and exit |
173
947843245525
improved util_header_callback by using sstr_t
Mike Becker <universe@uap-core.de>
parents:
170
diff
changeset
|
285 | if(sstrprefix(sbuffer, S("HTTP/"))) { |
170
cf054cded046
added depth header workaround for Microsoft IIS (tested with sharepoint)
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
286 | ucx_map_free_content(map, free); |
cf054cded046
added depth header workaround for Microsoft IIS (tested with sharepoint)
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
287 | ucx_map_clear(map); |
cf054cded046
added depth header workaround for Microsoft IIS (tested with sharepoint)
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
288 | return size*nitems; |
cf054cded046
added depth header workaround for Microsoft IIS (tested with sharepoint)
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
289 | } |
cf054cded046
added depth header workaround for Microsoft IIS (tested with sharepoint)
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
290 | |
cf054cded046
added depth header workaround for Microsoft IIS (tested with sharepoint)
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
291 | // if we get the terminating CRLF, just exit |
173
947843245525
improved util_header_callback by using sstr_t
Mike Becker <universe@uap-core.de>
parents:
170
diff
changeset
|
292 | if(!sstrcmp(sbuffer, S("\r\n"))) { |
170
cf054cded046
added depth header workaround for Microsoft IIS (tested with sharepoint)
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
293 | return 2; |
cf054cded046
added depth header workaround for Microsoft IIS (tested with sharepoint)
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
294 | } |
cf054cded046
added depth header workaround for Microsoft IIS (tested with sharepoint)
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
295 | |
173
947843245525
improved util_header_callback by using sstr_t
Mike Becker <universe@uap-core.de>
parents:
170
diff
changeset
|
296 | sstr_t key = sbuffer; |
947843245525
improved util_header_callback by using sstr_t
Mike Becker <universe@uap-core.de>
parents:
170
diff
changeset
|
297 | sstr_t value = sstrchr(sbuffer, ':'); |
170
cf054cded046
added depth header workaround for Microsoft IIS (tested with sharepoint)
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
298 | |
173
947843245525
improved util_header_callback by using sstr_t
Mike Becker <universe@uap-core.de>
parents:
170
diff
changeset
|
299 | if(value.length == 0) { |
947843245525
improved util_header_callback by using sstr_t
Mike Becker <universe@uap-core.de>
parents:
170
diff
changeset
|
300 | return 0; // invalid header line |
170
cf054cded046
added depth header workaround for Microsoft IIS (tested with sharepoint)
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
301 | } |
cf054cded046
added depth header workaround for Microsoft IIS (tested with sharepoint)
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
302 | |
173
947843245525
improved util_header_callback by using sstr_t
Mike Becker <universe@uap-core.de>
parents:
170
diff
changeset
|
303 | key.length = value.ptr - key.ptr; |
947843245525
improved util_header_callback by using sstr_t
Mike Becker <universe@uap-core.de>
parents:
170
diff
changeset
|
304 | value.ptr++; value.length--; |
170
cf054cded046
added depth header workaround for Microsoft IIS (tested with sharepoint)
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
305 | |
174
e7e56c56d126
updated ucx and used new sstrlower in util_header_callback
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
306 | key = sstrlower(sstrtrim(key)); |
173
947843245525
improved util_header_callback by using sstr_t
Mike Becker <universe@uap-core.de>
parents:
170
diff
changeset
|
307 | value = sstrdup(sstrtrim(value)); |
174
e7e56c56d126
updated ucx and used new sstrlower in util_header_callback
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
308 | |
173
947843245525
improved util_header_callback by using sstr_t
Mike Becker <universe@uap-core.de>
parents:
170
diff
changeset
|
309 | ucx_map_sstr_put(map, key, value.ptr); |
170
cf054cded046
added depth header workaround for Microsoft IIS (tested with sharepoint)
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
310 | |
173
947843245525
improved util_header_callback by using sstr_t
Mike Becker <universe@uap-core.de>
parents:
170
diff
changeset
|
311 | free(key.ptr); |
170
cf054cded046
added depth header workaround for Microsoft IIS (tested with sharepoint)
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
312 | |
173
947843245525
improved util_header_callback by using sstr_t
Mike Becker <universe@uap-core.de>
parents:
170
diff
changeset
|
313 | return sbuffer.length; |
170
cf054cded046
added depth header workaround for Microsoft IIS (tested with sharepoint)
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
314 | } |
cf054cded046
added depth header workaround for Microsoft IIS (tested with sharepoint)
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
315 | |
cf054cded046
added depth header workaround for Microsoft IIS (tested with sharepoint)
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
316 | void util_capture_header(CURL *handle, UcxMap* map) { |
176
747f3796eddd
improved util_capture_header when deactivating the capturing
Mike Becker <universe@uap-core.de>
parents:
174
diff
changeset
|
317 | if(map) { |
747f3796eddd
improved util_capture_header when deactivating the capturing
Mike Becker <universe@uap-core.de>
parents:
174
diff
changeset
|
318 | curl_easy_setopt(handle, CURLOPT_HEADERFUNCTION, util_header_callback); |
747f3796eddd
improved util_capture_header when deactivating the capturing
Mike Becker <universe@uap-core.de>
parents:
174
diff
changeset
|
319 | curl_easy_setopt(handle, CURLOPT_HEADERDATA, map); |
747f3796eddd
improved util_capture_header when deactivating the capturing
Mike Becker <universe@uap-core.de>
parents:
174
diff
changeset
|
320 | } else { |
170
cf054cded046
added depth header workaround for Microsoft IIS (tested with sharepoint)
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
321 | curl_easy_setopt(handle, CURLOPT_HEADERFUNCTION, NULL); |
176
747f3796eddd
improved util_capture_header when deactivating the capturing
Mike Becker <universe@uap-core.de>
parents:
174
diff
changeset
|
322 | curl_easy_setopt(handle, CURLOPT_HEADERDATA, NULL); |
170
cf054cded046
added depth header workaround for Microsoft IIS (tested with sharepoint)
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
323 | } |
cf054cded046
added depth header workaround for Microsoft IIS (tested with sharepoint)
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
324 | } |
cf054cded046
added depth header workaround for Microsoft IIS (tested with sharepoint)
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
325 | |
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
326 | char* util_resource_name(char *url) { |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
327 | int si = 0; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
328 | int osi = 0; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
329 | int i = 0; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
330 | int p = 0; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
331 | char c; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
332 | while((c = url[i]) != 0) { |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
333 | if(c == '/') { |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
334 | osi = si; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
335 | si = i; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
336 | p = 1; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
337 | } |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
338 | i++; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
339 | } |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
340 | |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
341 | char *name = url + si + p; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
342 | if(name[0] == 0) { |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
343 | name = url + osi + p; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
344 | if(name[0] == 0) { |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
345 | return url; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
346 | } |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
347 | } |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
348 | |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
349 | return name; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
350 | } |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
351 | |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
352 | int util_mkdir(char *path, mode_t mode) { |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
353 | #ifdef _WIN32 |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
354 | return mkdir(path); |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
355 | #else |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
356 | return mkdir(path, mode); |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
357 | #endif |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
358 | } |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
359 | |
372
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
349
diff
changeset
|
360 | char* util_concat_path(const char *url_base, const char *p) { |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
349
diff
changeset
|
361 | sstr_t base = sstr((char*)url_base); |
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
362 | sstr_t path; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
363 | if(p) { |
372
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
349
diff
changeset
|
364 | path = sstr((char*)p); |
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
365 | } else { |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
366 | path = sstrn("", 0); |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
367 | } |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
368 | |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
369 | int add_separator = 0; |
150
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
149
diff
changeset
|
370 | if(base.length != 0 && base.ptr[base.length-1] == '/') { |
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
371 | if(path.ptr[0] == '/') { |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
372 | base.length--; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
373 | } |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
374 | } else { |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
375 | if(path.length == 0 || path.ptr[0] != '/') { |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
376 | add_separator = 1; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
377 | } |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
378 | } |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
379 | |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
380 | sstr_t url; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
381 | if(add_separator) { |
70 | 382 | url = sstrcat(3, base, sstr("/"), path); |
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
383 | } else { |
70 | 384 | url = sstrcat(2, base, path); |
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
385 | } |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
386 | |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
387 | return url.ptr; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
388 | } |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
389 | |
181
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
177
diff
changeset
|
390 | char* util_get_url(DavSession *sn, char *href) { |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
391 | sstr_t base = sstr(sn->base_url); |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
392 | sstr_t href_str = sstr(href); |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
393 | |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
394 | char *base_path = util_url_path(sn->base_url); |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
395 | base.length -= strlen(base_path); |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
396 | |
70 | 397 | sstr_t url = sstrcat(2, base, href_str); |
181
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
177
diff
changeset
|
398 | return url.ptr; |
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
177
diff
changeset
|
399 | } |
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
177
diff
changeset
|
400 | |
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
177
diff
changeset
|
401 | void util_set_url(DavSession *sn, char *href) { |
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
177
diff
changeset
|
402 | char *url = util_get_url(sn, href); |
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
177
diff
changeset
|
403 | curl_easy_setopt(sn->handle, CURLOPT_URL, url); |
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
177
diff
changeset
|
404 | free(url); |
40
a95ee94b9204
supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
39
diff
changeset
|
405 | } |
a95ee94b9204
supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
39
diff
changeset
|
406 | |
a95ee94b9204
supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
39
diff
changeset
|
407 | char* util_path_to_url(DavSession *sn, char *path) { |
69
0dbdd7e8c1fc
fixed incorrect use of UcxBuffer
Mike Becker <universe@uap-core.de>
parents:
66
diff
changeset
|
408 | char *space = malloc(256); |
0dbdd7e8c1fc
fixed incorrect use of UcxBuffer
Mike Becker <universe@uap-core.de>
parents:
66
diff
changeset
|
409 | UcxBuffer *url = ucx_buffer_new(space, 256, UCX_BUFFER_AUTOEXTEND); |
40
a95ee94b9204
supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
39
diff
changeset
|
410 | |
a95ee94b9204
supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
39
diff
changeset
|
411 | // add base url |
a95ee94b9204
supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
39
diff
changeset
|
412 | ucx_buffer_write(sn->base_url, 1, strlen(sn->base_url), url); |
a95ee94b9204
supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
39
diff
changeset
|
413 | // remove trailing slash |
a95ee94b9204
supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
39
diff
changeset
|
414 | ucx_buffer_seek(url, -1, SEEK_CUR); |
a95ee94b9204
supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
39
diff
changeset
|
415 | |
a95ee94b9204
supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
39
diff
changeset
|
416 | sstr_t p = sstr(path); |
74
da079dc0724c
fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
71
diff
changeset
|
417 | ssize_t ntk = 0; |
40
a95ee94b9204
supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
39
diff
changeset
|
418 | sstr_t *tks = sstrsplit(p, S("/"), &ntk); |
a95ee94b9204
supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
39
diff
changeset
|
419 | |
a95ee94b9204
supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
39
diff
changeset
|
420 | for(int i=0;i<ntk;i++) { |
a95ee94b9204
supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
39
diff
changeset
|
421 | sstr_t node = tks[i]; |
a95ee94b9204
supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
39
diff
changeset
|
422 | if(node.length > 0) { |
a95ee94b9204
supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
39
diff
changeset
|
423 | char *esc = curl_easy_escape(sn->handle, node.ptr, node.length); |
a95ee94b9204
supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
39
diff
changeset
|
424 | ucx_buffer_putc(url, '/'); |
a95ee94b9204
supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
39
diff
changeset
|
425 | ucx_buffer_write(esc, 1, strlen(esc), url); |
a95ee94b9204
supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
39
diff
changeset
|
426 | curl_free(esc); |
a95ee94b9204
supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
39
diff
changeset
|
427 | } |
74
da079dc0724c
fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
71
diff
changeset
|
428 | free(node.ptr); |
40
a95ee94b9204
supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
39
diff
changeset
|
429 | } |
a95ee94b9204
supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
39
diff
changeset
|
430 | free(tks); |
a95ee94b9204
supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
39
diff
changeset
|
431 | if(path[p.length-1] == '/') { |
a95ee94b9204
supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
39
diff
changeset
|
432 | ucx_buffer_putc(url, '/'); |
a95ee94b9204
supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
39
diff
changeset
|
433 | } |
a95ee94b9204
supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
39
diff
changeset
|
434 | ucx_buffer_putc(url, 0); |
a95ee94b9204
supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
39
diff
changeset
|
435 | |
69
0dbdd7e8c1fc
fixed incorrect use of UcxBuffer
Mike Becker <universe@uap-core.de>
parents:
66
diff
changeset
|
436 | space = url->space; |
0dbdd7e8c1fc
fixed incorrect use of UcxBuffer
Mike Becker <universe@uap-core.de>
parents:
66
diff
changeset
|
437 | ucx_buffer_free(url); |
0dbdd7e8c1fc
fixed incorrect use of UcxBuffer
Mike Becker <universe@uap-core.de>
parents:
66
diff
changeset
|
438 | |
40
a95ee94b9204
supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
39
diff
changeset
|
439 | return space; |
a95ee94b9204
supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
39
diff
changeset
|
440 | } |
a95ee94b9204
supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
39
diff
changeset
|
441 | |
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
442 | char* util_parent_path(char *path) { |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
443 | char *name = util_resource_name(path); |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
444 | size_t namelen = strlen(name); |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
445 | size_t pathlen = strlen(path); |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
446 | size_t parentlen = pathlen - namelen; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
447 | char *parent = malloc(parentlen + 1); |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
448 | memcpy(parent, path, parentlen); |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
449 | parent[parentlen] = '\0'; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
450 | return parent; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
451 | } |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
452 | |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
453 | |
254
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
228
diff
changeset
|
454 | char* util_xml_get_text(const xmlNode *elm) { |
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
455 | xmlNode *node = elm->children; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
456 | while(node) { |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
457 | if(node->type == XML_TEXT_NODE) { |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
458 | return (char*)node->content; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
459 | } |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
460 | node = node->next; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
461 | } |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
462 | return NULL; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
463 | } |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
464 | |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
465 | |
39
3e55bed345f9
added some aes functions + ucx update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
33
diff
changeset
|
466 | char* util_base64decode(char *in) { |
3e55bed345f9
added some aes functions + ucx update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
33
diff
changeset
|
467 | int len = 0; |
3e55bed345f9
added some aes functions + ucx update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
33
diff
changeset
|
468 | return util_base64decode_len(in, &len); |
3e55bed345f9
added some aes functions + ucx update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
33
diff
changeset
|
469 | } |
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
470 | |
344
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
471 | #define WHITESPACE 64 |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
472 | #define EQUALS 65 |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
473 | #define INVALID 66 |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
474 | static char b64dectable[] = { |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
475 | 66,66,66,66,66,66,66,66,66,66,64,66,66,66,66,66,66,66,66,66,66,66,66,66,66, |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
476 | 66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,62,66,66,66,63,52,53, |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
477 | 54,55,56,57,58,59,60,61,66,66,66,65,66,66,66, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
478 | 10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,66,66,66,66,66,66,26,27,28, |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
479 | 29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,66,66, |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
480 | 66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66, |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
481 | 66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66, |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
482 | 66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66, |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
483 | 66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66, |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
484 | 66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66, |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
485 | 66,66,66,66,66,66 |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
486 | }; |
39
3e55bed345f9
added some aes functions + ucx update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
33
diff
changeset
|
487 | char* util_base64decode_len(char* in, int *outlen) { |
344
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
488 | /* code is mostly from wikibooks */ |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
489 | |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
490 | size_t inlen = strlen(in); |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
491 | size_t bufsize = (inlen*3) / 4; |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
492 | char *outbuf = malloc(bufsize+1); |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
493 | *outlen = -1; |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
494 | |
349
0b4ecadaf3f9
ports openssl code to commoncrypto (macos)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
344
diff
changeset
|
495 | unsigned char *out = (unsigned char*)outbuf; |
344
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
496 | |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
497 | char *end = in + inlen; |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
498 | char iter = 0; |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
499 | uint32_t buf = 0; |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
500 | size_t len = 0; |
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
501 | |
344
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
502 | while (in < end) { |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
503 | unsigned char c = b64dectable[*in++]; |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
504 | |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
505 | switch (c) { |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
506 | case WHITESPACE: continue; /* skip whitespace */ |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
507 | case INVALID: { |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
508 | /* invalid input */ |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
509 | outbuf[0] = 0; |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
510 | return outbuf; |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
511 | } |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
512 | case EQUALS: { |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
513 | /* pad character, end of data */ |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
514 | in = end; |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
515 | continue; |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
516 | } |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
517 | default: { |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
518 | buf = buf << 6 | c; |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
519 | iter++; // increment the number of iteration |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
520 | /* If the buffer is full, split it into bytes */ |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
521 | if (iter == 4) { |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
522 | if ((len += 3) > bufsize) { |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
523 | /* buffer overflow */ |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
524 | outbuf[0] = 0; |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
525 | return outbuf; |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
526 | } |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
527 | *(out++) = (buf >> 16) & 255; |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
528 | *(out++) = (buf >> 8) & 255; |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
529 | *(out++) = buf & 255; |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
530 | buf = 0; iter = 0; |
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
531 | |
344
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
532 | } |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
533 | } |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
534 | } |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
535 | } |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
536 | |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
537 | if (iter == 3) { |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
538 | if ((len += 2) > bufsize) { |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
539 | /* buffer overflow */ |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
540 | outbuf[0] = 0; |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
541 | return outbuf; |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
542 | } |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
543 | *(out++) = (buf >> 10) & 255; |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
544 | *(out++) = (buf >> 2) & 255; |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
545 | } |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
546 | else if (iter == 2) { |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
547 | if (++len > bufsize) { |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
548 | /* buffer overflow */ |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
549 | outbuf[0] = 0; |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
550 | return outbuf; |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
551 | } |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
552 | *(out++) = (buf >> 4) & 255; |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
553 | } |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
554 | |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
555 | *outlen = len; /* modify to reflect the actual output size */ |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
556 | outbuf[len] = 0; |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
557 | return outbuf; |
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
558 | } |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
559 | |
39
3e55bed345f9
added some aes functions + ucx update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
33
diff
changeset
|
560 | |
344
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
561 | static char* b64enctable = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
562 | char* util_base64encode(char *in, size_t len) { |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
563 | // calculate length of base64 output and create buffer |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
564 | size_t outlen = 4 * ((len + 2) / 3); |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
565 | int pad = len % 3; |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
566 | |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
567 | char *out = malloc(outlen + 1); |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
568 | out[outlen] = 0; |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
569 | size_t pos = 0; |
39
3e55bed345f9
added some aes functions + ucx update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
33
diff
changeset
|
570 | |
344
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
571 | // encode blocks of 3 bytes |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
572 | size_t i; |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
573 | size_t blockend = len - pad; |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
574 | for(i=0;i<blockend;i++) { |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
575 | unsigned char b1 = in[i++]; |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
576 | unsigned char b2 = in[i++]; |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
577 | unsigned char b3 = in[i]; |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
578 | uint32_t inb = b1 << 16 | (b2 << 8) | b3; |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
579 | out[pos++] = b64enctable[(inb >> 18) & 63]; |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
580 | out[pos++] = b64enctable[(inb >> 12) & 63]; |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
581 | out[pos++] = b64enctable[(inb >> 6) & 63]; |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
582 | out[pos++] = b64enctable[(inb) & 63]; |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
583 | } |
39
3e55bed345f9
added some aes functions + ucx update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
33
diff
changeset
|
584 | |
344
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
585 | // encode last bytes |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
586 | if(pad > 0) { |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
587 | char p[3] = {0, 0, 0}; |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
588 | for(int j=0;i<len;i++) { |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
589 | p[j++] = in[i]; |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
590 | } |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
591 | unsigned char b1 = p[0]; |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
592 | unsigned char b2 = p[1]; |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
593 | unsigned char b3 = p[2]; |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
594 | uint32_t inb = (b1 << 16) | (b2 << 8) | b3; |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
595 | out[pos++] = b64enctable[(inb >> 18) & 63]; |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
596 | out[pos++] = b64enctable[(inb >> 12) & 63]; |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
597 | out[pos++] = b64enctable[(inb >> 6) & 63]; |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
598 | out[pos++] = b64enctable[(inb) & 63]; |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
599 | for(int k=outlen-1;k>=outlen-(3-pad);k--) { |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
600 | out[k] = '='; |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
601 | } |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
602 | } |
72791e299d64
removes openssl dependencies for base64
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
337
diff
changeset
|
603 | |
39
3e55bed345f9
added some aes functions + ucx update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
33
diff
changeset
|
604 | return out; |
3e55bed345f9
added some aes functions + ucx update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
33
diff
changeset
|
605 | } |
3e55bed345f9
added some aes functions + ucx update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
33
diff
changeset
|
606 | |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
607 | char* util_encrypt_str(DavSession *sn, char *str, char *key) { |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
608 | DavKey *k = dav_context_get_key(sn->context, key); |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
609 | if(!k) { |
225
a297c2e28fa1
improved error handling in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
189
diff
changeset
|
610 | sn->error = DAV_ERROR; |
a297c2e28fa1
improved error handling in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
189
diff
changeset
|
611 | sstr_t err = ucx_sprintf("Key %s not found", key); |
a297c2e28fa1
improved error handling in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
189
diff
changeset
|
612 | dav_session_set_errstr(sn, err.ptr); |
a297c2e28fa1
improved error handling in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
189
diff
changeset
|
613 | free(err.ptr); |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
614 | return NULL; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
615 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
616 | |
147
458a8dc68048
added password based keys and fixed crash when keys are missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
124
diff
changeset
|
617 | return util_encrypt_str_k(sn, str, k); |
458a8dc68048
added password based keys and fixed crash when keys are missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
124
diff
changeset
|
618 | } |
458a8dc68048
added password based keys and fixed crash when keys are missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
124
diff
changeset
|
619 | |
458a8dc68048
added password based keys and fixed crash when keys are missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
124
diff
changeset
|
620 | char* util_encrypt_str_k(DavSession *sn, char *str, DavKey *key) { |
150
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
149
diff
changeset
|
621 | char *enc_str = aes_encrypt(str, strlen(str), key); |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
622 | char *ret_str = dav_session_strdup(sn, enc_str); |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
623 | free(enc_str); |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
624 | return ret_str; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
625 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
626 | |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
627 | char* util_decrypt_str(DavSession *sn, char *str, char *key) { |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
628 | DavKey *k = dav_context_get_key(sn->context, key); |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
629 | if(!k) { |
225
a297c2e28fa1
improved error handling in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
189
diff
changeset
|
630 | sn->error = DAV_ERROR; |
a297c2e28fa1
improved error handling in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
189
diff
changeset
|
631 | sstr_t err = ucx_sprintf("Key %s not found", key); |
a297c2e28fa1
improved error handling in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
189
diff
changeset
|
632 | dav_session_set_errstr(sn, err.ptr); |
a297c2e28fa1
improved error handling in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
189
diff
changeset
|
633 | free(err.ptr); |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
634 | return NULL; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
635 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
636 | |
147
458a8dc68048
added password based keys and fixed crash when keys are missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
124
diff
changeset
|
637 | return util_decrypt_str_k(sn, str, k); |
458a8dc68048
added password based keys and fixed crash when keys are missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
124
diff
changeset
|
638 | } |
458a8dc68048
added password based keys and fixed crash when keys are missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
124
diff
changeset
|
639 | |
458a8dc68048
added password based keys and fixed crash when keys are missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
124
diff
changeset
|
640 | char* util_decrypt_str_k(DavSession *sn, char *str, DavKey *key) { |
150
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
149
diff
changeset
|
641 | size_t len = 0; |
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
149
diff
changeset
|
642 | char *dec_str = aes_decrypt(str, &len, key); |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
643 | char *ret_str = dav_session_strdup(sn, dec_str); |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
644 | free(dec_str); |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
645 | return ret_str; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
646 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
647 | |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
648 | char* util_random_str() { |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
649 | unsigned char *str = malloc(25); |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
650 | str[24] = '\0'; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
651 | |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
652 | sstr_t t = S( |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
653 | "01234567890" |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
654 | "abcdefghijklmnopqrstuvwxyz" |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
655 | "ABCDEFGHIJKLMNOPQRSTUVWXYZ"); |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
656 | const unsigned char *table = (const unsigned char*)t.ptr; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
657 | |
349
0b4ecadaf3f9
ports openssl code to commoncrypto (macos)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
344
diff
changeset
|
658 | #ifdef DAV_USE_OPENSSL |
337
d7bda914d120
replaces RAND_pseudo_bytes with RAND_bytes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
329
diff
changeset
|
659 | RAND_bytes(str, 24); |
349
0b4ecadaf3f9
ports openssl code to commoncrypto (macos)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
344
diff
changeset
|
660 | #else |
0b4ecadaf3f9
ports openssl code to commoncrypto (macos)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
344
diff
changeset
|
661 | dav_rand_bytes(str, 24); |
0b4ecadaf3f9
ports openssl code to commoncrypto (macos)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
344
diff
changeset
|
662 | #endif |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
663 | for(int i=0;i<24;i++) { |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
664 | int c = str[i] % t.length; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
665 | str[i] = table[c]; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
666 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
667 | |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
668 | return (char*)str; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
669 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
670 | |
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
671 | /* |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
672 | * gets a substring from 0 to the appearance of the token |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
673 | * tokens are separated by space |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
674 | * sets sub to the substring and returns the remaining string |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
675 | */ |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
676 | sstr_t util_getsubstr_until_token(sstr_t str, sstr_t token, sstr_t *sub) { |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
677 | int i; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
678 | int token_start = -1; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
679 | int token_end = -1; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
680 | for(i=0;i<=str.length;i++) { |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
681 | int c; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
682 | if(i == str.length) { |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
683 | c = ' '; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
684 | } else { |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
685 | c = str.ptr[i]; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
686 | } |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
687 | if(c < 33) { |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
688 | if(token_start != -1) { |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
689 | token_end = i; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
690 | size_t len = token_end - token_start; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
691 | sstr_t tk = sstrsubsl(str, token_start, len); |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
692 | //printf("token: {%.*s}\n", token.length, token.ptr); |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
693 | if(!sstrcmp(tk, token)) { |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
694 | *sub = sstrtrim(sstrsubsl(str, 0, token_start)); |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
695 | break; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
696 | } |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
697 | token_start = -1; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
698 | token_end = -1; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
699 | } |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
700 | } else { |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
701 | if(token_start == -1) { |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
702 | token_start = i; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
703 | } |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
704 | } |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
705 | } |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
706 | |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
707 | if(i < str.length) { |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
708 | return sstrtrim(sstrsubs(str, i)); |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
709 | } else { |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
710 | str.ptr = NULL; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
711 | str.length = 0; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
712 | return str; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
713 | } |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
714 | } |
119
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
715 | |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
716 | sstr_t util_readline(FILE *stream) { |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
717 | UcxBuffer *buf = ucx_buffer_new(NULL, 128, UCX_BUFFER_AUTOEXTEND); |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
718 | |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
719 | int c; |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
720 | while((c = fgetc(stream)) != '\n') { |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
721 | ucx_buffer_putc(buf, c); |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
722 | } |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
723 | |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
724 | sstr_t str = sstrdup(sstrtrim(sstrn(buf->space, buf->size))); |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
725 | ucx_buffer_free(buf); |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
726 | return str; |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
727 | } |
147
458a8dc68048
added password based keys and fixed crash when keys are missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
124
diff
changeset
|
728 | |
458a8dc68048
added password based keys and fixed crash when keys are missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
124
diff
changeset
|
729 | char* util_password_input(char *prompt) { |
458a8dc68048
added password based keys and fixed crash when keys are missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
124
diff
changeset
|
730 | fprintf(stderr, "%s", prompt); |
458a8dc68048
added password based keys and fixed crash when keys are missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
124
diff
changeset
|
731 | fflush(stderr); |
458a8dc68048
added password based keys and fixed crash when keys are missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
124
diff
changeset
|
732 | |
153
272173064319
implemented hidden password input for windows by using conio
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
733 | #ifndef _WIN32 |
147
458a8dc68048
added password based keys and fixed crash when keys are missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
124
diff
changeset
|
734 | // hide terminal input |
458a8dc68048
added password based keys and fixed crash when keys are missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
124
diff
changeset
|
735 | struct termios oflags, nflags; |
458a8dc68048
added password based keys and fixed crash when keys are missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
124
diff
changeset
|
736 | tcgetattr(fileno(stdin), &oflags); |
458a8dc68048
added password based keys and fixed crash when keys are missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
124
diff
changeset
|
737 | nflags = oflags; |
458a8dc68048
added password based keys and fixed crash when keys are missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
124
diff
changeset
|
738 | nflags.c_lflag &= ~ECHO; |
458a8dc68048
added password based keys and fixed crash when keys are missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
124
diff
changeset
|
739 | nflags.c_lflag |= ECHONL; |
458a8dc68048
added password based keys and fixed crash when keys are missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
124
diff
changeset
|
740 | if (tcsetattr(fileno(stdin), TCSANOW, &nflags) != 0) { |
458a8dc68048
added password based keys and fixed crash when keys are missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
124
diff
changeset
|
741 | perror("tcsetattr"); |
458a8dc68048
added password based keys and fixed crash when keys are missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
124
diff
changeset
|
742 | } |
458a8dc68048
added password based keys and fixed crash when keys are missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
124
diff
changeset
|
743 | #endif |
458a8dc68048
added password based keys and fixed crash when keys are missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
124
diff
changeset
|
744 | |
458a8dc68048
added password based keys and fixed crash when keys are missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
124
diff
changeset
|
745 | // read password input |
458a8dc68048
added password based keys and fixed crash when keys are missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
124
diff
changeset
|
746 | UcxBuffer *buf = ucx_buffer_new(NULL, 128, UCX_BUFFER_AUTOEXTEND); |
458a8dc68048
added password based keys and fixed crash when keys are missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
124
diff
changeset
|
747 | int c = 0; |
153
272173064319
implemented hidden password input for windows by using conio
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
748 | while((c = getpasswordchar()) != EOF) { |
272173064319
implemented hidden password input for windows by using conio
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
749 | if(c == '\n' || c == '\r') { |
147
458a8dc68048
added password based keys and fixed crash when keys are missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
124
diff
changeset
|
750 | break; |
458a8dc68048
added password based keys and fixed crash when keys are missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
124
diff
changeset
|
751 | } |
458a8dc68048
added password based keys and fixed crash when keys are missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
124
diff
changeset
|
752 | ucx_buffer_putc(buf, c); |
458a8dc68048
added password based keys and fixed crash when keys are missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
124
diff
changeset
|
753 | } |
458a8dc68048
added password based keys and fixed crash when keys are missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
124
diff
changeset
|
754 | ucx_buffer_putc(buf, 0); |
153
272173064319
implemented hidden password input for windows by using conio
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
755 | fflush(stdin); |
147
458a8dc68048
added password based keys and fixed crash when keys are missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
124
diff
changeset
|
756 | |
153
272173064319
implemented hidden password input for windows by using conio
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
757 | #ifndef _WIN32 |
147
458a8dc68048
added password based keys and fixed crash when keys are missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
124
diff
changeset
|
758 | // restore terminal settings |
458a8dc68048
added password based keys and fixed crash when keys are missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
124
diff
changeset
|
759 | if (tcsetattr(fileno(stdin), TCSANOW, &oflags) != 0) { |
458a8dc68048
added password based keys and fixed crash when keys are missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
124
diff
changeset
|
760 | perror("tcsetattr"); |
458a8dc68048
added password based keys and fixed crash when keys are missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
124
diff
changeset
|
761 | } |
458a8dc68048
added password based keys and fixed crash when keys are missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
124
diff
changeset
|
762 | #endif |
458a8dc68048
added password based keys and fixed crash when keys are missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
124
diff
changeset
|
763 | |
458a8dc68048
added password based keys and fixed crash when keys are missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
124
diff
changeset
|
764 | char *str = buf->space; |
458a8dc68048
added password based keys and fixed crash when keys are missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
124
diff
changeset
|
765 | free(buf); // only free the UcxBuffer struct |
458a8dc68048
added password based keys and fixed crash when keys are missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
124
diff
changeset
|
766 | return str; |
458a8dc68048
added password based keys and fixed crash when keys are missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
124
diff
changeset
|
767 | } |
458a8dc68048
added password based keys and fixed crash when keys are missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
124
diff
changeset
|
768 | |
150
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
149
diff
changeset
|
769 | |
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
149
diff
changeset
|
770 | char* util_hexstr(unsigned char *data, size_t len) { |
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
149
diff
changeset
|
771 | size_t buflen = 2*len + 4; |
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
149
diff
changeset
|
772 | UcxBuffer *buf = ucx_buffer_new(malloc(buflen), buflen + 1, 0); |
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
149
diff
changeset
|
773 | for(int i=0;i<len;i++) { |
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
149
diff
changeset
|
774 | ucx_bprintf(buf, "%x", data[i]); |
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
149
diff
changeset
|
775 | } |
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
149
diff
changeset
|
776 | ucx_buffer_putc(buf, 0); |
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
149
diff
changeset
|
777 | char *str = buf->space; |
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
149
diff
changeset
|
778 | ucx_buffer_free(buf); |
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
149
diff
changeset
|
779 | return str; |
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
149
diff
changeset
|
780 | } |