src/server/safs/proxy.c

Sat, 14 Mar 2026 12:55:23 +0100

author
Olaf Wintermann <olaf.wintermann@gmail.com>
date
Sat, 14 Mar 2026 12:55:23 +0100
changeset 731
9e8b77e3e79c
parent 730
c190ce0aab98
child 732
2aeaf6f32861
permissions
-rw-r--r--

fix error handling in proxy_response_write

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 /*
720
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
70 * websocket read buffer
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
71 */
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
72 char *read_buf;
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
73 size_t read_buf_alloc;
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
74 size_t read_buf_size;
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
75 size_t read_buf_pos;
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
76
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
77 /*
672
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
78 * Has the response started (proxy_response_start called)
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
79 */
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
80 int response_started;
706
df64b4b79912 add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 700
diff changeset
81
df64b4b79912 add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 700
diff changeset
82 /*
df64b4b79912 add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 700
diff changeset
83 * reference counter
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 int ref;
672
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
86 } ProxyRequest;
671
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 670
diff changeset
87
706
df64b4b79912 add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 700
diff changeset
88 static void proxy_unref(ProxyRequest *proxy) {
df64b4b79912 add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 700
diff changeset
89 if(--proxy->ref == 0) {
726
5ad3bda4aca1 fix httpclient using the wrong method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 723
diff changeset
90 //const char *method = pblock_findkeyval(pb_key_method, proxy->rq->reqpb);
5ad3bda4aca1 fix httpclient using the wrong method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 723
diff changeset
91 //const char *uri = pblock_findkeyval(pb_key_uri, proxy->rq->reqpb);
5ad3bda4aca1 fix httpclient using the wrong method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 723
diff changeset
92 //log_ereport(LOG_INFORM, "reverse-proxy: %s %s finished", method, uri);
706
df64b4b79912 add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 700
diff changeset
93 http_client_free(proxy->client);
720
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
94 free(proxy->read_buf);
706
df64b4b79912 add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 700
diff changeset
95 free(proxy);
df64b4b79912 add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 700
diff changeset
96 }
df64b4b79912 add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 700
diff changeset
97 }
df64b4b79912 add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 700
diff changeset
98
671
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 670
diff changeset
99 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
100 ProxyRequest *proxy = userdata;
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
101
720
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
102 if(status == 101) {
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
103 pblock_fr("connection", proxy->response_header_rewrite, TRUE);
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
104 proxy->rq->rq_attr.keep_alive = 0;
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
105 }
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
106
672
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
107 HeaderArray *headers = client->response_headers;
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
108 while(headers) {
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
109 for(int i=0;i<headers->len;i++) {
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
110 cxmutstr name = headers->headers[i].name;
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
111 cxmutstr value = headers->headers[i].value;
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
112 // NSAPI uses lower case header names internally
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
113 for(int c=0;c<name.length;c++) {
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
114 name.ptr[c] = tolower(name.ptr[c]);
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
115 }
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
116 // HttpClient does not 0-terminate strings
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
117 name.ptr[name.length] = 0;
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
118 // check if this header should be modified
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
119 char *rewrite = pblock_findval(name.ptr, proxy->response_header_rewrite);
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
120 if(rewrite) {
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
121 value = cx_mutstr(rewrite);
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
122 if(value.length == 0) {
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
123 // empty header value -> skip
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
124 continue;
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
125 }
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
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
128 // add header to response
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
129 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
130 }
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
131 headers = headers->next;
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
132 }
671
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 670
diff changeset
133
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 670
diff changeset
134 protocol_status(proxy->sn, proxy->rq, status, message);
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 670
diff changeset
135 protocol_start_response(proxy->sn, proxy->rq);
672
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
136 proxy->response_started = 1;
720
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
137
671
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 670
diff changeset
138 return 0;
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 670
diff changeset
139 }
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 670
diff changeset
140
672
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
141 static void proxy_response_finished(HttpClient *client, void *userdata) {
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
142 ProxyRequest *proxy = userdata;
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
143
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
144 int ret = REQ_PROCEED;
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
145 if(!proxy->response_started) {
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
146 protocol_status(proxy->sn, proxy->rq, 502, NULL);
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
147 ret = REQ_ABORTED;
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
148 }
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
149
707
5fb102d2c745 fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 706
diff changeset
150 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
151 if(!ev_remove_poll(client->ev, proxy->event.object)) {
5fb102d2c745 fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 706
diff changeset
152 proxy_unref(proxy);
5fb102d2c745 fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 706
diff changeset
153 } else {
5fb102d2c745 fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 706
diff changeset
154 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
155 }
5fb102d2c745 fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 706
diff changeset
156 proxy->event.finish = NULL;
5fb102d2c745 fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 706
diff changeset
157 }
5fb102d2c745 fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 706
diff changeset
158
5fb102d2c745 fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 706
diff changeset
159 // return to nsapi threadpool
5fb102d2c745 fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 706
diff changeset
160 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
161 nsapi_function_return(proxy->sn, proxy->rq, ret);
672
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
162
706
df64b4b79912 add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 700
diff changeset
163 proxy_unref(proxy);
df64b4b79912 add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 700
diff changeset
164 }
df64b4b79912 add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 700
diff changeset
165
729
66afe8954ff9 fix wrong return error code in proxy_response_write
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 728
diff changeset
166 static int proxy_event(EventHandler *eh, Event *event) {
706
df64b4b79912 add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 700
diff changeset
167 ProxyRequest *proxy = event->cookie;
707
5fb102d2c745 fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 706
diff changeset
168 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
169 if(proxy->client->error == 0) {
df64b4b79912 add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 700
diff changeset
170 return 1;
df64b4b79912 add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 700
diff changeset
171 }
df64b4b79912 add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 700
diff changeset
172 }
df64b4b79912 add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 700
diff changeset
173 return 0;
df64b4b79912 add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 700
diff changeset
174 }
df64b4b79912 add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 700
diff changeset
175
729
66afe8954ff9 fix wrong return error code in proxy_response_write
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 728
diff changeset
176 static int proxy_event_finished(EventHandler *eh, Event *event) {
706
df64b4b79912 add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 700
diff changeset
177 ProxyRequest *proxy = event->cookie;
df64b4b79912 add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 700
diff changeset
178 proxy_unref(proxy);
df64b4b79912 add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 700
diff changeset
179 return 0;
672
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
180 }
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
181
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
182 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
183 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
184 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
185 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
186 ret = 0;
706
df64b4b79912 add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 700
diff changeset
187 } else if(ret < 0) {
df64b4b79912 add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 700
diff changeset
188 IOStream *st = proxy->sn->csd;
df64b4b79912 add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 700
diff changeset
189 if(st->io_errno == EWOULDBLOCK) {
df64b4b79912 add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 700
diff changeset
190 ret = HTTP_CLIENT_CALLBACK_WOULD_BLOCK;
df64b4b79912 add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 700
diff changeset
191 // is there already an poll event for csd?
707
5fb102d2c745 fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 706
diff changeset
192 if(!proxy->event.fn) {
706
df64b4b79912 add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 700
diff changeset
193 proxy->ref++;
df64b4b79912 add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 700
diff changeset
194 proxy->event.cookie = proxy;
729
66afe8954ff9 fix wrong return error code in proxy_response_write
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 728
diff changeset
195 proxy->event.fn = proxy_event;
66afe8954ff9 fix wrong return error code in proxy_response_write
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 728
diff changeset
196 proxy->event.finish = proxy_event_finished;
706
df64b4b79912 add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 700
diff changeset
197 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
198 ret = HTTP_CLIENT_CALLBACK_ERROR;
df64b4b79912 add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 700
diff changeset
199 }
df64b4b79912 add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 700
diff changeset
200 }
df64b4b79912 add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 700
diff changeset
201 } else {
df64b4b79912 add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 700
diff changeset
202 ret = HTTP_CLIENT_CALLBACK_ERROR;
df64b4b79912 add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 700
diff changeset
203 }
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
204 }
706
df64b4b79912 add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 700
diff changeset
205
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
206 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
207 }
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
208
671
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 670
diff changeset
209 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
210 ProxyRequest *proxy = userdata;
671
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 670
diff changeset
211 ssize_t ret = net_write(proxy->sn->csd, buf, nbytes);
731
9e8b77e3e79c fix error handling in proxy_response_write
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 730
diff changeset
212 if(ret < 0) {
707
5fb102d2c745 fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 706
diff changeset
213 IOStream *st = proxy->sn->csd;
5fb102d2c745 fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 706
diff changeset
214 if(st->io_errno == EWOULDBLOCK) {
729
66afe8954ff9 fix wrong return error code in proxy_response_write
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 728
diff changeset
215 log_ereport(LOG_INFORM, "proxy_response_write would block");
707
5fb102d2c745 fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 706
diff changeset
216 // Is there already an poll event for csd?
5fb102d2c745 fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 706
diff changeset
217 if(client->last_event == &proxy->event) {
5fb102d2c745 fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 706
diff changeset
218 // 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
219 // Make sure it is a write event
5fb102d2c745 fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 706
diff changeset
220 proxy->event.events = EVENT_POLLOUT;
729
66afe8954ff9 fix wrong return error code in proxy_response_write
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 728
diff changeset
221 log_ereport(LOG_INFORM, "proxy_response_write pollout event already exists");
707
5fb102d2c745 fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 706
diff changeset
222 return HTTP_CLIENT_CALLBACK_WOULD_BLOCK;
5fb102d2c745 fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 706
diff changeset
223 } else if(proxy->event.fn != NULL) {
5fb102d2c745 fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 706
diff changeset
224 // There is an inactive event, probably a read event
5fb102d2c745 fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 706
diff changeset
225 // 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
226 if(ev_remove_poll(client->ev, proxy->event.object)) {
5fb102d2c745 fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 706
diff changeset
227 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
228 return HTTP_CLIENT_CALLBACK_ERROR;
5fb102d2c745 fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 706
diff changeset
229 }
5fb102d2c745 fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 706
diff changeset
230 } else {
5fb102d2c745 fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 706
diff changeset
231 proxy->ref++;
5fb102d2c745 fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 706
diff changeset
232 proxy->event.cookie = proxy;
729
66afe8954ff9 fix wrong return error code in proxy_response_write
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 728
diff changeset
233 proxy->event.fn = proxy_event;
66afe8954ff9 fix wrong return error code in proxy_response_write
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 728
diff changeset
234 proxy->event.finish = proxy_event_finished;
707
5fb102d2c745 fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 706
diff changeset
235 }
5fb102d2c745 fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 706
diff changeset
236 // Add write event
729
66afe8954ff9 fix wrong return error code in proxy_response_write
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 728
diff changeset
237 log_ereport(LOG_INFORM, "proxy_response_write pollout");
707
5fb102d2c745 fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 706
diff changeset
238 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
239 proxy_unref(proxy);
5fb102d2c745 fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 706
diff changeset
240 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
241 }
729
66afe8954ff9 fix wrong return error code in proxy_response_write
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 728
diff changeset
242 return HTTP_CLIENT_CALLBACK_WOULD_BLOCK;
730
c190ce0aab98 add some httpclient debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 729
diff changeset
243 } else {
c190ce0aab98 add some httpclient debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 729
diff changeset
244 log_ereport(LOG_FAILURE, "proxy_response_write failed: %s", strerror(st->io_errno));
c190ce0aab98 add some httpclient debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 729
diff changeset
245 return HTTP_CLIENT_CALLBACK_ERROR;
707
5fb102d2c745 fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 706
diff changeset
246 }
5fb102d2c745 fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 706
diff changeset
247 }
671
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 670
diff changeset
248 return ret;
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 670
diff changeset
249 }
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 670
diff changeset
250
720
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
251 static ssize_t proxy_ws_write(HttpClient *client, void *buf, size_t nbytes, void *userdata) {
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
252 ProxyRequest *proxy = userdata;
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
253 ssize_t w = net_write(proxy->sn->csd, buf, nbytes);
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
254 if(w < 0) {
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
255 IOStream *stream = proxy->sn->csd;
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
256 return stream->io_errno == EWOULDBLOCK ? HTTP_CLIENT_CALLBACK_WOULD_BLOCK : HTTP_CLIENT_CALLBACK_ERROR;
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
257 }
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
258 return w;
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
259 }
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
260
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
261 static int proxy_ws_msg_ready(HttpClient *client, void *userdata) {
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
262 ProxyRequest *proxy = userdata;
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
263 IOStream *st = proxy->sn->csd;
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
264
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
265 if(proxy->read_buf == NULL) {
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
266 // proxy not initialized for websockets yet
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
267
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
268 st->setmode(st, IO_MODE_RAW);
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
269
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
270 proxy->read_buf_alloc = 1024*64;
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
271 proxy->read_buf = malloc(proxy->read_buf_alloc);
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
272 if(!proxy->read_buf) {
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
273 return 1;
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
274 }
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
275
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
276 proxy->event.cookie = proxy;
729
66afe8954ff9 fix wrong return error code in proxy_response_write
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 728
diff changeset
277 proxy->event.fn = proxy_event;
66afe8954ff9 fix wrong return error code in proxy_response_write
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 728
diff changeset
278 proxy->event.finish = proxy_event_finished;
720
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
279 if(event_pollin(client->ev, st, &proxy->event)) {
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
280 return 1;
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
281 }
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
282 proxy->ref++;
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
283 }
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
284
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
285 // is there still data in the read buffer, that needs to be transfered to
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
286 // the HttpClient message buffer?
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
287 while(proxy->read_buf_pos < proxy->read_buf_size) {
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
288 char *msg = proxy->read_buf + proxy->read_buf_pos;
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
289 size_t msglen = proxy->read_buf_size - proxy->read_buf_pos;
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
290 int n = http_client_add_message(client, msg, msglen);
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
291 if(n <= 0) {
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
292 return 0; // message buffer not ready
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
293 }
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
294 proxy->read_buf_pos += n;
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
295 }
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
296 // readbuf flushed, reset
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
297 proxy->read_buf_size = 0;
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
298 proxy->read_buf_pos = 0;
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
299
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
300 while(proxy->read_buf_size < proxy->read_buf_alloc) {
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
301 ssize_t r = net_read(proxy->sn->csd, proxy->read_buf + proxy->read_buf_size, proxy->read_buf_alloc - proxy->read_buf_size);
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
302 if(r <= 0) {
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
303 if(proxy->read_buf_size > 0) {
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
304 // we have read some data, the next proxy_ws_msg_ready will
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
305 // transfer this to the message buffer
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
306 return proxy_ws_msg_ready(client, userdata);
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
307 } else {
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
308 // no data read, return
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
309 return st->io_errno == EWOULDBLOCK ? 0 : 1; // return 1 in case of an error
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
310 }
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
311 }
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
312 proxy->read_buf_size += r;
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
313 }
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
314
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
315 // do this again, to add the now filled buffer to the HttpClient message buffer
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
316 // http_client_add_message or net_read should fail at some point
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
317 return proxy_ws_msg_ready(client, userdata);
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
318 }
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
319
662
70fdf948b642 refactor HttpParser to support parsing of Http responses
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
320 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
321 EventHandler *ev = sn->ev;
669
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 667
diff changeset
322 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
323 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
324 const char *query = pblock_findkeyval(pb_key_query, rq->reqpb);
728
a815f30e368d fix forwarded parameter in reverse-proxy-service saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 727
diff changeset
325 const char *forward = pblock_findval("forwarded", param);
727
4be837389b9e implement proxy forwarded/x-forwarded headers
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 726
diff changeset
326
4be837389b9e implement proxy forwarded/x-forwarded headers
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 726
diff changeset
327 char *host = pblock_findval("host", rq->headers);
4be837389b9e implement proxy forwarded/x-forwarded headers
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 726
diff changeset
328
4be837389b9e implement proxy forwarded/x-forwarded headers
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 726
diff changeset
329 int forwarded_headers = 0;
4be837389b9e implement proxy forwarded/x-forwarded headers
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 726
diff changeset
330 if(forward) {
4be837389b9e implement proxy forwarded/x-forwarded headers
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 726
diff changeset
331 if(!strcmp(forward, "true")) {
4be837389b9e implement proxy forwarded/x-forwarded headers
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 726
diff changeset
332 forwarded_headers = 1;
4be837389b9e implement proxy forwarded/x-forwarded headers
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 726
diff changeset
333 } else if(!strcmp(forward, "forwarded")) {
4be837389b9e implement proxy forwarded/x-forwarded headers
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 726
diff changeset
334 forwarded_headers = 1;
4be837389b9e implement proxy forwarded/x-forwarded headers
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 726
diff changeset
335 } else if(!strcmp(forward, "rfc7239")) {
4be837389b9e implement proxy forwarded/x-forwarded headers
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 726
diff changeset
336 forwarded_headers = 1;
4be837389b9e implement proxy forwarded/x-forwarded headers
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 726
diff changeset
337 } else if(!strcmp(forward, "xforwarded")) {
4be837389b9e implement proxy forwarded/x-forwarded headers
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 726
diff changeset
338 forwarded_headers = 2;
4be837389b9e implement proxy forwarded/x-forwarded headers
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 726
diff changeset
339 }
4be837389b9e implement proxy forwarded/x-forwarded headers
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 726
diff changeset
340 }
667
1f0f014c0121 add pblock_iterator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
341
726
5ad3bda4aca1 fix httpclient using the wrong method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 723
diff changeset
342 //log_ereport(LOG_INFORM, "reverse-proxy: %s %s", method, uri);
5ad3bda4aca1 fix httpclient using the wrong method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 723
diff changeset
343
721
482f4c153636 add host-header parameter for the reverse-proxy saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 720
diff changeset
344 char *host_header = pblock_findval("host-header", param);
482f4c153636 add host-header parameter for the reverse-proxy saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 720
diff changeset
345
699
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
346 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
347 if(location) {
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
348 cxstring loc = cx_str(location);
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
349 if(cx_strprefix(uri, loc)) {
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
350 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
351 uri += loc.length - 1;
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
352 } else {
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
353 uri += loc.length;
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
354 }
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
355 if(uri[0] == '\0') {
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
356 uri = "/";
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
357 }
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
358 } else {
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
359 // location does not match
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
360 return REQ_NOACTION;
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
361 }
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
362 }
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 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
365 if(!server_url) {
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
366 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
367 if(!server_url) {
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
368 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
369 return REQ_ABORTED;
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
370 }
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
371 }
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
372 WSUri srv_url;
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
373 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
374 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
375 return REQ_ABORTED;
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
376 }
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
377
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
378 char srvport[16];
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
379 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
380
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
381 char srvhost_static[256];
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
382 char *srvhost;
720
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
383 if(srv_url.hostlen + 10 < 256) {
699
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
384 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
385 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
386 srvhost = srvhost_static;
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
387 } else {
720
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
388 srvhost = pool_malloc(sn->pool, srv_url.hostlen + 10);
699
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
389 if(!srvhost) {
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
390 return REQ_ABORTED;
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
391 }
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
392 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
393 srvhost[srv_url.hostlen] = 0;
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
394 }
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
395
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
396 // 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
397 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
398 srv_url.pathlen--;
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
399 }
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
400
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
401 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
402 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
403 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
404 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
405 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
406 if(!new_uri.ptr) {
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
407 return REQ_ABORTED;
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
408 }
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
409
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
410 char *s = new_uri.ptr;
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
411 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
412 if(srv_url.pathlen > 0) {
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
413 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
414 s += srv_url.pathlen;
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
415 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
416 s_len -= srv_url.pathlen;
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
417 }
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
418
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
419 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
420 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
421 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
422 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
423 new_uri.length += query_len + 1;
669
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 667
diff changeset
424 }
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 667
diff changeset
425
672
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
426 // remove some response headers, that were previously set by ObjectType
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
427 // or other SAFs
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
428 pblock_removekey(pb_key_content_type, rq->srvhdrs);
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
429
706
df64b4b79912 add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 700
diff changeset
430 ProxyRequest *proxy = malloc(sizeof(ProxyRequest));
722
12fb6b33418c fix uninitialized memory in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 721
diff changeset
431 if(!proxy) {
12fb6b33418c fix uninitialized memory in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 721
diff changeset
432 return REQ_ABORTED;
12fb6b33418c fix uninitialized memory in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 721
diff changeset
433 }
12fb6b33418c fix uninitialized memory in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 721
diff changeset
434 memset(proxy, 0, sizeof(ProxyRequest));
672
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
435 proxy->sn = sn;
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
436 proxy->rq = rq;
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
437 proxy->request_header_rewrite = pblock_create_pool(sn->pool, 16);
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
438 proxy->response_header_rewrite = pblock_create_pool(sn->pool, 16);
706
df64b4b79912 add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 700
diff changeset
439 proxy->ref = 1;
672
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
440
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
441 // 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
442 // An empty string means, the header should be removed
723
2b7291e40688 fix duplicated host header
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 722
diff changeset
443 pblock_nvinsert("host", "", proxy->request_header_rewrite);
720
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
444 //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
445 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
446 pblock_nvinsert("content-length", "", proxy->request_header_rewrite);
672
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
447 pblock_nvinsert("server", "", proxy->response_header_rewrite);
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
448 pblock_nvinsert("connection", "", proxy->response_header_rewrite);
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
449
669
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 667
diff changeset
450 // setup HttpClient
667
1f0f014c0121 add pblock_iterator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
451 HttpClient *client = http_client_new(ev);
669
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 667
diff changeset
452 if(!client) {
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 667
diff changeset
453 return REQ_ABORTED;
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 667
diff changeset
454 }
706
df64b4b79912 add error handling in proxy_request_read
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 700
diff changeset
455 proxy->client = client;
662
70fdf948b642 refactor HttpParser to support parsing of Http responses
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
456
669
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 667
diff changeset
457 if(http_client_set_method(client, method)) {
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 667
diff changeset
458 http_client_free(client);
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 667
diff changeset
459 return REQ_ABORTED;
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 667
diff changeset
460 }
662
70fdf948b642 refactor HttpParser to support parsing of Http responses
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
461
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
462 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
463 http_client_free(client);
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 667
diff changeset
464 return REQ_ABORTED;
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 667
diff changeset
465 }
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 667
diff changeset
466
699
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
467 // set server address
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
468 struct addrinfo hints = { 0 };
700
658f4c02b4c5 fix proxy connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 699
diff changeset
469 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
470 hints.ai_socktype = SOCK_STREAM;
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
471 struct addrinfo *srv_addr;
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
472 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
473 http_client_free(client);
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
474 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
475 return REQ_ABORTED;
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
476 }
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
477
700
658f4c02b4c5 fix proxy connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 699
diff changeset
478 WSBool addr_set = FALSE;
658f4c02b4c5 fix proxy connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 699
diff changeset
479 struct addrinfo *addr = srv_addr;
658f4c02b4c5 fix proxy connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 699
diff changeset
480 while(addr) {
658f4c02b4c5 fix proxy connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 699
diff changeset
481 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
482 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
483 addr_set = TRUE;
658f4c02b4c5 fix proxy connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 699
diff changeset
484 }
658f4c02b4c5 fix proxy connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 699
diff changeset
485 break;
658f4c02b4c5 fix proxy connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 699
diff changeset
486 }
658f4c02b4c5 fix proxy connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 699
diff changeset
487
658f4c02b4c5 fix proxy connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 699
diff changeset
488 addr = addr->ai_next;
658f4c02b4c5 fix proxy connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 699
diff changeset
489 }
699
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
490 freeaddrinfo(srv_addr);
700
658f4c02b4c5 fix proxy connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 699
diff changeset
491 if(!addr_set) {
699
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
492 http_client_free(client);
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
493 return REQ_ABORTED;
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
494 }
d794871da099 implement reverse_proxy_service location and url parameters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 696
diff changeset
495
721
482f4c153636 add host-header parameter for the reverse-proxy saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 720
diff changeset
496 // prepare host header
482f4c153636 add host-header parameter for the reverse-proxy saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 720
diff changeset
497 if(!host_header) {
482f4c153636 add host-header parameter for the reverse-proxy saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 720
diff changeset
498 if(!((srv_url.scheme_num == WS_URI_HTTP && srv_url.port == 80) ||
482f4c153636 add host-header parameter for the reverse-proxy saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 720
diff changeset
499 (srv_url.scheme_num == WS_URI_HTTPS && srv_url.port == 443)))
482f4c153636 add host-header parameter for the reverse-proxy saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 720
diff changeset
500 {
482f4c153636 add host-header parameter for the reverse-proxy saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 720
diff changeset
501 // we have reserved enough space for the port
482f4c153636 add host-header parameter for the reverse-proxy saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 720
diff changeset
502 srvhost[srv_url.hostlen] = ':';
482f4c153636 add host-header parameter for the reverse-proxy saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 720
diff changeset
503 snprintf(srvhost + srv_url.hostlen + 1, 8, "%d", (int)srv_url.port);
482f4c153636 add host-header parameter for the reverse-proxy saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 720
diff changeset
504 }
482f4c153636 add host-header parameter for the reverse-proxy saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 720
diff changeset
505 host_header = srvhost;
482f4c153636 add host-header parameter for the reverse-proxy saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 720
diff changeset
506 }
482f4c153636 add host-header parameter for the reverse-proxy saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 720
diff changeset
507
720
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
508 // add host header
721
482f4c153636 add host-header parameter for the reverse-proxy saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 720
diff changeset
509 if(http_client_add_request_header(client, cx_mutstr("host"), cx_mutstr(host_header))) {
720
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
510 http_client_free(client);
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
511 return REQ_ABORTED;
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
512 }
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
513
727
4be837389b9e implement proxy forwarded/x-forwarded headers
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 726
diff changeset
514 char *ip = pblock_findkeyval(pb_key_ip, sn->client);
4be837389b9e implement proxy forwarded/x-forwarded headers
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 726
diff changeset
515 if(forwarded_headers == 1) {
4be837389b9e implement proxy forwarded/x-forwarded headers
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 726
diff changeset
516 char buf[512];
4be837389b9e implement proxy forwarded/x-forwarded headers
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 726
diff changeset
517 int n = snprintf(buf, 512, "host=\"%s\";for=\"%s\";proto=%s", host, ip, "https"); // TODO: proto
4be837389b9e implement proxy forwarded/x-forwarded headers
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 726
diff changeset
518 if(n > 511 || http_client_add_request_header_copy(client, cx_str("forwarded"), cx_str(buf))) {
4be837389b9e implement proxy forwarded/x-forwarded headers
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 726
diff changeset
519 http_client_free(client);
4be837389b9e implement proxy forwarded/x-forwarded headers
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 726
diff changeset
520 return REQ_ABORTED;
4be837389b9e implement proxy forwarded/x-forwarded headers
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 726
diff changeset
521 }
4be837389b9e implement proxy forwarded/x-forwarded headers
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 726
diff changeset
522 } else if(forwarded_headers == 2) {
4be837389b9e implement proxy forwarded/x-forwarded headers
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 726
diff changeset
523 if(http_client_add_request_header(client, cx_mutstr("x-forwarded-for"), cx_mutstr(ip))) {
4be837389b9e implement proxy forwarded/x-forwarded headers
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 726
diff changeset
524 http_client_free(client);
4be837389b9e implement proxy forwarded/x-forwarded headers
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 726
diff changeset
525 return REQ_ABORTED;
4be837389b9e implement proxy forwarded/x-forwarded headers
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 726
diff changeset
526 }
4be837389b9e implement proxy forwarded/x-forwarded headers
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 726
diff changeset
527 if(http_client_add_request_header(client, cx_mutstr("x-forwarded-host"), cx_mutstr(host))) {
4be837389b9e implement proxy forwarded/x-forwarded headers
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 726
diff changeset
528 http_client_free(client);
4be837389b9e implement proxy forwarded/x-forwarded headers
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 726
diff changeset
529 return REQ_ABORTED;
4be837389b9e implement proxy forwarded/x-forwarded headers
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 726
diff changeset
530 }
4be837389b9e implement proxy forwarded/x-forwarded headers
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 726
diff changeset
531 }
4be837389b9e implement proxy forwarded/x-forwarded headers
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 726
diff changeset
532
669
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 667
diff changeset
533 // add request headers to the client
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 667
diff changeset
534 CxIterator i = pblock_iterator(rq->headers);
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 667
diff changeset
535 cx_foreach(pb_entry*, entry, i) {
672
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
536 cxmutstr header_value;
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
537 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
538 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
539 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
540 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
541 // 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
542 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
543 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
544 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
545 }
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
546 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
547 }
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
548 } 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
549 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
550 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
551 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
552 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
553 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
554 }
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
555 } 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
556 // 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
557 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
558 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
559 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
560 }
672
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
561 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
562 } 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
563 // 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
564 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
565 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
566 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
567 }
672
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
568 }
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
569 } else {
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
570 header_value = cx_mutstr(entry->param->value);
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
571 }
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
572
226bfd584075 minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 671
diff changeset
573 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
574 http_client_free(client);
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 667
diff changeset
575 return REQ_ABORTED;
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 667
diff changeset
576 }
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 667
diff changeset
577 }
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 667
diff changeset
578
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
579 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
580 client->request_body_read_userdata = proxy;
671
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 670
diff changeset
581 client->response_start = proxy_response_start;
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 670
diff changeset
582 client->response_start_userdata = proxy;
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 670
diff changeset
583 client->response_body_write = proxy_response_write;
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 670
diff changeset
584 client->response_body_write_userdata = proxy;
707
5fb102d2c745 fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 706
diff changeset
585 client->response_finished = proxy_response_finished;
694
a5aa94800b59 implement proxy request finish callback
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 675
diff changeset
586 client->response_finished_userdata = proxy;
720
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
587 client->ws_write = proxy_ws_write;
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
588 client->ws_write_userdata = proxy;
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
589 client->ws_msg_ready = proxy_ws_msg_ready;
8c7d08d3be2e add support for websockets in the reverse proxy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 707
diff changeset
590 client->ws_msg_ready_userdata = proxy;
671
879005903b2b implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 670
diff changeset
591
694
a5aa94800b59 implement proxy request finish callback
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 675
diff changeset
592 net_setnonblock(sn->csd, 1);
669
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 667
diff changeset
593 if(http_client_start(client)) {
694
a5aa94800b59 implement proxy request finish callback
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 675
diff changeset
594 net_setnonblock(sn->csd, 0);
669
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 667
diff changeset
595 http_client_free(client);
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 667
diff changeset
596 return REQ_ABORTED;
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 667
diff changeset
597 }
665
b8d5b797d090 add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 662
diff changeset
598
667
1f0f014c0121 add pblock_iterator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 665
diff changeset
599 return REQ_PROCESSING;
662
70fdf948b642 refactor HttpParser to support parsing of Http responses
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
600 }
669
ccdc97fd8204 setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 667
diff changeset
601

mercurial