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

Add more utils

Browse Source
This commit is contained in:
Lorenz Stechauner
2023-01-11 11:06:36 +01:00
parent 7699583c5f
commit 764b754a6f
15 changed files with 133 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/lib/config.c
View File

@ -8,6 +8,7 @@
#include "../logger.h"
#include "config.h"
#include "utils.h"
#include <stdio.h>
#include <string.h>
@ -133,7 +134,7 @@ int config_load(const char *filename) {
} else {
hc->type = CONFIG_TYPE_REVERSE_PROXY;
}
} else if (strcmp(ptr, "http") == 0) {
} else if (streq(ptr, "http")) {
if (hc->type != 0 && hc->type != CONFIG_TYPE_REVERSE_PROXY) {
goto err;
} else {
@ -141,7 +142,7 @@ int config_load(const char *filename) {
hc->proxy.enc = 0;
}
continue;
} else if (strcmp(ptr, "https") == 0) {
} else if (streq(ptr, "https")) {
if (hc->type != 0 && hc->type != CONFIG_TYPE_REVERSE_PROXY) {
goto err;
} else {
@ -166,11 +167,11 @@ int config_load(const char *filename) {
if (target != NULL) {
strcpy(target, source);
} else if (mode == 1) {
if (strcmp(source, "forbidden") == 0) {
if (streq(source, "forbidden")) {
config.hosts[i - 1].local.dir_mode = URI_DIR_MODE_FORBIDDEN;
} else if (strcmp(source, "info") == 0) {
} else if (streq(source, "info")) {
config.hosts[i - 1].local.dir_mode = URI_DIR_MODE_INFO;
} else if (strcmp(source, "list") == 0) {
} else if (streq(source, "list")) {
config.hosts[i - 1].local.dir_mode = URI_DIR_MODE_LIST;
} else {
goto err;
@ -193,7 +194,7 @@ int config_load(const char *filename) {
if (hc->cert_name[0] == 0) goto err2;
int found = 0;
for (int m = 0; m < j; m++) {
if (strcmp(config.certs[m].name, hc->cert_name) == 0) {
if (streq(config.certs[m].name, hc->cert_name)) {
hc->cert = m;
found = 1;
break;
@ -213,7 +214,7 @@ host_config_t *get_host_config(const char *host) {
for (int i = 0; i < CONFIG_MAX_HOST_CONFIG; i++) {
host_config_t *hc = &config.hosts[i];
if (hc->type == CONFIG_TYPE_UNSET) break;
if (strcmp(hc->name, host) == 0) return hc;
if (streq(hc->name, host)) return hc;
if (hc->name[0] == '*' && hc->name[1] == '.') {
const char *pos = strstr(host, hc->name + 1);
if (pos != NULL && strlen(pos) == strlen(hc->name + 1)) return hc;

8
src/lib/fastcgi.c
View File

@ -236,16 +236,16 @@ int fastcgi_php_error(const fastcgi_cnx_t *conn, const char *msg, int msg_len, c
goto next;
}
if (len >= 14 && strncmp(ptr0, "PHP Warning: ", 14) == 0) {
if (len >= 14 && strstarts(ptr0, "PHP Warning: ")) {
msg_type = LOG_WARNING;
msg_pre_len = 14;
} else if (len >= 18 && strncmp(ptr0, "PHP Fatal error: ", 18) == 0) {
} else if (len >= 18 && strstarts(ptr0, "PHP Fatal error: ")) {
msg_type = LOG_ERROR;
msg_pre_len = 18;
} else if (len >= 18 && strncmp(ptr0, "PHP Parse error: ", 18) == 0) {
} else if (len >= 18 && strstarts(ptr0, "PHP Parse error: ")) {
msg_type = LOG_ERROR;
msg_pre_len = 18;
} else if (len >= 18 && strncmp(ptr0, "PHP Notice: ", 13) == 0) {
} else if (len >= 18 && strstarts(ptr0, "PHP Notice: ")) {
msg_type = LOG_NOTICE;
msg_pre_len = 13;
}

3
src/lib/geoip.c
View File

@ -9,6 +9,7 @@
#include "geoip.h"
#include "../logger.h"
#include "error.h"
#include "utils.h"
#include <memory.h>
#include <dirent.h>
@ -91,7 +92,7 @@ int geoip_init(const char *directory) {
struct dirent *entry;
int i = 0, status;
while ((entry = readdir(geoip_dir)) != NULL) {
if (strcmp(entry->d_name + strlen(entry->d_name) - 5, ".mmdb") != 0)
if (!strends(entry->d_name, ".mmdb"))
continue;
if (i >= GEOIP_MAX_MMDB) {

14
src/lib/http.c
View File

@ -390,15 +390,15 @@ const char *http_get_status_color(const http_status *status) {
}
char *http_format_date(time_t time, char *buf, size_t size) {
struct tm timeinfo;
strftime(buf, size, "%a, %d %b %Y %H:%M:%S GMT", gmtime_r(&time, &timeinfo));
struct tm time_info;
strftime(buf, size, "%a, %d %b %Y %H:%M:%S GMT", gmtime_r(&time, &time_info));
return buf;
}
char *http_get_date(char *buf, size_t size) {
time_t rawtime;
time(&rawtime);
return http_format_date(rawtime, buf, size);
time_t raw_time;
time(&raw_time);
return http_format_date(raw_time, buf, size);
}
const http_doc_info *http_get_status_info(const http_status *status) {
@ -426,9 +426,9 @@ int http_get_compression(const http_req *req, const http_res *res) {
const char *content_type = http_get_header_field(&res->hdr, "Content-Type");
const char *content_encoding = http_get_header_field(&res->hdr, "Content-Encoding");
if (mime_is_compressible(content_type) && content_encoding == NULL && accept_encoding != NULL) {
if (strstr(accept_encoding, "br") != NULL) {
if (strcontains(accept_encoding, "br")) {
return COMPRESS_BR;
} else if (strstr(accept_encoding, "gzip") != NULL) {
} else if (strcontains(accept_encoding, "gzip")) {
return COMPRESS_GZ;
}
}

8
src/lib/proxy.c
View File

@ -398,10 +398,10 @@ int proxy_init(proxy_ctx_t **proxy_ptr, http_req *req, http_res *res, http_statu
proxy:
connection = http_get_header_field(&req->hdr, "Connection");
if (connection != NULL && (strstr(connection, "upgrade") != NULL || strstr(connection, "Upgrade") != NULL)) {
if (strcontains(connection, "upgrade") || strcontains(connection, "Upgrade")) {
upgrade = http_get_header_field(&req->hdr, "Upgrade");
ws_version = http_get_header_field(&req->hdr, "Sec-WebSocket-Version");
if (upgrade != NULL && ws_version != NULL && strcmp(upgrade, "websocket") == 0 && strcmp(ws_version, "13") == 0) {
if (streq(upgrade, "websocket") && streq(ws_version, "13")) {
ctx->ws_key = http_get_header_field(&req->hdr, "Sec-WebSocket-Key");
} else {
res->status = http_get_status(501);
@ -437,7 +437,7 @@ int proxy_init(proxy_ctx_t **proxy_ptr, http_req *req, http_res *res, http_statu
ret = 0;
if (content_len > 0) {
ret = sock_splice(&proxy->proxy, client, buffer, sizeof(buffer), content_len);
} else if (transfer_encoding != NULL && strstr(transfer_encoding, "chunked") != NULL) {
} else if (strcontains(transfer_encoding, "chunked")) {
ret = sock_splice_chunked(&proxy->proxy, client, buffer, sizeof(buffer));
}
@ -510,7 +510,7 @@ int proxy_init(proxy_ctx_t **proxy_ptr, http_req *req, http_res *res, http_statu
goto proxy_err;
}
if (ptr == buf) {
if (strncmp(ptr, "HTTP/", 5) != 0) {
if (!strstarts(ptr, "HTTP/")) {
res->status = http_get_status(502);
ctx->origin = SERVER_RES;
error("Unable to parse header: Invalid header format");

14
src/lib/uri.c
View File

@ -78,7 +78,7 @@ int uri_init(http_uri *uri, const char *webroot, const char *uri_str, int dir_mo
if (query != NULL) {
query[-1] = '?';
}
if (strstr(uri->req_path, "/../") != NULL || strstr(uri->req_path, "/./") != NULL) {
if (strcontains(uri->req_path, "/../") || strcontains(uri->req_path, "/./")) {
return 2;
}
@ -145,10 +145,10 @@ int uri_init(http_uri *uri, const char *webroot, const char *uri_str, int dir_mo
uri->filename = malloc(strlen(buf0) + 1);
strcpy(uri->filename, buf0);
long len = (long) strlen(uri->path);
if (strcmp(uri->path + len - 4, ".ncr") == 0 || strcmp(uri->path + len - 4, ".php") == 0) {
if (strends(uri->path, ".ncr") || strends(uri->path, ".php")) {
uri->path[len - 4] = 0;
uri->is_static = 0;
} else if (strcmp(uri->path + len - 5, ".html") == 0) {
} else if (strends(uri->path, ".html")) {
uri->path[len - 5] = 0;
}
} else if (path_is_file(buf1)) {
@ -195,12 +195,12 @@ int uri_init(http_uri *uri, const char *webroot, const char *uri_str, int dir_mo
}
}
if (strcmp(uri->path + strlen(uri->path) - 5, "index") == 0) {
if (strends(uri->path + strlen(uri->path), "index")) {
uri->path[strlen(uri->path) - 5] = 0;
}
if (strcmp(uri->pathinfo, "index.ncr") == 0 ||
strcmp(uri->pathinfo, "index.php") == 0 ||
strcmp(uri->pathinfo, "index.html") == 0) {
if (streq(uri->pathinfo, "index.ncr") ||
streq(uri->pathinfo, "index.php") ||
streq(uri->pathinfo, "index.html")) {
uri->pathinfo[0] = 0;
}

2
src/lib/uri.h
View File

@ -26,7 +26,7 @@ typedef struct {
char charset[URI_CHARSET_SIZE];
char filename_comp_gz[256];
char filename_comp_br[256];
struct stat stat;
long mtime;
} metadata_t;
typedef struct {

70
src/lib/utils.c
View File

@ -124,27 +124,27 @@ int mime_is_compressible(const char *type) {
char *pos = strchr(type_parsed, ';');
if (pos != NULL) pos[0] = 0;
return
strncmp(type_parsed, "text/", 5) == 0 ||
strncmp(type_parsed, "message/", 7) == 0 ||
strstr(type_parsed, "+xml") != NULL ||
strstr(type_parsed, "+json") != NULL ||
strcmp(type_parsed, "application/javascript") == 0 ||
strcmp(type_parsed, "application/json") == 0 ||
strcmp(type_parsed, "application/xml") == 0 ||
strcmp(type_parsed, "application/x-www-form-urlencoded") == 0 ||
strcmp(type_parsed, "application/x-tex") == 0 ||
strcmp(type_parsed, "application/x-httpd-php") == 0 ||
strcmp(type_parsed, "application/x-latex") == 0 ||
strcmp(type_parsed, "application/vnd.ms-fontobject") == 0 ||
strcmp(type_parsed, "application/x-font-ttf") == 0 ||
strcmp(type_parsed, "application/x-javascript") == 0 ||
strcmp(type_parsed, "font/eot") == 0 ||
strcmp(type_parsed, "font/opentype") == 0 ||
strcmp(type_parsed, "image/bmp") == 0 ||
strcmp(type_parsed, "image/gif") == 0 ||
strcmp(type_parsed, "image/vnd.microsoft.icon") == 0 ||
strcmp(type_parsed, "image/vnd.microsoft.iconbinary") == 0 ||
strcmp(type_parsed, "image/x-icon") == 0;
strstarts(type_parsed, "text/") ||
strstarts(type_parsed, "message/") ||
strends(type_parsed, "+xml") ||
strends(type_parsed, "+json") ||
streq(type_parsed, "application/javascript") ||
streq(type_parsed, "application/json") ||
streq(type_parsed, "application/xml") ||
streq(type_parsed, "application/x-www-form-urlencoded") ||
streq(type_parsed, "application/x-tex") ||
streq(type_parsed, "application/x-httpd-php") ||
streq(type_parsed, "application/x-latex") ||
streq(type_parsed, "application/vnd.ms-fontobject") ||
streq(type_parsed, "application/x-font-ttf") ||
streq(type_parsed, "application/x-javascript") ||
streq(type_parsed, "font/eot") ||
streq(type_parsed, "font/opentype") ||
streq(type_parsed, "image/bmp") ||
streq(type_parsed, "image/gif") ||
streq(type_parsed, "image/vnd.microsoft.icon") ||
streq(type_parsed, "image/vnd.microsoft.iconbinary") ||
streq(type_parsed, "image/x-icon");
}
int strcpy_rem_webroot(char *dst, const char *src, long len, const char *webroot) {
@ -187,6 +187,26 @@ int str_trim_lws(char **start, char **end) {
return 0;
}
int streq(const char *restrict str1, const char *restrict str2) {
return str1 != NULL && str2 != NULL && strcmp(str1, str2) == 0;
}
int strcontains(const char *restrict haystack, const char *restrict needle) {
return haystack != NULL && needle != NULL && strstr(haystack, needle) != NULL;
}
int strstarts(const char *restrict str, const char *restrict prefix) {
if (str == NULL || prefix == NULL) return 0;
unsigned long l1 = strlen(str), l2 = strlen(prefix);
return l2 <= l1 && strncmp(str, prefix, l2) == 0;
}
int strends(const char *restrict str, const char *restrict suffix) {
if (str == NULL || suffix == NULL) return 0;
unsigned long l1 = strlen(str), l2 = strlen(suffix);
return l2 <= l1 && strcmp(str + l1 - l2, suffix) == 0;
}
int base64_encode(void *data, unsigned long data_len, char *output, unsigned long *output_len) {
unsigned long out_len = 4 * ((data_len + 2) / 3);
if (output_len != NULL) *output_len = out_len;
@ -221,6 +241,12 @@ long clock_cpu(void) {
return time.tv_sec * 1000000000 + time.tv_nsec;
}
long stat_mtime(const char *filename) {
struct stat stat_buf;
stat(filename, &stat_buf);
return stat_buf.st_mtime;
}
int rm_rf(const char *path) {
struct stat stat_buf;
if (lstat(path, &stat_buf) != 0)
@ -243,7 +269,7 @@ int rm_rf(const char *path) {
// read directory
for (struct dirent *ent; (ent = readdir(dir)) != NULL;) {
if (strcmp(ent->d_name, ".") == 0 || strcmp(ent->d_name, "..") == 0)
if (streq(ent->d_name, ".") || streq(ent->d_name, ".."))
continue;
snprintf(buf, sizeof(buf), "%s/%s", path, ent->d_name);

10
src/lib/utils.h
View File

@ -35,12 +35,22 @@ int str_trim(char **start, char **end);
int str_trim_lws(char **start, char **end);
int streq(const char *restrict str1, const char *restrict str2);
int strcontains(const char *restrict haystack, const char *restrict needle);
int strstarts(const char *restrict str, const char *restrict prefix);
int strends(const char *restrict str, const char *restrict suffix);
int base64_encode(void *data, unsigned long data_len, char *output, unsigned long *output_len);
long clock_micros(void);
long clock_cpu(void);
long stat_mtime(const char *filename);
int rm_rf(const char *path);
#endif //SESIMOS_UTILS_H