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

Add php error handling

Browse Source
This commit is contained in:
Lorenz Stechauner
2023-01-26 14:51:47 +01:00
parent 17327006db
commit 03dd126ca7
5 changed files with 54 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
src/lib/fastcgi.c
View File

@ -80,6 +80,7 @@ int fastcgi_init(fastcgi_cnx_t *conn, int mode, unsigned int req_num, const sock
conn->req_id = (req_num + 1) & 0xFFFF;
conn->webroot = uri->webroot;
conn->err = NULL;
conn->fd_err_bytes = 0;
sock_init(&conn->out, 0, SOCK_PIPE);
conn->socket.enc = 0;
@ -213,74 +214,44 @@ int fastcgi_close_cnx(fastcgi_cnx_t *cnx) {
return 0;
}
int fastcgi_close_stdin(fastcgi_cnx_t *conn) {
return (fastcgi_send_data(conn, FCGI_STDIN, 0, NULL) == -1) ? -1 : 0;
int fastcgi_close_stdin(fastcgi_cnx_t *cnx) {
return (fastcgi_send_data(cnx, FCGI_STDIN, 0, NULL) == -1) ? -1 : 0;
}
// TODO show/log php stderr
int fastcgi_php_error(const fastcgi_cnx_t *conn, const char *msg, int msg_len, char *err_msg) {
char *msg_str = malloc(msg_len + 1);
char *ptr0 = msg_str;
memcpy(msg_str, msg, msg_len);
msg_str[msg_len] = 0;
char *ptr1 = NULL;
int len, err = 0;
int fastcgi_php_error(fastcgi_cnx_t *cnx, char *err_msg) {
char *line = NULL, *line_ptr = NULL;
size_t line_len = 0;
int err = 0;
while (1) {
log_lvl_t msg_type = LOG_INFO;
int msg_pre_len = 0;
ptr1 = strstr(ptr0, "PHP message: ");
if (ptr1 == NULL) {
len = (int) (msg_len - (ptr0 - msg_str));
if (ptr0 == msg_str) msg_type = 2;
} else {
len = (int) (ptr1 - ptr0);
}
if (len == 0) {
goto next;
}
log_lvl_t msg_type = LOG_INFO;
if (len >= 14 && strstarts(ptr0, "PHP Warning: ")) {
msg_type = LOG_WARNING;
msg_pre_len = 14;
} else if (len >= 18 && strstarts(ptr0, "PHP Fatal error: ")) {
msg_type = LOG_ERROR;
msg_pre_len = 18;
} else if (len >= 18 && strstarts(ptr0, "PHP Parse error: ")) {
msg_type = LOG_ERROR;
msg_pre_len = 18;
} else if (len >= 18 && strstarts(ptr0, "PHP Notice: ")) {
msg_type = LOG_NOTICE;
msg_pre_len = 13;
}
for (long ret; cnx->fd_err_bytes > 0 && (ret = getline(&line, &line_len, cnx->err)) != -1; cnx->fd_err_bytes -= ret) {
if (ret > 0) line[ret - 1] = 0;
line_ptr = line;
char *ptr2 = ptr0;
char *ptr3;
int len2;
while (ptr2 - ptr0 < len) {
ptr3 = strchr(ptr2, '\n');
len2 = (int) (len - (ptr2 - ptr0));
if (ptr3 != NULL && (ptr3 - ptr2) < len2) {
len2 = (int) (ptr3 - ptr2);
if (strstarts(line_ptr, "PHP message: ")) {
line_ptr += 13;
if (strstarts(line_ptr, "PHP Warning: ")) {
msg_type = LOG_WARNING;
} else if (strstarts(line_ptr, "PHP Fatal error: ")) {
msg_type = LOG_ERROR;
} else if (strstarts(line_ptr, "PHP Parse error: ")) {
msg_type = LOG_ERROR;
} else if (strstarts(line_ptr, "PHP Notice: ")) {
msg_type = LOG_NOTICE;
}
logmsgf(msg_type, "%.*s", len2, ptr2);
if (msg_type == 2 && ptr2 == ptr0) {
strcpy_rem_webroot(err_msg, ptr2, len2, conn->webroot);
err = 1;
}
if (ptr3 == NULL) {
break;
}
ptr2 = ptr3 + 1;
}
next:
if (ptr1 == NULL) {
break;
logmsgf(msg_type, "%s", line_ptr);
if (err_msg && msg_type <= LOG_ERROR && line_ptr != line) {
strcpy_rem_webroot(err_msg, line_ptr, cnx->webroot);
err = 1;
}
ptr0 = ptr1 + 13;
}
free(msg_str);
// cleanup
free(line);
return err;
}
@ -309,7 +280,11 @@ int fastcgi_recv_frame(fastcgi_cnx_t *cnx) {
return -1;
}
int fd = (header.type == FCGI_STDOUT) ? cnx->fd_out : cnx->fd_err;
int fd = cnx->fd_out;
if (header.type == FCGI_STDERR) {
fd = cnx->fd_err;
cnx->fd_err_bytes += content_len + 1;
}
for (long ret, sent = 0; sent < content_len; sent += ret) {
if ((ret = splice(cnx->socket.socket, 0, fd, 0, content_len - sent, 0)) == -1) {
if (errno == EINTR) {
@ -320,6 +295,7 @@ int fastcgi_recv_frame(fastcgi_cnx_t *cnx) {
}
}
}
if (header.type == FCGI_STDERR) write(fd, "\n", 1);
if (sock_recv_x(&cnx->socket, buf, header.paddingLength, 0) == -1)
return -1;
@ -372,23 +348,28 @@ int fastcgi_header(fastcgi_cnx_t *cnx, http_res *res, char *err_msg) {
char *h_pos = strstr(content, "\r\n\r\n");
if (h_pos == NULL) {
error("Unable to parse header: End of header not found");
return 1;
return -1;
}
long header_len = h_pos - content + 4;
for (int i = 0; i < header_len; i++) {
if ((buf[i] >= 0x00 && buf[i] <= 0x1F && buf[i] != '\r' && buf[i] != '\n') || buf[i] == 0x7F) {
error("Unable to parse header: Header contains illegal characters");
return 2;
return -1;
}
}
if (fastcgi_php_error(cnx, err_msg) != 0) {
res->status = http_get_status(500);
return 1;
}
char *ptr = buf;
while (header_len != (ptr - buf)) {
char *pos0 = strstr(ptr, "\r\n");
if (pos0 == NULL) {
error("Unable to parse header: Invalid header format");
return 1;
return -1;
}
ret = http_parse_header_field(&res->hdr, ptr, pos0, 0);

5
src/lib/fastcgi.h
View File

@ -25,6 +25,7 @@ typedef struct {
int mode;
sock socket, out;
int fd_err, fd_out;
long fd_err_bytes;
FILE *err;
unsigned short req_id;
int app_status;
@ -39,9 +40,9 @@ int fastcgi_init(fastcgi_cnx_t *conn, int mode, unsigned int req_num, const sock
int fastcgi_close_cnx(fastcgi_cnx_t *cnx);
int fastcgi_close_stdin(fastcgi_cnx_t *conn);
int fastcgi_close_stdin(fastcgi_cnx_t *cnx);
int fastcgi_php_error(const fastcgi_cnx_t *conn, const char *msg, int msg_len, char *err_msg);
int fastcgi_php_error(fastcgi_cnx_t *cnx, char *err_msg);
int fastcgi_recv_frame(fastcgi_cnx_t *cnx);

5
src/lib/utils.c
View File

@ -157,9 +157,8 @@ int mime_is_text(const char *restrict type) {
streq(type_parsed, "application/x-javascript");
}
int strcpy_rem_webroot(char *dst, const char *src, long len, const char *webroot) {
memcpy(dst, src, len);
dst[len] = 0;
int strcpy_rem_webroot(char *dst, const char *src, const char *webroot) {
strcpy(dst, src);
if (webroot == NULL)
return 0;

2
src/lib/utils.h
View File

@ -31,7 +31,7 @@ int mime_is_compressible(const char *restrict type);
int mime_is_text(const char *restrict type);
int strcpy_rem_webroot(char *dst, const char *str, long len, const char *webroot);
int strcpy_rem_webroot(char *dst, const char *str, const char *webroot);
int str_trim(char **start, char **end);

9
src/worker/fastcgi_handler.c
View File

@ -31,6 +31,8 @@ void fastcgi_handler_func(client_ctx_t *ctx) {
case 1: return;
case 2: break;
}
} else {
fastcgi_close(ctx->fcgi_cnx);
}
}
@ -98,10 +100,9 @@ static int fastcgi_handler_1(client_ctx_t *ctx, fastcgi_cnx_t **fcgi_cnx) {
}
fastcgi_close_stdin(*fcgi_cnx);
ret = fastcgi_header(*fcgi_cnx, res, err_msg);
if (ret != 0) {
res->status = http_get_status(502);
return (ret < 0) ? -1 : 1;
if ((ret = fastcgi_header(*fcgi_cnx, res, err_msg)) != 0) {
if (ret == -1) res->status = http_get_status(502);
return ret;
}
const char *status_hdr = http_get_header_field(&res->hdr, "Status");