lorenz.stechauner/sesimos
1
1
Fork 0
Code Issues Pull Requests Projects Releases Activity

Fix revproxy and fastcgi http header field merging

Browse Source
This commit is contained in:
Lorenz Stechauner
2022-08-17 19:11:20 +02:00
parent ee8aedce91
commit f0b27b3b37
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/fastcgi.c
View File

@ -386,7 +386,7 @@ int fastcgi_header(fastcgi_conn *conn, http_res *res, char *err_msg) {
return 1; return 1;
} }
ret = http_parse_header_field(&res->hdr, ptr, pos0); ret = http_parse_header_field(&res->hdr, ptr, pos0, 0);
if (ret != 0) return (int) ret; if (ret != 0) return (int) ret;
if (pos0[2] == '\r' && pos0[3] == '\n') { if (pos0[2] == '\r' && pos0[3] == '\n') {
return 0; return 0;

6
src/lib/http.c
View File

@ -83,7 +83,7 @@ void http_free_res(http_res *res) {
http_free_hdr(&res->hdr); http_free_hdr(&res->hdr);
} }
int http_parse_header_field(http_hdr *hdr, const char *buf, const char *end_ptr) { int http_parse_header_field(http_hdr *hdr, const char *buf, const char *end_ptr, int flags) {
if (hdr->last_field_num > hdr->field_num) { if (hdr->last_field_num > hdr->field_num) {
print(ERR_STR "Unable to parse header: Invalid state" CLR_STR); print(ERR_STR "Unable to parse header: Invalid state" CLR_STR);
return 3; return 3;
@ -116,7 +116,7 @@ int http_parse_header_field(http_hdr *hdr, const char *buf, const char *end_ptr)
char field_num = hdr->field_num; char field_num = hdr->field_num;
int found = http_get_header_field_num_len(hdr, buf, len1); int found = http_get_header_field_num_len(hdr, buf, len1);
if (found == -1) { if (!(flags & HTTP_MERGE_FIELDS) || found == -1) {
if (http_add_header_field_len(hdr, buf, len1, pos1, len2 < 0 ? 0 : len2) != 0) { if (http_add_header_field_len(hdr, buf, len1, pos1, len2 < 0 ? 0 : len2) != 0) {
print(ERR_STR "Unable to parse header: Too many header fields" CLR_STR); print(ERR_STR "Unable to parse header: Too many header fields" CLR_STR);
return 3; return 3;
@ -204,7 +204,7 @@ int http_receive_request(sock *client, http_req *req) {
sprintf(req->uri, "%.*s", (int) len, pos1); sprintf(req->uri, "%.*s", (int) len, pos1);
sprintf(req->version, "%.3s", pos2 + 5); sprintf(req->version, "%.3s", pos2 + 5);
} else { } else {
int ret = http_parse_header_field(&req->hdr, ptr, pos0); int ret = http_parse_header_field(&req->hdr, ptr, pos0, HTTP_MERGE_FIELDS);
if (ret != 0) return ret; if (ret != 0) return ret;
} }
ptr = pos0 + 2; ptr = pos0 + 2;

4
src/lib/http.h
View File

@ -22,6 +22,8 @@
#define HTTP_FIELD_EX_VALUE 1 #define HTTP_FIELD_EX_VALUE 1
#define HTTP_FIELD_EX_NAME 2 #define HTTP_FIELD_EX_NAME 2
#define HTTP_MERGE_FIELDS 1
#define HTTP_1XX_STR "\x1B[1;32m" #define HTTP_1XX_STR "\x1B[1;32m"
#define HTTP_2XX_STR "\x1B[1;32m" #define HTTP_2XX_STR "\x1B[1;32m"
#define HTTP_3XX_STR "\x1B[1;33m" #define HTTP_3XX_STR "\x1B[1;33m"
@ -140,7 +142,7 @@ void http_free_res(http_res *res);
int http_receive_request(sock *client, http_req *req); int http_receive_request(sock *client, http_req *req);
int http_parse_header_field(http_hdr *hdr, const char *buf, const char *end_ptr) ; int http_parse_header_field(http_hdr *hdr, const char *buf, const char *end_ptr, int flags);
const char *http_get_header_field(const http_hdr *hdr, const char *field_name); const char *http_get_header_field(const http_hdr *hdr, const char *field_name);

2
src/lib/rev_proxy.c
View File

@ -422,7 +422,7 @@ int rev_proxy_init(http_req *req, http_res *res, http_status_ctx *ctx, host_conf
goto proxy_err; goto proxy_err;
} }
} else { } else {
ret = http_parse_header_field(&res->hdr, ptr, pos0); ret = http_parse_header_field(&res->hdr, ptr, pos0, 0);
if (ret != 0) { if (ret != 0) {
res->status = http_get_status(502); res->status = http_get_status(502);
ctx->origin = SERVER_RES; ctx->origin = SERVER_RES;