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

Refactor code to avoid warnings

Browse Source
This commit is contained in:
Lorenz Stechauner
2021-03-18 20:27:45 +01:00
parent 10464f3f30
commit c1d076db04
10 changed files with 79 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -7,11 +7,11 @@ packages:
compile: compile:
@mkdir -p bin @mkdir -p bin
gcc src/necronda-server.c -o bin/necronda-server -std=c11 -lssl -lcrypto -lmagic -lz -lmaxminddb gcc src/necronda-server.c -o bin/necronda-server -std=c11 -lssl -lcrypto -lmagic -lz -lmaxminddb -Wall
compile-debian: compile-debian:
@mkdir -p bin @mkdir -p bin
gcc src/necronda-server.c -o bin/necronda-server -std=c11 -lssl -lcrypto -lmagic -lz -lmaxminddb \ gcc src/necronda-server.c -o bin/necronda-server -std=c11 -lssl -lcrypto -lmagic -lz -lmaxminddb -Wall \
-D MAGIC_FILE="\"/usr/share/file/magic.mgc\"" \ -D MAGIC_FILE="\"/usr/share/file/magic.mgc\"" \
-D PHP_FPM_SOCKET="\"/var/run/php/php7.3-fpm.sock\"" -D PHP_FPM_SOCKET="\"/var/run/php/php7.3-fpm.sock\""

12
src/cache.c
View File

