Sun, 15 Sep 2024 09:47:36 +0200
improve sessionhandler trace logging
10 | 1 | /* |
2 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. | |
3 | * | |
44
3da1f7b6847f
added some error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
39
diff
changeset
|
4 | * Copyright 2013 Olaf Wintermann. All rights reserved. |
10 | 5 | * |
6 | * Redistribution and use in source and binary forms, with or without | |
7 | * modification, are permitted provided that the following conditions are met: | |
8 | * | |
9 | * 1. Redistributions of source code must retain the above copyright | |
10 | * notice, this list of conditions and the following disclaimer. | |
11 | * | |
12 | * 2. Redistributions in binary form must reproduce the above copyright | |
13 | * notice, this list of conditions and the following disclaimer in the | |
14 | * documentation and/or other materials provided with the distribution. | |
15 | * | |
16 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | |
17 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | |
18 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | |
19 | * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE | |
20 | * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | |
21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | |
22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | |
23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | |
24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |
25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |
26 | * POSSIBILITY OF SUCH DAMAGE. | |
27 | */ | |
28 | ||
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
201
diff
changeset
|
29 | #include <cx/string.h> |
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
201
diff
changeset
|
30 | #include <cx/map.h> |
92
382bff43c6eb
fixed some includes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
87
diff
changeset
|
31 | |
10 | 32 | #include "objecttype.h" |
14
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
10
diff
changeset
|
33 | #include "../util/pblock.h" |
10 | 34 | |
39
de4bc3cd2d36
added mime type configuration file
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
20
diff
changeset
|
35 | #include "../daemon/config.h" |
de4bc3cd2d36
added mime type configuration file
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
20
diff
changeset
|
36 | #include "../daemon/session.h" |
10 | 37 | |
38 | int object_type_by_extension(pblock *pb, Session *sn, Request *rq) { | |
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
201
diff
changeset
|
39 | cxstring path = cx_str(pblock_findkeyval(pb_key_path, rq->vars)); |
116
d7a186cf87f6
adds find-pathinfo saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
92
diff
changeset
|
40 | //printf("\nobject_type_by_extension: {%s}[%d]\n\n", path); |
17
d2a97bbeb57d
Added init.conf parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
41 | |
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
201
diff
changeset
|
42 | cxstring ct; |
116
d7a186cf87f6
adds find-pathinfo saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
92
diff
changeset
|
43 | if(path.ptr[path.length - 1] == '/') { |
77 | 44 | // directory |
428
ab58e46b50a5
improve error handling in send_file if the file is a directory
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
45 | ct = (cxstring)CX_STR(OBJTYPE_INTERNAL_DIRECTORY); |
10 | 46 | } else { |
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
201
diff
changeset
|
47 | cxstring ext; |
10 | 48 | ext.length = 0; |
116
d7a186cf87f6
adds find-pathinfo saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
92
diff
changeset
|
49 | for(int i=path.length - 1;i>=0;i--) { |
d7a186cf87f6
adds find-pathinfo saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
92
diff
changeset
|
50 | if(path.ptr[i] == '.') { |
d7a186cf87f6
adds find-pathinfo saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
92
diff
changeset
|
51 | ext.ptr = path.ptr + i + 1; |
d7a186cf87f6
adds find-pathinfo saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
92
diff
changeset
|
52 | ext.length = path.length - i - 1; |
201
196a3caebdc7
fix file extension detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
116
diff
changeset
|
53 | break; |
10 | 54 | } |
55 | } | |
56 | ||
57 | if(ext.length == 0) { | |
77 | 58 | // no extension, no type |
10 | 59 | return REQ_NOACTION; |
60 | } | |
61 | ||
77 | 62 | // get the mime type for the ext from the server configuration |
39
de4bc3cd2d36
added mime type configuration file
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
20
diff
changeset
|
63 | ServerConfiguration *config = session_get_config(sn); |
87
bdec069d2239
fixed pathcheck behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
64 | |
bdec069d2239
fixed pathcheck behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
65 | WS_ASSERT(config); |
bdec069d2239
fixed pathcheck behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
66 | WS_ASSERT(config->mimetypes); |
bdec069d2239
fixed pathcheck behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
67 | WS_ASSERT(config->mimetypes->map); |
bdec069d2239
fixed pathcheck behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
68 | |
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
201
diff
changeset
|
69 | char *type = cxMapGet(config->mimetypes->map, cx_hash_key_bytes((const unsigned char*)ext.ptr, ext.length)); |
39
de4bc3cd2d36
added mime type configuration file
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
20
diff
changeset
|
70 | |
de4bc3cd2d36
added mime type configuration file
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
20
diff
changeset
|
71 | if(!type) { |
20
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
72 | return REQ_NOACTION; |
10 | 73 | } |
39
de4bc3cd2d36
added mime type configuration file
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
20
diff
changeset
|
74 | |
de4bc3cd2d36
added mime type configuration file
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
20
diff
changeset
|
75 | ct.ptr = type; |
de4bc3cd2d36
added mime type configuration file
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
20
diff
changeset
|
76 | ct.length = strlen(type); |
10 | 77 | } |
78 | ||
79 | pblock_kvinsert(pb_key_content_type, ct.ptr, ct.length, rq->srvhdrs); | |
80 | return REQ_PROCEED; | |
81 | } | |
466
019c22775f7c
add force-type SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
428
diff
changeset
|
82 | |
019c22775f7c
add force-type SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
428
diff
changeset
|
83 | int object_type_force_type(pblock *pb, Session *sn, Request *rq) { |
019c22775f7c
add force-type SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
428
diff
changeset
|
84 | char *type = pblock_findkeyval(pb_key_type, pb); |
019c22775f7c
add force-type SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
428
diff
changeset
|
85 | |
019c22775f7c
add force-type SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
428
diff
changeset
|
86 | if(!type) { |
019c22775f7c
add force-type SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
428
diff
changeset
|
87 | return REQ_NOACTION; |
019c22775f7c
add force-type SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
428
diff
changeset
|
88 | } |
019c22775f7c
add force-type SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
428
diff
changeset
|
89 | |
019c22775f7c
add force-type SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
428
diff
changeset
|
90 | char *ct = pblock_findkeyval(pb_key_content_type, rq->srvhdrs); |
019c22775f7c
add force-type SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
428
diff
changeset
|
91 | if(ct) { |
019c22775f7c
add force-type SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
428
diff
changeset
|
92 | return REQ_NOACTION; |
019c22775f7c
add force-type SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
428
diff
changeset
|
93 | } |
019c22775f7c
add force-type SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
428
diff
changeset
|
94 | |
019c22775f7c
add force-type SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
428
diff
changeset
|
95 | pblock_kvinsert(pb_key_content_type, type, strlen(type), rq->srvhdrs); |
019c22775f7c
add force-type SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
428
diff
changeset
|
96 | |
019c22775f7c
add force-type SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
428
diff
changeset
|
97 | return REQ_PROCEED; |
019c22775f7c
add force-type SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
428
diff
changeset
|
98 | } |