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

Remove webroot from error documents

Browse Source
This commit is contained in:
Lorenz Stechauner
2021-09-29 17:25:28 +02:00
parent 69dfc562af
commit 495a3a6aaf
4 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/lib/fastcgi.c
View File

@ -61,6 +61,7 @@ int fastcgi_init(fastcgi_conn *conn, int mode, unsigned int client_num, unsigned
conn->req_id = req_id; conn->req_id = req_id;
conn->out_buf = NULL; conn->out_buf = NULL;
conn->out_off = 0; conn->out_off = 0;
conn->webroot = uri->webroot;
int fcgi_sock = socket(AF_UNIX, SOCK_STREAM, 0); int fcgi_sock = socket(AF_UNIX, SOCK_STREAM, 0);
if (fcgi_sock < 0) { if (fcgi_sock < 0) {
@ -215,7 +216,7 @@ int fastcgi_close_stdin(fastcgi_conn *conn) {
return 0; return 0;
} }
int fastcgi_php_error(const char *msg, int msg_len, char *err_msg) { int fastcgi_php_error(const fastcgi_conn *conn, const char *msg, int msg_len, char *err_msg) {
char *msg_str = malloc(msg_len + 1); char *msg_str = malloc(msg_len + 1);
char *ptr0 = msg_str; char *ptr0 = msg_str;
strncpy(msg_str, msg, msg_len); strncpy(msg_str, msg, msg_len);
@ -262,7 +263,7 @@ int fastcgi_php_error(const char *msg, int msg_len, char *err_msg) {
} }
print("%s%.*s%s", msg_type == 1 ? WRN_STR : msg_type == 2 ? ERR_STR : "", len2, ptr2, CLR_STR); print("%s%.*s%s", msg_type == 1 ? WRN_STR : msg_type == 2 ? ERR_STR : "", len2, ptr2, CLR_STR);
if (msg_type == 2 && ptr2 == ptr0) { if (msg_type == 2 && ptr2 == ptr0) {
sprintf(err_msg, "%.*s", len2, ptr2); strcpy_rem_webroot(err_msg, ptr2, len2, conn->webroot);
err = 1; err = 1;
} }
if (ptr3 == NULL) { if (ptr3 == NULL) {
@ -340,7 +341,7 @@ int fastcgi_header(fastcgi_conn *conn, http_res *res, char *err_msg) {
} else if (header.type == FCGI_STDERR) { } else if (header.type == FCGI_STDERR) {
// TODO implement Necronda backend error handling // TODO implement Necronda backend error handling
if (conn->mode == FASTCGI_PHP) { if (conn->mode == FASTCGI_PHP) {
err = err || fastcgi_php_error(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) {
break; break;
@ -479,7 +480,7 @@ int fastcgi_send(fastcgi_conn *conn, sock *client, int flags) {
} else if (header.type == FCGI_STDERR) { } else if (header.type == FCGI_STDERR) {
// TODO implement Necronda backend error handling // TODO implement Necronda backend error handling
if (conn->mode == FASTCGI_PHP) { if (conn->mode == FASTCGI_PHP) {
fastcgi_php_error(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; unsigned long avail_in, avail_out;

3
src/lib/fastcgi.h
View File

@ -31,6 +31,7 @@ typedef struct {
int socket; int socket;
unsigned short req_id; unsigned short req_id;
char *out_buf; char *out_buf;
const char *webroot;
unsigned short out_len; unsigned short out_len;
unsigned short out_off; unsigned short out_off;
} fastcgi_conn; } fastcgi_conn;
@ -42,7 +43,7 @@ int fastcgi_init(fastcgi_conn *conn, int mode, unsigned int client_num, unsigned
int fastcgi_close_stdin(fastcgi_conn *conn); int fastcgi_close_stdin(fastcgi_conn *conn);
int fastcgi_php_error(const char *msg, int msg_len, char *err_msg); int fastcgi_php_error(const fastcgi_conn *conn, const char *msg, int msg_len, char *err_msg);
int fastcgi_header(fastcgi_conn *conn, http_res *res, char *err_msg); int fastcgi_header(fastcgi_conn *conn, http_res *res, char *err_msg);

10
src/lib/utils.c
View File

@ -131,3 +131,13 @@ int mime_is_compressible(const char *type) {
strcmp(type_parsed, "image/vnd.microsoft.icon") == 0 || strcmp(type_parsed, "image/vnd.microsoft.icon") == 0 ||
strcmp(type_parsed, "image/x-icon") == 0; strcmp(type_parsed, "image/x-icon") == 0;
} }
int strcpy_rem_webroot(char *dst, const char *src, long len, const char *webroot) {
strncpy(dst, src, len);
if (webroot == NULL) return 0;
char *pos;
while ((pos = strstr(dst, webroot)) != NULL) {
strcpy(pos, pos + strlen(webroot));
}
return 0;
}

2
src/lib/utils.h
View File

@ -40,4 +40,6 @@ int url_decode(const char *str, char *dec, long *size);
int mime_is_compressible(const char *type); int mime_is_compressible(const char *type);
int strcpy_rem_webroot(char *dst, const char *str, long len, const char *webroot);
#endif //NECRONDA_SERVER_UTILS_H #endif //NECRONDA_SERVER_UTILS_H