Mon, 16 Jan 2017 14:41:20 +0100
fixes cgi cleanup
1 | 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:
23
diff
changeset
|
4 | * Copyright 2013 Olaf Wintermann. All rights reserved. |
1 | 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 | ||
29 | #include "request.h" | |
30 | ||
14
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
6
diff
changeset
|
31 | #include "../util/pblock.h" |
1 | 32 | #include "httprequest.h" |
82
740cfd9dd443
added some nsapi stuff
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
61
diff
changeset
|
33 | #include "../public/vfs.h" |
1 | 34 | |
35 | ||
36 | /* Code from req.cpp */ | |
21
627b09ee74e4
New configuration loader
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
37 | /* TODO: fremden Code durch eigenen ersetzen */ |
1 | 38 | |
39 | /* -------------------------- request_initialize -------------------------- */ | |
40 | ||
41 | int request_initialize( | |
42 | pool_handle_t *pool, | |
43 | HTTPRequest *hrq, | |
44 | NSAPIRequest *nrq) | |
45 | { | |
46 | Request *rq = &nrq->rq; | |
47 | ||
48 | rq->vars = pblock_create_pool(pool, REQ_HASHSIZE); | |
49 | if (!rq->vars) | |
50 | return 1; | |
51 | rq->reqpb = pblock_create_pool(pool, REQ_HASHSIZE); | |
52 | if (!rq->reqpb) | |
53 | return 1; | |
54 | rq->loadhdrs = 0; | |
55 | rq->headers = pblock_create_pool(pool, REQ_HASHSIZE); | |
56 | if (!rq->headers) | |
57 | return 1; | |
58 | rq->senthdrs = 0; | |
59 | rq->srvhdrs = pblock_create_pool(pool, REQ_HASHSIZE); | |
60 | if (!rq->srvhdrs) | |
61 | return 1; | |
62 | ||
63 | rq->os = NULL; | |
64 | rq->tmpos = NULL; | |
65 | rq->statpath = NULL; | |
66 | rq->staterr = NULL; | |
67 | rq->finfo = NULL; | |
68 | rq->aclstate = 0; | |
69 | rq->acldirno = 0; | |
70 | rq->aclname = NULL; | |
71 | rq->aclpb = NULL; | |
72 | rq->acllist = NULL; | |
52
aced2245fb1c
new pathcheck saf and code cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
73 | rq->aclreqaccess = 0; |
1 | 74 | rq->request_is_cacheable = 0; |
75 | rq->directive_is_cacheable = 0; | |
76 | rq->cached_headers = NULL; | |
77 | rq->cached_headers_len = 0; | |
78 | rq->unused = NULL; | |
79 | //rq->req_start = ft_time(); // TODO: ft_time | |
80 | rq->protv_num = 0; | |
81 | rq->method_num = -1; | |
82 | //PR_ASSERT(sizeof(rq->rq_attr) == sizeof(RQATTR)); // TODO: assert | |
83 | *(RQATTR *) &rq->rq_attr = 0; | |
84 | //rq->hostname = pool_strdup(pool, hostname); // TODO: hostname | |
85 | rq->allowed = 0; | |
86 | rq->byterange = 0; | |
87 | rq->status_num = 0; | |
88 | rq->staterrno = 0; | |
89 | rq->orig_rq = rq; | |
90 | ||
91 | // TODO: nrq | |
92 | ||
6
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
93 | /* NSAPI execution context */ |
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
94 | nrq->context.last_req_code = REQ_NOACTION; |
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
95 | |
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
96 | nrq->context.objset_index = -1; |
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
97 | nrq->context.dtable_index = 0; |
84
afd57ce39ec9
added initial java plugin code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
82
diff
changeset
|
98 | |
121
a881dc866e23
adds more CGI stuff
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
116
diff
changeset
|
99 | // host and port |
a881dc866e23
adds more CGI stuff
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
116
diff
changeset
|
100 | |
a881dc866e23
adds more CGI stuff
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
116
diff
changeset
|
101 | |
84
afd57ce39ec9
added initial java plugin code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
82
diff
changeset
|
102 | nrq->jvm_context = NULL; |
6
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
103 | |
23
a2c8fc23c90e
Added basic authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
21
diff
changeset
|
104 | |
a2c8fc23c90e
Added basic authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
21
diff
changeset
|
105 | // new |
a2c8fc23c90e
Added basic authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
21
diff
changeset
|
106 | rq->status_num = -1; |
54 | 107 | rq->vfs = NULL; |
59
ab25c0a231d0
some fixes and new public APIs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
108 | rq->davCollection = NULL; |
121
a881dc866e23
adds more CGI stuff
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
116
diff
changeset
|
109 | |
1 | 110 | return 0; |
111 | } | |
61
c858850f3d3a
improved configuration reloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
112 | |
c858850f3d3a
improved configuration reloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
113 | const VirtualServer* request_get_vs(Request *rq) { |
c858850f3d3a
improved configuration reloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
114 | return ((NSAPIRequest*)rq)->vs; |
c858850f3d3a
improved configuration reloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
115 | } |
82
740cfd9dd443
added some nsapi stuff
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
61
diff
changeset
|
116 | |
740cfd9dd443
added some nsapi stuff
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
61
diff
changeset
|
117 | struct stat* request_stat_path(const char *path, Request *rq) { |
740cfd9dd443
added some nsapi stuff
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
61
diff
changeset
|
118 | // TODO: reimplement with vfs support |
740cfd9dd443
added some nsapi stuff
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
61
diff
changeset
|
119 | // TODO: use pool |
740cfd9dd443
added some nsapi stuff
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
61
diff
changeset
|
120 | struct stat *s = malloc(sizeof(struct stat)); |
740cfd9dd443
added some nsapi stuff
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
61
diff
changeset
|
121 | if(stat(path, s)) { |
145
1c93281ca4bf
fixes memory leaks in request_stat_path and send_cgi
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
121
diff
changeset
|
122 | free(s); |
82
740cfd9dd443
added some nsapi stuff
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
61
diff
changeset
|
123 | return NULL; |
740cfd9dd443
added some nsapi stuff
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
61
diff
changeset
|
124 | } |
740cfd9dd443
added some nsapi stuff
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
61
diff
changeset
|
125 | // TODO: statpath and staterror |
740cfd9dd443
added some nsapi stuff
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
61
diff
changeset
|
126 | rq->finfo = s; |
740cfd9dd443
added some nsapi stuff
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
61
diff
changeset
|
127 | return s; |
740cfd9dd443
added some nsapi stuff
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
61
diff
changeset
|
128 | } |
740cfd9dd443
added some nsapi stuff
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
61
diff
changeset
|
129 | |
116
d7a186cf87f6
adds find-pathinfo saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
130 | int request_set_path(sstr_t root, sstr_t path, pblock *vars) { |
d7a186cf87f6
adds find-pathinfo saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
131 | // TODO: maybe replace this code with request_set_path from req.cpp |
d7a186cf87f6
adds find-pathinfo saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
132 | |
d7a186cf87f6
adds find-pathinfo saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
133 | // concat path |
d7a186cf87f6
adds find-pathinfo saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
134 | size_t length = root.length + path.length; |
d7a186cf87f6
adds find-pathinfo saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
135 | char *translated_path = alloca(length + 1); |
d7a186cf87f6
adds find-pathinfo saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
136 | memcpy(translated_path, root.ptr, root.length); |
d7a186cf87f6
adds find-pathinfo saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
137 | if(root.ptr[root.length-1] == '/') { |
d7a186cf87f6
adds find-pathinfo saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
138 | memcpy(translated_path + root.length, path.ptr, path.length); |
d7a186cf87f6
adds find-pathinfo saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
139 | } else { |
d7a186cf87f6
adds find-pathinfo saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
140 | translated_path[root.length] = '/'; |
d7a186cf87f6
adds find-pathinfo saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
141 | memcpy(translated_path + root.length + 1, path.ptr, path.length); |
d7a186cf87f6
adds find-pathinfo saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
142 | length++; |
d7a186cf87f6
adds find-pathinfo saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
143 | } |
d7a186cf87f6
adds find-pathinfo saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
144 | |
d7a186cf87f6
adds find-pathinfo saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
145 | // add path to specified pblock |
d7a186cf87f6
adds find-pathinfo saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
146 | pblock_kvinsert( |
d7a186cf87f6
adds find-pathinfo saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
147 | pb_key_ppath, |
d7a186cf87f6
adds find-pathinfo saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
148 | translated_path, |
d7a186cf87f6
adds find-pathinfo saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
149 | length, |
d7a186cf87f6
adds find-pathinfo saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
150 | vars); |
d7a186cf87f6
adds find-pathinfo saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
151 | |
d7a186cf87f6
adds find-pathinfo saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
152 | pblock_kvinsert(pb_key_ntrans_base, root.ptr, root.length, vars); |
d7a186cf87f6
adds find-pathinfo saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
153 | |
d7a186cf87f6
adds find-pathinfo saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
154 | return REQ_PROCEED; |
d7a186cf87f6
adds find-pathinfo saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
155 | } |
d7a186cf87f6
adds find-pathinfo saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
156 | |
82
740cfd9dd443
added some nsapi stuff
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
61
diff
changeset
|
157 | void request_free(Request *rq) { |
740cfd9dd443
added some nsapi stuff
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
61
diff
changeset
|
158 | // TODO: implement |
740cfd9dd443
added some nsapi stuff
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
61
diff
changeset
|
159 | } |
740cfd9dd443
added some nsapi stuff
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
61
diff
changeset
|
160 | |
740cfd9dd443
added some nsapi stuff
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
61
diff
changeset
|
161 | Request* request_restart_internal(const char *uri, Request *rq) { |
740cfd9dd443
added some nsapi stuff
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
61
diff
changeset
|
162 | // TODO: implement |
740cfd9dd443
added some nsapi stuff
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
61
diff
changeset
|
163 | return NULL; |
740cfd9dd443
added some nsapi stuff
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
61
diff
changeset
|
164 | } |
740cfd9dd443
added some nsapi stuff
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
61
diff
changeset
|
165 | |
740cfd9dd443
added some nsapi stuff
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
61
diff
changeset
|
166 | |
740cfd9dd443
added some nsapi stuff
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
61
diff
changeset
|
167 | char* servact_translate_uri(char *uri, Session *sn) { |
740cfd9dd443
added some nsapi stuff
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
61
diff
changeset
|
168 | // TODO: implement |
740cfd9dd443
added some nsapi stuff
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
61
diff
changeset
|
169 | return NULL; |
740cfd9dd443
added some nsapi stuff
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
61
diff
changeset
|
170 | } |