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

Format proxy errors if no content

Browse Source
This commit is contained in:
Lorenz Stechauner
2023-01-03 18:25:07 +01:00
parent 896486b64a
commit ffc5c80b65
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/worker/proxy_handler.c
View File

@ -22,10 +22,12 @@ static int proxy_handler_2(client_ctx_t *ctx);
void proxy_handler_func(client_ctx_t *ctx) { void proxy_handler_func(client_ctx_t *ctx) {
logger_set_prefix("[%s%*s%s]%s", BLD_STR, INET6_ADDRSTRLEN, ctx->req_host, CLR_STR, ctx->log_prefix); logger_set_prefix("[%s%*s%s]%s", BLD_STR, INET6_ADDRSTRLEN, ctx->req_host, CLR_STR, ctx->log_prefix);
proxy_handler_1(ctx); int ret = proxy_handler_1(ctx);
respond(ctx); respond(ctx);
if (ctx->use_proxy == 0) { if (ret == 1) {
} else if (ctx->use_proxy == 0) {
proxy_close(ctx->proxy); proxy_close(ctx->proxy);
} else if (ctx->use_proxy == 1) { } else if (ctx->use_proxy == 1) {
proxy_handler_2(ctx); proxy_handler_2(ctx);
@ -74,7 +76,10 @@ static int proxy_handler_1(client_ctx_t *ctx) {
const char *content_type = http_get_header_field(&res->hdr, "Content-Type"); const char *content_type = http_get_header_field(&res->hdr, "Content-Type");
const char *content_length_f = http_get_header_field(&res->hdr, "Content-Length"); const char *content_length_f = http_get_header_field(&res->hdr, "Content-Length");
const char *content_encoding = http_get_header_field(&res->hdr, "Content-Encoding"); const char *content_encoding = http_get_header_field(&res->hdr, "Content-Encoding");
if (content_encoding == NULL && content_type != NULL && content_length_f != NULL && strncmp(content_type, "text/html", 9) == 0) { if (content_encoding == NULL && (
(content_length_f != NULL && strcmp(content_length_f, "0") == 0) ||
(content_type != NULL && content_length_f != NULL && strncmp(content_type, "text/html", 9) == 0)))
{
long content_len = strtol(content_length_f, NULL, 10); long content_len = strtol(content_length_f, NULL, 10);
if (content_len <= sizeof(ctx->msg_content) - 1) { if (content_len <= sizeof(ctx->msg_content) - 1) {
if (status->status != 101) { if (status->status != 101) {
@ -82,7 +87,11 @@ static int proxy_handler_1(client_ctx_t *ctx) {
status->origin = res->status->code >= 400 ? SERVER : NONE; status->origin = res->status->code >= 400 ? SERVER : NONE;
} }
ctx->use_proxy = 0; ctx->use_proxy = 0;
proxy_dump(ctx->proxy, ctx->msg_content, content_len);
if (content_len > 0)
proxy_dump(ctx->proxy, ctx->msg_content, content_len);
return 1;
} }
} }
} }