@ -69,6 +69,7 @@ int cache_process() {
SHA_CTX ctx; SHA_CTX ctx;
unsigned char hash[SHA_DIGEST_LENGTH]; unsigned char hash[SHA_DIGEST_LENGTH];
int cache_changed = 0; int cache_changed = 0;
int p_len;
while (cache_continue) { while (cache_continue) {
for (int i = 0; i < FILE_CACHE_SIZE; i++) { for (int i = 0; i < FILE_CACHE_SIZE; i++) {
if (cache[i].filename[0] != 0 && cache[i].meta.etag[0] == 0 && !cache[i].is_updating) { if (cache[i].filename[0] != 0 && cache[i].meta.etag[0] == 0 && !cache[i].is_updating) {
@ -97,12 +98,19 @@ int cache_process() {
buf[j] = ch; buf[j] = ch;
} }
buf[strlen(rel_path)] = 0; buf[strlen(rel_path)] = 0;
sprintf(filename_comp, "%.*s/.necronda-server/cache/%s.z", cache[i].webroot_len, cache[i].filename, buf); p_len = snprintf(filename_comp, sizeof(filename_comp), "%.*s/.necronda-server/cache/%s.z",
cache[i].webroot_len, cache[i].filename, buf);
if (p_len < 0 || p_len >= sizeof(filename_comp)) {
fprintf(stderr, ERR_STR "Unable to open cached file: "
"File name for compressed file too long" CLR_STR "\n");
goto comp_err;
}
fprintf(stdout, "[cache] Compressing file %s\n", cache[i].filename); fprintf(stdout, "[cache] Compressing file %s\n", cache[i].filename);
comp_file = fopen(filename_comp, "wb"); comp_file = fopen(filename_comp, "wb");
if (comp_file == NULL) { if (comp_file == NULL) {
compress = 0;
fprintf(stderr, ERR_STR "Unable to open cached file: %s" CLR_STR "\n", strerror(errno)); fprintf(stderr, ERR_STR "Unable to open cached file: %s" CLR_STR "\n", strerror(errno));
comp_err:
compress = 0;
} else { } else {
strm.zalloc = Z_NULL; strm.zalloc = Z_NULL;
strm.zfree = Z_NULL; strm.zfree = Z_NULL;

10
src/client.c
View File

@ -42,6 +42,7 @@ int client_request_handler(sock *client, unsigned long client_num, unsigned int
int accept_if_modified_since = 0; int accept_if_modified_since = 0;
int use_fastcgi = 0; int use_fastcgi = 0;
int use_rev_proxy = 0; int use_rev_proxy = 0;
int p_len;
fastcgi_conn php_fpm = {.socket = 0, .req_id = 0}; fastcgi_conn php_fpm = {.socket = 0, .req_id = 0};
http_status custom_status; http_status custom_status;
@ -139,6 +140,8 @@ int client_request_handler(sock *client, unsigned long client_num, unsigned int
} else if (ret == 3) { } else if (ret == 3) {
sprintf(err_msg, "The specified webroot directory does not exist."); sprintf(err_msg, "The specified webroot directory does not exist.");
res.status = http_get_status(404); res.status = http_get_status(404);
} else {
res.status = http_get_status(500);
} }
goto respond; goto respond;
} }
@ -152,7 +155,12 @@ int client_request_handler(sock *client, unsigned long client_num, unsigned int
size = sizeof(buf0); size = sizeof(buf0);
url_encode(uri.uri, buf0, &size); url_encode(uri.uri, buf0, &size);
if (change_proto) { if (change_proto) {
sprintf(buf1, "https://%s%s", host, buf0); p_len = snprintf(buf1, sizeof(buf1), "https://%s%s", host, buf0);
if (p_len < 0 || p_len >= sizeof(buf1)) {
res.status = http_get_status(500);
print(ERR_STR "Header field 'Location' too long" CLR_STR);
goto respond;
}
http_add_header_field(&res.hdr, "Location", buf1); http_add_header_field(&res.hdr, "Location", buf1);
} else { } else {
http_add_header_field(&res.hdr, "Location", buf0); http_add_header_field(&res.hdr, "Location", buf0);

3
src/config.c
View File

@ -69,8 +69,7 @@ int config_load(const char *filename) {
int i = 0; int i = 0;
int mode = 0; int mode = 0;
char *ptr = NULL; char *ptr = NULL;
char host[256], *source, *target; char *source, *target;
host[0] = 0;
while ((ptr = strtok(ptr == NULL ? conf : NULL, "\n")) != NULL) { while ((ptr = strtok(ptr == NULL ? conf : NULL, "\n")) != NULL) {
char *comment = strchr(ptr, '#'); char *comment = strchr(ptr, '#');
if (comment != NULL) comment[0] = 0; if (comment != NULL) comment[0] = 0;

17
src/debug.c
View File

@ -1,17 +0,0 @@
//
// Created by lorenz on 17.01.21.
//
#include "fastcgi.c"
#include "http.c"
#include "sock.c"
const char *msg = "PHP message: PHP Notice: Undefined index: Verifiedd in /srv/necronda/www.necronda.net/admin/users.php on line 58PHP message: PHP Notice: Undefined index: Verifiedd in /srv/necronda/www.necronda.net/admin/users.php on line 58PHP message: PHP Notice: Undefined index: Verifiedd in /srv/necronda/www.necronda.net/admin/users.php on line 58PHP message: PHP Notice: Undefined index: Verifiedd in /srv/necronda/www.necronda.net/admin/users.php on line 58PHP message: PHP Notice: Undefined index: Verifiedd in /srv/necronda/www.necronda.net/admin/users.php on line 58PHP message: PHP Notice: Undefined index: Verifiedd in /srv/necronda/www.necronda.net/admin/users.php on line 58PHP message: PHP Notice: Undefined index: Verifiedd in /srv/necronda/www.necronda.net/admin/users.php on line 58PHP message: PHP Notice: Undefined index: Verifiedd in /srv/necronda/www.necronda.net/admin/users.php on line 58";
int main() {
char err[256];
int ret = fastcgi_php_error(msg, strlen(msg), err);
printf("%i\n", ret);
return 0;
}

2
src/fastcgi.c
View File

@ -130,7 +130,7 @@ int fastcgi_init(fastcgi_conn *conn, unsigned int client_num, unsigned int req_n
if (uri->pathinfo != NULL && strlen(uri->pathinfo) > 0) { if (uri->pathinfo != NULL && strlen(uri->pathinfo) > 0) {
sprintf(buf0, "/%s", uri->pathinfo); sprintf(buf0, "/%s", uri->pathinfo);
} else { } else {
sprintf(buf0, ""); buf0[0] = 0;
} }
param_ptr = fastcgi_add_param(param_ptr, "PATH_INFO", buf0); param_ptr = fastcgi_add_param(param_ptr, "PATH_INFO", buf0);

20
src/http.c
View File

@ -49,9 +49,9 @@ int http_parse_header_field(http_hdr *hdr, const char *buf, const char *end_ptr)
} }
long len = pos1 - buf; long len = pos1 - buf;
hdr->fields[hdr->field_num][0] = malloc(len + 1); hdr->fields[(int) hdr->field_num][0] = malloc(len + 1);
sprintf(hdr->fields[hdr->field_num][0], "%.*s", (int) len, buf); sprintf(hdr->fields[(int) hdr->field_num][0], "%.*s", (int) len, buf);
http_to_camel_case(hdr->fields[hdr->field_num][0], HTTP_CAMEL); http_to_camel_case(hdr->fields[(int) hdr->field_num][0], HTTP_CAMEL);
pos1++; pos1++;
pos2 = (char *) end_ptr - 1; pos2 = (char *) end_ptr - 1;
@ -60,11 +60,11 @@ int http_parse_header_field(http_hdr *hdr, const char *buf, const char *end_ptr)
len = pos2 - pos1 + 1; len = pos2 - pos1 + 1;
if (len <= 0) { if (len <= 0) {
hdr->fields[hdr->field_num][1] = malloc(1); hdr->fields[(int) hdr->field_num][1] = malloc(1);
hdr->fields[hdr->field_num][1][0] = 0; hdr->fields[(int) hdr->field_num][1][0] = 0;
} else { } else {
hdr->fields[hdr->field_num][1] = malloc(len + 1); hdr->fields[(int) hdr->field_num][1] = malloc(len + 1);
sprintf(hdr->fields[hdr->field_num][1], "%.*s", (int) len, pos1); sprintf(hdr->fields[(int) hdr->field_num][1], "%.*s", (int) len, pos1);
} }
hdr->field_num++; hdr->field_num++;
return 0; return 0;
@ -184,8 +184,8 @@ void http_add_header_field(http_hdr *hdr, const char *field_name, const char *fi
strcpy(_field_name, field_name); strcpy(_field_name, field_name);
strcpy(_field_value, field_value); strcpy(_field_value, field_value);
http_to_camel_case(_field_name, HTTP_PRESERVE); http_to_camel_case(_field_name, HTTP_PRESERVE);
hdr->fields[hdr->field_num][0] = _field_name; hdr->fields[(int) hdr->field_num][0] = _field_name;
hdr->fields[hdr->field_num][1] = _field_value; hdr->fields[(int) hdr->field_num][1] = _field_value;
hdr->field_num++; hdr->field_num++;
} }
@ -266,7 +266,7 @@ const char *http_get_status_color(http_status *status) {
unsigned short code = status->code; unsigned short code = status->code;
if (code >= 100 && code < 200) { if (code >= 100 && code < 200) {
return HTTP_1XX_STR; return HTTP_1XX_STR;
} else if (code >= 200 && code < 300 || code == 304) { } else if ((code >= 200 && code < 300) || code == 304) {
return HTTP_2XX_STR; return HTTP_2XX_STR;
} else if (code >= 300 && code < 400) { } else if (code >= 300 && code < 400) {
return HTTP_3XX_STR; return HTTP_3XX_STR;

50
src/rev_proxy.c
View File

@ -14,6 +14,7 @@ struct timeval server_timeout = {.tv_sec = SERVER_TIMEOUT, .tv_usec = 0};
int rev_proxy_request_header(http_req *req, int enc) { int rev_proxy_request_header(http_req *req, int enc) {
char buf1[256]; char buf1[256];
char buf2[256]; char buf2[256];
int p_len;
http_remove_header_field(&req->hdr, "Connection", HTTP_REMOVE_ALL); http_remove_header_field(&req->hdr, "Connection", HTTP_REMOVE_ALL);
http_add_header_field(&req->hdr, "Connection", "keep-alive"); http_add_header_field(&req->hdr, "Connection", "keep-alive");
@ -22,7 +23,11 @@ int rev_proxy_request_header(http_req *req, int enc) {
if (via == NULL) { if (via == NULL) {
http_add_header_field(&req->hdr, "Via", buf1); http_add_header_field(&req->hdr, "Via", buf1);
} else { } else {
sprintf(buf2, "%s, %s", via, buf1); p_len = snprintf(buf2, sizeof(buf2), "%s, %s", via, buf1);
if (p_len < 0 || p_len >= sizeof(buf2)) {
print(ERR_STR "Header field 'Via' too long" CLR_STR);
return -1;
}
http_remove_header_field(&req->hdr, "Via", HTTP_REMOVE_ALL); http_remove_header_field(&req->hdr, "Via", HTTP_REMOVE_ALL);
http_add_header_field(&req->hdr, "Via", buf2); http_add_header_field(&req->hdr, "Via", buf2);
} }
@ -32,15 +37,23 @@ int rev_proxy_request_header(http_req *req, int enc) {
int client_ipv6 = strchr(client_addr_str, ':') != NULL; int client_ipv6 = strchr(client_addr_str, ':') != NULL;
int server_ipv6 = strchr(server_addr_str, ':') != NULL; int server_ipv6 = strchr(server_addr_str, ':') != NULL;
sprintf(buf1, "by=%s%s%s;for=%s%s%s;host=%s;proto=%s", p_len = snprintf(buf1, sizeof(buf1), "by=%s%s%s;for=%s%s%s;host=%s;proto=%s",
server_ipv6 ? "\"[" : "", server_addr_str, server_ipv6 ? "]\"" : "", server_ipv6 ? "\"[" : "", server_addr_str, server_ipv6 ? "]\"" : "",
client_ipv6 ? "\"[" : "", client_addr_str, client_ipv6 ? "]\"" : "", client_ipv6 ? "\"[" : "", client_addr_str, client_ipv6 ? "]\"" : "",
host, enc ? "https" : "http"); host, enc ? "https" : "http");
if (p_len < 0 || p_len >= sizeof(buf1)) {
print(ERR_STR "Appended part of header field 'Forwarded' too long" CLR_STR);
return -1;
}
if (forwarded == NULL) { if (forwarded == NULL) {
// TODO escape IPv6 addresses // TODO escape IPv6 addresses
http_add_header_field(&req->hdr, "Forwarded", buf1); http_add_header_field(&req->hdr, "Forwarded", buf1);
} else { } else {
sprintf(buf2, "%s, %s", forwarded, buf1); p_len = snprintf(buf2, sizeof(buf2), "%s, %s", forwarded, buf1);
if (p_len < 0 || p_len >= sizeof(buf2)) {
print(ERR_STR "Header field 'Forwarded' too long" CLR_STR);
return -1;
}
http_remove_header_field(&req->hdr, "Forwarded", HTTP_REMOVE_ALL); http_remove_header_field(&req->hdr, "Forwarded", HTTP_REMOVE_ALL);
http_add_header_field(&req->hdr, "Forwarded", buf2); http_add_header_field(&req->hdr, "Forwarded", buf2);
} }
@ -102,13 +115,22 @@ int rev_proxy_request_header(http_req *req, int enc) {
int rev_proxy_response_header(http_req *req, http_res *res) { int rev_proxy_response_header(http_req *req, http_res *res) {
char buf1[256]; char buf1[256];
char buf2[256]; char buf2[256];
int p_len;
char *via = http_get_header_field(&res->hdr, "Via"); char *via = http_get_header_field(&res->hdr, "Via");
sprintf(buf1, "HTTP/%s %s", req->version, DEFAULT_HOST); p_len = snprintf(buf1, sizeof(buf1), "HTTP/%s %s", req->version, DEFAULT_HOST);
if (p_len < 0 || p_len >= sizeof(buf1)) {
print(ERR_STR "Appended part of header field 'Via' too long" CLR_STR);
return -1;
}
if (via == NULL) { if (via == NULL) {
http_add_header_field(&res->hdr, "Via", buf1); http_add_header_field(&res->hdr, "Via", buf1);
} else { } else {
sprintf(buf2, "%s, %s", via, buf1); p_len = snprintf(buf2, sizeof(buf2), "%s, %s", via, buf1);
if (p_len < 0 || p_len >= sizeof(buf2)) {
print(ERR_STR "Header field 'Via' too long" CLR_STR);
return -1;
}
http_remove_header_field(&res->hdr, "Via", HTTP_REMOVE_ALL); http_remove_header_field(&res->hdr, "Via", HTTP_REMOVE_ALL);
http_add_header_field(&res->hdr, "Via", buf2); http_add_header_field(&res->hdr, "Via", buf2);
} }
@ -201,7 +223,11 @@ int rev_proxy_init(http_req *req, http_res *res, host_config *conf, sock *client
print(BLUE_STR "Established new connection with " BLD_STR "[%s]:%i" CLR_STR, buffer, conf->rev_proxy.port); print(BLUE_STR "Established new connection with " BLD_STR "[%s]:%i" CLR_STR, buffer, conf->rev_proxy.port);
rev_proxy: rev_proxy:
rev_proxy_request_header(req, (int) client->enc); ret = rev_proxy_request_header(req, (int) client->enc);
if (ret != 0) {
res->status = http_get_status(500);
return -1;
}
ret = http_send_request(&rev_proxy, req); ret = http_send_request(&rev_proxy, req);
if (ret < 0) { if (ret < 0) {
@ -323,7 +349,11 @@ int rev_proxy_init(http_req *req, http_res *res, host_config *conf, sock *client
} }
sock_recv(&rev_proxy, buffer, header_len, 0); sock_recv(&rev_proxy, buffer, header_len, 0);
rev_proxy_response_header(req, res); ret = rev_proxy_response_header(req, res);
if (ret != 0) {
res->status = http_get_status(500);
return -1;
}
return 0; return 0;

7
src/uri.c
View File

@ -28,6 +28,7 @@ int uri_init(http_uri *uri, const char *webroot, const char *uri_str, int dir_mo
char buf1[1024]; char buf1[1024];
char buf2[1024]; char buf2[1024];
char buf3[1024]; char buf3[1024];
int p_len;
uri->webroot = NULL; uri->webroot = NULL;
uri->req_path = NULL; uri->req_path = NULL;
uri->path = NULL; uri->path = NULL;
@ -96,8 +97,10 @@ 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);
sprintf(buf1, "%s.php", buf0); p_len = snprintf(buf1, sizeof(buf1), "%s.php", buf0);
sprintf(buf2, "%s.html", buf0); if (p_len < 0 || p_len >= sizeof(buf1)) return -1;
p_len = snprintf(buf2, sizeof(buf2), "%s.html", buf0);
if (p_len < 0 || p_len >= sizeof(buf2)) return -1;
if (strlen(uri->path) <= 1 || path_exists(buf0) || path_is_file(buf1) || path_is_file(buf2)) { if (strlen(uri->path) <= 1 || path_exists(buf0) || path_is_file(buf1) || path_is_file(buf2)) {
break; break;

2
src/utils.c
View File

@ -120,7 +120,7 @@ MMDB_entry_data_list_s *mmdb_json(MMDB_entry_data_list_s *list, char *str, long
*str_off += sprintf(str + *str_off, "%lu", list->entry_data.uint64); *str_off += sprintf(str + *str_off, "%lu", list->entry_data.uint64);
break; break;
case MMDB_DATA_TYPE_UINT128: case MMDB_DATA_TYPE_UINT128:
*str_off += sprintf(str + *str_off, "%llu", list->entry_data.uint128); *str_off += sprintf(str + *str_off, "%llu", (unsigned long long) list->entry_data.uint128);
break; break;
case MMDB_DATA_TYPE_INT32: case MMDB_DATA_TYPE_INT32:
*str_off += sprintf(str + *str_off, "%i", list->entry_data.uint32); *str_off += sprintf(str + *str_off, "%i", list->entry_data.uint32);