Thu, 26 Feb 2026 21:35:53 +0100
fix proxy event handling
|
662
70fdf948b642
refactor HttpParser to support parsing of Http responses
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1 | /* |
|
70fdf948b642
refactor HttpParser to support parsing of Http responses
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
2 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. |
|
70fdf948b642
refactor HttpParser to support parsing of Http responses
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
3 | * |
|
70fdf948b642
refactor HttpParser to support parsing of Http responses
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
4 | * Copyright 2026 Olaf Wintermann. All rights reserved. |
|
70fdf948b642
refactor HttpParser to support parsing of Http responses
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
5 | * |
|
70fdf948b642
refactor HttpParser to support parsing of Http responses
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
6 | * Redistribution and use in source and binary forms, with or without |
|
70fdf948b642
refactor HttpParser to support parsing of Http responses
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
7 | * modification, are permitted provided that the following conditions are met: |
|
70fdf948b642
refactor HttpParser to support parsing of Http responses
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
8 | * |
|
70fdf948b642
refactor HttpParser to support parsing of Http responses
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
9 | * 1. Redistributions of source code must retain the above copyright |
|
70fdf948b642
refactor HttpParser to support parsing of Http responses
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
10 | * notice, this list of conditions and the following disclaimer. |
|
70fdf948b642
refactor HttpParser to support parsing of Http responses
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
11 | * |
|
70fdf948b642
refactor HttpParser to support parsing of Http responses
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
12 | * 2. Redistributions in binary form must reproduce the above copyright |
|
70fdf948b642
refactor HttpParser to support parsing of Http responses
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
13 | * notice, this list of conditions and the following disclaimer in the |
|
70fdf948b642
refactor HttpParser to support parsing of Http responses
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
14 | * documentation and/or other materials provided with the distribution. |
|
70fdf948b642
refactor HttpParser to support parsing of Http responses
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
15 | * |
|
70fdf948b642
refactor HttpParser to support parsing of Http responses
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
16 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
|
70fdf948b642
refactor HttpParser to support parsing of Http responses
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
17 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
|
70fdf948b642
refactor HttpParser to support parsing of Http responses
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
18 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
|
70fdf948b642
refactor HttpParser to support parsing of Http responses
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
19 | * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
|
70fdf948b642
refactor HttpParser to support parsing of Http responses
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
20 | * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
|
70fdf948b642
refactor HttpParser to support parsing of Http responses
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
|
70fdf948b642
refactor HttpParser to support parsing of Http responses
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
|
70fdf948b642
refactor HttpParser to support parsing of Http responses
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
|
70fdf948b642
refactor HttpParser to support parsing of Http responses
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
|
70fdf948b642
refactor HttpParser to support parsing of Http responses
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
|
70fdf948b642
refactor HttpParser to support parsing of Http responses
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
26 | * POSSIBILITY OF SUCH DAMAGE. |
|
70fdf948b642
refactor HttpParser to support parsing of Http responses
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
27 | */ |
|
70fdf948b642
refactor HttpParser to support parsing of Http responses
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
28 | |
|
70fdf948b642
refactor HttpParser to support parsing of Http responses
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
29 | #include "proxy.h" |
|
70fdf948b642
refactor HttpParser to support parsing of Http responses
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
30 | |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
670
diff
changeset
|
31 | #include <sys/socket.h> |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
670
diff
changeset
|
32 | #include <arpa/inet.h> |
|
699
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
33 | #include <sys/types.h> |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
34 | #include <netdb.h> |
|
672
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
35 | #include <ctype.h> |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
36 | #include <string.h> |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
670
diff
changeset
|
37 | |
|
662
70fdf948b642
refactor HttpParser to support parsing of Http responses
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
38 | #include "../util/pblock.h" |
|
696
27e42da5050f
proxy: get uri from pb_key_uri/pb_key_query instead of clf-request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
39 | #include "../util/util.h" |
|
706
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
40 | #include "../util/io.h" |
|
667
1f0f014c0121
add pblock_iterator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
41 | #include "../proxy/httpclient.h" |
|
1f0f014c0121
add pblock_iterator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
42 | |
|
669
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
667
diff
changeset
|
43 | |
|
672
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
44 | typedef struct ProxyRequest { |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
670
diff
changeset
|
45 | Session *sn; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
670
diff
changeset
|
46 | Request *rq; |
|
672
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
47 | |
|
706
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
48 | HttpClient *client; |
|
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
49 | |
|
672
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
50 | /* |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
51 | * request header rewrite map |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
52 | * name: header name |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
53 | * value: header value or an empty string, if the header should be removed |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
54 | */ |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
55 | pblock *request_header_rewrite; |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
56 | |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
57 | /* |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
58 | * response header rewrite map |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
59 | * name: header name |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
60 | * value: header value or an empty string, if the header should be removed |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
61 | */ |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
62 | pblock *response_header_rewrite; |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
63 | |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
64 | /* |
|
706
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
65 | * event structure for sn->csd |
|
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
66 | */ |
|
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
67 | Event event; |
|
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
68 | |
|
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
69 | /* |
|
672
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
70 | * Has the response started (proxy_response_start called) |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
71 | */ |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
72 | int response_started; |
|
706
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
73 | |
|
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
74 | /* |
|
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
75 | * reference counter |
|
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
76 | */ |
|
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
77 | int ref; |
|
672
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
78 | } ProxyRequest; |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
670
diff
changeset
|
79 | |
|
706
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
80 | static void proxy_unref(ProxyRequest *proxy) { |
|
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
81 | if(--proxy->ref == 0) { |
|
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
82 | http_client_free(proxy->client); |
|
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
83 | free(proxy); |
|
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
84 | } |
|
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
85 | } |
|
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
86 | |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
670
diff
changeset
|
87 | static int proxy_response_start(HttpClient *client, int status, char *message, void *userdata) { |
|
672
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
88 | ProxyRequest *proxy = userdata; |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
89 | |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
90 | HeaderArray *headers = client->response_headers; |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
91 | while(headers) { |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
92 | for(int i=0;i<headers->len;i++) { |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
93 | cxmutstr name = headers->headers[i].name; |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
94 | cxmutstr value = headers->headers[i].value; |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
95 | // NSAPI uses lower case header names internally |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
96 | for(int c=0;c<name.length;c++) { |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
97 | name.ptr[c] = tolower(name.ptr[c]); |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
98 | } |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
99 | // HttpClient does not 0-terminate strings |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
100 | name.ptr[name.length] = 0; |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
101 | // check if this header should be modified |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
102 | char *rewrite = pblock_findval(name.ptr, proxy->response_header_rewrite); |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
103 | if(rewrite) { |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
104 | value = cx_mutstr(rewrite); |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
105 | if(value.length == 0) { |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
106 | // empty header value -> skip |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
107 | continue; |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
108 | } |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
109 | } |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
110 | |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
111 | // add header to response |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
112 | pblock_nvlinsert(name.ptr, name.length, value.ptr, value.length, proxy->rq->srvhdrs); |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
113 | } |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
114 | headers = headers->next; |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
115 | } |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
670
diff
changeset
|
116 | |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
670
diff
changeset
|
117 | protocol_status(proxy->sn, proxy->rq, status, message); |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
670
diff
changeset
|
118 | protocol_start_response(proxy->sn, proxy->rq); |
|
672
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
119 | proxy->response_started = 1; |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
670
diff
changeset
|
120 | |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
670
diff
changeset
|
121 | return 0; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
670
diff
changeset
|
122 | } |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
670
diff
changeset
|
123 | |
|
672
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
124 | static void proxy_response_finished(HttpClient *client, void *userdata) { |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
125 | ProxyRequest *proxy = userdata; |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
126 | |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
127 | int ret = REQ_PROCEED; |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
128 | if(!proxy->response_started) { |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
129 | protocol_status(proxy->sn, proxy->rq, 502, NULL); |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
130 | ret = REQ_ABORTED; |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
131 | } |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
132 | |
|
707
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
133 | if(client->last_event != &proxy->event && proxy->event.fn != NULL) { |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
134 | if(!ev_remove_poll(client->ev, proxy->event.object)) { |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
135 | proxy_unref(proxy); |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
136 | } else { |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
137 | log_ereport(LOG_FAILURE, "proxy_response_finished: cannot remove poll"); |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
138 | } |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
139 | proxy->event.finish = NULL; |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
140 | } |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
141 | |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
142 | // return to nsapi threadpool |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
143 | net_setnonblock(proxy->sn->csd, 0); |
|
706
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
144 | nsapi_function_return(proxy->sn, proxy->rq, ret); |
|
672
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
145 | |
|
706
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
146 | proxy_unref(proxy); |
|
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
147 | } |
|
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
148 | |
|
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
149 | static int proxy_request_read_event(EventHandler *eh, Event *event) { |
|
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
150 | ProxyRequest *proxy = event->cookie; |
|
707
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
151 | if(http_client_process(proxy->client, event)) { |
|
706
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
152 | if(proxy->client->error == 0) { |
|
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
153 | return 1; |
|
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
154 | } |
|
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
155 | } |
|
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
156 | return 0; |
|
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
157 | } |
|
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
158 | |
|
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
159 | static int proxy_request_read_finished(EventHandler *eh, Event *event) { |
|
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
160 | ProxyRequest *proxy = event->cookie; |
|
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
161 | proxy_unref(proxy); |
|
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
162 | return 0; |
|
672
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
163 | } |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
164 | |
|
675
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
165 | static ssize_t proxy_request_read(HttpClient *client, void *buf, size_t nbytes, void *userdata) { |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
166 | ProxyRequest *proxy = userdata; |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
167 | int ret = netbuf_getbytes(proxy->sn->inbuf, buf, nbytes); |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
168 | if(ret == NETBUF_EOF) { |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
169 | ret = 0; |
|
706
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
170 | } else if(ret < 0) { |
|
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
171 | IOStream *st = proxy->sn->csd; |
|
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
172 | if(st->io_errno == EWOULDBLOCK) { |
|
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
173 | ret = HTTP_CLIENT_CALLBACK_WOULD_BLOCK; |
|
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
174 | // is there already an poll event for csd? |
|
707
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
175 | if(!proxy->event.fn) { |
|
706
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
176 | proxy->ref++; |
|
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
177 | proxy->event.cookie = proxy; |
|
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
178 | proxy->event.fn = proxy_request_read_event; |
|
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
179 | proxy->event.finish = proxy_request_read_finished; |
|
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
180 | if(event_pollin(client->ev, st, &proxy->event)) { |
|
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
181 | ret = HTTP_CLIENT_CALLBACK_ERROR; |
|
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
182 | } |
|
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
183 | } |
|
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
184 | } else { |
|
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
185 | ret = HTTP_CLIENT_CALLBACK_ERROR; |
|
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
186 | } |
|
675
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
187 | } |
|
706
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
188 | |
|
675
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
189 | return ret; |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
190 | } |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
191 | |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
670
diff
changeset
|
192 | static ssize_t proxy_response_write(HttpClient *client, void *buf, size_t nbytes, void *userdata) { |
|
672
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
193 | ProxyRequest *proxy = userdata; |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
670
diff
changeset
|
194 | ssize_t ret = net_write(proxy->sn->csd, buf, nbytes); |
|
707
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
195 | if(ret == NETBUF_EOF) { |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
196 | ret = HTTP_CLIENT_CALLBACK_ERROR; |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
197 | } else if(ret < 0) { |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
198 | IOStream *st = proxy->sn->csd; |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
199 | if(st->io_errno == EWOULDBLOCK) { |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
200 | // Is there already an poll event for csd? |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
201 | if(client->last_event == &proxy->event) { |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
202 | // Yes, there is already an event, and it even is the event that triggert this call. |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
203 | // Make sure it is a write event |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
204 | proxy->event.events = EVENT_POLLOUT; |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
205 | return HTTP_CLIENT_CALLBACK_WOULD_BLOCK; |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
206 | } else if(proxy->event.fn != NULL) { |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
207 | // There is an inactive event, probably a read event |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
208 | // Remove the old event before we add a write event |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
209 | if(ev_remove_poll(client->ev, proxy->event.object)) { |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
210 | log_ereport(LOG_FAILURE, "proxy_response_write: cannot remove poll"); |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
211 | return HTTP_CLIENT_CALLBACK_ERROR; |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
212 | } |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
213 | } else { |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
214 | proxy->ref++; |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
215 | proxy->event.cookie = proxy; |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
216 | proxy->event.fn = proxy_request_read_event; |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
217 | proxy->event.finish = proxy_request_read_finished; |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
218 | } |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
219 | // Add write event |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
220 | if(event_pollout(client->ev, proxy->sn->csd, &proxy->event)) { |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
221 | proxy_unref(proxy); |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
222 | log_ereport(LOG_FAILURE, "proxy_response_write: cannot add write poll"); |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
223 | } |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
224 | return HTTP_CLIENT_CALLBACK_ERROR; |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
225 | } |
|
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
226 | } |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
670
diff
changeset
|
227 | return ret; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
670
diff
changeset
|
228 | } |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
670
diff
changeset
|
229 | |
|
662
70fdf948b642
refactor HttpParser to support parsing of Http responses
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
230 | int http_reverse_proxy_service(pblock *param, Session *sn, Request *rq) { |
|
667
1f0f014c0121
add pblock_iterator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
231 | EventHandler *ev = sn->ev; |
|
669
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
667
diff
changeset
|
232 | const char *method = pblock_findkeyval(pb_key_method, rq->reqpb); |
|
696
27e42da5050f
proxy: get uri from pb_key_uri/pb_key_query instead of clf-request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
233 | const char *uri = pblock_findkeyval(pb_key_uri, rq->reqpb); |
|
27e42da5050f
proxy: get uri from pb_key_uri/pb_key_query instead of clf-request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
234 | const char *query = pblock_findkeyval(pb_key_query, rq->reqpb); |
|
667
1f0f014c0121
add pblock_iterator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
235 | |
|
699
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
236 | const char *location = pblock_findval("location", param); |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
237 | if(location) { |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
238 | cxstring loc = cx_str(location); |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
239 | if(cx_strprefix(uri, loc)) { |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
240 | if(loc.length > 0 && loc.ptr[loc.length-1] == '/') { |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
241 | uri += loc.length - 1; |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
242 | } else { |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
243 | uri += loc.length; |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
244 | } |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
245 | if(uri[0] == '\0') { |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
246 | uri = "/"; |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
247 | } |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
248 | } else { |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
249 | // location does not match |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
250 | return REQ_NOACTION; |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
251 | } |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
252 | } |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
253 | |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
254 | const char *server_url = pblock_findval("proxy-url", rq->vars); |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
255 | if(!server_url) { |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
256 | server_url = pblock_findval("url", param); |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
257 | if(!server_url) { |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
258 | log_ereport(LOG_MISCONFIG, "reverse-proxy: missing server url"); |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
259 | return REQ_ABORTED; |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
260 | } |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
261 | } |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
262 | WSUri srv_url; |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
263 | if(!util_parse_uri(server_url, &srv_url)) { |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
264 | log_ereport(LOG_MISCONFIG, "reverse-proxy: invalid server url: %s", server_url); |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
265 | return REQ_ABORTED; |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
266 | } |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
267 | |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
268 | char srvport[16]; |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
269 | snprintf(srvport, 16, "%d", (int)srv_url.port); |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
270 | |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
271 | char srvhost_static[256]; |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
272 | char *srvhost; |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
273 | if(srv_url.hostlen < 255) { |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
274 | memcpy(srvhost_static, srv_url.host, srv_url.hostlen); |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
275 | srvhost_static[srv_url.hostlen] = 0; |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
276 | srvhost = srvhost_static; |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
277 | } else { |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
278 | srvhost = pool_malloc(sn->pool, srv_url.hostlen + 1); |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
279 | if(!srvhost) { |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
280 | return REQ_ABORTED; |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
281 | } |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
282 | memcpy(srvhost, srv_url.host, srv_url.hostlen); |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
283 | srvhost[srv_url.hostlen] = 0; |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
284 | } |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
285 | |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
286 | // build the new uri using <srv_url.path><uri>?<query> |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
287 | if(srv_url.pathlen > 0 && srv_url.path[srv_url.pathlen-1] == '/') { |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
288 | srv_url.pathlen--; |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
289 | } |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
290 | |
|
696
27e42da5050f
proxy: get uri from pb_key_uri/pb_key_query instead of clf-request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
291 | cxmutstr new_uri = CX_NULLSTR; |
|
27e42da5050f
proxy: get uri from pb_key_uri/pb_key_query instead of clf-request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
292 | size_t uri_len = strlen(uri); |
|
27e42da5050f
proxy: get uri from pb_key_uri/pb_key_query instead of clf-request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
293 | size_t query_len = query ? strlen(query) : 0; |
|
699
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
294 | size_t new_uri_alloc = ((uri_len + query_len) * 3) + 2 + srv_url.pathlen; |
|
696
27e42da5050f
proxy: get uri from pb_key_uri/pb_key_query instead of clf-request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
295 | new_uri.ptr = pool_malloc(sn->pool, new_uri_alloc); |
|
699
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
296 | if(!new_uri.ptr) { |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
297 | return REQ_ABORTED; |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
298 | } |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
299 | |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
300 | char *s = new_uri.ptr; |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
301 | size_t s_len = new_uri_alloc; |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
302 | if(srv_url.pathlen > 0) { |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
303 | memcpy(s, srv_url.path, srv_url.pathlen); |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
304 | s += srv_url.pathlen; |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
305 | new_uri.length = srv_url.pathlen; |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
306 | s_len -= srv_url.pathlen; |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
307 | } |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
308 | |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
309 | new_uri.length += util_uri_escape_s(s, s_len, uri); |
|
696
27e42da5050f
proxy: get uri from pb_key_uri/pb_key_query instead of clf-request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
310 | if(new_uri.length > 0 && query_len > 0) { |
|
27e42da5050f
proxy: get uri from pb_key_uri/pb_key_query instead of clf-request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
311 | new_uri.ptr[new_uri.length] = '?'; |
|
27e42da5050f
proxy: get uri from pb_key_uri/pb_key_query instead of clf-request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
312 | memcpy(new_uri.ptr + new_uri.length + 1, query, query_len + 1); |
|
699
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
313 | new_uri.length += query_len + 1; |
|
669
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
667
diff
changeset
|
314 | } |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
667
diff
changeset
|
315 | |
|
672
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
316 | // remove some response headers, that were previously set by ObjectType |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
317 | // or other SAFs |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
318 | pblock_removekey(pb_key_content_type, rq->srvhdrs); |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
319 | |
|
706
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
320 | ProxyRequest *proxy = malloc(sizeof(ProxyRequest)); |
|
672
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
321 | proxy->sn = sn; |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
322 | proxy->rq = rq; |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
323 | proxy->request_header_rewrite = pblock_create_pool(sn->pool, 16); |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
324 | proxy->response_header_rewrite = pblock_create_pool(sn->pool, 16); |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
325 | proxy->response_started = 0; |
|
706
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
326 | proxy->ref = 1; |
|
672
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
327 | |
|
675
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
328 | // Some request/response headers should be removed or altered |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
329 | // An empty string means, the header should be removed |
|
672
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
330 | pblock_nvinsert("host", "", proxy->request_header_rewrite); |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
331 | pblock_nvinsert("connection", "", proxy->request_header_rewrite); |
|
675
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
332 | pblock_nvinsert("transfer-encoding", "", proxy->request_header_rewrite); |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
333 | pblock_nvinsert("content-length", "", proxy->request_header_rewrite); |
|
672
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
334 | pblock_nvinsert("server", "", proxy->response_header_rewrite); |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
335 | pblock_nvinsert("connection", "", proxy->response_header_rewrite); |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
336 | |
|
669
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
667
diff
changeset
|
337 | // setup HttpClient |
|
667
1f0f014c0121
add pblock_iterator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
338 | HttpClient *client = http_client_new(ev); |
|
669
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
667
diff
changeset
|
339 | if(!client) { |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
667
diff
changeset
|
340 | return REQ_ABORTED; |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
667
diff
changeset
|
341 | } |
|
706
df64b4b79912
add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
700
diff
changeset
|
342 | proxy->client = client; |
|
662
70fdf948b642
refactor HttpParser to support parsing of Http responses
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
343 | |
|
669
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
667
diff
changeset
|
344 | if(http_client_set_method(client, method)) { |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
667
diff
changeset
|
345 | http_client_free(client); |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
667
diff
changeset
|
346 | return REQ_ABORTED; |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
667
diff
changeset
|
347 | } |
|
662
70fdf948b642
refactor HttpParser to support parsing of Http responses
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
348 | |
|
696
27e42da5050f
proxy: get uri from pb_key_uri/pb_key_query instead of clf-request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
694
diff
changeset
|
349 | if(http_client_set_uri_len(client, new_uri.ptr, new_uri.length)) { |
|
669
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
667
diff
changeset
|
350 | http_client_free(client); |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
667
diff
changeset
|
351 | return REQ_ABORTED; |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
667
diff
changeset
|
352 | } |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
667
diff
changeset
|
353 | |
|
699
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
354 | // set server address |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
355 | struct addrinfo hints = { 0 }; |
|
700
658f4c02b4c5
fix proxy connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
699
diff
changeset
|
356 | hints.ai_family = AF_INET; //AF_UNSPEC; |
|
699
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
357 | hints.ai_socktype = SOCK_STREAM; |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
358 | struct addrinfo *srv_addr; |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
359 | if(getaddrinfo(srvhost, srvport, &hints, &srv_addr)) { |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
360 | http_client_free(client); |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
361 | log_ereport(LOG_FAILURE, "reverse-proxy: getaddr failed for address %s: %s", srvhost, strerror(errno)); |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
362 | return REQ_ABORTED; |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
363 | } |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
364 | |
|
700
658f4c02b4c5
fix proxy connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
699
diff
changeset
|
365 | WSBool addr_set = FALSE; |
|
658f4c02b4c5
fix proxy connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
699
diff
changeset
|
366 | struct addrinfo *addr = srv_addr; |
|
658f4c02b4c5
fix proxy connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
699
diff
changeset
|
367 | while(addr) { |
|
658f4c02b4c5
fix proxy connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
699
diff
changeset
|
368 | if(addr->ai_family == AF_INET || addr->ai_family == AF_INET6) { |
|
658f4c02b4c5
fix proxy connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
699
diff
changeset
|
369 | if(!http_client_set_addr(client, addr->ai_family, addr->ai_addr, addr->ai_addrlen)) { |
|
658f4c02b4c5
fix proxy connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
699
diff
changeset
|
370 | addr_set = TRUE; |
|
658f4c02b4c5
fix proxy connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
699
diff
changeset
|
371 | } |
|
658f4c02b4c5
fix proxy connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
699
diff
changeset
|
372 | break; |
|
658f4c02b4c5
fix proxy connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
699
diff
changeset
|
373 | } |
|
658f4c02b4c5
fix proxy connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
699
diff
changeset
|
374 | |
|
658f4c02b4c5
fix proxy connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
699
diff
changeset
|
375 | addr = addr->ai_next; |
|
658f4c02b4c5
fix proxy connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
699
diff
changeset
|
376 | } |
|
699
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
377 | freeaddrinfo(srv_addr); |
|
700
658f4c02b4c5
fix proxy connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
699
diff
changeset
|
378 | if(!addr_set) { |
|
699
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
379 | http_client_free(client); |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
380 | return REQ_ABORTED; |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
381 | } |
|
d794871da099
implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
696
diff
changeset
|
382 | |
|
669
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
667
diff
changeset
|
383 | // add request headers to the client |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
667
diff
changeset
|
384 | CxIterator i = pblock_iterator(rq->headers); |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
667
diff
changeset
|
385 | cx_foreach(pb_entry*, entry, i) { |
|
672
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
386 | cxmutstr header_value; |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
387 | char *rewrite_header = pblock_findval(entry->param->name, proxy->request_header_rewrite); |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
388 | if(rewrite_header) { |
|
675
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
389 | if(!strcmp(entry->param->name, "transfer-encoding")) { |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
390 | if(!strcmp(entry->param->value, "chunked")) { |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
391 | // enable chunked transfer encoding |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
392 | if(http_client_enable_chunked_transfer_encoding(client)) { |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
393 | http_client_free(client); |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
394 | return REQ_ABORTED; |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
395 | } |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
396 | continue; |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
397 | } |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
398 | } else if(!strcmp(entry->param->name, "content-length")) { |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
399 | long long contentlength; |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
400 | if(!cx_strtoll(cx_str(entry->param->value), &contentlength, 10)) { |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
401 | if(http_client_set_content_length(client, contentlength)) { |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
402 | http_client_free(client); |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
403 | return REQ_ABORTED; |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
404 | } |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
405 | } else { |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
406 | // illegal content-length |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
407 | protocol_status(sn, rq, 400, NULL); |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
408 | http_client_free(client); |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
409 | return REQ_ABORTED; |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
410 | } |
|
672
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
411 | continue; |
|
675
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
412 | } else { |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
413 | // static header rewrite or remove header if it is empty |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
414 | header_value = cx_mutstr(rewrite_header); |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
415 | if(header_value.length == 0) { |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
416 | continue; |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
417 | } |
|
672
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
418 | } |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
419 | } else { |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
420 | header_value = cx_mutstr(entry->param->value); |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
421 | } |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
422 | |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
423 | if(http_client_add_request_header(client, cx_mutstr(entry->param->name), header_value)) { |
|
669
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
667
diff
changeset
|
424 | http_client_free(client); |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
667
diff
changeset
|
425 | return REQ_ABORTED; |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
667
diff
changeset
|
426 | } |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
667
diff
changeset
|
427 | } |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
667
diff
changeset
|
428 | |
|
675
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
429 | client->request_body_read = proxy_request_read; |
|
edacba8beedb
add support for request bodies with a fixed content length for the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
430 | client->request_body_read_userdata = proxy; |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
670
diff
changeset
|
431 | client->response_start = proxy_response_start; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
670
diff
changeset
|
432 | client->response_start_userdata = proxy; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
670
diff
changeset
|
433 | client->response_body_write = proxy_response_write; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
670
diff
changeset
|
434 | client->response_body_write_userdata = proxy; |
|
707
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
706
diff
changeset
|
435 | client->response_finished = proxy_response_finished; |
|
694
a5aa94800b59
implement proxy request finish callback
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
436 | client->response_finished_userdata = proxy; |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
670
diff
changeset
|
437 | |
|
694
a5aa94800b59
implement proxy request finish callback
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
438 | net_setnonblock(sn->csd, 1); |
|
669
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
667
diff
changeset
|
439 | if(http_client_start(client)) { |
|
694
a5aa94800b59
implement proxy request finish callback
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
440 | net_setnonblock(sn->csd, 0); |
|
669
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
667
diff
changeset
|
441 | http_client_free(client); |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
667
diff
changeset
|
442 | return REQ_ABORTED; |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
667
diff
changeset
|
443 | } |
|
665
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
444 | |
|
667
1f0f014c0121
add pblock_iterator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
445 | return REQ_PROCESSING; |
|
662
70fdf948b642
refactor HttpParser to support parsing of Http responses
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
446 | } |
|
669
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
667
diff
changeset
|
447 |