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

Add sock_send_x and remove fastcgi compression

Browse Source
This commit is contained in:
Lorenz Stechauner
2023-01-12 19:50:35 +01:00
parent 5138dafb8e
commit f96dc46ea7
10 changed files with 55 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
src/lib/fastcgi.c
View File

@ -9,13 +9,13 @@
#include "../defs.h" #include "../defs.h"
#include "fastcgi.h" #include "fastcgi.h"
#include "utils.h" #include "utils.h"
#include "compress.h"
#include "../logger.h" #include "../logger.h"
#include "list.h" #include "list.h"
#include <sys/un.h> #include <sys/un.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <string.h> #include <string.h>
#include <unistd.h>
char *fastcgi_add_param(char *buf, const char *key, const char *value) { char *fastcgi_add_param(char *buf, const char *key, const char *value) {
char *ptr = buf; char *ptr = buf;
@ -66,9 +66,7 @@ int fastcgi_init(fastcgi_cnx_t *conn, int mode, unsigned int req_num, const sock
conn->socket = fcgi_sock; conn->socket = fcgi_sock;
struct sockaddr_un sock_addr = {AF_UNIX}; struct sockaddr_un sock_addr = {AF_UNIX};
if (conn->mode == FASTCGI_SESIMOS) { if (conn->mode == FASTCGI_BACKEND_PHP) {
snprintf(sock_addr.sun_path, sizeof(sock_addr.sun_path) - 1, "%s", SESIMOS_BACKEND_SOCKET);
} else if (conn->mode == FASTCGI_PHP) {
snprintf(sock_addr.sun_path, sizeof(sock_addr.sun_path) - 1, "%s", PHP_FPM_SOCKET); snprintf(sock_addr.sun_path, sizeof(sock_addr.sun_path) - 1, "%s", PHP_FPM_SOCKET);
} }
@ -219,8 +217,8 @@ int fastcgi_php_error(const fastcgi_cnx_t *conn, const char *msg, int msg_len, c
memcpy(msg_str, msg, msg_len); memcpy(msg_str, msg, msg_len);
msg_str[msg_len] = 0; msg_str[msg_len] = 0;
char *ptr1 = NULL; char *ptr1 = NULL;
int len; int len, err = 0;
int err = 0;
// FIXME *msg is part of a stream, handle fragmented lines // FIXME *msg is part of a stream, handle fragmented lines
while (1) { while (1) {
log_lvl_t msg_type = LOG_INFO; log_lvl_t msg_type = LOG_INFO;
@ -289,12 +287,7 @@ int fastcgi_header(fastcgi_cnx_t *conn, http_res *res, char *err_msg) {
while (1) { while (1) {
ret = recv(conn->socket, &header, sizeof(header), 0); ret = recv(conn->socket, &header, sizeof(header), 0);
if (ret < 0) { if (ret != sizeof(header)) {
res->status = http_get_status(500);
sprintf(err_msg, "Unable to communicate with FastCGI socket.");
error("Unable to receive from FastCGI socket");
return 1;
} else if (ret != sizeof(header)) {
res->status = http_get_status(500); res->status = http_get_status(500);
sprintf(err_msg, "Unable to communicate with FastCGI socket."); sprintf(err_msg, "Unable to communicate with FastCGI socket.");
error("Unable to receive from FastCGI socket"); error("Unable to receive from FastCGI socket");
@ -304,13 +297,7 @@ int fastcgi_header(fastcgi_cnx_t *conn, http_res *res, char *err_msg) {
content_len = (header.contentLengthB1 << 8) | header.contentLengthB0; content_len = (header.contentLengthB1 << 8) | header.contentLengthB0;
content = malloc(content_len + header.paddingLength); content = malloc(content_len + header.paddingLength);
ret = recv(conn->socket, content, content_len + header.paddingLength, 0); ret = recv(conn->socket, content, content_len + header.paddingLength, 0);
if (ret < 0) { if (ret != (content_len + header.paddingLength)) {
res->status = http_get_status(500);
sprintf(err_msg, "Unable to communicate with FastCGI socket.");
error("Unable to receive from FastCGI socket");
free(content);
return 1;
} else if (ret != (content_len + header.paddingLength)) {
res->status = http_get_status(500); res->status = http_get_status(500);
sprintf(err_msg, "Unable to communicate with FastCGI socket."); sprintf(err_msg, "Unable to communicate with FastCGI socket.");
error("Unable to receive from FastCGI socket"); error("Unable to receive from FastCGI socket");
@ -337,8 +324,7 @@ int fastcgi_header(fastcgi_cnx_t *conn, http_res *res, char *err_msg) {
free(content); free(content);
return 1; return 1;
} else if (header.type == FCGI_STDERR) { } else if (header.type == FCGI_STDERR) {
// TODO implement Sesimos backend error handling if (conn->mode == FASTCGI_BACKEND_PHP) {
if (conn->mode == FASTCGI_PHP) {
err = err || fastcgi_php_error(conn, content, content_len, err_msg); err = err || fastcgi_php_error(conn, content, content_len, err_msg);
} }
} else if (header.type == FCGI_STDOUT) { } else if (header.type == FCGI_STDOUT) {
@ -395,27 +381,9 @@ int fastcgi_header(fastcgi_cnx_t *conn, http_res *res, char *err_msg) {
int fastcgi_send(fastcgi_cnx_t *conn, sock *client, int flags) { int fastcgi_send(fastcgi_cnx_t *conn, sock *client, int flags) {
FCGI_Header header; FCGI_Header header;
long ret; long ret;
char buf0[256]; char buf0[256], *content, *ptr;
int len; int len;
char *content, *ptr;
unsigned short req_id, content_len; unsigned short req_id, content_len;
char comp_out[4096];
int finish_comp = 0;
compress_ctx comp_ctx;
if (flags & FASTCGI_COMPRESS_BR) {
flags &= ~FASTCGI_COMPRESS_GZ;
if (compress_init(&comp_ctx, COMPRESS_BR) != 0) {
error("Unable to init brotli");
flags &= ~FASTCGI_COMPRESS_BR;
}
} else if (flags & FASTCGI_COMPRESS_GZ) {
flags &= ~FASTCGI_COMPRESS_BR;
if (compress_init(&comp_ctx, COMPRESS_GZ) != 0) {
error("Unable to init gzip");
flags &= ~FASTCGI_COMPRESS_GZ;
}
}
if (conn->out_buf != NULL && conn->out_len > conn->out_off) { if (conn->out_buf != NULL && conn->out_len > conn->out_off) {
content = conn->out_buf; content = conn->out_buf;
@ -464,45 +432,23 @@ int fastcgi_send(fastcgi_cnx_t *conn, sock *client, int flags) {
conn->socket = 0; conn->socket = 0;
free(content); free(content);
if (flags & FASTCGI_COMPRESS) {
finish_comp = 1;
content_len = 0;
goto out;
finish:
compress_free(&comp_ctx);
}
if (flags & FASTCGI_CHUNKED) { if (flags & FASTCGI_CHUNKED) {
sock_send(client, "0\r\n\r\n", 5, 0); sock_send_x(client, "0\r\n\r\n", 5, 0);
} }
return 0; return 0;
} else if (header.type == FCGI_STDERR) { } else if (header.type == FCGI_STDERR) {
// TODO implement Sesimos backend error handling if (conn->mode == FASTCGI_BACKEND_PHP) {
if (conn->mode == FASTCGI_PHP) {
fastcgi_php_error(conn, content, content_len, buf0); fastcgi_php_error(conn, content, content_len, buf0);
} }
} else if (header.type == FCGI_STDOUT) { } else if (header.type == FCGI_STDOUT) {
unsigned long avail_in, avail_out;
out: out:
avail_in = content_len; if (content_len != 0) {
char *next_in = ptr; len = sprintf(buf0, "%X\r\n", content_len);
do { if (flags & FASTCGI_CHUNKED) sock_send_x(client, buf0, len, 0);
int buf_len = content_len; sock_send_x(client, ptr, content_len, 0);
if (flags & FASTCGI_COMPRESS) { if (flags & FASTCGI_CHUNKED) sock_send_x(client, "\r\n", 2, 0);
avail_out = sizeof(comp_out); }
compress_compress(&comp_ctx, next_in + content_len - avail_in, &avail_in, comp_out, &avail_out, finish_comp);
ptr = comp_out;
buf_len = (int) (sizeof(comp_out) - avail_out);
}
if (buf_len != 0) {
len = sprintf(buf0, "%X\r\n", buf_len);
if (flags & FASTCGI_CHUNKED) sock_send(client, buf0, len, 0);
sock_send(client, ptr, buf_len, 0);
if (flags & FASTCGI_CHUNKED) sock_send(client, "\r\n", 2, 0);
}
} while ((flags & FASTCGI_COMPRESS) && (avail_in != 0 || avail_out != sizeof(comp_out)));
if (finish_comp) goto finish;
} else { } else {
error("Unknown FastCGI type: %i", header.type); error("Unknown FastCGI type: %i", header.type);
} }
@ -562,8 +508,7 @@ int fastcgi_dump(fastcgi_cnx_t *conn, char *buf, long len) {
return 0; return 0;
} else if (header.type == FCGI_STDERR) { } else if (header.type == FCGI_STDERR) {
// TODO implement Sesimos backend error handling if (conn->mode == FASTCGI_BACKEND_PHP) {
if (conn->mode == FASTCGI_PHP) {
fastcgi_php_error(conn, content, content_len, buf0); fastcgi_php_error(conn, content, content_len, buf0);
} }
} else if (header.type == FCGI_STDOUT) { } else if (header.type == FCGI_STDOUT) {

14
src/lib/fastcgi.h
View File

@ -14,28 +14,20 @@
#include "uri.h" #include "uri.h"
#define FASTCGI_CHUNKED 1 #define FASTCGI_CHUNKED 1
#define FASTCGI_COMPRESS_GZ 2
#define FASTCGI_COMPRESS_BR 4
#define FASTCGI_COMPRESS 6
#define FASTCGI_COMPRESS_HOLD 8
#define FASTCGI_PHP 1 #define FASTCGI_BACKEND_PHP 1
#define FASTCGI_SESIMOS 2
#ifndef PHP_FPM_SOCKET #ifndef PHP_FPM_SOCKET
# define PHP_FPM_SOCKET "/var/run/php-fpm/php-fpm.sock" # define PHP_FPM_SOCKET "/var/run/php-fpm/php-fpm.sock"
#endif #endif
#define SESIMOS_BACKEND_SOCKET "/var/run/sesimos/backend.sock"
typedef struct { typedef struct {
int mode; int mode;
int socket; int socket;
unsigned short req_id; unsigned short req_id;
char *out_buf;
const char *webroot; const char *webroot;
unsigned short out_len; char *out_buf;
unsigned short out_off; unsigned short out_len, out_off;
char *r_addr; char *r_addr;
char *r_host; char *r_host;
} fastcgi_cnx_t; } fastcgi_cnx_t;

4
src/lib/http.c
View File

@ -358,7 +358,7 @@ int http_send_response(sock *client, http_res *res) {
off += sprintf(buf + off, "%s: %s\r\n", http_field_get_name(f), http_field_get_value(f)); off += sprintf(buf + off, "%s: %s\r\n", http_field_get_name(f), http_field_get_value(f));
} }
off += sprintf(buf + off, "\r\n"); off += sprintf(buf + off, "\r\n");
if (sock_send(client, buf, off, 0) != off) if (sock_send_x(client, buf, off, 0) != off)
return -1; return -1;
return 0; return 0;
@ -372,7 +372,7 @@ int http_send_request(sock *server, http_req *req) {
off += sprintf(buf + off, "%s: %s\r\n", http_field_get_name(f), http_field_get_value(f)); off += sprintf(buf + off, "%s: %s\r\n", http_field_get_name(f), http_field_get_value(f));
} }
off += sprintf(buf + off, "\r\n"); off += sprintf(buf + off, "\r\n");
if (sock_send(server, buf, off, 0) != off) if (sock_send_x(server, buf, off, 0) != off)
return -1; return -1;
return 0; return 0;

8
src/lib/proxy.c
View File

@ -635,14 +635,14 @@ int proxy_send(proxy_ctx_t *proxy, sock *client, unsigned long len_to_send, int
len = sprintf(buf, "%lX\r\n", buf_len); len = sprintf(buf, "%lX\r\n", buf_len);
ret = 1; ret = 1;
if (flags & PROXY_CHUNKED) ret = sock_send(client, buf, len, 0); if (flags & PROXY_CHUNKED) ret = sock_send_x(client, buf, len, 0);
if (ret <= 0) goto err; if (ret <= 0) goto err;
ret = sock_send(client, ptr, buf_len, 0); ret = sock_send_x(client, ptr, buf_len, 0);
if (ret <= 0) goto err; if (ret <= 0) goto err;
if (!(flags & PROXY_COMPRESS)) snd_len += ret; if (!(flags & PROXY_COMPRESS)) snd_len += ret;
if (flags & PROXY_CHUNKED) ret = sock_send(client, "\r\n", 2, 0); if (flags & PROXY_CHUNKED) ret = sock_send_x(client, "\r\n", 2, 0);
if (ret <= 0) { if (ret <= 0) {
err: err:
error("Unable to send"); error("Unable to send");
@ -660,7 +660,7 @@ int proxy_send(proxy_ctx_t *proxy, sock *client, unsigned long len_to_send, int
if (ret <= 0) return -1; if (ret <= 0) return -1;
if (flags & PROXY_CHUNKED) { if (flags & PROXY_CHUNKED) {
ret = sock_send(client, "0\r\n\r\n", 5, 0); ret = sock_send_x(client, "0\r\n\r\n", 5, 0);
if (ret <= 0) { if (ret <= 0) {
error("Unable to send"); error("Unable to send");
return -1; return -1;

10
src/lib/sock.c
View File

@ -106,6 +106,16 @@ long sock_send(sock *s, void *buf, unsigned long len, int flags) {
} }
} }
long sock_send_x(sock *s, void *buf, unsigned long len, int flags) {
long sent = 0;
for (long ret; sent < len; sent += ret) {
ret = sock_send(s, buf + sent, len - sent, flags);
if (ret <= 0)
return ret;
}
return sent;
}
long sock_recv(sock *s, void *buf, unsigned long len, int flags) { long sock_recv(sock *s, void *buf, unsigned long len, int flags) {
long ret; long ret;
if (s->enc) { if (s->enc) {

2
src/lib/sock.h
View File

@ -40,6 +40,8 @@ int sock_set_timeout(sock *s, double sec);
long sock_send(sock *s, void *buf, unsigned long len, int flags); long sock_send(sock *s, void *buf, unsigned long len, int flags);
long sock_send_x(sock *s, void *buf, unsigned long len, int flags);
long sock_recv(sock *s, void *buf, unsigned long len, int flags); long sock_recv(sock *s, void *buf, unsigned long len, int flags);
long sock_splice(sock *dst, sock *src, void *buf, unsigned long buf_len, unsigned long len); long sock_splice(sock *dst, sock *src, void *buf, unsigned long buf_len, unsigned long len);

27
src/lib/uri.c
View File

@ -113,18 +113,16 @@ int uri_init(http_uri *uri, const char *webroot, const char *uri_str, int dir_mo
while (1) { while (1) {
sprintf(buf0, "%s%s", uri->webroot, uri->path); sprintf(buf0, "%s%s", uri->webroot, uri->path);
p_len = snprintf(buf1, sizeof(buf1), "%s.ncr", buf0); p_len = snprintf(buf1, sizeof(buf1), "%s.php", buf0);
if (p_len < 0 || p_len >= sizeof(buf1)) return -1; if (p_len < 0 || p_len >= sizeof(buf1)) return -1;
p_len = snprintf(buf2, sizeof(buf2), "%s.php", buf0); p_len = snprintf(buf2, sizeof(buf2), "%s.html", buf0);
if (p_len < 0 || p_len >= sizeof(buf2)) return -1; if (p_len < 0 || p_len >= sizeof(buf2)) return -1;
p_len = snprintf(buf3, sizeof(buf3), "%s.html", buf0);
if (p_len < 0 || p_len >= sizeof(buf3)) return -1;
if (strlen(uri->path) <= 1 || if (strlen(uri->path) <= 1 ||
path_exists(buf0) || path_exists(buf0) ||
path_is_file(buf1) || path_is_file(buf1) ||
path_is_file(buf2) || path_is_file(buf2))
path_is_file(buf3)) { {
break; break;
} }
@ -145,7 +143,7 @@ int uri_init(http_uri *uri, const char *webroot, const char *uri_str, int dir_mo
uri->filename = malloc(strlen(buf0) + 1); uri->filename = malloc(strlen(buf0) + 1);
strcpy(uri->filename, buf0); strcpy(uri->filename, buf0);
long len = (long) strlen(uri->path); long len = (long) strlen(uri->path);
if (strends(uri->path, ".ncr") || strends(uri->path, ".php")) { if (strends(uri->path, ".php")) {
uri->path[len - 4] = 0; uri->path[len - 4] = 0;
uri->is_static = 0; uri->is_static = 0;
} else if (strends(uri->path, ".html")) { } else if (strends(uri->path, ".html")) {
@ -165,9 +163,8 @@ int uri_init(http_uri *uri, const char *webroot, const char *uri_str, int dir_mo
} else { } else {
uri->is_dir = 1; uri->is_dir = 1;
strcpy(uri->path + strlen(uri->path), "/"); strcpy(uri->path + strlen(uri->path), "/");
sprintf(buf1, "%s%sindex.ncr", uri->webroot, uri->path); sprintf(buf1, "%s%sindex.php", uri->webroot, uri->path);
sprintf(buf2, "%s%sindex.php", uri->webroot, uri->path); sprintf(buf2, "%s%sindex.html", uri->webroot, uri->path);
sprintf(buf3, "%s%sindex.html", uri->webroot, uri->path);
if (path_is_file(buf1)) { if (path_is_file(buf1)) {
uri->filename = malloc(strlen(buf1) + 1); uri->filename = malloc(strlen(buf1) + 1);
strcpy(uri->filename, buf1); strcpy(uri->filename, buf1);
@ -175,10 +172,6 @@ int uri_init(http_uri *uri, const char *webroot, const char *uri_str, int dir_mo
} else if (path_is_file(buf2)) { } else if (path_is_file(buf2)) {
uri->filename = malloc(strlen(buf2) + 1); uri->filename = malloc(strlen(buf2) + 1);
strcpy(uri->filename, buf2); strcpy(uri->filename, buf2);
uri->is_static = 0;
} else if (path_is_file(buf3)) {
uri->filename = malloc(strlen(buf3) + 1);
strcpy(uri->filename, buf3);
} else { } else {
if (dir_mode == URI_DIR_MODE_FORBIDDEN) { if (dir_mode == URI_DIR_MODE_FORBIDDEN) {
uri->is_static = 1; uri->is_static = 1;
@ -198,9 +191,9 @@ int uri_init(http_uri *uri, const char *webroot, const char *uri_str, int dir_mo
if (strends(uri->path + strlen(uri->path), "index")) { if (strends(uri->path + strlen(uri->path), "index")) {
uri->path[strlen(uri->path) - 5] = 0; uri->path[strlen(uri->path) - 5] = 0;
} }
if (streq(uri->pathinfo, "index.ncr") || if (streq(uri->pathinfo, "index.php") ||
streq(uri->pathinfo, "index.php") || streq(uri->pathinfo, "index.html"))
streq(uri->pathinfo, "index.html")) { {
uri->pathinfo[0] = 0; uri->pathinfo[0] = 0;
} }

2
src/lib/websocket.c
View File

@ -125,7 +125,7 @@ int ws_send_frame_header(sock *s, ws_frame *frame) {
ptr += 4; ptr += 4;
} }
long ret = sock_send(s, buf, ptr - buf, frame->len != 0 ? MSG_MORE : 0); long ret = sock_send_x(s, buf, ptr - buf, frame->len != 0 ? MSG_MORE : 0);
if (ret < 0) { if (ret < 0) {
error("Unable to send to socket"); error("Unable to send to socket");
return -1; return -1;

30
src/worker/fastcgi_handler.c
View File

@ -46,10 +46,8 @@ static int fastcgi_handler_1(client_ctx_t *ctx, fastcgi_cnx_t *fcgi_cnx) {
char buf[1024]; char buf[1024];
int mode, ret; int mode, ret;
if (strends(uri->filename, ".ncr")) { if (strends(uri->filename, ".php")) {
mode = FASTCGI_SESIMOS; mode = FASTCGI_BACKEND_PHP;
} else if (strends(uri->filename, ".php")) {
mode = FASTCGI_PHP;
} else { } else {
res->status = http_get_status(500); res->status = http_get_status(500);
error("Invalid FastCGI extension: %s", uri->filename); error("Invalid FastCGI extension: %s", uri->filename);
@ -127,27 +125,8 @@ static int fastcgi_handler_1(client_ctx_t *ctx, fastcgi_cnx_t *fcgi_cnx) {
} }
ctx->use_fastcgi = 1; ctx->use_fastcgi = 1;
if (ctx->content_length != -1 && ctx->content_length < 1024000) {
ctx->use_fastcgi |= FASTCGI_COMPRESS_HOLD;
}
ctx->content_length = -1; ctx->content_length = -1;
int http_comp = http_get_compression(req, res);
if (http_comp & COMPRESS) {
if (http_comp & COMPRESS_BR) {
ctx->use_fastcgi |= FASTCGI_COMPRESS_BR;
sprintf(buf, "br");
} else if (http_comp & COMPRESS_GZ) {
ctx->use_fastcgi |= FASTCGI_COMPRESS_GZ;
sprintf(buf, "gzip");
}
http_add_header_field(&res->hdr, "Vary", "Accept-Encoding");
http_add_header_field(&res->hdr, "Content-Encoding", buf);
http_remove_header_field(&res->hdr, "Content-Length", HTTP_REMOVE_ALL);
}
if (http_get_header_field(&res->hdr, "Content-Length") == NULL) { if (http_get_header_field(&res->hdr, "Content-Length") == NULL) {
http_add_header_field(&res->hdr, "Transfer-Encoding", "chunked"); http_add_header_field(&res->hdr, "Transfer-Encoding", "chunked");
} }
@ -156,10 +135,9 @@ static int fastcgi_handler_1(client_ctx_t *ctx, fastcgi_cnx_t *fcgi_cnx) {
} }
static int fastcgi_handler_2(client_ctx_t *ctx, fastcgi_cnx_t *fcgi_cnx) { static int fastcgi_handler_2(client_ctx_t *ctx, fastcgi_cnx_t *fcgi_cnx) {
const char *transfer_encoding = http_get_header_field(&ctx->res.hdr, "Transfer-Encoding"); int chunked = strcontains(http_get_header_field(&ctx->res.hdr, "Transfer-Encoding"), "chunked");
int chunked = strcontains(transfer_encoding, "chunked");
int flags = (chunked ? FASTCGI_CHUNKED : 0) | (ctx->use_fastcgi & (FASTCGI_COMPRESS | FASTCGI_COMPRESS_HOLD)); int flags = (chunked ? FASTCGI_CHUNKED : 0);
int ret = fastcgi_send(fcgi_cnx, &ctx->socket, flags); int ret = fastcgi_send(fcgi_cnx, &ctx->socket, flags);
if (ret < 0) { if (ret < 0) {
ctx->c_keep_alive = 0; ctx->c_keep_alive = 0;

4
src/worker/request_handler.c
View File

@ -341,7 +341,7 @@ int respond(client_ctx_t *ctx) {
} else if (!streq(req->method, "HEAD")) { } else if (!streq(req->method, "HEAD")) {
// default response // default response
if (ctx->msg_buf != NULL) { if (ctx->msg_buf != NULL) {
ret = sock_send(client, ctx->msg_buf, ctx->content_length, 0); ret = sock_send_x(client, ctx->msg_buf, ctx->content_length, 0);
if (ret <= 0) { if (ret <= 0) {
error("Unable to send"); error("Unable to send");
} }
@ -352,7 +352,7 @@ int respond(client_ctx_t *ctx) {
if (snd_len + len > ctx->content_length) { if (snd_len + len > ctx->content_length) {
len = ctx->content_length - snd_len; len = ctx->content_length - snd_len;
} }
ret = sock_send(client, buffer, len, feof(ctx->file) ? 0 : MSG_MORE); ret = sock_send_x(client, buffer, len, feof(ctx->file) ? 0 : MSG_MORE);
if (ret <= 0) { if (ret <= 0) {
error("Unable to send"); error("Unable to send");
break; break;