Fri, 05 Dec 2025 17:37:48 +0100
add session_create
| 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:
38
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 <stdio.h> | |
| 30 | #include <stdlib.h> | |
|
121
a881dc866e23
adds more CGI stuff
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
117
diff
changeset
|
31 | #include <limits.h> |
|
35
4417619a9bbd
using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
32 | |
|
24
1a7853a4257e
removed some NSPR dependencies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
23
diff
changeset
|
33 | #include <arpa/inet.h> |
|
9
30e51941a673
Added mod_jk dependencies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
8
diff
changeset
|
34 | |
|
14
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
12
diff
changeset
|
35 | #include "../public/nsapi.h" |
|
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
12
diff
changeset
|
36 | #include "../util/pool.h" |
|
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
12
diff
changeset
|
37 | #include "../util/pblock.h" |
|
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
12
diff
changeset
|
38 | #include "../util/io.h" |
|
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
12
diff
changeset
|
39 | #include "../util/util.h" |
| 1 | 40 | #include "httprequest.h" |
|
18
73aacbf6e492
Added server.conf parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
41 | #include "config.h" |
|
3
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
42 | #include "vserver.h" |
|
159
9ba9f8befa80
makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
154
diff
changeset
|
43 | #include "event.h" |
|
19
d680536f8c2f
Added configuration manager
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
44 | #include "httplistener.h" |
|
84
afd57ce39ec9
added initial java plugin code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
83
diff
changeset
|
45 | #include "func.h" |
|
44
3da1f7b6847f
added some error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
38
diff
changeset
|
46 | #include "error.h" |
| 1 | 47 | |
|
46
636e05eb48f6
cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
48 | void http_request_init(HTTPRequest *req) { |
|
180
98462e878ca7
fixes crash with broken http requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
168
diff
changeset
|
49 | memset(req, 0, sizeof(HTTPRequest)); |
| 1 | 50 | |
| 51 | HeaderArray *hd = malloc(sizeof(HeaderArray)); | |
| 52 | hd->next = NULL; | |
| 53 | hd->len = 0; | |
| 54 | hd->headers = calloc(16, sizeof(Header)); | |
| 55 | hd->alloc = 16; | |
| 56 | ||
| 57 | req->headers = hd; | |
|
102
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
101
diff
changeset
|
58 | |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
101
diff
changeset
|
59 | req->req_start = time(NULL); |
| 1 | 60 | } |
| 61 | ||
|
101
7fbcdbad0baa
added support for absolute URIs and improved keep alive
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
96
diff
changeset
|
62 | void http_request_cleanup(HTTPRequest *req) { |
|
114
c3a0f1275d71
fixed keep alive bug
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
110
diff
changeset
|
63 | header_array_free(req->headers); |
|
c3a0f1275d71
fixed keep alive bug
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
110
diff
changeset
|
64 | free(req); |
|
101
7fbcdbad0baa
added support for absolute URIs and improved keep alive
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
96
diff
changeset
|
65 | } |
|
7fbcdbad0baa
added support for absolute URIs and improved keep alive
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
96
diff
changeset
|
66 | |
|
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
411
diff
changeset
|
67 | cxmutstr http_request_get_abspath(HTTPRequest *req) { |
|
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
411
diff
changeset
|
68 | cxmutstr uri = req->uri; |
|
101
7fbcdbad0baa
added support for absolute URIs and improved keep alive
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
96
diff
changeset
|
69 | |
|
7fbcdbad0baa
added support for absolute URIs and improved keep alive
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
96
diff
changeset
|
70 | int i = 0; |
|
7fbcdbad0baa
added support for absolute URIs and improved keep alive
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
96
diff
changeset
|
71 | if(uri.ptr[0] == '/') { |
|
7fbcdbad0baa
added support for absolute URIs and improved keep alive
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
96
diff
changeset
|
72 | return uri; |
|
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
411
diff
changeset
|
73 | } else if(cx_strprefix(cx_strcast(uri), (cxstring)CX_STR("http://"))) { |
|
101
7fbcdbad0baa
added support for absolute URIs and improved keep alive
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
96
diff
changeset
|
74 | i = 7; |
|
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
411
diff
changeset
|
75 | } else if(cx_strprefix(cx_strcast(uri), (cxstring)CX_STR("https://"))) { |
|
101
7fbcdbad0baa
added support for absolute URIs and improved keep alive
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
96
diff
changeset
|
76 | i = 8; |
|
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
411
diff
changeset
|
77 | } else if(!cx_strcmp(cx_strcast(uri), (cxstring)CX_STR("*"))) { |
|
101
7fbcdbad0baa
added support for absolute URIs and improved keep alive
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
96
diff
changeset
|
78 | return uri; |
|
7fbcdbad0baa
added support for absolute URIs and improved keep alive
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
96
diff
changeset
|
79 | } |
|
7fbcdbad0baa
added support for absolute URIs and improved keep alive
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
96
diff
changeset
|
80 | |
|
7fbcdbad0baa
added support for absolute URIs and improved keep alive
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
96
diff
changeset
|
81 | for(;i<uri.length;i++) { |
|
7fbcdbad0baa
added support for absolute URIs and improved keep alive
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
96
diff
changeset
|
82 | if(uri.ptr[i] == '/') { |
|
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
411
diff
changeset
|
83 | return cx_strsubs_m(uri, i); |
|
101
7fbcdbad0baa
added support for absolute URIs and improved keep alive
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
96
diff
changeset
|
84 | } |
|
7fbcdbad0baa
added support for absolute URIs and improved keep alive
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
96
diff
changeset
|
85 | } |
|
7fbcdbad0baa
added support for absolute URIs and improved keep alive
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
96
diff
changeset
|
86 | |
|
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
411
diff
changeset
|
87 | return (cxmutstr){ "/", 1 }; |
|
101
7fbcdbad0baa
added support for absolute URIs and improved keep alive
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
96
diff
changeset
|
88 | } |
|
7fbcdbad0baa
added support for absolute URIs and improved keep alive
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
96
diff
changeset
|
89 | |
|
159
9ba9f8befa80
makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
154
diff
changeset
|
90 | int handle_request(HTTPRequest *request, threadpool_t *thrpool, EventHandler *ev) { |
| 1 | 91 | // handle nsapi request |
|
154
6394ce09889a
adds set-variable saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
142
diff
changeset
|
92 | |
| 1 | 93 | // create pool |
|
46
636e05eb48f6
cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
94 | pool_handle_t *pool = pool_create(); |
|
544
27684460629f
fix memory leak in case handle_request fails (some illegal requests)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
531
diff
changeset
|
95 | if(!pool) { |
|
27684460629f
fix memory leak in case handle_request fails (some illegal requests)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
531
diff
changeset
|
96 | log_ereport(LOG_FAILURE, "cannot create new memory pool for http request"); |
|
27684460629f
fix memory leak in case handle_request fails (some illegal requests)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
531
diff
changeset
|
97 | return 1; |
|
27684460629f
fix memory leak in case handle_request fails (some illegal requests)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
531
diff
changeset
|
98 | } |
|
27684460629f
fix memory leak in case handle_request fails (some illegal requests)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
531
diff
changeset
|
99 | |
|
27684460629f
fix memory leak in case handle_request fails (some illegal requests)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
531
diff
changeset
|
100 | int ret = nsapi_start_request(request, thrpool, ev, pool); |
|
27684460629f
fix memory leak in case handle_request fails (some illegal requests)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
531
diff
changeset
|
101 | if(ret) { |
|
614
eb1c4d464ecd
improve error handling/logging in nsapi_start_request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
591
diff
changeset
|
102 | if(request->status != 0) { |
|
623
53b31a734cd1
send error response if nsapi_start_request fails
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
614
diff
changeset
|
103 | fatal_error(request, request->status); |
|
614
eb1c4d464ecd
improve error handling/logging in nsapi_start_request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
591
diff
changeset
|
104 | } |
|
544
27684460629f
fix memory leak in case handle_request fails (some illegal requests)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
531
diff
changeset
|
105 | pool_destroy(pool); |
|
27684460629f
fix memory leak in case handle_request fails (some illegal requests)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
531
diff
changeset
|
106 | } |
|
27684460629f
fix memory leak in case handle_request fails (some illegal requests)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
531
diff
changeset
|
107 | return ret; |
|
27684460629f
fix memory leak in case handle_request fails (some illegal requests)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
531
diff
changeset
|
108 | } |
| 1 | 109 | |
|
544
27684460629f
fix memory leak in case handle_request fails (some illegal requests)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
531
diff
changeset
|
110 | int nsapi_start_request(HTTPRequest *request, threadpool_t *thrpool, EventHandler *ev, pool_handle_t *pool) { |
|
557
e35829a3a6d8
add sessionhandler debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
544
diff
changeset
|
111 | log_ereport(LOG_DEBUG, "trace reqid: %016llx nsapi_start_request", (unsigned long long int)request->connection->id); |
|
e35829a3a6d8
add sessionhandler debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
544
diff
changeset
|
112 | |
| 1 | 113 | // create nsapi data structures |
|
211
2160585200ac
add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
193
diff
changeset
|
114 | NSAPISession *sn = nsapisession_create(pool); |
|
35
4417619a9bbd
using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
115 | if(sn == NULL) { |
|
614
eb1c4d464ecd
improve error handling/logging in nsapi_start_request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
591
diff
changeset
|
116 | log_ereport(LOG_FAILURE, "cannot start request: OOM"); |
|
eb1c4d464ecd
improve error handling/logging in nsapi_start_request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
591
diff
changeset
|
117 | request->status = 503; |
|
544
27684460629f
fix memory leak in case handle_request fails (some illegal requests)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
531
diff
changeset
|
118 | return 1; |
|
35
4417619a9bbd
using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
119 | } |
|
211
2160585200ac
add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
193
diff
changeset
|
120 | |
|
46
636e05eb48f6
cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
121 | NSAPIRequest *rq = pool_malloc(pool, sizeof(NSAPIRequest)); |
|
35
4417619a9bbd
using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
122 | if(rq == NULL) { |
|
614
eb1c4d464ecd
improve error handling/logging in nsapi_start_request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
591
diff
changeset
|
123 | log_ereport(LOG_FAILURE, "cannot start request: OOM"); |
|
eb1c4d464ecd
improve error handling/logging in nsapi_start_request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
591
diff
changeset
|
124 | request->status = 503; |
|
544
27684460629f
fix memory leak in case handle_request fails (some illegal requests)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
531
diff
changeset
|
125 | return 1; |
|
35
4417619a9bbd
using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
126 | } |
| 141 | 127 | ZERO(rq, sizeof(NSAPIRequest)); |
|
102
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
101
diff
changeset
|
128 | rq->rq.req_start = request->req_start; |
|
3
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
129 | rq->phase = NSAPIAuthTrans; |
| 1 | 130 | |
| 131 | // fill session structure | |
|
211
2160585200ac
add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
193
diff
changeset
|
132 | IOStream *io = NULL; |
|
2160585200ac
add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
193
diff
changeset
|
133 | if(nsapisession_setconnection(sn, request->connection, request->netbuf, &io)) { |
|
614
eb1c4d464ecd
improve error handling/logging in nsapi_start_request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
591
diff
changeset
|
134 | log_ereport(LOG_FAILURE, "cannot start request: OOM"); |
|
eb1c4d464ecd
improve error handling/logging in nsapi_start_request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
591
diff
changeset
|
135 | request->status = 503; |
|
544
27684460629f
fix memory leak in case handle_request fails (some illegal requests)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
531
diff
changeset
|
136 | return 1; |
|
211
2160585200ac
add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
193
diff
changeset
|
137 | } |
|
38
d07810b02147
added ldap authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
37
diff
changeset
|
138 | |
|
159
9ba9f8befa80
makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
154
diff
changeset
|
139 | if(!ev) { |
|
9ba9f8befa80
makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
154
diff
changeset
|
140 | ev = ev_instance(get_default_event_handler()); |
|
9ba9f8befa80
makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
154
diff
changeset
|
141 | } |
|
9ba9f8befa80
makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
154
diff
changeset
|
142 | sn->sn.ev = ev; |
|
211
2160585200ac
add propfind/proppatch parser and first iteration of the new webdav api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
193
diff
changeset
|
143 | |
|
38
d07810b02147
added ldap authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
37
diff
changeset
|
144 | // the session needs the current server configuration |
|
78
3578977d29a3
added keep-alive support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
145 | sn->config = request->connection->listener->cfg; |
| 1 | 146 | |
|
46
636e05eb48f6
cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
147 | // add ip to sn->client pblock |
|
396
77d81f2bb9f7
add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
361
diff
changeset
|
148 | if(request->connection->addr_type == CONN_ADDR_IPV4) { |
|
397
f202a655f4c2
convert ipv6 addr to string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
396
diff
changeset
|
149 | char ip_str[INET_ADDRSTRLEN]; |
|
396
77d81f2bb9f7
add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
361
diff
changeset
|
150 | if(inet_ntop( |
|
77d81f2bb9f7
add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
361
diff
changeset
|
151 | AF_INET, |
|
77d81f2bb9f7
add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
361
diff
changeset
|
152 | &request->connection->address.address_v4.sin_addr, |
|
77d81f2bb9f7
add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
361
diff
changeset
|
153 | ip_str, |
|
77d81f2bb9f7
add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
361
diff
changeset
|
154 | INET_ADDRSTRLEN) != NULL) |
|
77d81f2bb9f7
add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
361
diff
changeset
|
155 | { |
|
77d81f2bb9f7
add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
361
diff
changeset
|
156 | pblock_kvinsert(pb_key_ip, ip_str, INET_ADDRSTRLEN, sn->sn.client); |
|
77d81f2bb9f7
add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
361
diff
changeset
|
157 | } |
|
397
f202a655f4c2
convert ipv6 addr to string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
396
diff
changeset
|
158 | } else if(request->connection->addr_type == CONN_ADDR_IPV6) { |
|
f202a655f4c2
convert ipv6 addr to string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
396
diff
changeset
|
159 | char ip_str[INET6_ADDRSTRLEN]; |
|
f202a655f4c2
convert ipv6 addr to string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
396
diff
changeset
|
160 | if(inet_ntop( |
|
f202a655f4c2
convert ipv6 addr to string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
396
diff
changeset
|
161 | AF_INET6, |
|
f202a655f4c2
convert ipv6 addr to string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
396
diff
changeset
|
162 | &request->connection->address.address_v6.sin6_addr, |
|
f202a655f4c2
convert ipv6 addr to string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
396
diff
changeset
|
163 | ip_str, |
|
f202a655f4c2
convert ipv6 addr to string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
396
diff
changeset
|
164 | INET6_ADDRSTRLEN) != NULL) |
|
f202a655f4c2
convert ipv6 addr to string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
396
diff
changeset
|
165 | { |
|
f202a655f4c2
convert ipv6 addr to string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
396
diff
changeset
|
166 | pblock_kvinsert(pb_key_ip, ip_str, INET6_ADDRSTRLEN, sn->sn.client); |
|
f202a655f4c2
convert ipv6 addr to string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
396
diff
changeset
|
167 | } |
|
9
30e51941a673
Added mod_jk dependencies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
8
diff
changeset
|
168 | } |
|
30e51941a673
Added mod_jk dependencies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
8
diff
changeset
|
169 | |
| 1 | 170 | // init NSAPI request structure |
|
46
636e05eb48f6
cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
171 | if(request_initialize(pool, request, rq) != 0) { |
|
60
feb2f1e115c6
improved logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
172 | log_ereport(LOG_FAILURE, "Cannot initialize request structure"); |
|
614
eb1c4d464ecd
improve error handling/logging in nsapi_start_request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
591
diff
changeset
|
173 | request->status = 503; |
| 1 | 174 | return 1; |
| 175 | } | |
| 176 | ||
|
3
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
177 | // set default virtual server |
|
19
d680536f8c2f
Added configuration manager
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
178 | rq->vs = request->connection->listener->default_vs.vs; |
|
3
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
179 | |
|
46
636e05eb48f6
cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
180 | // Pass request line as "clf-request" |
|
636e05eb48f6
cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
181 | // remove \r\n |
|
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
411
diff
changeset
|
182 | cxmutstr clfreq = request->request_line; |
|
180
98462e878ca7
fixes crash with broken http requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
168
diff
changeset
|
183 | while(clfreq.length > 0 && clfreq.ptr[clfreq.length - 1] < 33) { |
|
45
a24aa388f02f
added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
184 | clfreq.length--; |
|
a24aa388f02f
added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
185 | } |
| 1 | 186 | pblock_kvinsert( |
| 187 | pb_key_clf_request, | |
|
180
98462e878ca7
fixes crash with broken http requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
168
diff
changeset
|
188 | clfreq.ptr, |
|
98462e878ca7
fixes crash with broken http requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
168
diff
changeset
|
189 | clfreq.length, |
| 1 | 190 | rq->rq.reqpb); |
| 191 | ||
|
59
ab25c0a231d0
some fixes and new public APIs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
192 | // Pass method as "method" in reqpb, and also as method_num |
| 1 | 193 | pblock_kvinsert( |
| 194 | pb_key_method, | |
| 195 | request->method.ptr, | |
| 196 | request->method.length, | |
| 197 | rq->rq.reqpb); | |
| 198 | // TODO: method num | |
| 199 | //rqRq.rq.method_num = rqHdr->GetMethodNumber(); | |
| 200 | //PR_ASSERT(rqRq.rq.method_num != -1 || iStatus); | |
| 201 | ||
|
59
ab25c0a231d0
some fixes and new public APIs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
202 | // Pass protocol as "protocol" in reqpb, and also in protv_num |
| 1 | 203 | pblock_kvinsert( |
| 204 | pb_key_protocol, | |
| 205 | request->httpv.ptr, | |
| 206 | request->httpv.length, | |
| 207 | rq->rq.reqpb); | |
|
101
7fbcdbad0baa
added support for absolute URIs and improved keep alive
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
96
diff
changeset
|
208 | |
|
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
411
diff
changeset
|
209 | if(!cx_strcmp(cx_strcast(request->httpv), (cxstring)CX_STR("HTTP/1.1"))) { |
|
101
7fbcdbad0baa
added support for absolute URIs and improved keep alive
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
96
diff
changeset
|
210 | rq->rq.protv_num = PROTOCOL_VERSION_HTTP11; |
|
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
411
diff
changeset
|
211 | } else if(!cx_strcmp(cx_strcast(request->httpv), (cxstring)CX_STR("HTTP/1.0"))) { |
|
101
7fbcdbad0baa
added support for absolute URIs and improved keep alive
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
96
diff
changeset
|
212 | rq->rq.protv_num = PROTOCOL_VERSION_HTTP10; |
|
7fbcdbad0baa
added support for absolute URIs and improved keep alive
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
96
diff
changeset
|
213 | } else { |
|
136
9b48a1427aef
adds simple rewrite saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
133
diff
changeset
|
214 | // invalid protocol version - abort |
|
9b48a1427aef
adds simple rewrite saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
133
diff
changeset
|
215 | log_ereport( |
|
9b48a1427aef
adds simple rewrite saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
133
diff
changeset
|
216 | LOG_FAILURE, |
|
9b48a1427aef
adds simple rewrite saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
133
diff
changeset
|
217 | "invalid protocol version: %.*s", |
|
9b48a1427aef
adds simple rewrite saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
133
diff
changeset
|
218 | (int)request->httpv.length, |
|
9b48a1427aef
adds simple rewrite saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
133
diff
changeset
|
219 | request->httpv.ptr); |
|
614
eb1c4d464ecd
improve error handling/logging in nsapi_start_request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
591
diff
changeset
|
220 | request->status = 505; |
|
136
9b48a1427aef
adds simple rewrite saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
133
diff
changeset
|
221 | return 1; |
|
101
7fbcdbad0baa
added support for absolute URIs and improved keep alive
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
96
diff
changeset
|
222 | } |
| 1 | 223 | |
|
20
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
224 | /* |
|
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
225 | * get absolute path and query of the request uri |
|
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
226 | */ |
|
261
f2c772336ecd
add some references to issues
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
235
diff
changeset
|
227 | // TODO: check for '#' #72 |
|
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
411
diff
changeset
|
228 | cxmutstr absPath = http_request_get_abspath(request); |
|
614
eb1c4d464ecd
improve error handling/logging in nsapi_start_request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
591
diff
changeset
|
229 | if(absPath.length == 0) { |
|
eb1c4d464ecd
improve error handling/logging in nsapi_start_request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
591
diff
changeset
|
230 | log_ereport(LOG_FAILURE, "request uri length is zero"); |
|
101
7fbcdbad0baa
added support for absolute URIs and improved keep alive
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
96
diff
changeset
|
231 | return 1; |
|
7fbcdbad0baa
added support for absolute URIs and improved keep alive
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
96
diff
changeset
|
232 | } else if(absPath.ptr[0] == '*') { |
|
261
f2c772336ecd
add some references to issues
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
235
diff
changeset
|
233 | // TODO: implement global OPTIONS #71 |
|
101
7fbcdbad0baa
added support for absolute URIs and improved keep alive
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
96
diff
changeset
|
234 | return 1; |
|
7fbcdbad0baa
added support for absolute URIs and improved keep alive
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
96
diff
changeset
|
235 | } |
|
591
d703055a1af7
add request uri/path debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
579
diff
changeset
|
236 | log_ereport( |
|
d703055a1af7
add request uri/path debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
579
diff
changeset
|
237 | LOG_DEBUG, |
|
d703055a1af7
add request uri/path debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
579
diff
changeset
|
238 | "req uri: {%.*s}", |
|
d703055a1af7
add request uri/path debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
579
diff
changeset
|
239 | (int)absPath.length, |
|
d703055a1af7
add request uri/path debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
579
diff
changeset
|
240 | absPath.ptr); |
|
101
7fbcdbad0baa
added support for absolute URIs and improved keep alive
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
96
diff
changeset
|
241 | |
|
20
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
242 | for(int i=0;i<request->uri.length;i++) { |
|
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
243 | if(request->uri.ptr[i] == '?') { |
|
495
855a915472ff
don't add empty query to rq->reqpb
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
460
diff
changeset
|
244 | cxmutstr query; |
|
855a915472ff
don't add empty query to rq->reqpb
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
460
diff
changeset
|
245 | query.ptr = NULL; |
|
855a915472ff
don't add empty query to rq->reqpb
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
460
diff
changeset
|
246 | query.length = 0; |
|
855a915472ff
don't add empty query to rq->reqpb
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
460
diff
changeset
|
247 | |
|
20
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
248 | /* split uri in path and query */ |
|
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
249 | if(absPath.length > i + 2) { |
|
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
250 | query.length = absPath.length - i - 1; |
|
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
251 | query.ptr = absPath.ptr + i + 1; |
|
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
252 | } |
|
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
253 | absPath.length = i; |
|
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
254 | |
|
59
ab25c0a231d0
some fixes and new public APIs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
255 | // Pass any query as 'query' in reqpb |
|
495
855a915472ff
don't add empty query to rq->reqpb
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
460
diff
changeset
|
256 | if(query.length > 0) { |
|
855a915472ff
don't add empty query to rq->reqpb
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
460
diff
changeset
|
257 | pblock_kvinsert( |
|
20
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
258 | pb_key_query, |
|
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
259 | query.ptr, |
|
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
260 | query.length, |
|
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
261 | rq->rq.reqpb); |
|
495
855a915472ff
don't add empty query to rq->reqpb
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
460
diff
changeset
|
262 | } |
|
20
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
263 | |
|
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
264 | break; |
|
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
265 | } |
|
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
266 | } |
|
591
d703055a1af7
add request uri/path debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
579
diff
changeset
|
267 | log_ereport( |
|
d703055a1af7
add request uri/path debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
579
diff
changeset
|
268 | LOG_DEBUG, |
|
d703055a1af7
add request uri/path debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
579
diff
changeset
|
269 | "req abs path: {%.*s}", |
|
d703055a1af7
add request uri/path debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
579
diff
changeset
|
270 | (int)absPath.length, |
|
d703055a1af7
add request uri/path debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
579
diff
changeset
|
271 | absPath.ptr); |
|
26
37ff8bf54b89
Minimal webdav support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
24
diff
changeset
|
272 | |
|
59
ab25c0a231d0
some fixes and new public APIs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
273 | // Get abs_path part of request URI, and canonicalize the path |
|
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
411
diff
changeset
|
274 | cxmutstr orig_path = absPath; |
| 1 | 275 | absPath.ptr = util_canonicalize_uri( |
|
46
636e05eb48f6
cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
276 | pool, |
| 1 | 277 | absPath.ptr, |
| 278 | absPath.length, | |
| 279 | (int*)&absPath.length); | |
|
168
5c752979bfd6
fixes crash on broken urls
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
162
diff
changeset
|
280 | if(!absPath.ptr) { |
|
5c752979bfd6
fixes crash on broken urls
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
162
diff
changeset
|
281 | log_ereport( |
|
5c752979bfd6
fixes crash on broken urls
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
162
diff
changeset
|
282 | LOG_WARN, |
|
5c752979bfd6
fixes crash on broken urls
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
162
diff
changeset
|
283 | "invalid request path: {%.*s}", |
|
5c752979bfd6
fixes crash on broken urls
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
162
diff
changeset
|
284 | (int)orig_path.length, |
|
5c752979bfd6
fixes crash on broken urls
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
162
diff
changeset
|
285 | orig_path.ptr); |
|
614
eb1c4d464ecd
improve error handling/logging in nsapi_start_request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
591
diff
changeset
|
286 | request->status = 400; |
|
168
5c752979bfd6
fixes crash on broken urls
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
162
diff
changeset
|
287 | return 1; |
|
5c752979bfd6
fixes crash on broken urls
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
162
diff
changeset
|
288 | } |
| 1 | 289 | |
|
59
ab25c0a231d0
some fixes and new public APIs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
290 | // Decode the abs_path |
|
ab25c0a231d0
some fixes and new public APIs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
291 | if(util_uri_unescape_strict(absPath.ptr)) { |
|
ab25c0a231d0
some fixes and new public APIs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
292 | // Pass the abs_path as 'uri' in reqpb |
|
ab25c0a231d0
some fixes and new public APIs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
293 | pblock_kvinsert( |
|
ab25c0a231d0
some fixes and new public APIs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
294 | pb_key_uri, |
|
ab25c0a231d0
some fixes and new public APIs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
295 | absPath.ptr, |
|
ab25c0a231d0
some fixes and new public APIs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
296 | absPath.length, |
|
ab25c0a231d0
some fixes and new public APIs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
297 | rq->rq.reqpb); |
|
ab25c0a231d0
some fixes and new public APIs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
298 | } else { |
|
627
b30bf356dac4
fix potential uninitialized read in util_uri_unescape_strict
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
626
diff
changeset
|
299 | // util_uri_unescape_strict can modify absPath.ptr, but |
|
b30bf356dac4
fix potential uninitialized read in util_uri_unescape_strict
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
626
diff
changeset
|
300 | // we want to log the original uri. However we also don't want to |
|
b30bf356dac4
fix potential uninitialized read in util_uri_unescape_strict
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
626
diff
changeset
|
301 | // create an unnecessary copy. Therefore we restore the original |
|
b30bf356dac4
fix potential uninitialized read in util_uri_unescape_strict
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
626
diff
changeset
|
302 | // uri here by calling util_canonicalize_uri again |
|
b30bf356dac4
fix potential uninitialized read in util_uri_unescape_strict
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
626
diff
changeset
|
303 | absPath.ptr = util_canonicalize_uri( |
|
b30bf356dac4
fix potential uninitialized read in util_uri_unescape_strict
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
626
diff
changeset
|
304 | pool, |
|
b30bf356dac4
fix potential uninitialized read in util_uri_unescape_strict
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
626
diff
changeset
|
305 | absPath.ptr, |
|
b30bf356dac4
fix potential uninitialized read in util_uri_unescape_strict
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
626
diff
changeset
|
306 | absPath.length, |
|
b30bf356dac4
fix potential uninitialized read in util_uri_unescape_strict
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
626
diff
changeset
|
307 | (int*)&absPath.length); |
|
b30bf356dac4
fix potential uninitialized read in util_uri_unescape_strict
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
626
diff
changeset
|
308 | |
|
168
5c752979bfd6
fixes crash on broken urls
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
162
diff
changeset
|
309 | log_ereport( |
|
614
eb1c4d464ecd
improve error handling/logging in nsapi_start_request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
591
diff
changeset
|
310 | LOG_FAILURE, |
|
168
5c752979bfd6
fixes crash on broken urls
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
162
diff
changeset
|
311 | "uri unescape failed: {%.*s}", |
|
5c752979bfd6
fixes crash on broken urls
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
162
diff
changeset
|
312 | (int)absPath.length, |
|
5c752979bfd6
fixes crash on broken urls
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
162
diff
changeset
|
313 | absPath.ptr); |
|
614
eb1c4d464ecd
improve error handling/logging in nsapi_start_request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
591
diff
changeset
|
314 | request->status = 400; |
|
eb1c4d464ecd
improve error handling/logging in nsapi_start_request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
591
diff
changeset
|
315 | //pblock_kvinsert(pb_key_uri, "/", 1, rq->rq.reqpb); |
|
624
e051cb8398cf
add debug request logging in case uri_unescape fails
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
623
diff
changeset
|
316 | |
|
626
c5ee5c4f8f03
enable debug request file logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
624
diff
changeset
|
317 | return 1; |
|
59
ab25c0a231d0
some fixes and new public APIs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
318 | } |
|
624
e051cb8398cf
add debug request logging in case uri_unescape fails
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
623
diff
changeset
|
319 | |
| 1 | 320 | // pass http header to the NSAPI request structure |
|
59
ab25c0a231d0
some fixes and new public APIs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
321 | int hlen = request->headers->len; |
|
7
3c2ed7a7a5fd
request and response header now used
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
6
diff
changeset
|
322 | HeaderArray *ha = request->headers; |
|
3c2ed7a7a5fd
request and response header now used
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
6
diff
changeset
|
323 | for(int i=0;i<=hlen;i++) { |
|
3c2ed7a7a5fd
request and response header now used
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
6
diff
changeset
|
324 | if(i == hlen) { |
|
3c2ed7a7a5fd
request and response header now used
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
6
diff
changeset
|
325 | ha = ha->next; |
|
3c2ed7a7a5fd
request and response header now used
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
6
diff
changeset
|
326 | if(ha == NULL) { |
|
3c2ed7a7a5fd
request and response header now used
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
6
diff
changeset
|
327 | break; |
|
3c2ed7a7a5fd
request and response header now used
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
6
diff
changeset
|
328 | } |
|
3c2ed7a7a5fd
request and response header now used
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
6
diff
changeset
|
329 | i = 0; |
|
3c2ed7a7a5fd
request and response header now used
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
6
diff
changeset
|
330 | hlen = ha->len; |
|
3c2ed7a7a5fd
request and response header now used
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
6
diff
changeset
|
331 | } |
|
101
7fbcdbad0baa
added support for absolute URIs and improved keep alive
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
96
diff
changeset
|
332 | |
|
7fbcdbad0baa
added support for absolute URIs and improved keep alive
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
96
diff
changeset
|
333 | Header header = ha->headers[i]; |
|
7
3c2ed7a7a5fd
request and response header now used
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
6
diff
changeset
|
334 | |
|
101
7fbcdbad0baa
added support for absolute URIs and improved keep alive
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
96
diff
changeset
|
335 | if(header.name.ptr[0] < 90) { |
|
7fbcdbad0baa
added support for absolute URIs and improved keep alive
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
96
diff
changeset
|
336 | header.name.ptr[0] += 32; |
|
8
f4d56bf9de40
Added request body reader
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
7
diff
changeset
|
337 | } |
|
20
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
338 | |
|
46
636e05eb48f6
cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
339 | // change to lower case |
|
133
87b405d61f64
improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
127
diff
changeset
|
340 | for(int j=0;j<header.name.length;j++) { |
|
87b405d61f64
improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
127
diff
changeset
|
341 | if(header.name.ptr[j] > 64 && header.name.ptr[j] < 97) { |
|
87b405d61f64
improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
127
diff
changeset
|
342 | header.name.ptr[j] += 32; |
|
20
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
343 | } |
|
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
344 | } |
|
101
7fbcdbad0baa
added support for absolute URIs and improved keep alive
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
96
diff
changeset
|
345 | |
|
7fbcdbad0baa
added support for absolute URIs and improved keep alive
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
96
diff
changeset
|
346 | pblock_nvlinsert( |
|
7fbcdbad0baa
added support for absolute URIs and improved keep alive
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
96
diff
changeset
|
347 | header.name.ptr, |
|
7fbcdbad0baa
added support for absolute URIs and improved keep alive
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
96
diff
changeset
|
348 | header.name.length, |
|
7fbcdbad0baa
added support for absolute URIs and improved keep alive
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
96
diff
changeset
|
349 | header.value.ptr, |
|
7fbcdbad0baa
added support for absolute URIs and improved keep alive
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
96
diff
changeset
|
350 | header.value.length, |
|
20
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
351 | rq->rq.headers); |
|
7
3c2ed7a7a5fd
request and response header now used
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
6
diff
changeset
|
352 | } |
|
101
7fbcdbad0baa
added support for absolute URIs and improved keep alive
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
96
diff
changeset
|
353 | |
|
121
a881dc866e23
adds more CGI stuff
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
117
diff
changeset
|
354 | // get host and port |
|
a881dc866e23
adds more CGI stuff
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
117
diff
changeset
|
355 | char *hosthdr = pblock_findkeyval(pb_key_host, rq->rq.headers); |
|
a881dc866e23
adds more CGI stuff
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
117
diff
changeset
|
356 | if(hosthdr) { |
|
a881dc866e23
adds more CGI stuff
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
117
diff
changeset
|
357 | char *host = pool_strdup(pool, hosthdr); |
|
397
f202a655f4c2
convert ipv6 addr to string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
396
diff
changeset
|
358 | char *portstr = NULL; |
|
f202a655f4c2
convert ipv6 addr to string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
396
diff
changeset
|
359 | if(host[0] != '[') { |
|
f202a655f4c2
convert ipv6 addr to string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
396
diff
changeset
|
360 | portstr = strchr(host, ':'); |
|
f202a655f4c2
convert ipv6 addr to string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
396
diff
changeset
|
361 | } else { |
|
f202a655f4c2
convert ipv6 addr to string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
396
diff
changeset
|
362 | char *v6end = strchr(host, ']'); |
|
f202a655f4c2
convert ipv6 addr to string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
396
diff
changeset
|
363 | if(v6end) { |
|
f202a655f4c2
convert ipv6 addr to string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
396
diff
changeset
|
364 | portstr = strchr(v6end, ':'); |
|
f202a655f4c2
convert ipv6 addr to string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
396
diff
changeset
|
365 | } |
|
f202a655f4c2
convert ipv6 addr to string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
396
diff
changeset
|
366 | } |
|
f202a655f4c2
convert ipv6 addr to string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
396
diff
changeset
|
367 | |
|
121
a881dc866e23
adds more CGI stuff
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
117
diff
changeset
|
368 | if(portstr) { |
|
a881dc866e23
adds more CGI stuff
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
117
diff
changeset
|
369 | *portstr = '\0'; |
|
a881dc866e23
adds more CGI stuff
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
117
diff
changeset
|
370 | } |
|
a881dc866e23
adds more CGI stuff
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
117
diff
changeset
|
371 | rq->host = host; |
|
a881dc866e23
adds more CGI stuff
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
117
diff
changeset
|
372 | } else { |
|
a881dc866e23
adds more CGI stuff
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
117
diff
changeset
|
373 | rq->host = NULL; // TODO: value from listener |
|
a881dc866e23
adds more CGI stuff
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
117
diff
changeset
|
374 | } |
|
a881dc866e23
adds more CGI stuff
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
117
diff
changeset
|
375 | rq->port = request->connection->listener->port; |
|
a881dc866e23
adds more CGI stuff
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
117
diff
changeset
|
376 | |
|
138
06619bbd14ef
using host header to select virtual server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
136
diff
changeset
|
377 | if(rq->host) { |
|
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
411
diff
changeset
|
378 | VirtualServer *vs = cxMapGet(sn->config->host_vs, cx_hash_key_str(rq->host)); |
|
138
06619bbd14ef
using host header to select virtual server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
136
diff
changeset
|
379 | if(vs) { |
|
06619bbd14ef
using host header to select virtual server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
136
diff
changeset
|
380 | rq->vs = vs; |
|
06619bbd14ef
using host header to select virtual server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
136
diff
changeset
|
381 | } else { |
|
06619bbd14ef
using host header to select virtual server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
136
diff
changeset
|
382 | log_ereport( |
|
06619bbd14ef
using host header to select virtual server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
136
diff
changeset
|
383 | LOG_VERBOSE, |
|
06619bbd14ef
using host header to select virtual server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
136
diff
changeset
|
384 | "Unkown host '%s': using default virtual server", |
|
06619bbd14ef
using host header to select virtual server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
136
diff
changeset
|
385 | rq->host); |
|
06619bbd14ef
using host header to select virtual server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
136
diff
changeset
|
386 | } |
|
06619bbd14ef
using host header to select virtual server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
136
diff
changeset
|
387 | } |
|
06619bbd14ef
using host header to select virtual server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
136
diff
changeset
|
388 | |
|
101
7fbcdbad0baa
added support for absolute URIs and improved keep alive
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
96
diff
changeset
|
389 | // parse connection header |
|
7fbcdbad0baa
added support for absolute URIs and improved keep alive
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
96
diff
changeset
|
390 | rq->rq.rq_attr.keep_alive = (rq->rq.protv_num >= PROTOCOL_VERSION_HTTP11); |
|
7fbcdbad0baa
added support for absolute URIs and improved keep alive
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
96
diff
changeset
|
391 | char *conn_str = pblock_findkeyval(pb_key_connection, rq->rq.headers); |
|
7fbcdbad0baa
added support for absolute URIs and improved keep alive
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
96
diff
changeset
|
392 | if(conn_str) { |
|
7fbcdbad0baa
added support for absolute URIs and improved keep alive
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
96
diff
changeset
|
393 | if(!strcasecmp(conn_str, "keep-alive")) { |
|
7fbcdbad0baa
added support for absolute URIs and improved keep alive
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
96
diff
changeset
|
394 | rq->rq.rq_attr.keep_alive = 1; |
|
7fbcdbad0baa
added support for absolute URIs and improved keep alive
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
96
diff
changeset
|
395 | } else if(!strcasecmp(conn_str, "close")) { |
|
7fbcdbad0baa
added support for absolute URIs and improved keep alive
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
96
diff
changeset
|
396 | rq->rq.rq_attr.keep_alive = 0; |
|
7fbcdbad0baa
added support for absolute URIs and improved keep alive
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
96
diff
changeset
|
397 | } |
|
7fbcdbad0baa
added support for absolute URIs and improved keep alive
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
96
diff
changeset
|
398 | } |
|
26
37ff8bf54b89
Minimal webdav support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
24
diff
changeset
|
399 | |
|
46
636e05eb48f6
cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
400 | // check for request body and prepare input buffer |
|
8
f4d56bf9de40
Added request body reader
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
7
diff
changeset
|
401 | char *ctlen_str = pblock_findkeyval(pb_key_content_length, rq->rq.headers); |
|
f4d56bf9de40
Added request body reader
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
7
diff
changeset
|
402 | if(ctlen_str) { |
|
339
f4a34b0869c7
replace atoi with util_strtoint
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
403 | int64_t ctlen; |
|
f4a34b0869c7
replace atoi with util_strtoint
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
404 | if(util_strtoint(ctlen_str, &ctlen)) { |
|
f4a34b0869c7
replace atoi with util_strtoint
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
405 | netbuf *nb = sn->netbuf; |
|
f4a34b0869c7
replace atoi with util_strtoint
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
406 | HttpStream *net_io = (HttpStream*)sn->sn.csd; |
|
354
017eda1be105
add missing HttpStream initializations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
339
diff
changeset
|
407 | net_io->read_eof = WS_FALSE; |
|
8
f4d56bf9de40
Added request body reader
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
7
diff
changeset
|
408 | |
|
339
f4a34b0869c7
replace atoi with util_strtoint
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
409 | // how many bytes are already read and in the buffer |
|
f4a34b0869c7
replace atoi with util_strtoint
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
410 | int cur_input_available = nb->cursize - nb->pos; |
|
8
f4d56bf9de40
Added request body reader
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
7
diff
changeset
|
411 | |
|
339
f4a34b0869c7
replace atoi with util_strtoint
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
412 | if(cur_input_available >= ctlen) { |
|
f4a34b0869c7
replace atoi with util_strtoint
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
413 | // we have the whole request body in the buffer and |
|
f4a34b0869c7
replace atoi with util_strtoint
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
414 | // maybe even more |
|
f4a34b0869c7
replace atoi with util_strtoint
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
415 | // no more read from the socket is necessary to get the body, |
|
f4a34b0869c7
replace atoi with util_strtoint
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
416 | // therefore disable it |
|
f4a34b0869c7
replace atoi with util_strtoint
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
417 | net_io->max_read = 0; |
|
f4a34b0869c7
replace atoi with util_strtoint
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
418 | } else { |
|
f4a34b0869c7
replace atoi with util_strtoint
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
419 | // read still required to get the complete request body |
|
f4a34b0869c7
replace atoi with util_strtoint
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
420 | net_io->max_read = ctlen - cur_input_available; |
|
f4a34b0869c7
replace atoi with util_strtoint
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
421 | } |
|
f4a34b0869c7
replace atoi with util_strtoint
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
422 | //printf("request body length: %d\n", ctlen); |
|
f4a34b0869c7
replace atoi with util_strtoint
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
423 | } // else: should we abort? |
|
8
f4d56bf9de40
Added request body reader
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
7
diff
changeset
|
424 | } |
|
333
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
425 | char *transfer_encoding = pblock_findkeyval(pb_key_transfer_encoding, rq->rq.headers); |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
426 | if(transfer_encoding) { |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
427 | if(!strcmp(transfer_encoding, "chunked")) { |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
428 | netbuf *nb = sn->netbuf; |
|
449
a28a5ccc894b
improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
448
diff
changeset
|
429 | // a separate buffer is required for reading chunked transfer enc |
|
448
02b003f7560c
use separate buffer for chunked transfer encoding, not inbuf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
430 | sn->buffer = pool_malloc(pool, nb->maxsize); |
|
02b003f7560c
use separate buffer for chunked transfer encoding, not inbuf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
431 | if(!sn->buffer) { |
|
614
eb1c4d464ecd
improve error handling/logging in nsapi_start_request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
591
diff
changeset
|
432 | request->status = 503; |
|
448
02b003f7560c
use separate buffer for chunked transfer encoding, not inbuf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
433 | return 1; |
|
02b003f7560c
use separate buffer for chunked transfer encoding, not inbuf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
434 | } |
|
449
a28a5ccc894b
improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
448
diff
changeset
|
435 | |
|
a28a5ccc894b
improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
448
diff
changeset
|
436 | // copy remaining bytes from inbuf to the additional buffer |
|
448
02b003f7560c
use separate buffer for chunked transfer encoding, not inbuf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
437 | if(nb->cursize - nb->pos > 0) { |
|
02b003f7560c
use separate buffer for chunked transfer encoding, not inbuf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
438 | memcpy(sn->buffer, nb->inbuf, nb->cursize); |
|
02b003f7560c
use separate buffer for chunked transfer encoding, not inbuf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
439 | } |
|
02b003f7560c
use separate buffer for chunked transfer encoding, not inbuf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
440 | |
|
333
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
441 | sn->pos = nb->pos; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
442 | sn->cursize = nb->cursize; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
443 | |
|
449
a28a5ccc894b
improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
448
diff
changeset
|
444 | // clear inbuf |
|
448
02b003f7560c
use separate buffer for chunked transfer encoding, not inbuf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
445 | nb->pos = 0; |
|
02b003f7560c
use separate buffer for chunked transfer encoding, not inbuf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
446 | nb->cursize = 0; |
|
02b003f7560c
use separate buffer for chunked transfer encoding, not inbuf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
447 | |
|
333
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
448 | if(httpstream_enable_chunked_read(sn->sn.csd, sn->buffer, nb->maxsize, &sn->cursize, &sn->pos)) { |
|
614
eb1c4d464ecd
improve error handling/logging in nsapi_start_request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
591
diff
changeset
|
449 | request->status = 500; // should not happen |
|
333
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
450 | return 1; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
451 | } |
|
448
02b003f7560c
use separate buffer for chunked transfer encoding, not inbuf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
452 | } // else: TODO: unknown transfer encoding error |
|
333
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
453 | } |
|
26
37ff8bf54b89
Minimal webdav support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
24
diff
changeset
|
454 | |
|
37
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
455 | // |
| 1 | 456 | // Send the request to the NSAPI system |
|
37
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
457 | // |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
458 | |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
459 | // compare current and listener thread pool |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
460 | threadpool_t *lstp = request->connection->listener->threadpool; |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
461 | sn->defaultpool = lstp; |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
462 | if(lstp == thrpool) { |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
463 | sn->currentpool = thrpool; |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
464 | nsapi_handle_request(sn, rq); |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
465 | } else { |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
466 | // execute nsapi functions on a different thread pool |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
467 | nsapi_change_threadpool(sn, rq, lstp); |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
468 | } |
|
114
c3a0f1275d71
fixed keep alive bug
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
110
diff
changeset
|
469 | |
| 1 | 470 | return 0; |
| 471 | } | |
| 472 | ||
| 473 | ||
| 474 | ||
|
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
411
diff
changeset
|
475 | void header_add(HeaderArray *hd, cxmutstr name, cxmutstr value) { |
| 1 | 476 | while(hd->len >= hd->alloc) { |
| 477 | if(hd->next == NULL) { | |
| 478 | HeaderArray *block = malloc(sizeof(HeaderArray)); | |
| 479 | block->next = NULL; | |
| 480 | block->len = 0; | |
| 481 | block->headers = calloc(16, sizeof(Header)); | |
| 482 | block->alloc = 16; | |
| 483 | hd->next = block; | |
| 484 | } | |
| 485 | hd = hd->next; | |
| 486 | } | |
| 487 | hd->headers[hd->len].name = name; | |
| 488 | hd->headers[hd->len].value = value; | |
| 489 | hd->len++; | |
| 490 | } | |
| 491 | ||
|
46
636e05eb48f6
cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
492 | void header_array_free(HeaderArray *hd) { |
|
636e05eb48f6
cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
493 | HeaderArray *next; |
|
636e05eb48f6
cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
494 | while(hd) { |
|
636e05eb48f6
cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
495 | next = hd->next; |
|
636e05eb48f6
cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
496 | free(hd->headers); |
|
636e05eb48f6
cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
497 | free(hd); |
|
636e05eb48f6
cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
498 | hd = next; |
|
636e05eb48f6
cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
499 | } |
|
636e05eb48f6
cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
500 | } |
|
636e05eb48f6
cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
501 | |
|
3
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
502 | |
|
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
503 | /* |
|
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
504 | * NSAPI Processing |
|
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
505 | */ |
|
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
506 | |
|
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
507 | int nsapi_handle_request(NSAPISession *sn, NSAPIRequest *rq) { |
|
558
0e79e17c70e2
improve sessionhandler trace logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
557
diff
changeset
|
508 | log_ereport(LOG_DEBUG, "trace reqid: %016llx nsapi_handle_request %d", (unsigned long long int)sn->connection->id, rq->phase); |
|
557
e35829a3a6d8
add sessionhandler debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
544
diff
changeset
|
509 | |
|
3
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
510 | int r = REQ_NOACTION; |
|
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
511 | do { |
|
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
512 | switch(rq->phase) { |
|
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
513 | case NSAPIAuthTrans: { |
|
22
adb0bda54e6b
Server can run as daemon
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
21
diff
changeset
|
514 | r = nsapi_authtrans(sn, rq); |
|
adb0bda54e6b
Server can run as daemon
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
21
diff
changeset
|
515 | if(r != REQ_PROCEED) { |
|
adb0bda54e6b
Server can run as daemon
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
21
diff
changeset
|
516 | break; |
|
adb0bda54e6b
Server can run as daemon
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
21
diff
changeset
|
517 | } |
|
3
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
518 | rq->phase++; |
|
6
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
519 | nsapi_context_next_stage(&rq->context); |
|
3
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
520 | } |
|
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
521 | case NSAPINameTrans: { |
|
21
627b09ee74e4
New configuration loader
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
20
diff
changeset
|
522 | //printf(">>> NameTrans\n"); |
|
3
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
523 | r = nsapi_nametrans(sn, rq); |
|
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
524 | if(r != REQ_PROCEED) { |
|
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
525 | break; |
|
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
526 | } |
|
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
527 | rq->phase++; |
|
6
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
528 | nsapi_context_next_stage(&rq->context); |
|
3
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
529 | } |
|
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
530 | case NSAPIPathCheck: { |
|
21
627b09ee74e4
New configuration loader
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
20
diff
changeset
|
531 | //printf(">>> PathCheck\n"); |
|
23
a2c8fc23c90e
Added basic authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
22
diff
changeset
|
532 | r = nsapi_pathcheck(sn, rq); |
|
a2c8fc23c90e
Added basic authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
22
diff
changeset
|
533 | if(r != REQ_PROCEED) { |
|
a2c8fc23c90e
Added basic authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
22
diff
changeset
|
534 | break; |
|
a2c8fc23c90e
Added basic authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
22
diff
changeset
|
535 | } |
|
3
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
536 | rq->phase++; |
|
6
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
537 | nsapi_context_next_stage(&rq->context); |
|
3
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
538 | } |
|
5
dbc01588686e
Added parser for obj.conf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
3
diff
changeset
|
539 | case NSAPIObjectType: { |
|
21
627b09ee74e4
New configuration loader
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
20
diff
changeset
|
540 | //printf(">>> ObjectType\n"); |
| 10 | 541 | r = nsapi_objecttype(sn, rq); |
| 542 | if(r != REQ_PROCEED) { | |
| 543 | break; | |
| 544 | } | |
|
5
dbc01588686e
Added parser for obj.conf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
3
diff
changeset
|
545 | rq->phase++; |
|
6
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
546 | nsapi_context_next_stage(&rq->context); |
|
5
dbc01588686e
Added parser for obj.conf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
3
diff
changeset
|
547 | } |
|
3
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
548 | case NSAPIService: { |
|
21
627b09ee74e4
New configuration loader
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
20
diff
changeset
|
549 | //printf(">>> Service\n"); |
|
3
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
550 | r = nsapi_service(sn, rq); |
|
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
551 | if(r != REQ_PROCEED) { |
|
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
552 | break; |
|
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
553 | } |
|
95
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
554 | rq->phase = NSAPIAddLog; // skip NSAPIError |
|
6
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
555 | nsapi_context_next_stage(&rq->context); |
|
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
556 | } |
|
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
557 | case NSAPIAddLog: { |
|
21
627b09ee74e4
New configuration loader
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
20
diff
changeset
|
558 | //printf(">>> AddLog\n"); |
|
45
a24aa388f02f
added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
559 | r = nsapi_addlog(sn, rq); |
|
95
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
560 | if(r == REQ_PROCESSING) { |
|
45
a24aa388f02f
added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
561 | break; |
|
a24aa388f02f
added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
562 | } |
|
95
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
563 | // finish request |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
564 | r = REQ_PROCEED; |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
565 | break; |
|
3
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
566 | } |
|
70
4e6e812c1d97
fixed some warnings
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
61
diff
changeset
|
567 | default: // should not happen, but when it does, finish the req |
|
3
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
568 | case REQ_FINISH: { |
|
21
627b09ee74e4
New configuration loader
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
20
diff
changeset
|
569 | //printf(">>> Finish\n"); |
|
95
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
570 | //r = nsapi_finish_request(sn, rq); |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
571 | r = REQ_PROCEED; |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
572 | break; |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
573 | } |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
574 | case NSAPIError: { |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
575 | //printf(">>> Error\n"); |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
576 | r = nsapi_error(sn, rq); |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
577 | if(r == REQ_PROCEED) { |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
578 | // restart the loop to switch to AddLog directive |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
579 | r = REQ_RESTART; |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
580 | rq->phase = NSAPIAddLog; |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
581 | nsapi_context_next_stage(&rq->context); |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
582 | } else { |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
583 | /* |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
584 | * an error occured while handling an error |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
585 | * leave loop to finish the request (without AddLog) |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
586 | */ |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
587 | r = REQ_PROCEED; |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
588 | break; |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
589 | } |
|
3
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
590 | } |
|
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
591 | } |
|
35
4417619a9bbd
using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
592 | |
|
4417619a9bbd
using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
593 | if(r == REQ_ABORTED) { |
|
95
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
594 | // switch to NSAPIError |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
595 | rq->phase = NSAPIError; |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
596 | nsapi_context_next_stage(&rq->context); |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
597 | r = REQ_RESTART; |
|
35
4417619a9bbd
using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
598 | } |
|
4417619a9bbd
using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
599 | |
|
3
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
600 | } while (r == REQ_RESTART); |
|
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
601 | |
|
37
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
602 | if(r != REQ_PROCESSING) { |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
603 | r = nsapi_finish_request(sn, rq); |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
604 | } |
|
3
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
605 | |
|
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
606 | return r; |
|
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
607 | } |
|
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
608 | |
|
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
609 | int nsapi_finish_request(NSAPISession *sn, NSAPIRequest *rq) { |
|
460
b9a447b02046
resourcepool_free should remove the resource from the request resource cache
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
449
diff
changeset
|
610 | rq->finished = TRUE; |
|
272
f210681d9dd0
add minimal working implementation for resourcepool_lookup()
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
261
diff
changeset
|
611 | request_free_resources(sn, rq); |
|
f210681d9dd0
add minimal working implementation for resourcepool_lookup()
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
261
diff
changeset
|
612 | |
|
557
e35829a3a6d8
add sessionhandler debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
544
diff
changeset
|
613 | log_ereport(LOG_DEBUG, "trace reqid: %016llx nsapi_finish_request", (unsigned long long int)sn->connection->id); |
|
e35829a3a6d8
add sessionhandler debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
544
diff
changeset
|
614 | |
|
354
017eda1be105
add missing HttpStream initializations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
339
diff
changeset
|
615 | WSBool read_stream_eof = httpstream_eof(sn->sn.csd); |
|
017eda1be105
add missing HttpStream initializations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
339
diff
changeset
|
616 | if(!read_stream_eof) { |
|
017eda1be105
add missing HttpStream initializations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
339
diff
changeset
|
617 | log_ereport(LOG_WARN, "request input stream not closed"); |
|
017eda1be105
add missing HttpStream initializations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
339
diff
changeset
|
618 | // TODO: clean stream |
|
017eda1be105
add missing HttpStream initializations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
339
diff
changeset
|
619 | rq->rq.rq_attr.keep_alive = 0; // workaround |
|
017eda1be105
add missing HttpStream initializations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
339
diff
changeset
|
620 | } |
|
017eda1be105
add missing HttpStream initializations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
339
diff
changeset
|
621 | if(sn->pos < sn->cursize) { |
|
017eda1be105
add missing HttpStream initializations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
339
diff
changeset
|
622 | log_ereport(LOG_WARN, "nsapi_finish_request: TODO: remaining bytes in buffer"); |
|
017eda1be105
add missing HttpStream initializations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
339
diff
changeset
|
623 | // TODO: reuse buffer in next request |
|
017eda1be105
add missing HttpStream initializations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
339
diff
changeset
|
624 | rq->rq.rq_attr.keep_alive = 0; // workaround |
|
017eda1be105
add missing HttpStream initializations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
339
diff
changeset
|
625 | } |
|
361
570026d3a685
make sure the http stream is finished if headers are sent
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
360
diff
changeset
|
626 | |
|
570026d3a685
make sure the http stream is finished if headers are sent
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
360
diff
changeset
|
627 | if(rq->rq.senthdrs) { |
|
570026d3a685
make sure the http stream is finished if headers are sent
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
360
diff
changeset
|
628 | // flush buffer and add termination if chunked encoding |
|
570026d3a685
make sure the http stream is finished if headers are sent
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
360
diff
changeset
|
629 | // is enabled |
|
570026d3a685
make sure the http stream is finished if headers are sent
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
360
diff
changeset
|
630 | net_finish(sn->sn.csd); |
|
570026d3a685
make sure the http stream is finished if headers are sent
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
360
diff
changeset
|
631 | } else { |
|
360
79ddd772e807
check if service SAFs sent a response, terminate connection in case no response was sent
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
632 | // why was no response sent? |
|
79ddd772e807
check if service SAFs sent a response, terminate connection in case no response was sent
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
633 | // something must have gone wrong |
|
79ddd772e807
check if service SAFs sent a response, terminate connection in case no response was sent
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
634 | // terminate the session |
|
79ddd772e807
check if service SAFs sent a response, terminate connection in case no response was sent
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
635 | char *clf_req = pblock_findkeyval(pb_key_clf_request, rq->rq.reqpb); |
|
79ddd772e807
check if service SAFs sent a response, terminate connection in case no response was sent
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
636 | log_ereport(LOG_WARN, "nsapi_finish_request: no response header: request: %s", clf_req); |
|
79ddd772e807
check if service SAFs sent a response, terminate connection in case no response was sent
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
637 | rq->rq.rq_attr.keep_alive = 0; |
|
79ddd772e807
check if service SAFs sent a response, terminate connection in case no response was sent
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
638 | } |
|
354
017eda1be105
add missing HttpStream initializations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
339
diff
changeset
|
639 | |
|
407
78af44222463
close connection if content-length != number of bytes written
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
397
diff
changeset
|
640 | char *response_content_length = pblock_findkeyval(pb_key_content_length, rq->rq.srvhdrs); |
|
78af44222463
close connection if content-length != number of bytes written
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
397
diff
changeset
|
641 | int64_t response_ctlen; |
|
78af44222463
close connection if content-length != number of bytes written
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
397
diff
changeset
|
642 | if(response_content_length && util_strtoint(response_content_length, &response_ctlen)) { |
|
78af44222463
close connection if content-length != number of bytes written
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
397
diff
changeset
|
643 | int64_t w = httpstream_written(sn->sn.csd); |
|
78af44222463
close connection if content-length != number of bytes written
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
397
diff
changeset
|
644 | if(w != response_ctlen) { |
|
78af44222463
close connection if content-length != number of bytes written
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
397
diff
changeset
|
645 | log_ereport(LOG_WARN, "nsapi_finish_request: content-length != number of bytes written"); |
|
78af44222463
close connection if content-length != number of bytes written
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
397
diff
changeset
|
646 | rq->rq.rq_attr.keep_alive = 0; // fatal io error, we can not safely reuse the connection |
|
78af44222463
close connection if content-length != number of bytes written
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
397
diff
changeset
|
647 | } |
|
78af44222463
close connection if content-length != number of bytes written
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
397
diff
changeset
|
648 | } |
|
78af44222463
close connection if content-length != number of bytes written
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
397
diff
changeset
|
649 | |
|
78
3578977d29a3
added keep-alive support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
650 | if(rq->rq.rq_attr.keep_alive) { |
|
3578977d29a3
added keep-alive support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
651 | SessionHandler *sh = sn->connection->session_handler; |
|
3578977d29a3
added keep-alive support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
652 | sh->keep_alive(sh, sn->connection); |
|
3578977d29a3
added keep-alive support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
653 | /* |
|
3578977d29a3
added keep-alive support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
654 | * keep the connection object |
|
3578977d29a3
added keep-alive support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
655 | * the sn->config is referenced by the connection, so we don't |
|
79
f48cea237ec3
fixed some memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
78
diff
changeset
|
656 | * unref it |
|
78
3578977d29a3
added keep-alive support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
657 | */ |
|
3578977d29a3
added keep-alive support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
658 | } else { |
|
558
0e79e17c70e2
improve sessionhandler trace logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
557
diff
changeset
|
659 | log_ereport(LOG_DEBUG, "trace reqid: %016llx connection: close", (unsigned long long int)sn->connection->id); |
|
114
c3a0f1275d71
fixed keep alive bug
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
110
diff
changeset
|
660 | connection_destroy(sn->connection); |
|
78
3578977d29a3
added keep-alive support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
661 | } |
|
46
636e05eb48f6
cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
662 | |
|
78
3578977d29a3
added keep-alive support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
663 | // free all memory |
|
46
636e05eb48f6
cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
664 | free(sn->netbuf->inbuf); |
|
636e05eb48f6
cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
665 | free(sn->netbuf); |
|
636e05eb48f6
cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
666 | |
|
636e05eb48f6
cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
667 | pool_destroy(sn->sn.pool); |
|
114
c3a0f1275d71
fixed keep alive bug
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
110
diff
changeset
|
668 | |
|
3
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
669 | return 0; |
|
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
670 | } |
|
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
671 | |
|
272
f210681d9dd0
add minimal working implementation for resourcepool_lookup()
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
261
diff
changeset
|
672 | void request_free_resources(NSAPISession *sn, NSAPIRequest *rq) { |
|
f210681d9dd0
add minimal working implementation for resourcepool_lookup()
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
261
diff
changeset
|
673 | if(!rq->resources) return; |
|
f210681d9dd0
add minimal working implementation for resourcepool_lookup()
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
261
diff
changeset
|
674 | |
| 579 | 675 | CxMapIterator i = cxMapIteratorValues(rq->resources); |
|
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
411
diff
changeset
|
676 | cx_foreach(ResourceData *, resource, i) { |
|
272
f210681d9dd0
add minimal working implementation for resourcepool_lookup()
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
261
diff
changeset
|
677 | resourcepool_free(&sn->sn, &rq->rq, resource); |
|
f210681d9dd0
add minimal working implementation for resourcepool_lookup()
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
261
diff
changeset
|
678 | } |
|
f210681d9dd0
add minimal working implementation for resourcepool_lookup()
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
261
diff
changeset
|
679 | } |
|
f210681d9dd0
add minimal working implementation for resourcepool_lookup()
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
261
diff
changeset
|
680 | |
|
22
adb0bda54e6b
Server can run as daemon
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
21
diff
changeset
|
681 | int nsapi_authtrans(NSAPISession *sn, NSAPIRequest *rq) { |
|
adb0bda54e6b
Server can run as daemon
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
21
diff
changeset
|
682 | HTTPObjectConfig *objconf = rq->vs->objects; |
|
adb0bda54e6b
Server can run as daemon
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
21
diff
changeset
|
683 | httpd_object *obj = objconf->objects[0]; |
|
adb0bda54e6b
Server can run as daemon
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
21
diff
changeset
|
684 | dtable *dt = object_get_dtable(obj, NSAPIAuthTrans); |
|
adb0bda54e6b
Server can run as daemon
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
21
diff
changeset
|
685 | |
|
adb0bda54e6b
Server can run as daemon
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
21
diff
changeset
|
686 | int ret = rq->context.last_req_code; |
|
adb0bda54e6b
Server can run as daemon
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
21
diff
changeset
|
687 | for(int i=NCX_DI(rq);i<dt->ndir;i++) { |
|
37
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
688 | if(ret == REQ_NOACTION) { |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
689 | directive *d = dt->dirs[i]; |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
690 | ret = nsapi_exec(d, sn, rq); |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
691 | } |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
692 | |
|
22
adb0bda54e6b
Server can run as daemon
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
21
diff
changeset
|
693 | if(ret != REQ_NOACTION) { |
|
adb0bda54e6b
Server can run as daemon
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
21
diff
changeset
|
694 | /* |
|
adb0bda54e6b
Server can run as daemon
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
21
diff
changeset
|
695 | * if a saf is still processing, we need to save the context, to |
|
adb0bda54e6b
Server can run as daemon
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
21
diff
changeset
|
696 | * process this object at a later time |
|
adb0bda54e6b
Server can run as daemon
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
21
diff
changeset
|
697 | */ |
|
adb0bda54e6b
Server can run as daemon
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
21
diff
changeset
|
698 | if(ret == REQ_PROCESSING) { |
|
87
bdec069d2239
fixed pathcheck behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
699 | // save nsapi context |
|
bdec069d2239
fixed pathcheck behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
700 | // add +1 to start next round with next function |
|
22
adb0bda54e6b
Server can run as daemon
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
21
diff
changeset
|
701 | rq->context.dtable_index = i + 1; |
|
adb0bda54e6b
Server can run as daemon
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
21
diff
changeset
|
702 | } |
|
adb0bda54e6b
Server can run as daemon
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
21
diff
changeset
|
703 | |
|
adb0bda54e6b
Server can run as daemon
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
21
diff
changeset
|
704 | return ret; |
|
adb0bda54e6b
Server can run as daemon
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
21
diff
changeset
|
705 | } |
|
adb0bda54e6b
Server can run as daemon
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
21
diff
changeset
|
706 | } |
|
adb0bda54e6b
Server can run as daemon
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
21
diff
changeset
|
707 | |
|
adb0bda54e6b
Server can run as daemon
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
21
diff
changeset
|
708 | |
|
adb0bda54e6b
Server can run as daemon
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
21
diff
changeset
|
709 | return REQ_PROCEED; |
|
adb0bda54e6b
Server can run as daemon
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
21
diff
changeset
|
710 | } |
|
adb0bda54e6b
Server can run as daemon
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
21
diff
changeset
|
711 | |
|
3
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
712 | int nsapi_nametrans(NSAPISession *sn, NSAPIRequest *rq) { |
|
6
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
713 | HTTPObjectConfig *objconf = rq->vs->objects; |
|
21
627b09ee74e4
New configuration loader
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
20
diff
changeset
|
714 | //printf("nsapi_nametrans\n"); |
|
6
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
715 | httpd_objset *objset = objset_create(sn->sn.pool); |
|
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
716 | rq->rq.os = objset; |
|
87
bdec069d2239
fixed pathcheck behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
717 | // first object in objconf is the default object TODO: make sure it is |
|
6
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
718 | objset_add_object(sn->sn.pool, objset, objconf->objects[0]); |
|
3
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
719 | |
|
87
bdec069d2239
fixed pathcheck behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
720 | httpd_object *obj = objset->obj[0]; // nametrans only in default object |
|
6
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
721 | dtable *dt = object_get_dtable(obj, NSAPINameTrans); |
|
3
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
722 | |
|
87
bdec069d2239
fixed pathcheck behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
723 | // execute directives |
|
6
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
724 | int ret = rq->context.last_req_code; |
|
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
725 | char *name = NULL; |
|
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
726 | char *ppath = NULL; |
|
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
727 | for(int i=NCX_DI(rq);i<dt->ndir;i++) { |
|
37
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
728 | if(ret == REQ_NOACTION) { |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
729 | directive *d = dt->dirs[i]; |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
730 | ret = nsapi_exec(d, sn, rq); |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
731 | } |
|
6
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
732 | |
|
87
bdec069d2239
fixed pathcheck behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
733 | // check for name or ppath |
|
6
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
734 | name = pblock_findkeyval(pb_key_name, rq->rq.vars); |
|
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
735 | ppath = pblock_findkeyval(pb_key_ppath, rq->rq.vars); |
|
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
736 | |
|
87
bdec069d2239
fixed pathcheck behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
737 | // add additional objects to the objset |
|
6
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
738 | if(add_objects(objconf, objset, sn, rq, name, ppath) == REQ_ABORTED) { |
|
115
51d9a15eac98
improves logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
114
diff
changeset
|
739 | log_ereport(LOG_FAILURE, "add_objects failed"); |
|
6
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
740 | return REQ_ABORTED; |
|
3
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
741 | } |
|
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
742 | |
|
6
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
743 | if(ret != REQ_NOACTION) { |
|
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
744 | /* |
|
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
745 | * if a saf is still processing, we need to save the context, to |
|
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
746 | * process this object at a later time |
|
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
747 | */ |
|
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
748 | if(ret == REQ_PROCESSING) { |
|
87
bdec069d2239
fixed pathcheck behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
749 | // save nsapi context |
|
bdec069d2239
fixed pathcheck behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
750 | // add +1 to start next round with next function |
|
6
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
751 | rq->context.dtable_index = i + 1; |
|
117
a94cf2e94492
fixes nametrans
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
116
diff
changeset
|
752 | } else if(ret == REQ_PROCEED) { |
|
a94cf2e94492
fixes nametrans
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
116
diff
changeset
|
753 | char *pp = pblock_findkeyval(pb_key_ppath, rq->rq.vars); |
|
a94cf2e94492
fixes nametrans
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
116
diff
changeset
|
754 | pblock_kvinsert(pb_key_path, pp, strlen(pp), rq->rq.vars); |
|
6
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
755 | } |
|
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
756 | |
|
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
757 | return ret; |
|
3
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
758 | } |
|
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
759 | } |
|
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
760 | |
|
87
bdec069d2239
fixed pathcheck behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
761 | // if no function has set the ppath var, translate it to docroot |
|
6
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
762 | if(ret == REQ_NOACTION && ppath == NULL) { |
|
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
411
diff
changeset
|
763 | cxmutstr docroot = rq->vs->document_root; |
|
636
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
627
diff
changeset
|
764 | if(rq->location && rq->location->docroot.ptr) { |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
627
diff
changeset
|
765 | docroot = rq->location->docroot; |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
627
diff
changeset
|
766 | } |
|
6
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
767 | if(docroot.length < 1) { |
|
136
9b48a1427aef
adds simple rewrite saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
133
diff
changeset
|
768 | log_ereport( |
|
9b48a1427aef
adds simple rewrite saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
133
diff
changeset
|
769 | LOG_WARN, |
|
9b48a1427aef
adds simple rewrite saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
133
diff
changeset
|
770 | "VirtualServer(%.*s) docroot too short", |
|
9b48a1427aef
adds simple rewrite saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
133
diff
changeset
|
771 | (int)rq->vs->name.length, |
|
9b48a1427aef
adds simple rewrite saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
133
diff
changeset
|
772 | rq->vs->name.ptr); |
|
9b48a1427aef
adds simple rewrite saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
133
diff
changeset
|
773 | return REQ_ABORTED; // docroot too short |
|
6
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
774 | } |
|
96
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
95
diff
changeset
|
775 | |
|
87
bdec069d2239
fixed pathcheck behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
776 | // if there is a trailing '/', remove it |
|
96
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
95
diff
changeset
|
777 | /* |
|
6
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
778 | if(docroot.ptr[docroot.length - 1] == '/') { |
|
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
779 | docroot.length--; |
|
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
780 | } |
|
96
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
95
diff
changeset
|
781 | |
|
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
411
diff
changeset
|
782 | cxmutstr uri = cx_str(pblock_findkeyval(pb_key_uri, rq->rq.reqpb)); |
|
96
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
95
diff
changeset
|
783 | |
|
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
411
diff
changeset
|
784 | cxmutstr translated; |
|
6
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
785 | translated.length = docroot.length + uri.length; |
|
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
786 | translated.ptr = alloca(translated.length + 1); |
|
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
411
diff
changeset
|
787 | translated = cx_strncat(translated, 2, docroot, uri); |
|
6
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
788 | |
|
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
789 | pblock_kvinsert( |
|
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
790 | pb_key_ppath, |
|
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
791 | translated.ptr, |
|
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
792 | translated.length, |
|
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
793 | rq->rq.vars); |
|
96
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
95
diff
changeset
|
794 | */ |
|
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
411
diff
changeset
|
795 | cxstring uri = cx_str(pblock_findkeyval(pb_key_uri, rq->rq.reqpb)); |
|
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
411
diff
changeset
|
796 | request_set_path(cx_strcast(docroot), uri, rq->rq.vars); |
|
6
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
797 | } |
|
116
d7a186cf87f6
adds find-pathinfo saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
115
diff
changeset
|
798 | |
|
d7a186cf87f6
adds find-pathinfo saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
115
diff
changeset
|
799 | // TODO: remove ppath |
|
d7a186cf87f6
adds find-pathinfo saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
115
diff
changeset
|
800 | char *pp = pblock_findkeyval(pb_key_ppath, rq->rq.vars); |
|
d7a186cf87f6
adds find-pathinfo saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
115
diff
changeset
|
801 | pblock_kvinsert(pb_key_path, pp, strlen(pp), rq->rq.vars); |
|
6
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
802 | |
|
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
803 | return REQ_PROCEED; |
|
3
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
804 | } |
|
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
805 | |
|
23
a2c8fc23c90e
Added basic authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
22
diff
changeset
|
806 | int nsapi_pathcheck(NSAPISession *sn, NSAPIRequest *rq) { |
|
a2c8fc23c90e
Added basic authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
22
diff
changeset
|
807 | //printf("nsapi_pathcheck\n"); |
|
a2c8fc23c90e
Added basic authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
22
diff
changeset
|
808 | httpd_objset *objset = rq->rq.os; |
|
a2c8fc23c90e
Added basic authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
22
diff
changeset
|
809 | |
|
a2c8fc23c90e
Added basic authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
22
diff
changeset
|
810 | if(NCX_OI(rq) == -1) { |
|
a2c8fc23c90e
Added basic authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
22
diff
changeset
|
811 | NCX_OI(rq) = objset->pos - 1; |
|
a2c8fc23c90e
Added basic authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
22
diff
changeset
|
812 | } |
|
a2c8fc23c90e
Added basic authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
22
diff
changeset
|
813 | |
|
a2c8fc23c90e
Added basic authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
22
diff
changeset
|
814 | int ret = rq->context.last_req_code; |
|
a2c8fc23c90e
Added basic authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
22
diff
changeset
|
815 | for(int i=NCX_OI(rq);i>=0;i--) { |
|
a2c8fc23c90e
Added basic authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
22
diff
changeset
|
816 | httpd_object *obj = objset->obj[i]; |
|
a2c8fc23c90e
Added basic authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
22
diff
changeset
|
817 | dtable *dt = object_get_dtable(obj, NSAPIPathCheck); |
|
a2c8fc23c90e
Added basic authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
22
diff
changeset
|
818 | |
|
a2c8fc23c90e
Added basic authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
22
diff
changeset
|
819 | // execute directives |
|
37
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
820 | for(int j=NCX_DI(rq);j<dt->ndir;j++) { |
| 141 | 821 | if(ret == REQ_NOACTION || ret == REQ_PROCEED) { |
|
37
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
822 | directive *d = dt->dirs[j]; |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
823 | ret = nsapi_exec(d, sn, rq); |
|
87
bdec069d2239
fixed pathcheck behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
824 | } else { |
|
23
a2c8fc23c90e
Added basic authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
22
diff
changeset
|
825 | if(ret == REQ_PROCESSING) { |
|
87
bdec069d2239
fixed pathcheck behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
826 | // save nsapi context |
|
23
a2c8fc23c90e
Added basic authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
22
diff
changeset
|
827 | rq->context.objset_index = i; |
|
a2c8fc23c90e
Added basic authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
22
diff
changeset
|
828 | |
|
87
bdec069d2239
fixed pathcheck behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
829 | // add +1 to start next round with next function |
|
23
a2c8fc23c90e
Added basic authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
22
diff
changeset
|
830 | rq->context.dtable_index = j + 1; |
|
a2c8fc23c90e
Added basic authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
22
diff
changeset
|
831 | } |
|
a2c8fc23c90e
Added basic authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
22
diff
changeset
|
832 | |
|
a2c8fc23c90e
Added basic authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
22
diff
changeset
|
833 | return ret; |
|
a2c8fc23c90e
Added basic authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
22
diff
changeset
|
834 | } |
|
a2c8fc23c90e
Added basic authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
22
diff
changeset
|
835 | } |
|
a2c8fc23c90e
Added basic authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
22
diff
changeset
|
836 | } |
|
a2c8fc23c90e
Added basic authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
22
diff
changeset
|
837 | |
|
24
1a7853a4257e
removed some NSPR dependencies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
23
diff
changeset
|
838 | return REQ_PROCEED; |
|
23
a2c8fc23c90e
Added basic authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
22
diff
changeset
|
839 | } |
|
a2c8fc23c90e
Added basic authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
22
diff
changeset
|
840 | |
| 10 | 841 | int nsapi_objecttype(NSAPISession *sn, NSAPIRequest *rq) { |
|
21
627b09ee74e4
New configuration loader
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
20
diff
changeset
|
842 | //printf("nsapi_objecttype\n"); |
| 10 | 843 | httpd_objset *objset = rq->rq.os; |
| 844 | ||
| 845 | if(NCX_OI(rq) == -1) { | |
|
87
bdec069d2239
fixed pathcheck behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
846 | // object index is undefined -> define correct object index |
| 10 | 847 | NCX_OI(rq) = objset->pos - 1; |
| 848 | } | |
| 849 | ||
| 850 | int ret = rq->context.last_req_code; | |
| 851 | for(int i=NCX_OI(rq);i>=0;i--) { | |
| 852 | httpd_object *obj = objset->obj[i]; | |
| 853 | dtable *dt = object_get_dtable(obj, NSAPIObjectType); | |
| 854 | ||
| 855 | // execute directives | |
|
37
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
856 | for(int j=NCX_DI(rq);j<dt->ndir;j++) { |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
857 | if(ret == REQ_NOACTION) { |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
858 | directive *d = dt->dirs[j]; |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
859 | ret = nsapi_exec(d, sn, rq); |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
860 | } |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
861 | |
| 10 | 862 | switch(ret) { |
| 863 | case REQ_PROCEED: { | |
| 864 | char *type = pblock_findkeyval( | |
| 865 | pb_key_content_type, | |
| 866 | rq->rq.srvhdrs); | |
| 867 | if(type == NULL) { | |
| 868 | ret = REQ_NOACTION; | |
| 869 | break; | |
| 870 | } | |
| 871 | return ret; | |
| 872 | } | |
| 873 | case REQ_PROCESSING: { | |
|
87
bdec069d2239
fixed pathcheck behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
874 | // save nsapi context |
| 10 | 875 | rq->context.objset_index = i; |
| 876 | ||
|
87
bdec069d2239
fixed pathcheck behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
877 | // add +1 to start next round with next function |
| 10 | 878 | rq->context.dtable_index = j + 1; |
| 879 | return ret; | |
| 880 | } | |
| 881 | case REQ_NOACTION: { | |
| 882 | break; | |
| 883 | } | |
| 884 | default: { | |
| 885 | return ret; | |
| 886 | } | |
| 887 | } | |
| 888 | } | |
| 889 | } | |
| 890 | ||
| 891 | /* | |
| 892 | * No function returned with REQ_PROCEED, but we need a content type. | |
| 893 | * If the path ends with a '/', we set the content type to | |
| 894 | * 'internal/directory' so that 'index-common' can serve the content. | |
| 895 | * Otherwise we set the content type to text/plain | |
| 896 | */ | |
|
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
411
diff
changeset
|
897 | cxstring path = cx_str(pblock_findkeyval(pb_key_ppath, rq->rq.vars)); |
|
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
411
diff
changeset
|
898 | cxstring ct; |
| 10 | 899 | if(path.ptr[path.length - 1] == '/') { |
|
87
bdec069d2239
fixed pathcheck behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
900 | // directory |
|
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
411
diff
changeset
|
901 | ct = (cxstring)CX_STR("internal/directory"); |
| 10 | 902 | } else { |
|
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
411
diff
changeset
|
903 | ct = (cxstring)CX_STR("text/plain"); |
| 10 | 904 | } |
| 905 | pblock_kvinsert(pb_key_content_type, ct.ptr, ct.length, rq->rq.srvhdrs); | |
| 906 | ||
| 907 | return REQ_PROCEED; | |
| 908 | } | |
| 909 | ||
|
3
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
910 | int nsapi_service(NSAPISession *sn, NSAPIRequest *rq) { |
|
21
627b09ee74e4
New configuration loader
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
20
diff
changeset
|
911 | //printf("nsapi_service\n"); |
|
6
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
912 | httpd_objset *objset = rq->rq.os; |
|
3
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
913 | |
|
6
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
914 | if(NCX_OI(rq) == -1) { |
|
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
915 | NCX_OI(rq) = objset->pos - 1; |
|
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
916 | } |
|
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
917 | |
|
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
918 | int ret = rq->context.last_req_code; |
|
12
34aa8001ea53
Added directory index
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
10
diff
changeset
|
919 | char *content_type = NULL; |
|
20
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
920 | char *method = NULL; |
|
6
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
921 | for(int i=NCX_OI(rq);i>=0;i--) { |
|
12
34aa8001ea53
Added directory index
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
10
diff
changeset
|
922 | httpd_object *obj = objset->obj[i]; |
|
3
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
923 | dtable *dt = object_get_dtable(obj, NSAPIService); |
|
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
924 | |
|
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
925 | // execute directives |
|
37
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
926 | for(int j=NCX_DI(rq);j<dt->ndir;j++) { |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
927 | if(ret == REQ_NOACTION) { |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
928 | directive *d = dt->dirs[j]; |
|
3
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
929 | |
|
87
bdec069d2239
fixed pathcheck behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
930 | // check type parameter |
|
37
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
931 | char *dtp = pblock_findkeyval(pb_key_type, d->param); |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
932 | if(dtp) { |
|
87
bdec069d2239
fixed pathcheck behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
933 | // type parameter for directive |
|
37
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
934 | if(!content_type) { |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
935 | content_type = pblock_findkeyval( |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
936 | pb_key_content_type, |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
937 | rq->rq.srvhdrs); |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
938 | } |
|
87
bdec069d2239
fixed pathcheck behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
939 | // compare types |
|
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
411
diff
changeset
|
940 | if(!contenttype_match(cx_str(dtp), cx_str(content_type))) { |
|
37
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
941 | continue; |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
942 | } |
|
20
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
943 | } |
|
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
944 | |
|
87
bdec069d2239
fixed pathcheck behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
945 | // check method parameter |
|
37
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
946 | char *dmt = pblock_findkeyval(pb_key_method, d->param); |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
947 | if(dmt) { |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
948 | if(!method) { |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
949 | method = pblock_findkeyval(pb_key_method, rq->rq.reqpb); |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
950 | } |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
951 | |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
952 | if(!method_match(dmt, method)) { |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
953 | continue; |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
954 | } |
|
20
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
955 | } |
|
37
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
956 | |
|
87
bdec069d2239
fixed pathcheck behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
957 | // execute the saf |
|
37
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
958 | ret = nsapi_exec(d, sn, rq); |
|
20
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
959 | } |
|
37
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
960 | |
|
6
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
961 | if(ret != REQ_NOACTION) { |
|
361
570026d3a685
make sure the http stream is finished if headers are sent
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
360
diff
changeset
|
962 | if(ret == REQ_PROCEED && !rq->rq.senthdrs) { |
|
570026d3a685
make sure the http stream is finished if headers are sent
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
360
diff
changeset
|
963 | // a service SAF must send a response |
|
570026d3a685
make sure the http stream is finished if headers are sent
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
360
diff
changeset
|
964 | // senthdrs == 0 indicators something has gone |
|
570026d3a685
make sure the http stream is finished if headers are sent
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
360
diff
changeset
|
965 | // wrong |
|
570026d3a685
make sure the http stream is finished if headers are sent
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
360
diff
changeset
|
966 | protocol_status(&sn->sn, &rq->rq, 500, NULL); |
|
570026d3a685
make sure the http stream is finished if headers are sent
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
360
diff
changeset
|
967 | ret = REQ_ABORTED; |
|
80
0de4a90979e1
fixed chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
79
diff
changeset
|
968 | } else if(ret == REQ_PROCESSING) { |
|
87
bdec069d2239
fixed pathcheck behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
969 | // save nsapi context |
|
6
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
970 | rq->context.objset_index = i; |
|
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
971 | |
|
87
bdec069d2239
fixed pathcheck behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
972 | // add +1 to start next round with next function |
|
6
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
973 | rq->context.dtable_index = j + 1; |
|
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
974 | } |
|
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
975 | |
|
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
976 | return ret; |
|
3
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
977 | } |
|
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
978 | } |
|
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
979 | } |
|
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
980 | |
|
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
981 | return ret; |
|
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
982 | } |
|
137197831306
minimal request handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
983 | |
|
95
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
984 | int nsapi_error(NSAPISession *sn, NSAPIRequest *rq) { |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
985 | //printf("nsapi_error\n"); |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
986 | httpd_objset *objset = rq->rq.os; |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
987 | |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
988 | if(NCX_OI(rq) == -1) { |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
989 | NCX_OI(rq) = objset->pos - 1; |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
990 | } |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
991 | |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
992 | int ret = rq->context.last_req_code; |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
993 | for(int i=NCX_OI(rq);i>=0;i--) { |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
994 | httpd_object *obj = objset->obj[i]; |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
995 | dtable *dt = object_get_dtable(obj, NSAPIError); |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
996 | |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
997 | // execute directives |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
998 | for(int j=NCX_DI(rq);j<dt->ndir;j++) { |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
999 | if(ret == REQ_NOACTION) { |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
1000 | directive *d = dt->dirs[j]; |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
1001 | |
|
339
f4a34b0869c7
replace atoi with util_strtoint
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1002 | // check status code parameter |
|
f4a34b0869c7
replace atoi with util_strtoint
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1003 | // Error SAFs can specify, for which status code they should |
|
f4a34b0869c7
replace atoi with util_strtoint
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1004 | // be executed |
|
95
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
1005 | char *status = pblock_findkeyval(pb_key_type, d->param); |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
1006 | if(status) { |
|
339
f4a34b0869c7
replace atoi with util_strtoint
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1007 | int64_t statuscode = -1; |
|
f4a34b0869c7
replace atoi with util_strtoint
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1008 | if(!util_strtoint(status, &statuscode)) { |
|
f4a34b0869c7
replace atoi with util_strtoint
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1009 | log_ereport( |
|
f4a34b0869c7
replace atoi with util_strtoint
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1010 | LOG_WARN, |
|
f4a34b0869c7
replace atoi with util_strtoint
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1011 | "nsapi_error: directive '%s' ignored: invalid type parameter: integer status code expected", |
|
f4a34b0869c7
replace atoi with util_strtoint
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1012 | d->func->name); |
|
f4a34b0869c7
replace atoi with util_strtoint
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1013 | } else if(statuscode != rq->rq.status_num) { |
|
95
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
1014 | continue; |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
1015 | } |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
1016 | } |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
1017 | |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
1018 | // execute the saf |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
1019 | ret = nsapi_exec(d, sn, rq); |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
1020 | } |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
1021 | |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
1022 | if(ret == REQ_ABORTED) { |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
1023 | // if an error directive fails, we use the default |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
1024 | // error handler |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
1025 | break; |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
1026 | } |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
1027 | if(ret != REQ_NOACTION) { |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
1028 | if(ret == REQ_PROCEED) { |
|
339
f4a34b0869c7
replace atoi with util_strtoint
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1029 | // flush buffer and add termination if chunked encoding |
|
f4a34b0869c7
replace atoi with util_strtoint
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1030 | // is enabled |
|
95
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
1031 | net_finish(sn->sn.csd); |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
1032 | } else if(ret == REQ_PROCESSING) { |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
1033 | // save nsapi context |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
1034 | rq->context.objset_index = i; |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
1035 | |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
1036 | // add +1 to start next round with next function |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
1037 | rq->context.dtable_index = j + 1; |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
1038 | } |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
1039 | return ret; |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
1040 | } |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
1041 | } |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
1042 | } |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
1043 | |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
1044 | if(ret != REQ_PROCEED) { |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
1045 | // default error handler |
|
235
4990147c58d0
add handler for http expect header
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
211
diff
changeset
|
1046 | if(!rq->rq.senthdrs) { |
|
4990147c58d0
add handler for http expect header
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
211
diff
changeset
|
1047 | nsapi_error_request((Session*)sn, (Request*)rq); |
|
4990147c58d0
add handler for http expect header
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
211
diff
changeset
|
1048 | } |
|
95
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
1049 | } |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
1050 | |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
1051 | return ret; |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
1052 | } |
|
74a81d9e19d0
added error directive for custom error pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
1053 | |
|
45
a24aa388f02f
added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
1054 | int nsapi_addlog(NSAPISession *sn, NSAPIRequest *rq) { |
|
a24aa388f02f
added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
1055 | //printf("nsapi_addlog\n"); |
|
a24aa388f02f
added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
1056 | httpd_objset *objset = rq->rq.os; |
|
a24aa388f02f
added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
1057 | |
|
a24aa388f02f
added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
1058 | if(NCX_OI(rq) == -1) { |
|
a24aa388f02f
added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
1059 | NCX_OI(rq) = objset->pos - 1; |
|
a24aa388f02f
added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
1060 | } |
|
a24aa388f02f
added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
1061 | |
|
a24aa388f02f
added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
1062 | int ret = rq->context.last_req_code; |
|
a24aa388f02f
added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
1063 | for(int i=NCX_OI(rq);i>=0;i--) { |
|
a24aa388f02f
added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
1064 | httpd_object *obj = objset->obj[i]; |
|
a24aa388f02f
added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
1065 | dtable *dt = object_get_dtable(obj, NSAPIAddLog); |
|
a24aa388f02f
added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
1066 | |
|
a24aa388f02f
added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
1067 | // execute directives |
|
a24aa388f02f
added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
1068 | for(int j=NCX_DI(rq);j<dt->ndir;j++) { |
|
a24aa388f02f
added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
1069 | if(ret == REQ_NOACTION) { |
|
a24aa388f02f
added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
1070 | directive *d = dt->dirs[j]; |
|
a24aa388f02f
added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
1071 | ret = nsapi_exec(d, sn, rq); |
|
a24aa388f02f
added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
1072 | } |
|
a24aa388f02f
added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
1073 | |
|
a24aa388f02f
added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
1074 | if(ret != REQ_NOACTION) { |
|
a24aa388f02f
added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
1075 | if(ret == REQ_PROCESSING) { |
|
87
bdec069d2239
fixed pathcheck behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
1076 | // save nsapi context |
|
45
a24aa388f02f
added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
1077 | rq->context.objset_index = i; |
|
a24aa388f02f
added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
1078 | |
|
87
bdec069d2239
fixed pathcheck behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
1079 | // add +1 to start next round with next function |
|
45
a24aa388f02f
added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
1080 | rq->context.dtable_index = j + 1; |
|
a24aa388f02f
added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
1081 | } |
|
a24aa388f02f
added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
1082 | |
|
a24aa388f02f
added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
1083 | return ret; |
|
a24aa388f02f
added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
1084 | } |
|
a24aa388f02f
added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
1085 | } |
|
a24aa388f02f
added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
1086 | } |
|
a24aa388f02f
added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
1087 | |
|
a24aa388f02f
added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
1088 | return REQ_PROCEED; |
|
a24aa388f02f
added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
1089 | } |
|
a24aa388f02f
added access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
1090 | |
|
37
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1091 | struct _tpd_data { |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1092 | NSAPISession *sn; |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1093 | NSAPIRequest *rq; |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1094 | directive *directive; |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1095 | threadpool_t *threadpool; |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1096 | }; |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1097 | |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1098 | int nsapi_exec(directive *d, NSAPISession *sn, NSAPIRequest *rq) { |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1099 | // TODO: condition |
|
83
28433f06d5ee
added minimal nsapi conditions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
80
diff
changeset
|
1100 | if(d->cond) { |
|
28433f06d5ee
added minimal nsapi conditions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
80
diff
changeset
|
1101 | if(!condition_evaluate(d->cond, (Session*)sn, (Request*)rq)) { |
|
28433f06d5ee
added minimal nsapi conditions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
80
diff
changeset
|
1102 | return REQ_NOACTION; |
|
28433f06d5ee
added minimal nsapi conditions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
80
diff
changeset
|
1103 | } |
|
28433f06d5ee
added minimal nsapi conditions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
80
diff
changeset
|
1104 | } |
|
37
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1105 | |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1106 | char *poolname = pblock_findkeyval(pb_key_pool, d->param); |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1107 | if(poolname) { |
|
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
411
diff
changeset
|
1108 | threadpool_t *pool = get_threadpool(cx_str(poolname)); |
|
37
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1109 | if(pool && pool != sn->currentpool) { |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1110 | // execute directive in different thread pool |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1111 | return nsapi_exec_tp(d, sn, rq, pool); |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1112 | } |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1113 | } else if(sn->currentpool != sn->defaultpool) { |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1114 | // if no pool is set, use always the default thread pool |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1115 | return nsapi_exec_tp(d, sn, rq, sn->defaultpool); |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1116 | } |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1117 | |
|
84
afd57ce39ec9
added initial java plugin code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
83
diff
changeset
|
1118 | return SAF_EXEC(d->func, d->param, (Session*)sn, (Request*)rq); |
|
37
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1119 | } |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1120 | |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1121 | int nsapi_exec_tp( |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1122 | directive *d, |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1123 | NSAPISession *sn, |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1124 | NSAPIRequest *rq, |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1125 | threadpool_t *pool) |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1126 | { |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1127 | struct _tpd_data *data = malloc(sizeof(struct _tpd_data)); |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1128 | if(data == NULL) { |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1129 | // TODO: set error |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1130 | return REQ_ABORTED; |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1131 | } |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1132 | data->sn = sn; |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1133 | data->rq = rq; |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1134 | data->directive = d; |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1135 | data->threadpool = pool; |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1136 | |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1137 | sn->currentpool = pool; |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1138 | threadpool_run(pool, thrpool_exec, data); |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1139 | |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1140 | return REQ_PROCESSING; |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1141 | } |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1142 | |
|
531
9b15b1f72bef
change nsapi_function_return behavior: move saf return to the end of the event cycle
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
495
diff
changeset
|
1143 | void nsapi_saf_return(Session *session, Request *request, int ret) { |
|
37
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1144 | NSAPISession *sn = (NSAPISession*)session; |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1145 | NSAPIRequest *rq = (NSAPIRequest*)request; |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1146 | |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1147 | rq->context.last_req_code = ret; |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1148 | |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1149 | if(sn->currentpool != sn->defaultpool) { |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1150 | nsapi_change_threadpool(sn, rq, sn->defaultpool); |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1151 | } else { |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1152 | nsapi_handle_request(sn, rq); |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1153 | } |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1154 | } |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1155 | |
|
531
9b15b1f72bef
change nsapi_function_return behavior: move saf return to the end of the event cycle
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
495
diff
changeset
|
1156 | void nsapi_function_return(Session *session, Request *request, int ret) { |
|
9b15b1f72bef
change nsapi_function_return behavior: move saf return to the end of the event cycle
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
495
diff
changeset
|
1157 | ev_saf_return(session->ev, session, request, ret); |
|
9b15b1f72bef
change nsapi_function_return behavior: move saf return to the end of the event cycle
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
495
diff
changeset
|
1158 | } |
|
9b15b1f72bef
change nsapi_function_return behavior: move saf return to the end of the event cycle
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
495
diff
changeset
|
1159 | |
|
37
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1160 | void nsapi_change_threadpool( |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1161 | NSAPISession *sn, |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1162 | NSAPIRequest *rq, |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1163 | threadpool_t *thrpool) |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1164 | { |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1165 | struct _tpd_data *data = malloc(sizeof(struct _tpd_data)); |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1166 | data->sn = sn; |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1167 | data->rq = rq; |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1168 | data->threadpool = thrpool; |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1169 | |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1170 | threadpool_run(thrpool, thrpool_change, data); |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1171 | } |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1172 | |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1173 | void* thrpool_exec(void *d) { |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1174 | struct _tpd_data *data = d; |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1175 | |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1176 | data->sn->currentpool = data->threadpool; |
|
84
afd57ce39ec9
added initial java plugin code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
83
diff
changeset
|
1177 | int r = SAF_EXEC( |
|
afd57ce39ec9
added initial java plugin code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
83
diff
changeset
|
1178 | data->directive->func, |
|
37
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1179 | data->directive->param, |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1180 | (Session*)data->sn, |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1181 | (Request*)data->rq); |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1182 | |
|
116
d7a186cf87f6
adds find-pathinfo saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
115
diff
changeset
|
1183 | nsapi_function_return((Session*)data->sn, (Request*)data->rq, r); |
|
37
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1184 | free(data); |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1185 | |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1186 | return NULL; |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1187 | } |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1188 | |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1189 | void* thrpool_change(void *d) { |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1190 | struct _tpd_data *data = d; |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1191 | |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1192 | data->sn->currentpool = data->threadpool; |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1193 | nsapi_handle_request(data->sn, data->rq); |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1194 | |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1195 | free(data); |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1196 | return NULL; |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1197 | } |
|
360b9aabe17e
added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
1198 | |
|
20
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
1199 | |
|
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
1200 | /* |
|
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
1201 | * checks if the method matches the cmp string |
|
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
1202 | * the format of cmp is a single method string or a list of methods |
|
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
1203 | * (method1|method2|method3|...) |
|
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
1204 | */ |
|
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
1205 | int method_match(char *cmp, char *method) { |
|
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
1206 | if(cmp[0] != '(') { |
|
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
1207 | /* not a list of methods, so just compare the 2 strings */ |
|
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
1208 | if(!strcmp(cmp, method)) { |
|
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
1209 | return 1; |
|
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
1210 | } |
|
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
1211 | } else if(cmp[0] == 0) { |
|
142
55298bc9ed28
adds new a pathcheck saf and improves content type matchin and improves content type matching
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
141
diff
changeset
|
1212 | // empty string |
|
55298bc9ed28
adds new a pathcheck saf and improves content type matchin and improves content type matching
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
141
diff
changeset
|
1213 | log_ereport( |
|
55298bc9ed28
adds new a pathcheck saf and improves content type matchin and improves content type matching
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
141
diff
changeset
|
1214 | LOG_WARN, |
|
55298bc9ed28
adds new a pathcheck saf and improves content type matchin and improves content type matching
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
141
diff
changeset
|
1215 | "Skipped service saf with empty method parameter"); |
|
20
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
1216 | return 0; |
|
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
1217 | } |
|
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
1218 | |
|
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
1219 | size_t method_len = strlen(method); |
|
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
1220 | size_t last_pos = 0; |
|
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
1221 | cmp++; /* skip '(' */ |
|
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
1222 | for(int i=0;cmp[i]!=0;i++) { |
|
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
1223 | char c = cmp[i]; |
|
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
1224 | if(c == '|' || c == ')') { |
|
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
1225 | size_t len = i - last_pos; |
|
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
1226 | if(len == method_len) { |
|
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
1227 | char *cp = cmp + last_pos; |
|
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
1228 | if(!memcmp(cp, method, len)) { |
|
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
1229 | return 1; |
|
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
1230 | } |
|
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
1231 | } |
|
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
1232 | last_pos = i + 1; |
|
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
1233 | } |
|
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
1234 | } |
|
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
1235 | |
|
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
1236 | return 0; |
|
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
1237 | } |
|
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
19
diff
changeset
|
1238 | |
|
6
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
1239 | /* |
|
142
55298bc9ed28
adds new a pathcheck saf and improves content type matchin and improves content type matching
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
141
diff
changeset
|
1240 | * checks if the content type matches the cmp string |
|
55298bc9ed28
adds new a pathcheck saf and improves content type matchin and improves content type matching
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
141
diff
changeset
|
1241 | * the format of cmp is a single string with wildcards or a list |
|
55298bc9ed28
adds new a pathcheck saf and improves content type matchin and improves content type matching
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
141
diff
changeset
|
1242 | * of types (also with wildcard support) |
|
55298bc9ed28
adds new a pathcheck saf and improves content type matchin and improves content type matching
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
141
diff
changeset
|
1243 | * (type1|type2*) |
|
55298bc9ed28
adds new a pathcheck saf and improves content type matchin and improves content type matching
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
141
diff
changeset
|
1244 | */ |
|
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
411
diff
changeset
|
1245 | int contenttype_match(cxstring cmp, cxstring ctype) { |
|
142
55298bc9ed28
adds new a pathcheck saf and improves content type matchin and improves content type matching
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
141
diff
changeset
|
1246 | if(cmp.ptr[0] != '(') { |
|
55298bc9ed28
adds new a pathcheck saf and improves content type matchin and improves content type matching
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
141
diff
changeset
|
1247 | if(cmp.ptr[0] == '*') { |
|
55298bc9ed28
adds new a pathcheck saf and improves content type matchin and improves content type matching
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
141
diff
changeset
|
1248 | cmp.ptr++; |
|
55298bc9ed28
adds new a pathcheck saf and improves content type matchin and improves content type matching
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
141
diff
changeset
|
1249 | cmp.length--; |
|
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
411
diff
changeset
|
1250 | return cx_strsuffix(ctype, cmp); |
|
142
55298bc9ed28
adds new a pathcheck saf and improves content type matchin and improves content type matching
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
141
diff
changeset
|
1251 | } else if(cmp.ptr[cmp.length-1] == '*') { |
|
55298bc9ed28
adds new a pathcheck saf and improves content type matchin and improves content type matching
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
141
diff
changeset
|
1252 | cmp.length--; |
|
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
411
diff
changeset
|
1253 | return cx_strprefix(ctype, cmp); |
|
142
55298bc9ed28
adds new a pathcheck saf and improves content type matchin and improves content type matching
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
141
diff
changeset
|
1254 | } else { |
|
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
411
diff
changeset
|
1255 | return !cx_strcmp(cmp, ctype); |
|
142
55298bc9ed28
adds new a pathcheck saf and improves content type matchin and improves content type matching
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
141
diff
changeset
|
1256 | } |
|
55298bc9ed28
adds new a pathcheck saf and improves content type matchin and improves content type matching
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
141
diff
changeset
|
1257 | } else if(cmp.ptr[0] == 0) { |
|
55298bc9ed28
adds new a pathcheck saf and improves content type matchin and improves content type matching
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
141
diff
changeset
|
1258 | log_ereport(LOG_WARN, "Skipped service saf with empty type parameter"); |
|
55298bc9ed28
adds new a pathcheck saf and improves content type matchin and improves content type matching
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
141
diff
changeset
|
1259 | return 0; |
|
55298bc9ed28
adds new a pathcheck saf and improves content type matchin and improves content type matching
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
141
diff
changeset
|
1260 | } |
|
55298bc9ed28
adds new a pathcheck saf and improves content type matchin and improves content type matching
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
141
diff
changeset
|
1261 | |
|
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
411
diff
changeset
|
1262 | cmp = cx_strsubsl(cmp, 1, cmp.length - 2); |
|
142
55298bc9ed28
adds new a pathcheck saf and improves content type matchin and improves content type matching
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
141
diff
changeset
|
1263 | |
|
55298bc9ed28
adds new a pathcheck saf and improves content type matchin and improves content type matching
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
141
diff
changeset
|
1264 | int begin = 0; |
|
55298bc9ed28
adds new a pathcheck saf and improves content type matchin and improves content type matching
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
141
diff
changeset
|
1265 | for(int i=0;i<cmp.length;i++) { |
|
55298bc9ed28
adds new a pathcheck saf and improves content type matchin and improves content type matching
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
141
diff
changeset
|
1266 | if(cmp.ptr[i] == '|') { |
|
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
411
diff
changeset
|
1267 | if(contenttype_match(cx_strsubsl(cmp, begin, i-begin), ctype)) { |
|
142
55298bc9ed28
adds new a pathcheck saf and improves content type matchin and improves content type matching
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
141
diff
changeset
|
1268 | return 1; |
|
55298bc9ed28
adds new a pathcheck saf and improves content type matchin and improves content type matching
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
141
diff
changeset
|
1269 | } |
|
55298bc9ed28
adds new a pathcheck saf and improves content type matchin and improves content type matching
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
141
diff
changeset
|
1270 | begin = i + 1; |
|
55298bc9ed28
adds new a pathcheck saf and improves content type matchin and improves content type matching
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
141
diff
changeset
|
1271 | } |
|
55298bc9ed28
adds new a pathcheck saf and improves content type matchin and improves content type matching
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
141
diff
changeset
|
1272 | } |
|
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
411
diff
changeset
|
1273 | return contenttype_match(cx_strsubs(cmp, begin), ctype); |
|
142
55298bc9ed28
adds new a pathcheck saf and improves content type matchin and improves content type matching
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
141
diff
changeset
|
1274 | } |
|
55298bc9ed28
adds new a pathcheck saf and improves content type matchin and improves content type matching
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
141
diff
changeset
|
1275 | |
|
55298bc9ed28
adds new a pathcheck saf and improves content type matchin and improves content type matching
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
141
diff
changeset
|
1276 | /* |
|
6
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
1277 | * adds objects with specific name or path to the httpd_objset |
|
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
1278 | */ |
|
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
1279 | int add_objects( |
|
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
1280 | HTTPObjectConfig *objs, |
|
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
1281 | httpd_objset *os, |
|
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
1282 | NSAPISession *sn, |
|
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
1283 | NSAPIRequest *rq, |
|
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
1284 | char *name, |
|
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
1285 | char *path) |
|
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
1286 | { |
|
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
1287 | /* first, add all objects with a matching path */ |
| 10 | 1288 | /* TODO */ |
|
6
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
1289 | |
|
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
1290 | |
|
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
1291 | /* add object with object with matching name */ |
| 10 | 1292 | if(name == NULL) { |
| 1293 | return REQ_PROCEED; | |
| 1294 | } | |
| 1295 | ||
| 1296 | for(int i=0;i<objs->nobj;i++) { | |
| 1297 | httpd_object *obj = objs->objects[i]; | |
| 1298 | ||
| 1299 | if(obj->name && !strcmp(name, obj->name)) { | |
| 1300 | objset_add_object(sn->sn.pool, os, obj); | |
| 1301 | } | |
| 1302 | } | |
|
6
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
1303 | |
|
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
1304 | return REQ_PROCEED; |
|
ce8fecc9847d
improved request processing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
5
diff
changeset
|
1305 | } |