Fix config file parsing

.gitignore

@@ -1,7 +1,8 @@
 *
 !src
 !src/**
-!run.sh
+!docs
+!docs/**
 !Makefile
 !.gitignore
 !README.md

Makefile

@@ -1,19 +1,26 @@
-.DEFAULT_GOAL := install
+
+CC=gcc
+CFLAGS=-std=gnu11 -Wall
+LIBS=-lssl -lcrypto -lmagic -lz -lmaxminddb -lbrotlienc
+
+DEBIAN_OPTS=-D CACHE_MAGIC_FILE="\"/usr/share/file/magic.mgc\"" -D PHP_FPM_SOCKET="\"/var/run/php/php7.4-fpm.sock\""
 
 packages:
 	@echo "Installing packages..."
-	sudo apt-get install gcc libmagic-dev libssl-dev php-fpm
+	sudo apt install gcc php-fpm libmagic-dev libssl-dev libmaxminddb-dev
 	@echo "Finished downloading!"
 
+permit:
+	sudo setcap 'cap_net_bind_service=+ep' "$(shell pwd)/bin/necronda-server"
+
 compile:
 	@mkdir -p bin
-	gcc src/necronda-server.c -o bin/necronda-server -std=c11 -lssl -lcrypto -lmagic -lz -lmaxminddb -Wall
+	$(CC) src/lib/*.c -o bin/libnecrondaserver.so --shared -fPIC $(CFLAGS) $(LIBS)
+	$(CC) src/necronda-server.c -o bin/necronda-server $(CFLAGS) $(LIBS) \
+		-Lbin -lnecrondaserver -Wl,-rpath=$(shell pwd)/bin
 
-compile-debian:
+compile-prod:
 	@mkdir -p bin
-	gcc src/necronda-server.c -o bin/necronda-server -std=c11 -lssl -lcrypto -lmagic -lz -lmaxminddb -Wall \
+	$(CC) src/lib/*.c -o bin/libnecrondaserver.so --shared -fPIC $(CFLAGS) $(LIBS) $(DEBIAN_OPTS) -O3
-		-D MAGIC_FILE="\"/usr/share/file/magic.mgc\"" \
+	$(CC) src/necronda-server.c -o bin/necronda-server $(CFLAGS) $(LIBS) $(DEBIAN_OPTS) -O3 \
-		-D PHP_FPM_SOCKET="\"/var/run/php/php7.3-fpm.sock\""
+		-Lbin -lnecrondaserver -Wl,-rpath=$(shell pwd)/bin
-
-install: | packages compile
-	@echo "Finished!"

README.md

@@ -1,2 +1,44 @@
 
-# Necronda web server
+Necronda web server
+===================
+
+## Features
+
+* Full IPv4 and IPv6 support
+* Serving local files via HTTP and HTTPS
+  * File compression ([gzip](https://www.gzip.org/), [Brotli](https://www.brotli.org/)) and disk cache for compressed files
+* Reverse proxy for other HTTP and HTTPS servers
+* FastCGI support (e.g. [PHP-FPM](https://php-fpm.org/))
+* Support for [MaxMind's GeoIP Database](https://www.maxmind.com/en/geoip2-services-and-databases)
+* Optional DNS reverse lookup for connecting hosts
+* Automatic URL rewrite (e.g. `/index.html` -> `/`, `/test.php` -> `/test`)
+* Modern looking and responsive error documents
+
+
+## Configuration
+
+See [docs/example.conf](docs/example.conf) for more details.
+
+
+### Global directives
+
+* `certificate` - path to SSL certificate (or certificate chain)
+* `private_key` - path to SSL private key
+* `geoip_dir` (optional) - path to a directory containing GeoIP databases
+* `dns_server` (optional) - address of a DNS server
+
+
+### Virtual host configuration
+
+* `[<host>]` - begins section for the virtual host `<host>`
+* Local
+    * `webroot` - path to the root directory
+    * `dir_mode` - specify the behaviour for directories without an `index.html` or `index.php`
+        * `forbidden` - the server will respond with `403 Forbidden`
+        * `info` - try passing *path info* to an upper `.php` file.
+        * `list` - list contents of directory (**not implemented yet**)
+* Reverse proxy
+    * `hostname` - hostname of server to be reverse proxy of
+    * `port` - port to be used
+    * `http` - use HTTP to communicate with server
+    * `https` - use HTTPS to communicate with server

docs/example.conf

@@ -0,0 +1,19 @@
+
+certificate /var/cert/cert.pem
+private_key /var/cert/cert.key
+#geoip_dir  /var/dir
+#dns_server 192.168.0.1
+
+[localhost]
+webroot     /var/www/localhost
+dir_mode    forbidden
+
+[me.local]
+hostname    www.example.com
+port        80
+http
+
+[secure.local]
+hostname    www.example.com
+port        443
+https

run.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-echo "-- Building and starting Necronda Server..."
-make compile && \
- echo "-- Successfully finished compiling!" && \
- echo "-- Starting Server..." && \
- ./bin/necronda-server $@

src/client.c

@@ -5,12 +5,36 @@
  * Lorenz Stechauner, 2020-12-03
  */
 
-#include "client.h"
+#include "lib/utils.h"
+#include "lib/config.h"
+#include "lib/sock.h"
+#include "lib/http.h"
+#include "lib/rev_proxy.h"
+#include "lib/fastcgi.h"
+#include "lib/cache.h"
+#include "lib/geoip.h"
+#include "lib/compress.h"
 
+#include <string.h>
+#include <sys/select.h>
+#include <errno.h>
+#include <unistd.h>
+#include <openssl/ssl.h>
+#include <openssl/err.h>
+#include <signal.h>
+#include <arpa/inet.h>
+
+int server_keep_alive = 1;
+struct timeval client_timeout = {.tv_sec = CLIENT_TIMEOUT, .tv_usec = 0};
+
+int server_keep_alive;
+char *log_client_prefix, *log_conn_prefix, *log_req_prefix, *client_geoip;
+char *client_addr_str, *client_addr_str_ptr, *server_addr_str, *server_addr_str_ptr, *client_host_str;
+struct timeval client_timeout;
 
 host_config *get_host_config(const char *host) {
-    for (int i = 0; i < MAX_HOST_CONFIG; i++) {
+    for (int i = 0; i < CONFIG_MAX_HOST_CONFIG; i++) {
-        host_config *hc = &config[i];
+        host_config *hc = &config->hosts[i];
         if (hc->type == CONFIG_TYPE_UNSET) break;
         if (strcmp(hc->name, host) == 0) return hc;
     }
@@ -30,26 +54,31 @@ int client_request_handler(sock *client, unsigned long client_num, unsigned int
     struct timespec begin, end;
     long ret;
     int client_keep_alive;
+
     char buf0[1024], buf1[1024];
-    char msg_buf[4096], msg_pre_buf[4096], err_msg[256];
+    char msg_buf[8192], msg_pre_buf_1[4096], msg_pre_buf_2[4096], err_msg[256];
+    char msg_content[1024];
     char buffer[CHUNK_SIZE];
-    err_msg[0] = 0;
     char host[256], *host_ptr, *hdr_connection;
-    host_config *conf = NULL;
+
-    long content_length = 0;
-    FILE *file = NULL;
     msg_buf[0] = 0;
+    err_msg[0] = 0;
+    msg_content[0] = 0;
+
+    host_config *conf = NULL;
+    FILE *file = NULL;
+
+    long content_length = 0;
     int accept_if_modified_since = 0;
     int use_fastcgi = 0;
     int use_rev_proxy = 0;
     int p_len;
-    fastcgi_conn php_fpm = {.socket = 0, .req_id = 0};
+
+    fastcgi_conn fcgi_conn = {.socket = 0, .req_id = 0};
     http_status custom_status;
 
-    http_res res;
+    http_res res = {.version = "1.1", .status = http_get_status(501), .hdr.field_num = 0};
-    sprintf(res.version, "1.1");
+    http_status_ctx ctx = {.status = 0, .origin = NONE};
-    res.status = http_get_status(501);
-    res.hdr.field_num = 0;
 
     clock_gettime(CLOCK_MONOTONIC, &begin);
 
@@ -78,15 +107,15 @@ int client_request_handler(sock *client, unsigned long client_num, unsigned int
         if (ret < 0) {
             goto abort;
         } else if (ret == 1) {
-            sprintf(err_msg, "Unable to parse header: Invalid header format.");
+            sprintf(err_msg, "Unable to parse http header: Invalid header format.");
         } else if (ret == 2) {
-            sprintf(err_msg, "Unable to parse header: Invalid method.");
+            sprintf(err_msg, "Unable to parse http header: Invalid method.");
         } else if (ret == 3) {
-            sprintf(err_msg, "Unable to parse header: Invalid version.");
+            sprintf(err_msg, "Unable to parse http header: Invalid version.");
         } else if (ret == 4) {
-            sprintf(err_msg, "Unable to parse header: Header contains illegal characters.");
+            sprintf(err_msg, "Unable to parse http header: Header contains illegal characters.");
         } else if (ret == 5) {
-            sprintf(err_msg, "Unable to parse header: End of header not found.");
+            sprintf(err_msg, "Unable to parse http header: End of header not found.");
         }
         res.status = http_get_status(400);
         goto respond;
@@ -114,7 +143,7 @@ int client_request_handler(sock *client, unsigned long client_num, unsigned int
         strcpy(host, host_ptr);
     }
 
-    sprintf(log_req_prefix, "[%s%24s%s]%s ", BLD_STR, host, CLR_STR, log_client_prefix);
+    sprintf(log_req_prefix, "[%6i][%s%*s%s]%s ", getpid(), BLD_STR, INET6_ADDRSTRLEN, host, CLR_STR, log_client_prefix);
     log_prefix = log_req_prefix;
     print(BLD_STR "%s %s" CLR_STR, req.method, req.uri);
 
@@ -174,7 +203,31 @@ int client_request_handler(sock *client, unsigned long client_num, unsigned int
         goto respond;
     }
 
+    if (http_get_header_field(&req.hdr, "Transfer-Encoding") != NULL) {
+        sprintf(err_msg, "This server is unable to process requests with the Transfer-Encoding header field.");
+        res.status = http_get_status(501);
+        goto respond;
+    }
+
     if (conf->type == CONFIG_TYPE_LOCAL) {
+        if (strcmp(req.method, "TRACE") == 0) {
+            res.status = http_get_status(200);
+            http_add_header_field(&res.hdr, "Content-Type", "message/http");
+
+            content_length = snprintf(msg_buf, sizeof(msg_buf) - content_length, "%s %s HTTP/%s\r\n",
+                                      req.method, req.uri, req.version);
+            for (int i = 0; i < req.hdr.field_num; i++) {
+                content_length += snprintf(msg_buf + content_length, sizeof(msg_buf) - content_length, "%s: %s\r\n",
+                                           req.hdr.fields[i][0], req.hdr.fields[i][1]);
+            }
+
+            goto respond;
+        }
+
+        if (strncmp(uri.req_path, "/.well-known/", 13) == 0) {
+            http_add_header_field(&res.hdr, "Access-Control-Allow-Origin", "*");
+        }
+
         if (strncmp(uri.req_path, "/.well-known/", 13) != 0 && strstr(uri.path, "/.") != NULL) {
             res.status = http_get_status(403);
             sprintf(err_msg, "Parts of this URI are hidden.");
@@ -198,13 +251,18 @@ int client_request_handler(sock *client, unsigned long client_num, unsigned int
 
         if (uri.is_static) {
             res.status = http_get_status(200);
-            http_add_header_field(&res.hdr, "Allow", "GET, HEAD");
             http_add_header_field(&res.hdr, "Accept-Ranges", "bytes");
             if (strcmp(req.method, "GET") != 0 && strcmp(req.method, "HEAD") != 0) {
                 res.status = http_get_status(405);
                 goto respond;
             }
 
+            if (http_get_header_field(&req.hdr, "Content-Length") != NULL) {
+                res.status = http_get_status(400);
+                sprintf(err_msg, "A GET request must not contain a payload");
+                goto respond;
+            }
+
             ret = uri_cache_init(&uri);
             if (ret != 0) {
                 res.status = http_get_status(500);
@@ -215,9 +273,43 @@ int client_request_handler(sock *client, unsigned long client_num, unsigned int
             http_add_header_field(&res.hdr, "Last-Modified", last_modified);
             sprintf(buf1, "%s; charset=%s", uri.meta->type, uri.meta->charset);
             http_add_header_field(&res.hdr, "Content-Type", buf1);
-            if (uri.meta->etag[0] != 0) {
+
-                http_add_header_field(&res.hdr, "ETag", uri.meta->etag);
+
+            char *accept_encoding = http_get_header_field(&req.hdr, "Accept-Encoding");
+            int enc = 0;
+            if (accept_encoding != NULL) {
+                if (uri.meta->filename_comp_br[0] != 0 && strstr(accept_encoding, "br") != NULL) {
+                    file = fopen(uri.meta->filename_comp_br, "rb");
+                    if (file == NULL) {
+                        cache_filename_comp_invalid(uri.filename);
+                    } else {
+                        http_add_header_field(&res.hdr, "Content-Encoding", "br");
+                        enc = COMPRESS_BR;
+                    }
+                } else if (uri.meta->filename_comp_gz[0] != 0 && strstr(accept_encoding, "gzip") != NULL) {
+                    file = fopen(uri.meta->filename_comp_gz, "rb");
+                    if (file == NULL) {
+                        cache_filename_comp_invalid(uri.filename);
+                    } else {
+                        http_add_header_field(&res.hdr, "Content-Encoding", "gzip");
+                        enc = COMPRESS_GZ;
+                    }
+                }
+                if (enc != 0) {
+                    http_add_header_field(&res.hdr, "Vary", "Accept-Encoding");
+                }
             }
+
+            if (uri.meta->etag[0] != 0) {
+                if (enc) {
+                    sprintf(buf0, "%s-%s", uri.meta->etag,
+                            (enc & COMPRESS_BR) ? "br" : (enc & COMPRESS_GZ) ? "gzip" : "");
+                    http_add_header_field(&res.hdr, "ETag", buf0);
+                } else {
+                    http_add_header_field(&res.hdr, "ETag", uri.meta->etag);
+                }
+            }
+
             if (strncmp(uri.meta->type, "text/", 5) == 0) {
                 http_add_header_field(&res.hdr, "Cache-Control", "public, max-age=3600");
             } else {
@@ -227,8 +319,8 @@ int client_request_handler(sock *client, unsigned long client_num, unsigned int
             char *if_modified_since = http_get_header_field(&req.hdr, "If-Modified-Since");
             char *if_none_match = http_get_header_field(&req.hdr, "If-None-Match");
             if ((if_none_match != NULL && strstr(if_none_match, uri.meta->etag) == NULL) ||
-                (accept_if_modified_since && if_modified_since != NULL &&
+                    (accept_if_modified_since && if_modified_since != NULL &&
-                 strcmp(if_modified_since, last_modified) == 0)) {
+                    strcmp(if_modified_since, last_modified) == 0)) {
                 res.status = http_get_status(304);
                 goto respond;
             }
@@ -277,63 +369,59 @@ int client_request_handler(sock *client, unsigned long client_num, unsigned int
                 goto respond;
             }
 
-            char *accept_encoding = http_get_header_field(&req.hdr, "Accept-Encoding");
+            if (file == NULL) {
-            if (uri.meta->filename_comp[0] != 0 && accept_encoding != NULL &&
-                strstr(accept_encoding, "deflate") != NULL) {
-                file = fopen(uri.meta->filename_comp, "rb");
-                if (file == NULL) {
-                    cache_filename_comp_invalid(uri.filename);
-                    goto not_compressed;
-                }
-                http_add_header_field(&res.hdr, "Content-Encoding", "deflate");
-            } else {
-                not_compressed:
                 file = fopen(uri.filename, "rb");
             }
+
             fseek(file, 0, SEEK_END);
             content_length = ftell(file);
             fseek(file, 0, SEEK_SET);
         } else {
+            int mode;
+            if (strcmp(uri.filename + strlen(uri.filename) - 4, ".ncr") == 0) {
+                mode = FASTCGI_NECRONDA;
+            } else if (strcmp(uri.filename + strlen(uri.filename) - 4, ".php") == 0) {
+                mode = FASTCGI_PHP;
+            } else {
+                res.status = http_get_status(500);
+                print(ERR_STR "Invalid FastCGI extension: %s" CLR_STR, uri.filename);
+                goto respond;
+            }
+
             struct stat statbuf;
             stat(uri.filename, &statbuf);
             char *last_modified = http_format_date(statbuf.st_mtime, buf0, sizeof(buf0));
             http_add_header_field(&res.hdr, "Last-Modified", last_modified);
 
             res.status = http_get_status(200);
-            if (fastcgi_init(&php_fpm, client_num, req_num, client, &req, &uri) != 0) {
+            if (fastcgi_init(&fcgi_conn, mode, client_num, req_num, client, &req, &uri) != 0) {
-                res.status = http_get_status(502);
+                res.status = http_get_status(503);
-                sprintf(err_msg, "Unable to communicate with PHP-FPM.");
+                sprintf(err_msg, "Unable to communicate with FastCGI socket.");
                 goto respond;
             }
 
-            if (strcmp(req.method, "POST") == 0 || strcmp(req.method, "PUT") == 0) {
+            char *client_content_length = http_get_header_field(&req.hdr, "Content-Length");
-                char *client_content_length = http_get_header_field(&req.hdr, "Content-Length");
+            if (client_content_length != NULL) {
-                unsigned long client_content_len;
+                unsigned long client_content_len = strtoul(client_content_length, NULL, 10);
-                if (client_content_length == NULL) {
+                ret = fastcgi_receive(&fcgi_conn, client, client_content_len);
-                    goto fastcgi_end;
-                }
-                client_content_len = strtoul(client_content_length, NULL, 10);
-                ret = fastcgi_receive(&php_fpm, client, client_content_len);
                 if (ret != 0) {
                     if (ret < 0) {
                         goto abort;
                     } else {
-                        sprintf(err_msg, "Unable to communicate with PHP-FPM.");
+                        sprintf(err_msg, "Unable to communicate with FastCGI socket.");
                     }
                     res.status = http_get_status(502);
                     goto respond;
                 }
             }
-            fastcgi_end:
+            fastcgi_close_stdin(&fcgi_conn);
-            fastcgi_close_stdin(&php_fpm);
 
-            ret = fastcgi_header(&php_fpm, &res, err_msg);
+            ret = fastcgi_header(&fcgi_conn, &res, err_msg);
             if (ret != 0) {
-                if (ret < 0) {
+                if (ret < 0) goto abort;
-                    goto abort;
-                }
                 goto respond;
             }
+
             char *status = http_get_header_field(&res.hdr, "Status");
             if (status != NULL) {
                 int status_code = (int) strtoul(status, NULL, 10);
@@ -351,13 +439,43 @@ int client_request_handler(sock *client, unsigned long client_num, unsigned int
                 }
             }
 
-            char *accept_encoding = http_get_header_field(&req.hdr, "Accept-Encoding");
+            const char *content_length_f = http_get_header_field(&res.hdr, "Content-Length");
-            if (accept_encoding != NULL && strstr(accept_encoding, "deflate") != NULL) {
+            content_length = (content_length_f == NULL) ? -1 : strtol(content_length_f, NULL, 10);
-                http_add_header_field(&res.hdr, "Content-Encoding", "deflate");
+
+            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 (content_encoding == NULL &&
+                content_type != NULL &&
+                strncmp(content_type, "text/html", 9) == 0 &&
+                content_length != -1 &&
+                content_length <= sizeof(msg_content) - 1)
+            {
+                fastcgi_dump(&fcgi_conn, msg_content, sizeof(msg_content));
+                goto respond;
+            }
+
+            use_fastcgi = 1;
+
+            if (content_length != -1 && content_length < 1024000) {
+                use_fastcgi |= FASTCGI_COMPRESS_HOLD;
             }
 
             content_length = -1;
-            use_fastcgi = 1;
+
+            int http_comp = http_get_compression(&req, &res);
+            if (http_comp & COMPRESS) {
+                if (http_comp & COMPRESS_BR) {
+                    use_fastcgi |= FASTCGI_COMPRESS_BR;
+                    sprintf(buf0, "br");
+                } else if (http_comp & COMPRESS_GZ) {
+                    use_fastcgi |= FASTCGI_COMPRESS_GZ;
+                    sprintf(buf0, "gzip");
+                }
+                http_add_header_field(&res.hdr, "Vary", "Accept-Encoding");
+                http_add_header_field(&res.hdr, "Content-Encoding", buf0);
+                http_remove_header_field(&res.hdr, "Content-Length", HTTP_REMOVE_ALL);
+            }
+
             if (http_get_header_field(&res.hdr, "Content-Length") == NULL) {
                 http_add_header_field(&res.hdr, "Transfer-Encoding", "chunked");
             }
@@ -366,8 +484,51 @@ int client_request_handler(sock *client, unsigned long client_num, unsigned int
         print("Reverse proxy for " BLD_STR "%s:%i" CLR_STR, conf->rev_proxy.hostname, conf->rev_proxy.port);
         http_remove_header_field(&res.hdr, "Date", HTTP_REMOVE_ALL);
         http_remove_header_field(&res.hdr, "Server", HTTP_REMOVE_ALL);
-        ret = rev_proxy_init(&req, &res, conf, client, &custom_status, err_msg);
+
-        use_rev_proxy = ret == 0;
+        ret = rev_proxy_init(&req, &res, &ctx, conf, client, &custom_status, err_msg);
+        use_rev_proxy = (ret == 0);
+
+        // Let 300 be formatted by origin server
+        if (use_rev_proxy && res.status->code >= 301 && res.status->code < 600) {
+            const char *content_type = http_get_header_field(&res.hdr, "Content-Type");
+            const char *content_length_f = http_get_header_field(&res.hdr, "Content-Length");
+            const char *content_encoding = http_get_header_field(&res.hdr, "Content-Encoding");
+            if (content_encoding == NULL && content_type != NULL && content_length_f != NULL &&
+                strncmp(content_type, "text/html", 9) == 0)
+            {
+                long content_len = strtol(content_length_f, NULL, 10);
+                if (content_len <= sizeof(msg_content) - 1) {
+                    ctx.status = res.status->code;
+                    ctx.origin = res.status->code >= 400 ? SERVER : NONE;
+                    use_rev_proxy = 0;
+                    rev_proxy_dump(msg_content, content_len);
+                }
+            }
+        }
+
+        /*
+        char *content_encoding = http_get_header_field(&res.hdr, "Content-Encoding");
+        if (use_rev_proxy && content_encoding == NULL) {
+            int http_comp = http_get_compression(&req, &res);
+            if (http_comp & COMPRESS_BR) {
+                use_rev_proxy |= REV_PROXY_COMPRESS_BR;
+            } else if (http_comp & COMPRESS_GZ) {
+                use_rev_proxy |= REV_PROXY_COMPRESS_GZ;
+            }
+        }
+
+        char *transfer_encoding = http_get_header_field(&res.hdr, "Transfer-Encoding");
+        int chunked = transfer_encoding != NULL && strcmp(transfer_encoding, "chunked") == 0;
+        http_remove_header_field(&res.hdr, "Transfer-Encoding", HTTP_REMOVE_ALL);
+        ret = sprintf(buf0, "%s%s%s",
+                      (use_rev_proxy & REV_PROXY_COMPRESS_BR) ? "br" :
+                      ((use_rev_proxy & REV_PROXY_COMPRESS_GZ) ? "gzip" : ""),
+                      ((use_rev_proxy & REV_PROXY_COMPRESS) && chunked) ? ", " : "",
+                      chunked ? "chunked" : "");
+        if (ret > 0) {
+            http_add_header_field(&res.hdr, "Transfer-Encoding", buf0);
+        }
+        */
     } else {
         print(ERR_STR "Unknown host type: %i" CLR_STR, conf->type);
         res.status = http_get_status(501);
@@ -375,28 +536,67 @@ int client_request_handler(sock *client, unsigned long client_num, unsigned int
 
     respond:
     if (!use_rev_proxy) {
+        if (conf != NULL && conf->type == CONFIG_TYPE_LOCAL && uri.is_static && res.status->code == 405) {
+            http_add_header_field(&res.hdr, "Allow", "GET, HEAD, TRACE");
+        }
         if (http_get_header_field(&res.hdr, "Accept-Ranges") == NULL) {
             http_add_header_field(&res.hdr, "Accept-Ranges", "none");
         }
-        if (!use_fastcgi && !use_rev_proxy && file == NULL &&
+        if (!use_fastcgi && file == NULL) {
-            ((res.status->code >= 400 && res.status->code < 600) || err_msg[0] != 0)) {
             http_remove_header_field(&res.hdr, "Date", HTTP_REMOVE_ALL);
             http_remove_header_field(&res.hdr, "Server", HTTP_REMOVE_ALL);
+            http_remove_header_field(&res.hdr, "Cache-Control", HTTP_REMOVE_ALL);
+            http_remove_header_field(&res.hdr, "Content-Type", HTTP_REMOVE_ALL);
+            http_remove_header_field(&res.hdr, "Content-Encoding", HTTP_REMOVE_ALL);
             http_add_header_field(&res.hdr, "Date", http_get_date(buf0, sizeof(buf0)));
             http_add_header_field(&res.hdr, "Server", SERVER_STR);
+            http_add_header_field(&res.hdr, "Cache-Control", "no-cache");
+            http_add_header_field(&res.hdr, "Content-Type", "text/html; charset=UTF-8");
 
             // TODO list Locations on 3xx Redirects
             const http_doc_info *info = http_get_status_info(res.status);
             const http_status_msg *http_msg = http_get_error_msg(res.status);
 
-            sprintf(msg_pre_buf, info->doc, res.status->code, res.status->msg,
+            if (res.status->code >= 300 && res.status->code < 400 && msg_content[0] == 0) {
+                const char *location = http_get_header_field(&res.hdr, "Location");
+                if (location != NULL) {
+                    snprintf(msg_content, sizeof(msg_content),
+                             "<ul>\n\t<li><a href=\"%1$s\">%1$s</a></li>\n</ul>\n", location);
+                }
+            }
+
+            char *rev_proxy_doc = "";
+            if (conf != NULL && conf->type == CONFIG_TYPE_REVERSE_PROXY) {
+                const http_status *status = http_get_status(ctx.status);
+                char stat_str[8];
+                sprintf(stat_str, "%03i", ctx.status);
+                sprintf(msg_pre_buf_2, http_rev_proxy_document,
+                        " success",
+                        (ctx.origin == CLIENT_REQ) ? " error" : " success",
+                        (ctx.origin == INTERNAL) ? " error" : " success",
+                        (ctx.origin == SERVER_REQ) ? " error" : (ctx.status == 0 ? "" : " success"),
+                        (ctx.origin == CLIENT_RES) ? " error" : " success",
+                        (ctx.origin == SERVER) ? " error" : (ctx.status == 0 ? "" : " success"),
+                        (ctx.origin == SERVER_RES) ? " error" : (ctx.status == 0 ? "" : " success"),
+                        (ctx.origin == INTERNAL) ? " error" : " success",
+                        (ctx.origin == INTERNAL || ctx.origin == SERVER) ? " error" : " success",
+                        res.status->code,
+                        res.status->msg,
+                        (ctx.status == 0) ? "???" : stat_str,
+                        (status != NULL) ? status->msg : "",
+                        host);
+                rev_proxy_doc = msg_pre_buf_2;
+            }
+
+            sprintf(msg_pre_buf_1, info->doc, res.status->code, res.status->msg,
                     http_msg != NULL ? http_msg->msg : "", err_msg[0] != 0 ? err_msg : "");
             content_length = snprintf(msg_buf, sizeof(msg_buf), http_default_document, res.status->code,
-                                      res.status->msg, msg_pre_buf, info->mode, info->icon, info->color, host);
+                                      res.status->msg, msg_pre_buf_1, info->mode, info->icon, info->color, host,
-            http_add_header_field(&res.hdr, "Content-Type", "text/html; charset=UTF-8");
+                                      rev_proxy_doc, msg_content[0] != 0 ? msg_content : "");
         }
         if (content_length >= 0) {
             sprintf(buf0, "%li", content_length);
+            http_remove_header_field(&res.hdr, "Content-Length", HTTP_REMOVE_ALL);
             http_add_header_field(&res.hdr, "Content-Length", buf0);
         } else if (http_get_header_field(&res.hdr, "Transfer-Encoding") == NULL) {
             server_keep_alive = 0;
@@ -450,19 +650,25 @@ int client_request_handler(sock *client, unsigned long client_num, unsigned int
         } else if (use_fastcgi) {
             char *transfer_encoding = http_get_header_field(&res.hdr, "Transfer-Encoding");
             int chunked = transfer_encoding != NULL && strcmp(transfer_encoding, "chunked") == 0;
-            char *content_encoding = http_get_header_field(&res.hdr, "Content-Encoding");
+
-            int comp = content_encoding != NULL && strcmp(content_encoding, "deflate") == 0;
+            int flags = (chunked ? FASTCGI_CHUNKED : 0) | (use_fastcgi & (FASTCGI_COMPRESS | FASTCGI_COMPRESS_HOLD));
-            int flags = (chunked ? FASTCGI_CHUNKED : 0) | (comp ? FASTCGI_COMPRESS : 0);
+            ret = fastcgi_send(&fcgi_conn, client, flags);
-            fastcgi_send(&php_fpm, client, flags);
         } else if (use_rev_proxy) {
             char *transfer_encoding = http_get_header_field(&res.hdr, "Transfer-Encoding");
-            int chunked = transfer_encoding != NULL && strcmp(transfer_encoding, "chunked") == 0;
+            int chunked = transfer_encoding != NULL && strstr(transfer_encoding, "chunked") != NULL;
+
             char *content_len = http_get_header_field(&res.hdr, "Content-Length");
             unsigned long len_to_send = 0;
             if (content_len != NULL) {
                 len_to_send = strtol(content_len, NULL, 10);
             }
-            rev_proxy_send(client, chunked, len_to_send);
+
+            int flags = (chunked ? REV_PROXY_CHUNKED : 0) | (use_rev_proxy & REV_PROXY_COMPRESS);
+            ret = rev_proxy_send(client, len_to_send, flags);
+        }
+
+        if (ret < 0) {
+            client_keep_alive = 0;
         }
     }
 
@@ -477,10 +683,10 @@ int client_request_handler(sock *client, unsigned long client_num, unsigned int
 
     uri_free(&uri);
     abort:
-    if (php_fpm.socket != 0) {
+    if (fcgi_conn.socket != 0) {
-        shutdown(php_fpm.socket, SHUT_RDWR);
+        shutdown(fcgi_conn.socket, SHUT_RDWR);
-        close(php_fpm.socket);
+        close(fcgi_conn.socket);
-        php_fpm.socket = 0;
+        fcgi_conn.socket = 0;
     }
     http_free_req(&req);
     http_free_res(&res);
@@ -570,7 +776,7 @@ int client_connection_handler(sock *client, unsigned long client_num) {
         if (pos != NULL) {
             pos = strstr(pos, "\"iso_code\":");
             pos += 12;
-            strncpy(client_cc, pos, 2);
+            snprintf(client_cc, sizeof(client_cc), "%s", pos);
         }
     }
 
@@ -599,6 +805,7 @@ int client_connection_handler(sock *client, unsigned long client_num) {
         client->_ssl_error = ERR_get_error();
         if (ret <= 0) {
             print(ERR_STR "Unable to perform handshake: %s" CLR_STR, sock_strerror(client));
+            ret = -1;
             goto close;
         }
     }
@@ -657,16 +864,17 @@ int client_handler(sock *client, unsigned long client_num, struct sockaddr_in6 *
     log_req_prefix = malloc(256);
     log_client_prefix = malloc(256);
     sprintf(log_client_prefix, "[%s%4i%s]%s[%*s][%5i]%s", (int) client->enc ? HTTPS_STR : HTTP_STR,
-            ntohs(server_addr->sin6_port), CLR_STR, color_table[client_num % 6], INET_ADDRSTRLEN, client_addr_str,
+            ntohs(server_addr->sin6_port), CLR_STR, color_table[client_num % 6], INET6_ADDRSTRLEN, client_addr_str,
             ntohs(client_addr->sin6_port), CLR_STR);
 
     log_conn_prefix = malloc(256);
-    sprintf(log_conn_prefix, "[%24s]%s ", server_addr_str, log_client_prefix);
+    sprintf(log_conn_prefix, "[%6i][%*s]%s ", getpid(), INET6_ADDRSTRLEN, server_addr_str, log_client_prefix);
     log_prefix = log_conn_prefix;
 
     print("Started child process with PID %i", getpid());
 
     ret = client_connection_handler(client, client_num);
+
     free(client_addr_str_ptr);
     client_addr_str_ptr = NULL;
     free(server_addr_str_ptr);
@@ -681,5 +889,6 @@ int client_handler(sock *client, unsigned long client_num, struct sockaddr_in6 *
     log_req_prefix = NULL;
     free(log_client_prefix);
     log_client_prefix = NULL;
+
     return ret;
 }

src/client.h

@@ -1,23 +0,0 @@
-/**
- * Necronda Web Server
- * Client connection and request handlers (header file)
- * src/client.h
- * Lorenz Stechauner, 2021-01-17
- */
-
-#ifndef NECRONDA_SERVER_CLIENT_H
-#define NECRONDA_SERVER_CLIENT_H
-
-#include "necronda-server.h"
-#include "utils.h"
-#include "uri.h"
-#include "http.h"
-#include "fastcgi.h"
-
-
-int server_keep_alive = 1;
-char *log_client_prefix, *log_conn_prefix, *log_req_prefix, *client_geoip;
-
-struct timeval client_timeout = {.tv_sec = CLIENT_TIMEOUT, .tv_usec = 0};
-
-#endif //NECRONDA_SERVER_CLIENT_H

src/lib/cache.c

@@ -1,12 +1,26 @@
 /**
  * Necronda Web Server
  * File cache implementation
- * src/cache.c
+ * src/lib/cache.c
  * Lorenz Stechauner, 2020-12-19
  */
 
 #include "cache.h"
+#include "utils.h"
+#include "compress.h"
+#include <stdio.h>
+#include <magic.h>
+#include <sys/ipc.h>
+#include <sys/shm.h>
+#include <string.h>
+#include <errno.h>
+#include <signal.h>
+#include <openssl/sha.h>
+#include <malloc.h>
 
+int cache_continue = 1;
+magic_t magic;
+cache_entry *cache;
 
 int magic_init() {
     magic = magic_open(MAGIC_MIME);
@@ -14,7 +28,7 @@ int magic_init() {
         fprintf(stderr, ERR_STR "Unable to open magic cookie: %s" CLR_STR "\n", strerror(errno));
         return -1;
     }
-    if (magic_load(magic, MAGIC_FILE) != 0) {
+    if (magic_load(magic, CACHE_MAGIC_FILE) != 0) {
         fprintf(stderr, ERR_STR "Unable to load magic cookie: %s" CLR_STR "\n", magic_error(magic));
         return -2;
     }
@@ -29,7 +43,7 @@ int cache_process() {
     signal(SIGINT, cache_process_term);
     signal(SIGTERM, cache_process_term);
 
-    int shm_id = shmget(SHM_KEY_CACHE, FILE_CACHE_SIZE * sizeof(cache_entry), 0);
+    int shm_id = shmget(CACHE_SHM_KEY, CACHE_ENTRIES * sizeof(cache_entry), 0);
     if (shm_id < 0) {
         fprintf(stderr, ERR_STR "Unable to create shared memory: %s" CLR_STR "\n", strerror(errno));
         return -1;
@@ -43,108 +57,135 @@ int cache_process() {
     }
     cache = shm_rw;
 
-    if (mkdir("/var/necronda-server/", 0755) < 0) {
+    if (mkdir("/var/necronda/", 0755) < 0 && errno != EEXIST) {
-        if (errno != EEXIST) {
+        fprintf(stderr, ERR_STR "Unable to create directory '/var/necronda/': %s" CLR_STR "\n", strerror(errno));
-            fprintf(stderr, ERR_STR "Unable to create directory '/var/necronda-server/': %s" CLR_STR "\n", strerror(errno));
+        return -3;
-            return -3;
-        }
     }
 
-    FILE *cache_file = fopen("/var/necronda-server/cache", "rb");
+    if (mkdir("/var/necronda/server/", 0755) < 0 && errno != EEXIST) {
+        fprintf(stderr, ERR_STR "Unable to create directory '/var/necronda/server/': %s" CLR_STR "\n", strerror(errno));
+        return -3;
+    }
+
+    FILE *cache_file = fopen("/var/necronda/server/cache", "rb");
     if (cache_file != NULL) {
-        fread(cache, sizeof(cache_entry), FILE_CACHE_SIZE, cache_file);
+        fread(cache, sizeof(cache_entry), CACHE_ENTRIES, cache_file);
         fclose(cache_file);
     }
 
-    for (int i = 0; i < FILE_CACHE_SIZE; i++) {
+    for (int i = 0; i < CACHE_ENTRIES; i++) {
         cache[i].is_updating = 0;
     }
 
     FILE *file;
-    char buf[16384];
+    char *buf = malloc(CACHE_BUF_SIZE);
-    char comp_buf[16384];
+    char *comp_buf = malloc(CACHE_BUF_SIZE);
-    char filename_comp[256];
+    char filename_comp_gz[256];
+    char filename_comp_br[256];
     unsigned long read;
     int compress;
     SHA_CTX ctx;
     unsigned char hash[SHA_DIGEST_LENGTH];
     int cache_changed = 0;
-    int p_len;
+    int p_len_gz, p_len_br;
+    int ret;
     while (cache_continue) {
-        for (int i = 0; i < FILE_CACHE_SIZE; i++) {
+        for (int i = 0; i < CACHE_ENTRIES; i++) {
             if (cache[i].filename[0] != 0 && cache[i].meta.etag[0] == 0 && !cache[i].is_updating) {
                 cache[i].is_updating = 1;
                 fprintf(stdout, "[cache] Hashing file %s\n", cache[i].filename);
                 SHA1_Init(&ctx);
                 file = fopen(cache[i].filename, "rb");
-                compress = strncmp(cache[i].meta.type, "text/", 5) == 0 ||
+                compress = mime_is_compressible(cache[i].meta.type);
-                        (strncmp(cache[i].meta.type, "application/", 12) == 0 &&
-                        strstr(cache[i].meta.type, "+xml") != NULL);
 
-                int level = NECRONDA_ZLIB_LEVEL;
+                compress_ctx comp_ctx;
-                z_stream strm;
+                FILE *comp_file_gz = NULL;
-                FILE *comp_file = NULL;
+                FILE *comp_file_br = NULL;
                 if (compress) {
                     sprintf(buf, "%.*s/.necronda-server", cache[i].webroot_len, cache[i].filename);
-                    mkdir(buf, 0755);
+                    if (mkdir(buf, 0755) != 0 && errno != EEXIST) {
+                        fprintf(stderr, ERR_STR "Unable to create directory %s: %s" CLR_STR "\n", buf, strerror(errno));
+                        goto comp_err;
+                    }
+
                     sprintf(buf, "%.*s/.necronda-server/cache", cache[i].webroot_len, cache[i].filename);
-                    mkdir(buf, 0700);
+                    if (mkdir(buf, 0700) != 0 && errno != EEXIST) {
+                        fprintf(stderr, ERR_STR "Unable to create directory %s: %s" CLR_STR "\n", buf, strerror(errno));
+                        goto comp_err;
+                    }
+
                     char *rel_path = cache[i].filename + cache[i].webroot_len + 1;
                     for (int j = 0; j < strlen(rel_path); j++) {
                         char ch = rel_path[j];
-                        if (ch == '/') {
+                        if (ch == '/') ch = '_';
-                            ch = '_';
-                        }
                         buf[j] = ch;
                     }
                     buf[strlen(rel_path)] = 0;
-                    p_len = snprintf(filename_comp, sizeof(filename_comp), "%.*s/.necronda-server/cache/%s.z",
+
-                                     cache[i].webroot_len, cache[i].filename, buf);
+                    p_len_gz = snprintf(filename_comp_gz, sizeof(filename_comp_gz),
-                    if (p_len < 0 || p_len >= sizeof(filename_comp)) {
+                                        "%.*s/.necronda-server/cache/%s.gz",
+                                        cache[i].webroot_len, cache[i].filename, buf);
+                    p_len_br = snprintf(filename_comp_br, sizeof(filename_comp_br),
+                                        "%.*s/.necronda-server/cache/%s.br",
+                                        cache[i].webroot_len, cache[i].filename, buf);
+                    if (p_len_gz < 0 || p_len_gz >= sizeof(filename_comp_gz) ||
+                        p_len_br < 0 || p_len_br >= sizeof(filename_comp_br))
+                    {
                         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);
-                    comp_file = fopen(filename_comp, "wb");
+
-                    if (comp_file == NULL) {
+                    comp_file_gz = fopen(filename_comp_gz, "wb");
+                    comp_file_br = fopen(filename_comp_br, "wb");
+                    if (comp_file_gz == NULL || comp_file_br == NULL) {
                         fprintf(stderr, ERR_STR "Unable to open cached file: %s" CLR_STR "\n", strerror(errno));
                         comp_err:
                         compress = 0;
                     } else {
-                        strm.zalloc = Z_NULL;
+                        ret = compress_init(&comp_ctx, COMPRESS_GZ | COMPRESS_BR);
-                        strm.zfree = Z_NULL;
+                        if (ret != 0) {
-                        strm.opaque = Z_NULL;
+                            fprintf(stderr, ERR_STR "Unable to init compression: %s" CLR_STR "\n", strerror(errno));
-                        if (deflateInit(&strm, level) != Z_OK) {
-                            fprintf(stderr, ERR_STR "Unable to init deflate: %s" CLR_STR "\n", strerror(errno));
                             compress = 0;
-                            fclose(comp_file);
+                            fclose(comp_file_gz);
+                            fclose(comp_file_br);
                         }
                     }
                 }
 
-                while ((read = fread(buf, 1, sizeof(buf), file)) > 0) {
+                while ((read = fread(buf, 1, CACHE_BUF_SIZE, file)) > 0) {
                     SHA1_Update(&ctx, buf, read);
                     if (compress) {
-                        strm.avail_in = read;
+                        unsigned long avail_in, avail_out;
-                        strm.next_in = (unsigned char *) buf;
+                        avail_in = read;
                         do {
-                            strm.avail_out = sizeof(comp_buf);
+                            avail_out = CACHE_BUF_SIZE;
-                            strm.next_out = (unsigned char *) comp_buf;
+                            compress_compress_mode(&comp_ctx, COMPRESS_GZ,buf + read - avail_in, &avail_in,
-                            deflate(&strm, feof(file) ? Z_FINISH : Z_NO_FLUSH);
+                                                   comp_buf, &avail_out, feof(file));
-                            fwrite(comp_buf, 1, sizeof(comp_buf) - strm.avail_out, comp_file);
+                            fwrite(comp_buf, 1, CACHE_BUF_SIZE - avail_out, comp_file_gz);
-                            strm.avail_in = 0;
+                        } while (avail_in != 0 || avail_out != CACHE_BUF_SIZE);
-                        } while (strm.avail_out == 0);
+                        avail_in = read;
+                        do {
+                            avail_out = CACHE_BUF_SIZE;
+                            compress_compress_mode(&comp_ctx, COMPRESS_BR, buf + read - avail_in, &avail_in,
+                                                   comp_buf, &avail_out, feof(file));
+                            fwrite(comp_buf, 1, CACHE_BUF_SIZE - avail_out, comp_file_br);
+                        } while (avail_in != 0 || avail_out != CACHE_BUF_SIZE);
                     }
                 }
 
                 if (compress) {
-                    deflateEnd(&strm);
+                    compress_free(&comp_ctx);
-                    fclose(comp_file);
+                    fclose(comp_file_gz);
+                    fclose(comp_file_br);
                     fprintf(stdout, "[cache] Finished compressing file %s\n", cache[i].filename);
-                    strcpy(cache[i].meta.filename_comp, filename_comp);
+                    strcpy(cache[i].meta.filename_comp_gz, filename_comp_gz);
+                    strcpy(cache[i].meta.filename_comp_br, filename_comp_br);
                 } else {
-                    memset(cache[i].meta.filename_comp, 0, sizeof(cache[i].meta.filename_comp));
+                    memset(cache[i].meta.filename_comp_gz, 0, sizeof(cache[i].meta.filename_comp_gz));
+                    memset(cache[i].meta.filename_comp_br, 0, sizeof(cache[i].meta.filename_comp_br));
                 }
                 SHA1_Final(hash, &ctx);
                 memset(cache[i].meta.etag, 0, sizeof(cache[i].meta.etag));
@@ -160,13 +201,21 @@ int cache_process() {
 
         if (cache_changed) {
             cache_changed = 0;
-            cache_file = fopen("/var/necronda-server/cache", "wb");
+            cache_file = fopen("/var/necronda/server/cache", "wb");
-            fwrite(cache, sizeof(cache_entry), FILE_CACHE_SIZE, cache_file);
+            if (cache_file == NULL) {
+                fprintf(stderr, ERR_STR "Unable to open cache file: %s" CLR_STR "\n", strerror(errno));
+                free(buf);
+                free(comp_buf);
+                return -1;
+            }
+            fwrite(cache, sizeof(cache_entry), CACHE_ENTRIES, cache_file);
             fclose(cache_file);
         } else {
             sleep(1);
         }
     }
+    free(buf);
+    free(comp_buf);
     return 0;
 }
 
@@ -175,7 +224,7 @@ int cache_init() {
         return -1;
     }
 
-    int shm_id = shmget(SHM_KEY_CACHE, FILE_CACHE_SIZE * sizeof(cache_entry), IPC_CREAT | IPC_EXCL | 0600);
+    int shm_id = shmget(CACHE_SHM_KEY, CACHE_ENTRIES * sizeof(cache_entry), IPC_CREAT | IPC_EXCL | 0600);
     if (shm_id < 0) {
         fprintf(stderr, ERR_STR "Unable to create shared memory: %s" CLR_STR "\n", strerror(errno));
         return -2;
@@ -194,7 +243,7 @@ int cache_init() {
         return -4;
     }
     cache = shm_rw;
-    memset(cache, 0, FILE_CACHE_SIZE * sizeof(cache_entry));
+    memset(cache, 0, CACHE_ENTRIES * sizeof(cache_entry));
     shmdt(shm_rw);
     cache = shm;
 
@@ -202,24 +251,22 @@ int cache_init() {
     if (pid == 0) {
         // child
         if (cache_process() == 0) {
-            return 1;
+            return 0;
         } else {
             return -6;
         }
     } else if (pid > 0) {
         // parent
         fprintf(stderr, "Started child process with PID %i as cache-updater\n", pid);
-        children[0] = pid;
+        return pid;
     } else {
         fprintf(stderr, ERR_STR "Unable to create child process: %s" CLR_STR "\n", strerror(errno));
         return -5;
     }
-
-    return 0;
 }
 
 int cache_unload() {
-    int shm_id = shmget(SHM_KEY_CACHE, 0, 0);
+    int shm_id = shmget(CACHE_SHM_KEY, 0, 0);
     if (shm_id < 0) {
         fprintf(stderr, ERR_STR "Unable to get shared memory id: %s" CLR_STR "\n", strerror(errno));
         shmdt(cache);
@@ -235,7 +282,7 @@ int cache_unload() {
 
 int cache_update_entry(int entry_num, const char *filename, const char *webroot) {
     void *cache_ro = cache;
-    int shm_id = shmget(SHM_KEY_CACHE, 0, 0);
+    int shm_id = shmget(CACHE_SHM_KEY, 0, 0);
     void *shm_rw = shmat(shm_id, NULL, 0);
     if (shm_rw == (void *) -1) {
         print(ERR_STR "Unable to attach shared memory (rw): %s" CLR_STR, strerror(errno));
@@ -254,11 +301,11 @@ int cache_update_entry(int entry_num, const char *filename, const char *webroot)
     const char *type = magic_file(magic, filename);
     char type_new[24];
     sprintf(type_new, "%s", type);
-    if (strcmp(type, "text/plain") == 0) {
+    if (strncmp(type, "text/", 5) == 0) {
         if (strcmp(filename + strlen(filename) - 4, ".css") == 0) {
             sprintf(type_new, "text/css");
         } else if (strcmp(filename + strlen(filename) - 3, ".js") == 0) {
-            sprintf(type_new, "text/javascript");
+            sprintf(type_new, "application/javascript");
         }
     }
     strcpy(cache[entry_num].meta.type, type_new);
@@ -267,7 +314,8 @@ int cache_update_entry(int entry_num, const char *filename, const char *webroot)
     strcpy(cache[entry_num].meta.charset, magic_file(magic, filename));
 
     memset(cache[entry_num].meta.etag, 0, sizeof(cache[entry_num].meta.etag));
-    memset(cache[entry_num].meta.filename_comp, 0, sizeof(cache[entry_num].meta.filename_comp));
+    memset(cache[entry_num].meta.filename_comp_gz, 0, sizeof(cache[entry_num].meta.filename_comp_gz));
+    memset(cache[entry_num].meta.filename_comp_br, 0, sizeof(cache[entry_num].meta.filename_comp_br));
     cache[entry_num].is_updating = 0;
 
     shmdt(shm_rw);
@@ -277,7 +325,7 @@ int cache_update_entry(int entry_num, const char *filename, const char *webroot)
 
 int cache_filename_comp_invalid(const char *filename) {
     void *cache_ro = cache;
-    int shm_id = shmget(SHM_KEY_CACHE, 0, 0);
+    int shm_id = shmget(CACHE_SHM_KEY, 0, 0);
     void *shm_rw = shmat(shm_id, NULL, 0);
     if (shm_rw == (void *) -1) {
         print(ERR_STR "Unable to attach shared memory (rw): %s" CLR_STR, strerror(errno));
@@ -286,9 +334,9 @@ int cache_filename_comp_invalid(const char *filename) {
     cache = shm_rw;
 
     int i;
-    for (i = 0; i < FILE_CACHE_SIZE; i++) {
+    for (i = 0; i < CACHE_ENTRIES; i++) {
         if (cache[i].filename[0] != 0 && strlen(cache[i].filename) == strlen(filename) &&
-            strcmp(cache[i].filename, filename) == 0) {
+                strcmp(cache[i].filename, filename) == 0) {
             if (cache[i].is_updating) {
                 return 0;
             } else {
@@ -298,7 +346,8 @@ int cache_filename_comp_invalid(const char *filename) {
     }
 
     memset(cache[i].meta.etag, 0, sizeof(cache[i].meta.etag));
-    memset(cache[i].meta.filename_comp, 0, sizeof(cache[i].meta.filename_comp));
+    memset(cache[i].meta.filename_comp_gz, 0, sizeof(cache[i].meta.filename_comp_gz));
+    memset(cache[i].meta.filename_comp_br, 0, sizeof(cache[i].meta.filename_comp_br));
     cache[i].is_updating = 0;
 
     shmdt(shm_rw);
@@ -312,9 +361,9 @@ int uri_cache_init(http_uri *uri) {
     }
 
     int i;
-    for (i = 0; i < FILE_CACHE_SIZE; i++) {
+    for (i = 0; i < CACHE_ENTRIES; i++) {
         if (cache[i].filename[0] != 0 && strlen(cache[i].filename) == strlen(uri->filename) &&
-            strcmp(cache[i].filename, uri->filename) == 0) {
+                strcmp(cache[i].filename, uri->filename) == 0) {
             uri->meta = &cache[i].meta;
             if (cache[i].is_updating) {
                 return 0;
@@ -325,7 +374,7 @@ int uri_cache_init(http_uri *uri) {
     }
 
     if (uri->meta == NULL) {
-        for (i = 0; i < FILE_CACHE_SIZE; i++) {
+        for (i = 0; i < CACHE_ENTRIES; i++) {
             if (cache[i].filename[0] == 0) {
                 if (cache_update_entry(i, uri->filename, uri->webroot) != 0) {
                     return -1;

src/lib/cache.h

@@ -1,7 +1,7 @@
 /**
  * Necronda Web Server
  * File cache implementation (header file)
- * src/cache.h
+ * src/lib/cache.h
  * Lorenz Stechauner, 2020-12-19
  */
 
@@ -10,14 +10,14 @@
 
 #include "uri.h"
 
-#include <stdio.h>
+#define CACHE_SHM_KEY 255641
-#include <zlib.h>
+#define CACHE_ENTRIES 1024
-#include <magic.h>
+#define CACHE_BUF_SIZE 16384
-#include <sys/ipc.h>
-#include <sys/shm.h>
 
+#ifndef CACHE_MAGIC_FILE
+#   define CACHE_MAGIC_FILE "/usr/share/file/misc/magic.mgc"
+#endif
 
-magic_t magic;
 
 typedef struct {
     char filename[256];
@@ -26,9 +26,9 @@ typedef struct {
     meta_data meta;
 } cache_entry;
 
-cache_entry *cache;
+extern cache_entry *cache;
 
-int cache_continue = 1;
+extern int cache_continue;
 
 int magic_init();
 

src/lib/compress.c

@@ -0,0 +1,79 @@
+/**
+ * Necronda Web Server
+ * Compression interface
+ * src/lib/compress.c
+ * Lorenz Stechauner, 2021-05-05
+ */
+
+#include "compress.h"
+#include <malloc.h>
+#include <errno.h>
+
+int compress_init(compress_ctx *ctx, int mode) {
+    ctx->gzip = NULL;
+    ctx->brotli = NULL;
+    ctx->mode = 0;
+    int ret;
+    if (mode & COMPRESS_GZ) {
+        ctx->mode |= COMPRESS_GZ;
+        ctx->gzip = malloc(sizeof(z_stream));
+        ctx->gzip->zalloc = Z_NULL;
+        ctx->gzip->zfree = Z_NULL;
+        ctx->gzip->opaque = Z_NULL;
+        ret = deflateInit2(ctx->gzip, COMPRESS_LEVEL_GZIP, Z_DEFLATED, 15 + 16, 9, Z_DEFAULT_STRATEGY);
+        if (ret != Z_OK) return -1;
+    }
+    if (mode & COMPRESS_BR) {
+        ctx->mode |= COMPRESS_BR;
+        ctx->brotli = BrotliEncoderCreateInstance(NULL, NULL, NULL);
+        if (ctx->brotli == NULL) return -1;
+        BrotliEncoderSetParameter(ctx->brotli, BROTLI_PARAM_MODE, BROTLI_MODE_GENERIC);
+        BrotliEncoderSetParameter(ctx->brotli, BROTLI_PARAM_QUALITY, COMPRESS_LEVEL_BROTLI);
+    }
+    return 0;
+}
+
+int compress_compress(compress_ctx *ctx, const char *in, unsigned long *in_len, char *out, unsigned long *out_len, int finish) {
+    if ((ctx->mode & COMPRESS_GZ) && (ctx->mode & COMPRESS_BR)) {
+        errno = EINVAL;
+        return -1;
+    }
+    return compress_compress_mode(ctx, ctx->mode, in, in_len, out, out_len, finish);
+}
+
+int compress_compress_mode(compress_ctx *ctx, int mode, const char *in, unsigned long *in_len, char *out, unsigned long *out_len, int finish) {
+    if ((mode & COMPRESS_GZ) && (mode & COMPRESS_BR)) {
+        errno = EINVAL;
+        return -1;
+    } else if (mode & COMPRESS_GZ) {
+        ctx->gzip->next_in = (unsigned char*) in;
+        ctx->gzip->avail_in = *in_len;
+        ctx->gzip->next_out = (unsigned char*) out;
+        ctx->gzip->avail_out = *out_len;
+        int ret = deflate(ctx->gzip, finish ? Z_FINISH : Z_NO_FLUSH);
+        *in_len = ctx->gzip->avail_in;
+        *out_len = ctx->gzip->avail_out;
+        return ret;
+    } else if (mode & COMPRESS_BR) {
+        int ret = BrotliEncoderCompressStream(ctx->brotli, finish ? BROTLI_OPERATION_FINISH : BROTLI_OPERATION_PROCESS,
+                                              in_len, (const unsigned char**) &in, out_len, (unsigned char **) &out, NULL);
+        return (ret == BROTLI_TRUE) ? 0 : -1;
+    } else {
+        errno = EINVAL;
+        return -2;
+    }
+}
+
+int compress_free(compress_ctx *ctx) {
+    if (ctx->gzip != NULL) {
+        deflateEnd(ctx->gzip);
+        free(ctx->gzip);
+        ctx->gzip = NULL;
+    }
+    if (ctx->brotli != NULL) {
+        BrotliEncoderDestroyInstance(ctx->brotli);
+        ctx->brotli = NULL;
+    }
+    ctx->mode = 0;
+    return 0;
+}

src/lib/compress.h

@@ -0,0 +1,37 @@
+/**
+ * Necronda Web Server
+ * Compression interface (header file)
+ * src/lib/compress.h
+ * Lorenz Stechauner, 2021-05-05
+ */
+
+#ifndef NECRONDA_SERVER_COMPRESS_H
+#define NECRONDA_SERVER_COMPRESS_H
+
+#include <zlib.h>
+#include <brotli/encode.h>
+
+#define COMPRESS_LEVEL_GZIP 9
+#define COMPRESS_LEVEL_BROTLI BROTLI_MAX_QUALITY
+
+#define COMPRESS_GZ 1
+#define COMPRESS_BR 2
+#define COMPRESS 3
+
+typedef struct {
+    int mode;
+    z_stream *gzip;
+    BrotliEncoderState *brotli;
+} compress_ctx;
+
+int compress_init(compress_ctx *ctx, int mode);
+
+int compress_compress(compress_ctx *ctx, const char *in, unsigned long *in_len, char *out, unsigned long *out_len,
+                      int finish);
+
+int compress_compress_mode(compress_ctx *ctx, int mode, const char *in, unsigned long *in_len, char *out,
+                           unsigned long *out_len, int finish);
+
+int compress_free(compress_ctx *ctx);
+
+#endif //NECRONDA_SERVER_COMPRESS_H

src/lib/config.c

@@ -1,15 +1,24 @@
 /**
  * Necronda Web Server
  * Configuration file loader
- * src/config.c
+ * src/lib/config.c
  * Lorenz Stechauner, 2021-01-05
  */
 
 #include "config.h"
+#include "utils.h"
+#include <stdio.h>
+#include <sys/ipc.h>
+#include <sys/shm.h>
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
 
+t_config *config;
+char geoip_dir[256], dns_server[256];
 
 int config_init() {
-    int shm_id = shmget(SHM_KEY_CONFIG, MAX_HOST_CONFIG * sizeof(host_config), IPC_CREAT | IPC_EXCL | 0640);
+    int shm_id = shmget(CONFIG_SHM_KEY, sizeof(t_config), IPC_CREAT | IPC_EXCL | 0640);
     if (shm_id < 0) {
         fprintf(stderr, ERR_STR "Unable to create shared memory: %s" CLR_STR "\n", strerror(errno));
         return -1;
@@ -28,14 +37,14 @@ int config_init() {
         return -3;
     }
     config = shm_rw;
-    memset(config, 0, MAX_HOST_CONFIG * sizeof(host_config));
+    memset(config, 0, sizeof(t_config));
     shmdt(shm_rw);
     config = shm;
     return 0;
 }
 
 int config_unload() {
-    int shm_id = shmget(SHM_KEY_CONFIG, 0, 0);
+    int shm_id = shmget(CONFIG_SHM_KEY, 0, 0);
     if (shm_id < 0) {
         fprintf(stderr, ERR_STR "Unable to get shared memory id: %s" CLR_STR "\n", strerror(errno));
         shmdt(config);
@@ -63,38 +72,77 @@ int config_load(const char *filename) {
     fread(conf, 1, len, file);
     fclose(file);
 
-    host_config *tmp_config = malloc(MAX_HOST_CONFIG * sizeof(host_config));
+    t_config *tmp_config = malloc(sizeof(t_config));
-    memset(tmp_config, 0, MAX_HOST_CONFIG * sizeof(host_config));
+    memset(tmp_config, 0, sizeof(t_config));
 
     int i = 0;
+    int j = 0;
+    int line = 0;
     int mode = 0;
+    char section = 0;
     char *ptr = NULL;
     char *source, *target;
-    while ((ptr = strtok(ptr == NULL ? conf :  NULL, "\n")) != NULL) {
+    while ((ptr = strsep(&conf, "\r\n")) != NULL) {
+        line++;
         char *comment = strchr(ptr, '#');
         if (comment != NULL) comment[0] = 0;
+
         len = strlen(ptr);
+        char *end_ptr = ptr + len - 1;
+        while (end_ptr[0] == ' ' || end_ptr[0] == '\t') {
+            end_ptr[0] = 0;
+            end_ptr--;
+        }
+        len = strlen(ptr);
+        if (len == 0) continue;
+
         if (ptr[0] == '[') {
             if (ptr[len - 1] != ']') goto err;
-            strncpy(tmp_config[i].name, ptr + 1, len - 2);
+            ptr++;
-            i++;
+            int l = 0;
+            if (strncmp(ptr, "host", 4) == 0 && (ptr[4] == ' ' || ptr[4] == '\t')) {
+                ptr += 4;
+                while (ptr[0] == ' ' || ptr[0] == '\t' || ptr[0] == ']') ptr++;
+                while (ptr[l] != ' ' && ptr[l] != '\t' && ptr[l] != ']') l++;
+                if (l == 0) goto err;
+                snprintf(tmp_config->hosts[i].name, sizeof(tmp_config->hosts[i].name), "%.*s", l, ptr);
+                i++;
+                section = 'h';
+            } else if (strncmp(ptr, "cert", 4) == 0 && (ptr[4] == ' ' || ptr[4] == '\t')) {
+                ptr += 4;
+                while (ptr[0] == ' ' || ptr[0] == '\t' || ptr[0] == ']') ptr++;
+                while (ptr[l] != ' ' && ptr[l] != '\t' && ptr[l] != ']') l++;
+                if (l == 0) goto err;
+                snprintf(tmp_config->certs[j].name, sizeof(tmp_config->certs[j].name), "%.*s", l, ptr);
+                j++;
+                section = 'c';
+            } else {
+                goto err;
+            }
             continue;
-        } else if (i == 0) {
+        } else if (section == 0) {
-            if (len > 12 && strncmp(ptr, "certificate", 11) == 0 && (ptr[11] == ' ' || ptr[11] == '\t')) {
+            if (len > 10 && strncmp(ptr, "geoip_dir", 9) == 0 && (ptr[9] == ' ' || ptr[9] == '\t')) {
-                source = ptr + 11;
-                target = cert_file;
-            } else if (len > 12 && strncmp(ptr, "private_key", 11) == 0 && (ptr[11] == ' ' || ptr[11] == '\t')) {
-                source = ptr + 11;
-                target = key_file;
-            } else if (len > 10 && strncmp(ptr, "geoip_dir", 9) == 0 && (ptr[9] == ' ' || ptr[9] == '\t')) {
                 source = ptr + 9;
                 target = geoip_dir;
             } else if (len > 11 && strncmp(ptr, "dns_server", 10) == 0 && (ptr[10] == ' ' || ptr[10] == '\t')) {
                 source = ptr + 10;
                 target = dns_server;
+            } else {
+                goto err;
             }
-        } else {
+        } else if (section == 'c') {
-            host_config *hc = &tmp_config[i - 1];
+            cert_config *cc = &tmp_config->certs[j - 1];
+            if (len > 12 && strncmp(ptr, "certificate", 11) == 0 && (ptr[11] == ' ' || ptr[11] == '\t')) {
+                source = ptr + 11;
+                target = cc->full_chain;
+            } else if (len > 12 && strncmp(ptr, "private_key", 11) == 0 && (ptr[11] == ' ' || ptr[11] == '\t')) {
+                source = ptr + 11;
+                target = cc->priv_key;
+            } else {
+                goto err;
+            }
+        } else if (section == 'h') {
+            host_config *hc = &tmp_config->hosts[i - 1];
             if (len > 8 && strncmp(ptr, "webroot", 7) == 0 && (ptr[7] == ' ' || ptr[7] == '\t')) {
                 source = ptr + 7;
                 target = hc->local.webroot;
@@ -103,6 +151,9 @@ int config_load(const char *filename) {
                 } else {
                     hc->type = CONFIG_TYPE_LOCAL;
                 }
+            } else if (len > 5 && strncmp(ptr, "cert", 4) == 0 && (ptr[4] == ' ' || ptr[4] == '\t')) {
+                source = ptr + 4;
+                target = hc->cert_name;
             } else if (len > 9 && strncmp(ptr, "dir_mode", 8) == 0 && (ptr[8] == ' ' || ptr[8] == '\t')) {
                 source = ptr + 8;
                 target = NULL;
@@ -145,47 +196,66 @@ int config_load(const char *filename) {
                     hc->rev_proxy.enc = 1;
                 }
                 continue;
+            } else {
+                goto err;
             }
+        } else {
+            goto err;
         }
-        char *end_ptr = source + strlen(source) - 1;
+
         while (source[0] == ' ' || source[0] == '\t') source++;
-        while (end_ptr[0] == ' ' || end_ptr[0] == '\t') end_ptr--;
+        if (strlen(source) == 0) {
-        if (end_ptr <= source) {
             err:
             free(conf);
             free(tmp_config);
-            fprintf(stderr, ERR_STR "Unable to parse config file" CLR_STR "\n");
+            fprintf(stderr, ERR_STR "Unable to parse config file (line %i)" CLR_STR "\n", line);
             return -2;
         }
-        end_ptr[1] = 0;
+
         if (target != NULL) {
             strcpy(target, source);
         } else if (mode == 1) {
             if (strcmp(source, "forbidden") == 0) {
-                tmp_config[i - 1].local.dir_mode = URI_DIR_MODE_FORBIDDEN;
+                tmp_config->hosts[i - 1].local.dir_mode = URI_DIR_MODE_FORBIDDEN;
             } else if (strcmp(source, "info") == 0) {
-                tmp_config[i - 1].local.dir_mode = URI_DIR_MODE_INFO;
+                tmp_config->hosts[i - 1].local.dir_mode = URI_DIR_MODE_INFO;
             } else if (strcmp(source, "list") == 0) {
-                tmp_config[i - 1].local.dir_mode = URI_DIR_MODE_LIST;
+                tmp_config->hosts[i - 1].local.dir_mode = URI_DIR_MODE_LIST;
             } else {
                 goto err;
             }
         } else if (mode == 2) {
-            tmp_config[i - 1].rev_proxy.port = (unsigned short) strtoul(source, NULL, 10);
+            tmp_config->hosts[i - 1].rev_proxy.port = (unsigned short) strtoul(source, NULL, 10);
         }
     }
     free(conf);
 
-    for (int j = 0; j < i; j++) {
+    for (int k = 0; k < i; k++) {
-        if (tmp_config[j].type == CONFIG_TYPE_LOCAL) {
+        host_config *hc = &tmp_config->hosts[k];
-            char *webroot = tmp_config[j].local.webroot;
+        if (hc->type == CONFIG_TYPE_LOCAL) {
+            char *webroot = tmp_config->hosts[k].local.webroot;
             if (webroot[strlen(webroot) - 1] == '/') {
                 webroot[strlen(webroot) - 1] = 0;
             }
         }
+        if (hc->cert_name[0] == 0) goto err2;
+        int found = 0;
+        for (int m = 0; m < j; m++) {
+            if (strcmp(tmp_config->certs[m].name, hc->cert_name) == 0) {
+                hc->cert = m;
+                found = 1;
+                break;
+            }
+        }
+        if (!found) {
+            err2:
+            free(tmp_config);
+            fprintf(stderr, ERR_STR "Unable to parse config file" CLR_STR "\n");
+            return -2;
+        }
     }
 
-    int shm_id = shmget(SHM_KEY_CONFIG, 0, 0);
+    int shm_id = shmget(CONFIG_SHM_KEY, 0, 0);
     if (shm_id < 0) {
         fprintf(stderr, ERR_STR "Unable to get shared memory id: %s" CLR_STR "\n", strerror(errno));
         shmdt(config);
@@ -198,7 +268,7 @@ int config_load(const char *filename) {
         fprintf(stderr, ERR_STR "Unable to attach shared memory (rw): %s" CLR_STR "\n", strerror(errno));
         return -4;
     }
-    memcpy(shm_rw, tmp_config, MAX_HOST_CONFIG * sizeof(host_config));
+    memcpy(shm_rw, tmp_config, sizeof(t_config));
     free(tmp_config);
     shmdt(shm_rw);
     return 0;

src/lib/config.h

@@ -1,28 +1,33 @@
 /**
  * Necronda Web Server
  * Configuration file loader (header file)
- * src/config.h
+ * src/lib/config.h
  * Lorenz Stechauner, 2021-01-05
  */
 
-
 #ifndef NECRONDA_SERVER_CONFIG_H
 #define NECRONDA_SERVER_CONFIG_H
 
+#include "uri.h"
+
+#define CONFIG_SHM_KEY 255642
+#define CONFIG_MAX_HOST_CONFIG 64
+#define CONFIG_MAX_CERT_CONFIG 64
+
 #define CONFIG_TYPE_UNSET 0
 #define CONFIG_TYPE_LOCAL 1
 #define CONFIG_TYPE_REVERSE_PROXY 2
 
-#include "uri.h"
+#ifndef DEFAULT_CONFIG_FILE
-
+#   define DEFAULT_CONFIG_FILE "/etc/necronda/server.conf"
-#include <stdio.h>
+#endif
-#include <sys/ipc.h>
-#include <sys/shm.h>
 
 
 typedef struct {
     int type;
     char name[256];
+    char cert_name[256];
+    int cert;
     union {
         struct {
             char hostname[256];
@@ -36,10 +41,19 @@ typedef struct {
     };
 } host_config;
 
+typedef struct {
+    char name[256];
+    char full_chain[256];
+    char priv_key[256];
+} cert_config;
 
-host_config *config;
+typedef struct {
-char cert_file[256], key_file[256], geoip_dir[256], dns_server[256];
+    host_config hosts[CONFIG_MAX_HOST_CONFIG];
+    cert_config certs[CONFIG_MAX_CERT_CONFIG];
+} t_config;
 
+extern t_config *config;
+extern char geoip_dir[256], dns_server[256];
 
 int config_init();
 

src/lib/fastcgi.c

@@ -1,12 +1,18 @@
 /**
  * Necronda Web Server
  * FastCGI interface implementation
- * src/fastcgi.c
+ * src/lib/fastcgi.c
  * Lorenz Stechauner, 2020-12-26
  */
 
 #include "fastcgi.h"
-
+#include "utils.h"
+#include "compress.h"
+#include "../necronda-server.h"
+#include <sys/un.h>
+#include <sys/socket.h>
+#include <errno.h>
+#include <string.h>
 
 char *fastcgi_add_param(char *buf, const char *key, const char *value) {
     char *ptr = buf;
@@ -43,7 +49,7 @@ char *fastcgi_add_param(char *buf, const char *key, const char *value) {
     return ptr;
 }
 
-int fastcgi_init(fastcgi_conn *conn, unsigned int client_num, unsigned int req_num, const sock *client,
+int fastcgi_init(fastcgi_conn *conn, int mode, unsigned int client_num, unsigned int req_num, const sock *client,
                  const http_req *req, const http_uri *uri) {
     unsigned short req_id = (client_num & 0xFFF) << 4;
     if (client_num == 0) {
@@ -51,20 +57,28 @@ int fastcgi_init(fastcgi_conn *conn, unsigned int client_num, unsigned int req_n
     } else {
         req_id |= req_num & 0xF;
     }
+    conn->mode = mode;
     conn->req_id = req_id;
     conn->out_buf = NULL;
     conn->out_off = 0;
+    conn->webroot = uri->webroot;
 
-    int php_fpm = socket(AF_UNIX, SOCK_STREAM, 0);
+    int fcgi_sock = socket(AF_UNIX, SOCK_STREAM, 0);
-    if (php_fpm < 0) {
+    if (fcgi_sock < 0) {
         print(ERR_STR "Unable to create unix socket: %s" CLR_STR, strerror(errno));
         return -1;
     }
-    conn->socket = php_fpm;
+    conn->socket = fcgi_sock;
 
-    struct sockaddr_un php_fpm_addr = {AF_UNIX, PHP_FPM_SOCKET};
+    struct sockaddr_un sock_addr = {AF_UNIX};
-    if (connect(conn->socket, (struct sockaddr *) &php_fpm_addr, sizeof(php_fpm_addr)) < 0) {
+    if (conn->mode == FASTCGI_NECRONDA) {
-        print(ERR_STR "Unable to connect to unix socket of PHP-FPM: %s" CLR_STR, strerror(errno));
+        snprintf(sock_addr.sun_path, sizeof(sock_addr.sun_path) - 1, "%s", NECRONDA_BACKEND_SOCKET);
+    } else if (conn->mode == FASTCGI_PHP) {
+        snprintf(sock_addr.sun_path, sizeof(sock_addr.sun_path) - 1, "%s", PHP_FPM_SOCKET);
+    }
+
+    if (connect(conn->socket, (struct sockaddr *) &sock_addr, sizeof(sock_addr)) < 0) {
+        print(ERR_STR "Unable to connect to unix socket of FastCGI socket: %s" CLR_STR, strerror(errno));
         return -1;
     }
 
@@ -84,7 +98,7 @@ int fastcgi_init(fastcgi_conn *conn, unsigned int client_num, unsigned int req_n
             {.roleB1 = (FCGI_RESPONDER >> 8) & 0xFF, .roleB0 = FCGI_RESPONDER & 0xFF, .flags = 0}
     };
     if (send(conn->socket, &begin, sizeof(begin), 0) != sizeof(begin)) {
-        print(ERR_STR "Unable to send to PHP-FPM: %s" CLR_STR, strerror(errno));
+        print(ERR_STR "Unable to send to FastCGI socket: %s" CLR_STR, strerror(errno));
         return -2;
     }
 
@@ -167,7 +181,7 @@ int fastcgi_init(fastcgi_conn *conn, unsigned int client_num, unsigned int req_n
     header.contentLengthB0 = param_len & 0xFF;
     memcpy(param_buf, &header, sizeof(header));
     if (send(conn->socket, param_buf, param_len + sizeof(header), 0) != param_len + sizeof(header)) {
-        print(ERR_STR "Unable to send to PHP-FPM: %s" CLR_STR, strerror(errno));
+        print(ERR_STR "Unable to send to FastCGI socket: %s" CLR_STR, strerror(errno));
         return -2;
     }
 
@@ -175,7 +189,7 @@ int fastcgi_init(fastcgi_conn *conn, unsigned int client_num, unsigned int req_n
     header.contentLengthB1 = 0;
     header.contentLengthB0 = 0;
     if (send(conn->socket, &header, sizeof(header), 0) != sizeof(header)) {
-        print(ERR_STR "Unable to send to PHP-FPM: %s" CLR_STR, strerror(errno));
+        print(ERR_STR "Unable to send to FastCGI socket: %s" CLR_STR, strerror(errno));
         return -2;
     }
 
@@ -195,14 +209,14 @@ int fastcgi_close_stdin(fastcgi_conn *conn) {
     };
 
     if (send(conn->socket, &header, sizeof(header), 0) != sizeof(header)) {
-        print(ERR_STR "Unable to send to PHP-FPM: %s" CLR_STR, strerror(errno));
+        print(ERR_STR "Unable to send to FastCGI socket: %s" CLR_STR, strerror(errno));
         return -2;
     }
 
     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 *ptr0 = msg_str;
     strncpy(msg_str, msg, msg_len);
@@ -247,9 +261,9 @@ int fastcgi_php_error(const char *msg, int msg_len, char *err_msg) {
             if (ptr3 != NULL && (ptr3 - ptr2) < len2) {
                 len2 = (int) (ptr3 - ptr2);
             }
-            print("%s%.*s%s", msg_type == 1 ? WRN_STR : msg_type == 2 ? ERR_STR : "", len2, ptr2, msg_type != 0 ? 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) {
-                sprintf(err_msg, "%.*s", len2, ptr2);
+                strcpy_rem_webroot(err_msg, ptr2, len2, conn->webroot);
                 err = 1;
             }
             if (ptr3 == NULL) {
@@ -272,20 +286,20 @@ int fastcgi_header(fastcgi_conn *conn, http_res *res, char *err_msg) {
     FCGI_Header header;
     char *content;
     unsigned short content_len, req_id;
-    int ret;
+    long ret;
     int err = 0;
 
     while (1) {
         ret = recv(conn->socket, &header, sizeof(header), 0);
         if (ret < 0) {
-            res->status = http_get_status(502);
+            res->status = http_get_status(500);
-            sprintf(err_msg, "Unable to communicate with PHP-FPM.");
+            sprintf(err_msg, "Unable to communicate with FastCGI socket.");
-            print(ERR_STR "Unable to receive from PHP-FPM: %s" CLR_STR, strerror(errno));
+            print(ERR_STR "Unable to receive from FastCGI socket: %s" CLR_STR, strerror(errno));
             return 1;
         } else if (ret != sizeof(header)) {
-            res->status = http_get_status(502);
+            res->status = http_get_status(500);
-            sprintf(err_msg, "Unable to communicate with PHP-FPM.");
+            sprintf(err_msg, "Unable to communicate with FastCGI socket.");
-            print(ERR_STR "Unable to receive from PHP-FPM" CLR_STR);
+            print(ERR_STR "Unable to receive from FastCGI socket" CLR_STR);
             return 1;
         }
         req_id = (header.requestIdB1 << 8) | header.requestIdB0;
@@ -293,15 +307,15 @@ int fastcgi_header(fastcgi_conn *conn, http_res *res, char *err_msg) {
         content = malloc(content_len + header.paddingLength);
         ret = recv(conn->socket, content, content_len + header.paddingLength, 0);
         if (ret < 0) {
-            res->status = http_get_status(502);
+            res->status = http_get_status(500);
-            sprintf(err_msg, "Unable to communicate with PHP-FPM.");
+            sprintf(err_msg, "Unable to communicate with FastCGI socket.");
-            print(ERR_STR "Unable to receive from PHP-FPM: %s" CLR_STR, strerror(errno));
+            print(ERR_STR "Unable to receive from FastCGI socket: %s" CLR_STR, strerror(errno));
             free(content);
             return 1;
         } else if (ret != (content_len + header.paddingLength)) {
-            res->status = http_get_status(502);
+            res->status = http_get_status(500);
-            sprintf(err_msg, "Unable to communicate with PHP-FPM.");
+            sprintf(err_msg, "Unable to communicate with FastCGI socket.");
-            print(ERR_STR "Unable to receive from PHP-FPM" CLR_STR);
+            print(ERR_STR "Unable to receive from FastCGI socket" CLR_STR);
             free(content);
             return 1;
         }
@@ -318,14 +332,17 @@ int fastcgi_header(fastcgi_conn *conn, http_res *res, char *err_msg) {
                 print(ERR_STR "FastCGI protocol error: %i" CLR_STR, body->protocolStatus);
             }
             if (app_status != 0) {
-                print(ERR_STR "Script terminated with exit code %i" CLR_STR, app_status);
+                print(ERR_STR "FastCGI app terminated with exit code %i" CLR_STR, app_status);
             }
             close(conn->socket);
             conn->socket = 0;
             free(content);
             return 1;
         } else if (header.type == FCGI_STDERR) {
-            err = err || fastcgi_php_error(content, content_len, err_msg);
+            // TODO implement Necronda backend error handling
+            if (conn->mode == FASTCGI_PHP) {
+                err = err || fastcgi_php_error(conn, content, content_len, err_msg);
+            }
         } else if (header.type == FCGI_STDOUT) {
             break;
         } else {
@@ -366,7 +383,7 @@ int fastcgi_header(fastcgi_conn *conn, http_res *res, char *err_msg) {
         }
 
         ret = http_parse_header_field(&res->hdr, ptr, pos0);
-        if (ret != 0) return ret;
+        if (ret != 0) return (int) ret;
         if (pos0[2] == '\r' && pos0[3] == '\n') {
             return 0;
         }
@@ -378,7 +395,7 @@ int fastcgi_header(fastcgi_conn *conn, http_res *res, char *err_msg) {
 
 int fastcgi_send(fastcgi_conn *conn, sock *client, int flags) {
     FCGI_Header header;
-    int ret;
+    long ret;
     char buf0[256];
     int len;
     char *content, *ptr;
@@ -386,15 +403,18 @@ int fastcgi_send(fastcgi_conn *conn, sock *client, int flags) {
     char comp_out[4096];
     int finish_comp = 0;
 
-    z_stream strm;
+    compress_ctx comp_ctx;
-    if (flags & FASTCGI_COMPRESS) {
+    if (flags & FASTCGI_COMPRESS_BR) {
-        int level = NECRONDA_ZLIB_LEVEL;
+        flags &= ~FASTCGI_COMPRESS_GZ;
-        strm.zalloc = Z_NULL;
+        if (compress_init(&comp_ctx, COMPRESS_BR) != 0) {
-        strm.zfree = Z_NULL;
+            print(ERR_STR "Unable to init brotli: %s" CLR_STR, strerror(errno));
-        strm.opaque = Z_NULL;
+            flags &= ~FASTCGI_COMPRESS_BR;
-        if (deflateInit(&strm, level) != Z_OK) {
+        }
-            print(ERR_STR "Unable to init deflate: %s" CLR_STR, strerror(errno));
+    } else if (flags & FASTCGI_COMPRESS_GZ) {
-            flags &= !FASTCGI_COMPRESS;
+        flags &= ~FASTCGI_COMPRESS_BR;
+        if (compress_init(&comp_ctx, COMPRESS_GZ) != 0) {
+            print(ERR_STR "Unable to init gzip: %s" CLR_STR, strerror(errno));
+            flags &= ~FASTCGI_COMPRESS_GZ;
         }
     }
 
@@ -408,25 +428,28 @@ int fastcgi_send(fastcgi_conn *conn, sock *client, int flags) {
     while (1) {
         ret = recv(conn->socket, &header, sizeof(header), 0);
         if (ret < 0) {
-            print(ERR_STR "Unable to receive from PHP-FPM: %s" CLR_STR, strerror(errno));
+            print(ERR_STR "Unable to receive from FastCGI socket: %s" CLR_STR, strerror(errno));
             return -1;
         } else if (ret != sizeof(header)) {
-            print(ERR_STR "Unable to receive from PHP-FPM" CLR_STR);
+            print(ERR_STR "Unable to receive from FastCGI socket: received len (%li) != header len (%li)" CLR_STR,
+                  ret, sizeof(header));
             return -1;
         }
+
         req_id = (header.requestIdB1 << 8) | header.requestIdB0;
         content_len = (header.contentLengthB1 << 8) | header.contentLengthB0;
         content = malloc(content_len + header.paddingLength);
         ptr = content;
-        ret = recv(conn->socket, content, content_len + header.paddingLength, 0);
+
-        if (ret < 0) {
+        long rcv_len = 0;
-            print(ERR_STR "Unable to receive from PHP-FPM: %s" CLR_STR, strerror(errno));
+        while (rcv_len < content_len + header.paddingLength) {
-            free(content);
+            ret = recv(conn->socket, content + rcv_len, content_len + header.paddingLength - rcv_len, 0);
-            return -1;
+            if (ret < 0) {
-        } else if (ret != (content_len + header.paddingLength)) {
+                print(ERR_STR "Unable to receive from FastCGI socket: %s" CLR_STR, strerror(errno));
-            print(ERR_STR "Unable to receive from PHP-FPM" CLR_STR);
+                free(content);
-            free(content);
+                return -1;
-            return -1;
+            }
+            rcv_len += ret;
         }
 
         if (header.type == FCGI_END_REQUEST) {
@@ -437,7 +460,7 @@ int fastcgi_send(fastcgi_conn *conn, sock *client, int flags) {
                 print(ERR_STR "FastCGI protocol error: %i" CLR_STR, body->protocolStatus);
             }
             if (app_status != 0) {
-                print(ERR_STR "Script terminated with exit code %i" CLR_STR, app_status);
+                print(ERR_STR "FastCGI app terminated with exit code %i" CLR_STR, app_status);
             }
             close(conn->socket);
             conn->socket = 0;
@@ -448,7 +471,7 @@ int fastcgi_send(fastcgi_conn *conn, sock *client, int flags) {
                 content_len = 0;
                 goto out;
                 finish:
-                deflateEnd(&strm);
+                compress_free(&comp_ctx);
             }
 
             if (flags & FASTCGI_CHUNKED) {
@@ -457,22 +480,23 @@ int fastcgi_send(fastcgi_conn *conn, sock *client, int flags) {
 
             return 0;
         } else if (header.type == FCGI_STDERR) {
-            fastcgi_php_error(content, content_len, buf0);
+            // TODO implement Necronda backend error handling
-        } else if (header.type == FCGI_STDOUT) {
+            if (conn->mode == FASTCGI_PHP) {
-            out:
+                fastcgi_php_error(conn, content, content_len, buf0);
-            if (flags & FASTCGI_COMPRESS) {
-                strm.avail_in = content_len;
-                strm.next_in = (unsigned char *) ptr;
             }
+        } else if (header.type == FCGI_STDOUT) {
+            unsigned long avail_in, avail_out;
+            out:
+            avail_in = content_len;
+            void *next_in = ptr;
             do {
                 int buf_len = content_len;
                 if (flags & FASTCGI_COMPRESS) {
-                    strm.avail_out = sizeof(comp_out);
+                    avail_out = sizeof(comp_out);
-                    strm.next_out = (unsigned char *) comp_out;
+                    compress_compress(&comp_ctx, next_in + content_len - avail_in, &avail_in, comp_out, &avail_out,
-                    deflate(&strm, finish_comp ? Z_FINISH : Z_NO_FLUSH);
+                                      finish_comp);
-                    strm.avail_in = 0;
                     ptr = comp_out;
-                    buf_len = (int) (sizeof(comp_out) - strm.avail_out);
+                    buf_len = (int) (sizeof(comp_out) - avail_out);
                 }
                 if (buf_len != 0) {
                     len = sprintf(buf0, "%X\r\n", buf_len);
@@ -480,7 +504,7 @@ int fastcgi_send(fastcgi_conn *conn, sock *client, int flags) {
                     sock_send(client, ptr, buf_len, 0);
                     if (flags & FASTCGI_CHUNKED) sock_send(client, "\r\n", 2, 0);
                 }
-            } while ((flags & FASTCGI_COMPRESS) && strm.avail_out == 0);
+            } while ((flags & FASTCGI_COMPRESS) && (avail_in != 0 || avail_out != sizeof(comp_out)));
             if (finish_comp) goto finish;
         } else {
             print(ERR_STR "Unknown FastCGI type: %i" CLR_STR, header.type);
@@ -489,6 +513,72 @@ int fastcgi_send(fastcgi_conn *conn, sock *client, int flags) {
     }
 }
 
+int fastcgi_dump(fastcgi_conn *conn, char *buf, long len) {
+    FCGI_Header header;
+    long ret;
+    char buf0[256];
+    char *content, *ptr = buf;
+    unsigned short req_id, content_len;
+
+    if (conn->out_buf != NULL && conn->out_len > conn->out_off) {
+        ptr += snprintf(ptr, len, "%.*s", conn->out_len - conn->out_off, conn->out_buf + conn->out_off);
+    }
+
+    while (1) {
+        ret = recv(conn->socket, &header, sizeof(header), 0);
+        if (ret < 0) {
+            print(ERR_STR "Unable to receive from FastCGI socket: %s" CLR_STR, strerror(errno));
+            return -1;
+        } else if (ret != sizeof(header)) {
+            print(ERR_STR "Unable to receive from FastCGI socket: received len (%li) != header len (%li)" CLR_STR,
+                  ret, sizeof(header));
+            return -1;
+        }
+
+        req_id = (header.requestIdB1 << 8) | header.requestIdB0;
+        content_len = (header.contentLengthB1 << 8) | header.contentLengthB0;
+        content = malloc(content_len + header.paddingLength);
+
+        long rcv_len = 0;
+        while (rcv_len < content_len + header.paddingLength) {
+            ret = recv(conn->socket, content + rcv_len, content_len + header.paddingLength - rcv_len, 0);
+            if (ret < 0) {
+                print(ERR_STR "Unable to receive from FastCGI socket: %s" CLR_STR, strerror(errno));
+                free(content);
+                return -1;
+            }
+            rcv_len += ret;
+        }
+
+        if (header.type == FCGI_END_REQUEST) {
+            FCGI_EndRequestBody *body = (FCGI_EndRequestBody *) content;
+            int app_status = (body->appStatusB3 << 24) | (body->appStatusB2 << 16) | (body->appStatusB1 << 8) |
+                             body->appStatusB0;
+            if (body->protocolStatus != FCGI_REQUEST_COMPLETE) {
+                print(ERR_STR "FastCGI protocol error: %i" CLR_STR, body->protocolStatus);
+            }
+            if (app_status != 0) {
+                print(ERR_STR "FastCGI app terminated with exit code %i" CLR_STR, app_status);
+            }
+            close(conn->socket);
+            conn->socket = 0;
+            free(content);
+
+            return 0;
+        } else if (header.type == FCGI_STDERR) {
+            // TODO implement Necronda backend error handling
+            if (conn->mode == FASTCGI_PHP) {
+                fastcgi_php_error(conn, content, content_len, buf0);
+            }
+        } else if (header.type == FCGI_STDOUT) {
+            ptr += snprintf(ptr, len - (ptr - buf), "%.*s", content_len, content);
+        } else {
+            print(ERR_STR "Unknown FastCGI type: %i" CLR_STR, header.type);
+        }
+        free(content);
+    }
+}
+
 int fastcgi_receive(fastcgi_conn *conn, sock *client, unsigned long len) {
     unsigned long rcv_len = 0;
     char *buf[16384];
@@ -524,7 +614,7 @@ int fastcgi_receive(fastcgi_conn *conn, sock *client, unsigned long len) {
         if (send(conn->socket, &header, sizeof(header), 0) != sizeof(header)) goto err;
         if (send(conn->socket, buf, ret, 0) != ret) {
             err:
-            print(ERR_STR "Unable to send to PHP-FPM: %s" CLR_STR, strerror(errno));
+            print(ERR_STR "Unable to send to FastCGI socket: %s" CLR_STR, strerror(errno));
             return -2;
         }
     }

src/lib/fastcgi.h

@@ -0,0 +1,57 @@
+/**
+ * Necronda Web Server
+ * FastCGI interface implementation (header file)
+ * src/lib/fastcgi.h
+ * Lorenz Stechauner, 2020-12-26
+ */
+
+#ifndef NECRONDA_SERVER_FASTCGI_H
+#define NECRONDA_SERVER_FASTCGI_H
+
+#include "include/fastcgi.h"
+#include "http.h"
+#include "uri.h"
+
+#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_NECRONDA 2
+
+#ifndef PHP_FPM_SOCKET
+#   define PHP_FPM_SOCKET "/var/run/php-fpm/php-fpm.sock"
+#endif
+
+#define NECRONDA_BACKEND_SOCKET "/var/run/necronda/necronda-backend.sock"
+
+typedef struct {
+    int mode;
+    int socket;
+    unsigned short req_id;
+    char *out_buf;
+    const char *webroot;
+    unsigned short out_len;
+    unsigned short out_off;
+} fastcgi_conn;
+
+char *fastcgi_add_param(char *buf, const char *key, const char *value);
+
+int fastcgi_init(fastcgi_conn *conn, int mode, unsigned int client_num, unsigned int req_num, const sock *client,
+                 const http_req *req, const http_uri *uri);
+
+int fastcgi_close_stdin(fastcgi_conn *conn);
+
+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_send(fastcgi_conn *conn, sock *client, int flags);
+
+int fastcgi_dump(fastcgi_conn *conn, char *buf, long len);
+
+int fastcgi_receive(fastcgi_conn *conn, sock *client, unsigned long len);
+
+#endif //NECRONDA_SERVER_FASTCGI_H

src/lib/geoip.c

@@ -0,0 +1,69 @@
+/**
+ * Necronda Web Server
+ * MaxMind GeoIP Database interface
+ * src/lib/geoip.c
+ * Lorenz Stechauner, 2021-05-04
+ */
+
+#include "geoip.h"
+
+MMDB_entry_data_list_s *mmdb_json(MMDB_entry_data_list_s *list, char *str, long *str_off, long str_len) {
+    switch (list->entry_data.type) {
+        case MMDB_DATA_TYPE_MAP:
+            *str_off += sprintf(str + *str_off, "{");
+            break;
+        case MMDB_DATA_TYPE_ARRAY:
+            *str_off += sprintf(str + *str_off, "[");
+            break;
+        case MMDB_DATA_TYPE_UTF8_STRING:
+            *str_off += sprintf(str + *str_off, "\"%.*s\"", list->entry_data.data_size, list->entry_data.utf8_string);
+            break;
+        case MMDB_DATA_TYPE_UINT16:
+            *str_off += sprintf(str + *str_off, "%u", list->entry_data.uint16);
+            break;
+        case MMDB_DATA_TYPE_UINT32:
+            *str_off += sprintf(str + *str_off, "%u", list->entry_data.uint32);
+            break;
+        case MMDB_DATA_TYPE_UINT64:
+            *str_off += sprintf(str + *str_off, "%lu", list->entry_data.uint64);
+            break;
+        case MMDB_DATA_TYPE_UINT128:
+            *str_off += sprintf(str + *str_off, "%llu", (unsigned long long) list->entry_data.uint128);
+            break;
+        case MMDB_DATA_TYPE_INT32:
+            *str_off += sprintf(str + *str_off, "%i", list->entry_data.uint32);
+            break;
+        case MMDB_DATA_TYPE_BOOLEAN:
+            *str_off += sprintf(str + *str_off, "%s", list->entry_data.boolean ? "true" : "false");
+            break;
+        case MMDB_DATA_TYPE_FLOAT:
+            *str_off += sprintf(str + *str_off, "%f", list->entry_data.float_value);
+            break;
+        case MMDB_DATA_TYPE_DOUBLE:
+            *str_off += sprintf(str + *str_off, "%f", list->entry_data.double_value);
+            break;
+    }
+    if (list->entry_data.type != MMDB_DATA_TYPE_MAP && list->entry_data.type != MMDB_DATA_TYPE_ARRAY) {
+        return list->next;
+    }
+    MMDB_entry_data_list_s *next = list->next;
+    int stat = 0;
+    for (int i = 0; i < list->entry_data.data_size; i++) {
+        next = mmdb_json(next, str, str_off, str_len);
+        if (list->entry_data.type == MMDB_DATA_TYPE_MAP) {
+            stat = !stat;
+            if (stat) {
+                i--;
+                *str_off += sprintf(str + *str_off, ":");
+                continue;
+            }
+        }
+        if (i != list->entry_data.data_size - 1) *str_off += sprintf(str + *str_off, ",");
+    }
+    if (list->entry_data.type == MMDB_DATA_TYPE_MAP) {
+        *str_off += sprintf(str + *str_off, "}");
+    } else {
+        *str_off += sprintf(str + *str_off, "]");
+    }
+    return next;
+}

src/lib/geoip.h

@@ -0,0 +1,18 @@
+/**
+ * Necronda Web Server
+ * MaxMind GeoIP Database interface (header file)
+ * src/lib/geoip.h
+ * Lorenz Stechauner, 2021-05-04
+ */
+
+
+#ifndef NECRONDA_SERVER_GEOIP_H
+#define NECRONDA_SERVER_GEOIP_H
+
+#include <maxminddb.h>
+
+#define GEOIP_MAX_SIZE 8192
+
+MMDB_entry_data_list_s *mmdb_json(MMDB_entry_data_list_s *list, char *str, long *str_off, long str_len);
+
+#endif //NECRONDA_SERVER_GEOIP_H

src/lib/http.c

@@ -1,12 +1,14 @@
 /**
  * Necronda Web Server
  * HTTP implementation
- * src/net/http.c
+ * src/lib/http.c
  * Lorenz Stechauner, 2020-12-09
  */
 
 #include "http.h"
-
+#include "utils.h"
+#include "compress.h"
+#include <string.h>
 
 void http_to_camel_case(char *str, int mode) {
     char last = '-';
@@ -31,7 +33,7 @@ void http_free_hdr(http_hdr *hdr) {
 }
 
 void http_free_req(http_req *req) {
-    if (req->uri == NULL) free(req->uri);
+    if (req->uri != NULL) free(req->uri);
     req->uri = NULL;
     http_free_hdr(&req->hdr);
 }
@@ -83,19 +85,19 @@ int http_receive_request(sock *client, http_req *req) {
     while (1) {
         rcv_len  = sock_recv(client, buf, CLIENT_MAX_HEADER_SIZE, 0);
         if (rcv_len <= 0) {
-            print("Unable to receive: %s", sock_strerror(client));
+            print("Unable to receive http header: %s", sock_strerror(client));
             return -1;
         }
 
         unsigned long header_len = strstr(buf, "\r\n\r\n") - buf + 4;
         if (header_len <= 0) {
-            print(ERR_STR "Unable to parse header: End of header not found" CLR_STR);
+            print(ERR_STR "Unable to parse http header: End of header not found" CLR_STR);
             return 5;
         }
 
         for (int i = 0; i < header_len; i++) {
             if ((buf[i] >= 0x00 && buf[i] <= 0x1F && buf[i] != '\r' && buf[i] != '\n') || buf[i] == 0x7F) {
-                print(ERR_STR "Unable to parse header: Header contains illegal characters" CLR_STR);
+                print(ERR_STR "Unable to parse http header: Header contains illegal characters" CLR_STR);
                 return 4;
             }
         }
@@ -104,7 +106,7 @@ int http_receive_request(sock *client, http_req *req) {
         while (header_len > (ptr - buf + 2)) {
             pos0 = strstr(ptr, "\r\n");
             if (pos0 == NULL) {
-                print(ERR_STR "Unable to parse header: Invalid header format" CLR_STR);
+                print(ERR_STR "Unable to parse http header: Invalid header format" CLR_STR);
                 return 1;
             }
 
@@ -113,27 +115,27 @@ int http_receive_request(sock *client, http_req *req) {
                 if (pos1 == NULL) goto err_hdr_fmt;
 
                 if (pos1 - ptr - 1 >= sizeof(req->method)) {
-                    print(ERR_STR "Unable to parse header: Method name too long" CLR_STR);
+                    print(ERR_STR "Unable to parse http header: Method name too long" CLR_STR);
                     return 2;
                 }
 
                 for (int i = 0; i < (pos1 - ptr - 1); i++) {
                     if (ptr[i] < 'A' || ptr[i] > 'Z') {
-                        print(ERR_STR "Unable to parse header: Invalid method" CLR_STR);
+                        print(ERR_STR "Unable to parse http header: Invalid method" CLR_STR);
                         return 2;
                     }
                 }
-                strncpy(req->method, ptr, pos1 - ptr - 1);
+                snprintf(req->method, sizeof(req->method), "%.*s", (int) (pos1 - ptr - 1), ptr);
 
                 pos2 = memchr(pos1, ' ', rcv_len - (pos1 - buf)) + 1;
                 if (pos2 == NULL) {
                     err_hdr_fmt:
-                    print(ERR_STR "Unable to parse header: Invalid header format" CLR_STR);
+                    print(ERR_STR "Unable to parse http header: Invalid header format" CLR_STR);
                     return 1;
                 }
 
                 if (memcmp(pos2, "HTTP/", 5) != 0 || memcmp(pos2 + 8, "\r\n", 2) != 0) {
-                    print(ERR_STR "Unable to parse header: Invalid version" CLR_STR);
+                    print(ERR_STR "Unable to parse http header: Invalid version" CLR_STR);
                     return 3;
                 }
 
@@ -245,7 +247,7 @@ int http_send_request(sock *server, http_req *req) {
 }
 
 const http_status *http_get_status(unsigned short status_code) {
-    for (int i = 0; i < sizeof(http_statuses) / sizeof(http_status); i++) {
+    for (int i = 0; i < http_statuses_size / sizeof(http_status); i++) {
         if (http_statuses[i].code == status_code) {
             return &http_statuses[i];
         }
@@ -255,7 +257,7 @@ const http_status *http_get_status(unsigned short status_code) {
 
 const http_status_msg *http_get_error_msg(const http_status *status) {
     unsigned short code = status->code;
-    for (int i = 0; i < sizeof(http_status_messages) / sizeof(http_status_msg); i++) {
+    for (int i = 0; i < http_status_messages_size / sizeof(http_status_msg); i++) {
         if (http_status_messages[i].code == code) {
             return &http_status_messages[i];
         }
@@ -310,3 +312,17 @@ const http_doc_info *http_get_status_info(const http_status *status) {
     }
     return NULL;
 }
+
+int http_get_compression(const http_req *req, const http_res *res) {
+    char *accept_encoding = http_get_header_field(&req->hdr, "Accept-Encoding");
+    char *content_type = http_get_header_field(&res->hdr, "Content-Type");
+    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) {
+            return COMPRESS_BR;
+        } else if (strstr(accept_encoding, "gzip") != NULL) {
+            return COMPRESS_GZ;
+        }
+    }
+    return 0;
+}

src/lib/http.h

@@ -0,0 +1,139 @@
+/**
+ * Necronda Web Server
+ * HTTP implementation (header file)
+ * src/lib/http.h
+ * Lorenz Stechauner, 2020-12-09
+ */
+
+#ifndef NECRONDA_SERVER_HTTP_H
+#define NECRONDA_SERVER_HTTP_H
+
+#include "sock.h"
+
+#define HTTP_PRESERVE 0
+#define HTTP_LOWER 1
+#define HTTP_CAMEL 2
+
+#define HTTP_REMOVE_ONE 0
+#define HTTP_REMOVE_ALL 1
+#define HTTP_REMOVE_LAST 2
+
+#define HTTP_1XX_STR "\x1B[1;32m"
+#define HTTP_2XX_STR "\x1B[1;32m"
+#define HTTP_3XX_STR "\x1B[1;33m"
+#define HTTP_4XX_STR "\x1B[1;31m"
+#define HTTP_5XX_STR "\x1B[1;31m"
+
+#define HTTP_COLOR_SUCCESS "#008000"
+#define HTTP_COLOR_INFO "#606060"
+#define HTTP_COLOR_WARNING "#E0C000"
+#define HTTP_COLOR_ERROR "#C00000"
+
+#define CLIENT_MAX_HEADER_SIZE 8192
+
+#ifndef SERVER_STR
+#   define SERVER_STR "Necronda"
+#endif
+
+#ifndef SERVER_STR_HTML
+#   define SERVER_STR_HTML "Necronda web server"
+#endif
+
+typedef struct {
+    unsigned short code;
+    char type[16];
+    char msg[64];
+} http_status;
+
+typedef struct {
+    unsigned short code;
+    const char *msg;
+} http_status_msg;
+
+typedef struct {
+    char mode[8];
+    char color[8];
+    const char *icon;
+    const char *doc;
+} http_doc_info;
+
+typedef struct {
+    char field_num;
+    char *fields[64][2];
+} http_hdr;
+
+typedef struct {
+    char method[16];
+    char *uri;
+    char version[4];
+    http_hdr hdr;
+} http_req;
+
+typedef struct {
+    const http_status *status;
+    char version[4];
+    http_hdr hdr;
+} http_res;
+
+typedef enum {
+    NONE, INTERNAL, CLIENT_REQ, SERVER_REQ, SERVER, SERVER_RES, CLIENT_RES
+} http_error_origin;
+
+typedef struct {
+    unsigned short status;
+    http_error_origin origin;
+} http_status_ctx;
+
+extern const http_status http_statuses[];
+extern const http_status_msg http_status_messages[];
+extern const int http_statuses_size;
+extern const int http_status_messages_size;
+
+extern const char http_default_document[];
+extern const char http_rev_proxy_document[];
+extern const char http_error_document[];
+extern const char http_error_icon[];
+extern const char http_warning_document[];
+extern const char http_warning_icon[];
+extern const char http_success_document[];
+extern const char http_success_icon[];
+extern const char http_info_document[];
+extern const char http_info_icon[];
+
+void http_to_camel_case(char *str, int mode);
+
+void http_free_hdr(http_hdr *hdr);
+
+void http_free_req(http_req *req);
+
+void http_free_res(http_res *res);
+
+int http_receive_request(sock *client, http_req *req);
+
+int http_parse_header_field(http_hdr *hdr, const char *buf, const char *end_ptr) ;
+
+char *http_get_header_field(const http_hdr *hdr, const char *field_name);
+
+void http_add_header_field(http_hdr *hdr, const char *field_name, const char *field_value);
+
+void http_remove_header_field(http_hdr *hdr, const char *field_name, int mode);
+
+int http_send_response(sock *client, http_res *res);
+
+int http_send_request(sock *server, http_req *req);
+
+const http_status *http_get_status(unsigned short status_code);
+
+const http_status_msg *http_get_error_msg(const http_status *status);
+
+const char *http_get_status_color(const http_status *status);
+
+char *http_format_date(time_t time, char *buf, size_t size);
+
+char *http_get_date(char *buf, size_t size);
+
+const http_doc_info *http_get_status_info(const http_status *status);
+
+int http_get_compression(const http_req *req, const http_res *res);
+
+#endif //NECRONDA_SERVER_HTTP_H

src/lib/http_static.c

@@ -1,67 +1,14 @@
 /**
  * Necronda Web Server
- * HTTP implementation (header file)
+ * HTTP static implementation
- * src/net/http.h
+ * src/lib/http_static.c
- * Lorenz Stechauner, 2020-12-09
+ * Lorenz Stechauner, 2021-05-03
  */
 
-#ifndef NECRONDA_SERVER_HTTP_H
+#include "../necronda.h"
-#define NECRONDA_SERVER_HTTP_H
+#include "http.h"
 
-#define HTTP_PRESERVE 0
+const http_status http_statuses[] = {
-#define HTTP_LOWER 1
-#define HTTP_CAMEL 2
-
-#define HTTP_REMOVE_ONE 0
-#define HTTP_REMOVE_ALL 1
-#define HTTP_REMOVE_LAST 2
-
-#define HTTP_COLOR_SUCCESS "#008000"
-#define HTTP_COLOR_INFO "#606060"
-#define HTTP_COLOR_WARNING "#E0C000"
-#define HTTP_COLOR_ERROR "#C00000"
-
-#include "sock.h"
-#include "utils.h"
-
-
-typedef struct {
-    unsigned short code;
-    char type[16];
-    char msg[32];
-} http_status;
-
-typedef struct {
-    unsigned short code;
-    const char *msg;
-} http_status_msg;
-
-typedef struct {
-    char mode[8];
-    char color[8];
-    const char *icon;
-    const char *doc;
-} http_doc_info;
-
-typedef struct {
-    char field_num;
-    char *fields[64][2];
-} http_hdr;
-
-typedef struct {
-    char method[16];
-    char *uri;
-    char version[3];
-    http_hdr hdr;
-} http_req;
-
-typedef struct {
-    const http_status *status;
-    char version[3];
-    http_hdr hdr;
-} http_res;
-
-static const http_status http_statuses[] = {
         {100, "Informational", "Continue"},
         {101, "Informational", "Switching Protocols"},
 
@@ -109,7 +56,7 @@ static const http_status http_statuses[] = {
         {505, "Server Error",  "HTTP Version Not Supported"},
 };
 
-static const http_status_msg http_status_messages[] = {
+const http_status_msg http_status_messages[] = {
         {100, "The client SHOULD continue with its request."},
         {101, "The server understands and is willing to comply with the clients request, via the Upgrade message header field, for a change in the application protocol being used on this connection."},
 
@@ -156,7 +103,7 @@ static const http_status_msg http_status_messages[] = {
         {505, "The server does not support, or refuses to support, the HTTP protocol version that was used in the request message."}
 };
 
-static const char http_default_document[] =
+const char http_default_document[] =
         "<!DOCTYPE html>\n"
         "<html lang=\"en\">\n"
         "<head>\n"
@@ -169,20 +116,85 @@ static const char http_default_document[] =
         "\t<link rel=\"shortcut icon\" type=\"image/x-icon\" href=\"/favicon.ico\"/>\n"
         "%5$s"
         "\t<style>\n"
-        "\t\thtml{font-family:\"Arial\",sans-serif;--error:" HTTP_COLOR_ERROR ";--warning:" HTTP_COLOR_WARNING ";--success:" HTTP_COLOR_SUCCESS ";--info:" HTTP_COLOR_INFO ";--color:var(--%4$s);}\n"
+        "\t\thtml{font-family:\"Arial\",sans-serif;--error:" HTTP_COLOR_ERROR ";--warning:" HTTP_COLOR_WARNING ";--success:" HTTP_COLOR_SUCCESS ";--info:" HTTP_COLOR_INFO ";--soft:#808080;--color:var(--%4$s);}\n"
         "\t\tbody{background-color:#F0F0F0;margin:0;}\n"
         "\t\tmain{max-width:650px;margin:2em auto;}\n"
-        "\t\tsection{margin:1em;background-color:#FFFFFF;border: 1px solid var(--color);border-radius:4px;padding:1em;}\n"
+        "\t\tsection{margin:2em 1em;background-color:#FFFFFF;border: 1px solid var(--color);border-radius:4px;padding:1em;}\n"
-        "\t\th1,h2,h3,h4,h5,h6,h7{text-align:center;color:var(--color);font-weight:normal;}\n"
+        "\t\th1,h2,h3,h4,h5,h6{text-align:center;color:var(--color);font-weight:normal;}\n"
-        "\t\th1{font-size:3em;margin:0.125em 0 0.125em 0;}\n"
+        "\t\th1{font-size:3em;margin:0.125em 0;}\n"
         "\t\th2{font-size:1.5em;margin:0.25em 0 1em 0;}\n"
         "\t\tp{text-align:center;font-size:0.875em;}\n"
-        "\t\tdiv.footer{color:#808080;font-size:0.75em;text-align:center;margin:2em 0 0.5em 0;}\n"
+        "\t\tdiv.footer{color:var(--soft);font-size:0.75em;text-align:center;margin:2em 0 0.5em 0;}\n"
-        "\t\tdiv.footer a{color:#808080;}\n"
+        "\t\tdiv.footer a{color:var(--soft);}\n"
+        "\t\tul,ol{width:fit-content;margin:auto;}\n"
+        "\t\tpre{width:fit-content;margin:2em auto 0 auto;}\n"
+        "\n"
+        "\t\tsection.error-ctx{display:flex;padding:0;border:none;}\n"
+        "\t\tdiv.box{flex:100%% 1 1;border:1px solid var(--info);color:var(--info);position:relative;padding:1em;box-sizing:border-box;text-align:center;}\n"
+        "\t\tdiv.box.error{border-color:var(--error);color:var(--error);}\n"
+        "\t\tdiv.box.success{border-color:var(--success);color:var(--success);}\n"
+        "\t\tdiv.arrow{position:absolute;height:20px;width:30px;z-index:10;background-repeat:no-repeat;background-size:contain;}\n"
+        "\t\tdiv.arrow.response{left:-17.5px;bottom:calc(33.3333%% - 10px);}\n"
+        "\t\tdiv.arrow.request{right:-17.5px;top:calc(33.3333%% - 10px);}\n"
+        "\t\tdiv.border{flex:1px 0 0;background-color:var(--info);}\n"
+        "\t\tdiv.border.error{background-color:var(--error);}\n"
+        "\t\tdiv.border.success{background-color:var(--success);}\n"
+        "\t\tdiv.content>span{display:block;color:var(--soft);font-size:0.75em;}\n"
+        "\t\tdiv.content>img{height:3.75rem;margin:0.75rem auto;display:block;}\n"
+        "\t\th3{font-size:2.25em;margin:0.75rem 0 0 0;color:unset;height:2.5rem;}\n"
+        "\t\th4{font-size:1em;margin:0 0 0.75rem 0;color:unset;height:1.25rem;}\n"
+        "\n"
+        "\t\tdiv.arrow.request.success{background-image:url('data:image/svg+xml;base64,"
+        "PHN2ZyB3aWR0aD0iMzAiIGhlaWdodD0iMjAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAw"
+        "L3N2ZyI+PHBhdGggZD0iTTEsMSBMMjUsMSBMMjksMTAgTDI1LDE5IEwxLDE5IiBmaWxsPSIjRkZG"
+        "RkZGIiBzdHJva2U9IiMwMDgwMDAiIHN0cm9rZS13aWR0aD0iMiIvPjwvc3ZnPgo=');}\n"
+        "\t\tdiv.arrow.request.error{background-image:url('data:image/svg+xml;base64,"
+        "PHN2ZyB3aWR0aD0iMzAiIGhlaWdodD0iMjAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAw"
+        "L3N2ZyI+PHBhdGggZD0iTTEsMSBMMjUsMSBMMjksMTAgTDI1LDE5IEwxLDE5IiBmaWxsPSIjRkZG"
+        "RkZGIiBzdHJva2U9IiNDMDAwMDAiIHN0cm9rZS13aWR0aD0iMiIvPjwvc3ZnPgo=');}\n"
+        "\t\tdiv.arrow.response.success{background-image:url('data:image/svg+xml;base64,"
+        "PHN2ZyB3aWR0aD0iMzAiIGhlaWdodD0iMjAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAw"
+        "L3N2ZyI+PHBhdGggZD0iTTI5LDE5IEw1LDE5IEwxLDEwIEw1LDEgTDI5LDEiIGZpbGw9IiNGRkZG"
+        "RkYiIHN0cm9rZT0iIzAwODAwMCIgc3Ryb2tlLXdpZHRoPSIyIi8+PC9zdmc+Cg==');}\n"
+        "\t\tdiv.arrow.response.error{background-image:url('data:image/svg+xml;base64,"
+        "PHN2ZyB3aWR0aD0iMzAiIGhlaWdodD0iMjAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAw"
+        "L3N2ZyI+PHBhdGggZD0iTTI5LDE5IEw1LDE5IEwxLDEwIEw1LDEgTDI5LDEiIGZpbGw9IiNGRkZG"
+        "RkYiIHN0cm9rZT0iI0MwMDAwMCIgc3Ryb2tlLXdpZHRoPSIyIi8+PC9zdmc+Cg==');}\n"
+        "\n"
         "\t\t@media(prefers-color-scheme:dark){\n"
-        "\t\t\thtml{color:#FFFFFF;}\n"
+        "\t\t\thtml{color:#FFFFFF;--soft:#404040;}\n"
         "\t\t\tbody{background-color:#101010;}\n"
         "\t\t\tsection{background-color:#181818;}\n"
+        "\n"
+        "\t\t\tdiv.arrow.request.success{background-image:url('data:image/svg+xml;base64,"
+        "PHN2ZyB3aWR0aD0iMzAiIGhlaWdodD0iMjAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAw"
+        "L3N2ZyI+PHBhdGggZD0iTTEsMSBMMjUsMSBMMjksMTAgTDI1LDE5IEwxLDE5IiBmaWxsPSIjMTgx"
+        "ODE4IiBzdHJva2U9IiMwMDgwMDAiIHN0cm9rZS13aWR0aD0iMiIvPjwvc3ZnPgo=');}\n"
+        "\t\t\tdiv.arrow.request.error{background-image:url('data:image/svg+xml;base64,"
+        "PHN2ZyB3aWR0aD0iMzAiIGhlaWdodD0iMjAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAw"
+        "L3N2ZyI+PHBhdGggZD0iTTEsMSBMMjUsMSBMMjksMTAgTDI1LDE5IEwxLDE5IiBmaWxsPSIjMTgx"
+        "ODE4IiBzdHJva2U9IiNDMDAwMDAiIHN0cm9rZS13aWR0aD0iMiIvPjwvc3ZnPgo=');}\n"
+        "\t\t\tdiv.arrow.response.success{background-image:url('data:image/svg+xml;base64,"
+        "PHN2ZyB3aWR0aD0iMzAiIGhlaWdodD0iMjAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAw"
+        "L3N2ZyI+PHBhdGggZD0iTTI5LDE5IEw1LDE5IEwxLDEwIEw1LDEgTDI5LDEiIGZpbGw9IiMxODE4"
+        "MTgiIHN0cm9rZT0iIzAwODAwMCIgc3Ryb2tlLXdpZHRoPSIyIi8+PC9zdmc+Cg==');}\n"
+        "\t\t\tdiv.arrow.response.error{background-image:url('data:image/svg+xml;base64,"
+        "PHN2ZyB3aWR0aD0iMzAiIGhlaWdodD0iMjAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAw"
+        "L3N2ZyI+PHBhdGggZD0iTTI5LDE5IEw1LDE5IEwxLDEwIEw1LDEgTDI5LDEiIGZpbGw9IiMxODE4"
+        "MTgiIHN0cm9rZT0iI0MwMDAwMCIgc3Ryb2tlLXdpZHRoPSIyIi8+PC9zdmc+Cg==');}\n"
+        "\t\t}\n"
+        "\t\t@media(min-width:650px){\n"
+        "\t\t\tdiv.box:first-child{border-top-left-radius:4px;border-bottom-left-radius:4px;border-right:none;}\n"
+        "\t\t\tdiv.box:last-child{border-top-right-radius:4px;border-bottom-right-radius:4px;border-left:none;}\n"
+        "\t\t\tdiv.box:not(:last-child):not(:first-child){border-left:none;border-right:none;}\n"
+        "\t\t}\n"
+        "\t\t@media(max-width:650px){\n"
+        "\t\t\tsection.error-ctx{flex-direction:column;height:unset;}\n"
+        "\t\t\tdiv.box:first-child{border-top-left-radius:4px;border-top-right-radius:4px;border-bottom:none;padding-top:1em;}\n"
+        "\t\t\tdiv.box:last-child{border-bottom-right-radius:4px;border-bottom-left-radius:4px;border-top:none;padding-bottom:1em;}\n"
+        "\t\t\tdiv.box:not(:last-child):not(:first-child){border-top:none;border-bottom:none;}\n"
+        "\t\t\tdiv.arrow.response{transform:rotate(90deg);top:-10px;left:calc(33.3333%% - 22.5px);right:unset;}\n"
+        "\t\t\tdiv.arrow.request{transform:rotate(90deg);bottom:-10px;right:calc(33.3333%% - 22.5px);top:unset;}\n"
         "\t\t}\n"
         "\t</style>\n"
         "</head>\n"
@@ -190,96 +202,102 @@ static const char http_default_document[] =
         "\t<main>\n"
         "\t\t<section>\n"
         "%3$s"
-        "\t\t\t<div class=\"footer\"><a href=\"https://%7$s/\">%7$s</a> - Necronda&nbsp;web&nbsp;server&nbsp;" NECRONDA_VERSION "</div>\n"
+        "%9$s"
+        "\t\t\t<div class=\"footer\"><a href=\"https://%7$s/\">%7$s</a> - " SERVER_STR_HTML "</div>\n"
         "\t\t</section>\n"
+        "%8$s"
         "\t</main>\n"
         "</body>\n"
         "</html>\n";
 
-static const char http_error_document[] =
+const char http_rev_proxy_document[] =
+        "\t\t<section class=\"error-ctx\">\n"
+        "\t\t\t<div class=\"box%1$s\">\n"
+        "\t\t\t\t<div class=\"content\">\n"
+        "\t\t\t\t\t<span>Client</span>\n"
+        "\t\t\t\t\t<img src=\"data:image/svg+xml;base64,"
+        "PHN2ZyB3aWR0aD0iNjQiIGhlaWdodD0iNjQiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAw"
+        "L3N2ZyI+PHBhdGggZD0iTTIsMzIgYTMwLDMwLDAsMSwwLDYwLDAgYTMwLDMwLDAsMSwwLC02MCww"
+        "IEw2MiwzMiBNNiwxNiBMNTgsMTYgTTYsNDggTDU4LDQ4IE0zMiwyIEwzMiw2MiBhMTUsMzAsMCwx"
+        "LDAsMCwtNjAgYTE1LDMwLDAsMSwwLDAsNjAgWiIgc3Ryb2tlPSIjMDA4MDAwIiBzdHJva2Utd2lk"
+        "dGg9IjIiIGZpbGw9IiMwMDAwMDAwMCIvPjwvc3ZnPgo=\"/>\n"
+        "\t\t\t\t\t<span>Your Browser</span>\n"
+        "\t\t\t\t</div>\n"
+        "\t\t\t\t<div class=\"arrow request%2$s\"></div>\n"
+        "\t\t\t</div>\n"
+        "\t\t\t<div class=\"border%8$s\"></div>\n"
+        "\t\t\t<div class=\"box%3$s\">\n"
+        "\t\t\t\t<div class=\"content\">\n"
+        "\t\t\t\t\t<span>Reverse Proxy</span>\n"
+        "\t\t\t\t\t<h3>%10$03i</h3>\n"
+        "\t\t\t\t\t<h4>%11$s</h4>\n"
+        "\t\t\t\t\t<span>" SERVER_NAME "</span>\n"
+        "\t\t\t\t</div>\n"
+        "\t\t\t\t<div class=\"arrow request%4$s\"></div>\n"
+        "\t\t\t\t<div class=\"arrow response%5$s\"></div>\n"
+        "\t\t\t</div>\n"
+        "\t\t\t<div class=\"border%9$s\"></div>\n"
+        "\t\t\t<div class=\"box%6$s\">\n"
+        "\t\t\t\t<div class=\"content\">\n"
+        "\t\t\t\t\t<span>Server</span>\n"
+        "\t\t\t\t\t<h3>%12$s</h3>\n"
+        "\t\t\t\t\t<h4>%13$s</h4>\n"
+        "\t\t\t\t\t<span>%14$s</span>\n"
+        "\t\t\t\t</div>\n"
+        "\t\t\t\t<div class=\"arrow response%7$s\"></div>\n"
+        "\t\t\t</div>\n"
+        "\t\t</section>\n";
+
+const char http_error_document[] =
         "\t\t\t<h1>%1$i</h1>\n"
         "\t\t\t<h2>%2$s :&#xFEFF;(</h2>\n"
         "\t\t\t<p>%3$s</p>\n"
         "\t\t\t<p>%4$s</p>\n";
 
-static const char http_error_icon[] =
+const char http_error_icon[] =
         "\t<link rel=\"alternate icon\" type=\"image/svg+xml\" sizes=\"any\" href=\"data:image/svg+xml;base64,"
         "PHN2ZyB3aWR0aD0iMTYiIGhlaWdodD0iMTYiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAw"
         "L3N2ZyI+PHRleHQgeD0iNCIgeT0iMTIiIGZpbGw9IiNDMDAwMDAiIHN0eWxlPSJmb250LWZhbWls"
         "eTonQXJpYWwnLHNhbnMtc2VyaWYiPjooPC90ZXh0Pjwvc3ZnPgo=\"/>\n";
 
 
-static const char http_warning_document[] =
+const char http_warning_document[] =
-        "\t\t\t<h1>%1$i</h1>\n"
-        "\t\t\t<h2>%2$s :&#xFEFF;o</h2>\n"
-        "\t\t\t<p>%3$s</p>\n"
-        "\t\t\t<p>%4$s</p>\n";
-
-static const char http_warning_icon[] =
-        "\t<link rel=\"alternate icon\" type=\"image/svg+xml\" sizes=\"any\" href=\"data:image/svg+xml;base64,"
-        "PHN2ZyB3aWR0aD0iMTYiIGhlaWdodD0iMTYiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAw"
-        "L3N2ZyI+PHRleHQgeD0iNCIgeT0iMTIiIGZpbGw9IiNFMEMwMDAiIHN0eWxlPSJmb250LWZhbWls"
-        "eTonQXJpYWwnLHNhbnMtc2VyaWYiPjpvPC90ZXh0Pjwvc3ZnPgo=\"/>\n";
-
-
-static const char http_success_document[] =
         "\t\t\t<h1>%1$i</h1>\n"
         "\t\t\t<h2>%2$s :&#xFEFF;)</h2>\n"
         "\t\t\t<p>%3$s</p>\n"
         "\t\t\t<p>%4$s</p>\n";
 
-static const char http_success_icon[] =
+const char http_warning_icon[] =
+        "\t<link rel=\"alternate icon\" type=\"image/svg+xml\" sizes=\"any\" href=\"data:image/svg+xml;base64,"
+        "PHN2ZyB3aWR0aD0iMTYiIGhlaWdodD0iMTYiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAw"
+        "L3N2ZyI+PHRleHQgeD0iNCIgeT0iMTIiIGZpbGw9IiNFMEMwMDAiIHN0eWxlPSJmb250LWZhbWls"
+        "eTonQXJpYWwnLHNhbnMtc2VyaWYiPjopPC90ZXh0Pjwvc3ZnPgo=\"/>\n";
+
+
+const char http_success_document[] =
+        "\t\t\t<h1>%1$i</h1>\n"
+        "\t\t\t<h2>%2$s :&#xFEFF;)</h2>\n"
+        "\t\t\t<p>%3$s</p>\n"
+        "\t\t\t<p>%4$s</p>\n";
+
+const char http_success_icon[] =
         "\t<link rel=\"alternate icon\" type=\"image/svg+xml\" sizes=\"any\" href=\"data:image/svg+xml;base64,"
         "PHN2ZyB3aWR0aD0iMTYiIGhlaWdodD0iMTYiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAw"
         "L3N2ZyI+PHRleHQgeD0iNCIgeT0iMTIiIGZpbGw9IiMwMDgwMDAiIHN0eWxlPSJmb250LWZhbWls"
         "eTonQXJpYWwnLHNhbnMtc2VyaWYiPjopPC90ZXh0Pjwvc3ZnPgo=\"/>\n";
 
 
-static const char http_info_document[] =
+const char http_info_document[] =
         "\t\t\t<h1>%1$i</h1>\n"
         "\t\t\t<h2>%2$s :&#xFEFF;)</h2>\n"
         "\t\t\t<p>%3$s</p>\n"
         "\t\t\t<p>%4$s</p>\n";
 
-static const char http_info_icon[] =
+const char http_info_icon[] =
         "\t<link rel=\"alternate icon\" type=\"image/svg+xml\" sizes=\"any\" href=\"data:image/svg+xml;base64,"
         "PHN2ZyB3aWR0aD0iMTYiIGhlaWdodD0iMTYiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAw"
         "L3N2ZyI+PHRleHQgeD0iNCIgeT0iMTIiIGZpbGw9IiM2MDYwNjAiIHN0eWxlPSJmb250LWZhbWls"
         "eTonQXJpYWwnLHNhbnMtc2VyaWYiPjopPC90ZXh0Pjwvc3ZnPgo=\"/>\n";
 
-
+const int http_statuses_size = sizeof(http_statuses);
-void http_to_camel_case(char *str, int mode);
+const int http_status_messages_size = sizeof(http_status_messages);
-
-void http_free_hdr(http_hdr *hdr);
-
-void http_free_req(http_req *req);
-
-void http_free_res(http_res *res);
-
-int http_receive_request(sock *client, http_req *req);
-
-int http_parse_header_field(http_hdr *hdr, const char *buf, const char *end_ptr) ;
-
-char *http_get_header_field(const http_hdr *hdr, const char *field_name);
-
-void http_add_header_field(http_hdr *hdr, const char *field_name, const char *field_value);
-
-void http_remove_header_field(http_hdr *hdr, const char *field_name, int mode);
-
-int http_send_response(sock *client, http_res *res);
-
-int http_send_request(sock *server, http_req *req);
-
-const http_status *http_get_status(unsigned short status_code);
-
-const http_status_msg *http_get_error_msg(const http_status *status);
-
-const char *http_get_status_color(const http_status *status);
-
-char *http_format_date(time_t time, char *buf, size_t size);
-
-char *http_get_date(char *buf, size_t size);
-
-const http_doc_info *http_get_status_info(const http_status *status);
-
-#endif //NECRONDA_SERVER_HTTP_H

src/lib/include/fastcgi.h

@@ -1,48 +1,12 @@
 /**
  * Necronda Web Server
- * FastCGI interface implementation (header file)
+ * FastCGI header file
- * src/fastcgi.h
+ * src/lib/include/fastcgi.h
- * Lorenz Stechauner, 2020-12-26
+ * Lorenz Stechauner, 2021-05-03
  */
 
-#ifndef NECRONDA_SERVER_FASTCGI_H
+#ifndef NECRONDA_SERVER_EXTERN_FASTCGI_H
-#define NECRONDA_SERVER_FASTCGI_H
+#define NECRONDA_SERVER_EXTERN_FASTCGI_H
-
-#define FASTCGI_CHUNKED 1
-#define FASTCGI_COMPRESS 2
-
-#include "necronda-server.h"
-#include "http.h"
-#include "uri.h"
-#include "client.h"
-
-#include <sys/un.h>
-#include <zlib.h>
-
-
-typedef struct {
-    int socket;
-    unsigned short req_id;
-    char *out_buf;
-    unsigned short out_len;
-    unsigned short out_off;
-} fastcgi_conn;
-
-char *fastcgi_add_param(char *buf, const char *key, const char *value);
-
-int fastcgi_init(fastcgi_conn *conn, unsigned int client_num, unsigned int req_num, const sock *client,
-                 const http_req *req, const http_uri *uri);
-
-int fastcgi_close_stdin(fastcgi_conn *conn);
-
-int fastcgi_php_error(const char *msg, int msg_len, char *err_msg);
-
-int fastcgi_header(fastcgi_conn *conn, http_res *res, char *err_msg);
-
-int fastcgi_send(fastcgi_conn *conn, sock *client, int flags);
-
-int fastcgi_receive(fastcgi_conn *conn, sock *client, unsigned long len);
-
 
 /*
  * Listening socket file number
@@ -155,4 +119,4 @@ typedef struct {
     FCGI_UnknownTypeBody body;
 } FCGI_UnknownTypeRecord;
 
-#endif //NECRONDA_SERVER_FASTCGI_H
+#endif //NECRONDA_SERVER_EXTERN_FASTCGI_H

src/lib/rev_proxy.c

@@ -1,16 +1,33 @@
 /**
  * Necronda Web Server
  * Reverse proxy
- * src/rev_proxy.c
+ * src/lib/rev_proxy.c
  * Lorenz Stechauner, 2021-01-07
  */
 
 #include "rev_proxy.h"
+#include "utils.h"
+#include "compress.h"
+#include "../necronda-server.h"
+#include <openssl/ssl.h>
+#include <string.h>
+#include <errno.h>
+#include <openssl/err.h>
+#include <arpa/inet.h>
+#include <sys/time.h>
 
 sock rev_proxy;
 char *rev_proxy_host = NULL;
 struct timeval server_timeout = {.tv_sec = SERVER_TIMEOUT, .tv_usec = 0};
 
+int rev_proxy_preload() {
+    rev_proxy.buf = NULL;
+    rev_proxy.buf_len = 0;
+    rev_proxy.buf_off = 0;
+    rev_proxy.ctx = SSL_CTX_new(TLS_client_method());
+    return 0;
+}
+
 int rev_proxy_request_header(http_req *req, int enc) {
     char buf1[256];
     char buf2[256];
@@ -19,7 +36,7 @@ int rev_proxy_request_header(http_req *req, int enc) {
     http_add_header_field(&req->hdr, "Connection", "keep-alive");
 
     char *via = http_get_header_field(&req->hdr, "Via");
-    sprintf(buf1, "HTTP/%s %s", req->version, DEFAULT_HOST);
+    sprintf(buf1, "HTTP/%s %s", req->version, SERVER_NAME);
     if (via == NULL) {
         http_add_header_field(&req->hdr, "Via", buf1);
     } else {
@@ -117,7 +134,7 @@ int rev_proxy_response_header(http_req *req, http_res *res) {
     int p_len;
 
     char *via = http_get_header_field(&res->hdr, "Via");
-    p_len = snprintf(buf1, sizeof(buf1), "HTTP/%s %s", req->version, DEFAULT_HOST);
+    p_len = snprintf(buf1, sizeof(buf1), "HTTP/%s %s", req->version, SERVER_NAME);
     if (p_len < 0 || p_len >= sizeof(buf1)) {
         print(ERR_STR "Appended part of header field 'Via' too long" CLR_STR);
         return -1;
@@ -137,8 +154,8 @@ int rev_proxy_response_header(http_req *req, http_res *res) {
     return 0;
 }
 
-int rev_proxy_init(http_req *req, http_res *res, host_config *conf, sock *client, http_status *custom_status,
+int rev_proxy_init(http_req *req, http_res *res, http_status_ctx *ctx, host_config *conf, sock *client,
-                   char *err_msg) {
+                   http_status *custom_status, char *err_msg) {
     char buffer[CHUNK_SIZE];
     long ret;
     int tries = 0;
@@ -160,27 +177,27 @@ int rev_proxy_init(http_req *req, http_res *res, host_config *conf, sock *client
     if (rev_proxy.socket  < 0) {
         print(ERR_STR "Unable to create socket: %s" CLR_STR, strerror(errno));
         res->status = http_get_status(500);
+        ctx->origin = INTERNAL;
         return -1;
     }
 
-    server_timeout.tv_sec = SERVER_TIMEOUT;
+    server_timeout.tv_sec = SERVER_TIMEOUT_INIT;
     server_timeout.tv_usec = 0;
-    if (setsockopt(client->socket, SOL_SOCKET, SO_RCVTIMEO, &server_timeout, sizeof(server_timeout)) < 0)
+    if (setsockopt(rev_proxy.socket, SOL_SOCKET, SO_RCVTIMEO, &server_timeout, sizeof(server_timeout)) < 0)
+        goto rev_proxy_timeout_err;
+    if (setsockopt(rev_proxy.socket, SOL_SOCKET, SO_SNDTIMEO, &server_timeout, sizeof(server_timeout)) < 0)
         goto rev_proxy_timeout_err;
-    if (setsockopt(client->socket, SOL_SOCKET, SO_SNDTIMEO, &server_timeout, sizeof(server_timeout)) < 0) {
-        rev_proxy_timeout_err:
-        res->status = http_get_status(502);
-        print(ERR_STR "Unable to set timeout for socket: %s" CLR_STR, strerror(errno));
-        sprintf(err_msg, "Unable to set timeout for socket: %s", strerror(errno));
-        goto proxy_err;
-    }
 
-    struct hostent *host_ent = gethostbyname(conf->rev_proxy.hostname);
+    struct hostent *host_ent = gethostbyname2(conf->rev_proxy.hostname, AF_INET6);
     if (host_ent == NULL) {
-        res->status = http_get_status(502);
+        host_ent = gethostbyname2(conf->rev_proxy.hostname, AF_INET);
-        print(ERR_STR "Unable to connect to server: Name or service not known" CLR_STR);
+        if (host_ent == NULL) {
-        sprintf(err_msg, "Unable to connect to server: Name or service not known.");
+            res->status = http_get_status(503);
-        goto proxy_err;
+            ctx->origin = SERVER_REQ;
+            print(ERR_STR "Unable to connect to server: Name or service not known" CLR_STR);
+            sprintf(err_msg, "Unable to connect to server: Name or service not known.");
+            goto proxy_err;
+        }
     }
 
     struct sockaddr_in6 address = {.sin6_family = AF_INET6, .sin6_port = htons(conf->rev_proxy.port)};
@@ -192,13 +209,38 @@ int rev_proxy_init(http_req *req, http_res *res, host_config *conf, sock *client
         memcpy(&address.sin6_addr, addr, 16);
     }
 
+    inet_ntop(address.sin6_family, (void *) &address.sin6_addr, buffer, sizeof(buffer));
+
+    print(BLUE_STR "Connecting to " BLD_STR "[%s]:%i" CLR_STR BLUE_STR "..." CLR_STR, buffer, conf->rev_proxy.port);
     if (connect(rev_proxy.socket, (struct sockaddr *) &address, sizeof(address)) < 0) {
-        res->status = http_get_status(502);
+        if (errno == ETIMEDOUT || errno == EINPROGRESS) {
-        print(ERR_STR "Unable to connect to server: %s" CLR_STR, strerror(errno));
+            res->status = http_get_status(504);
+            ctx->origin = SERVER_REQ;
+        } else if (errno == ECONNREFUSED) {
+            res->status = http_get_status(503);
+            ctx->origin = SERVER_REQ;
+        } else {
+            res->status = http_get_status(500);
+            ctx->origin = INTERNAL;
+        }
+        print(ERR_STR "Unable to connect to [%s]:%i: %s" CLR_STR, buffer, conf->rev_proxy.port, strerror(errno));
         sprintf(err_msg, "Unable to connect to server: %s.", strerror(errno));
         goto proxy_err;
     }
 
+    server_timeout.tv_sec = SERVER_TIMEOUT;
+    server_timeout.tv_usec = 0;
+    if (setsockopt(rev_proxy.socket, SOL_SOCKET, SO_RCVTIMEO, &server_timeout, sizeof(server_timeout)) < 0)
+        goto rev_proxy_timeout_err;
+    if (setsockopt(rev_proxy.socket, SOL_SOCKET, SO_SNDTIMEO, &server_timeout, sizeof(server_timeout)) < 0) {
+        rev_proxy_timeout_err:
+        res->status = http_get_status(500);
+        ctx->origin = INTERNAL;
+        print(ERR_STR "Unable to set timeout for reverse proxy socket: %s" CLR_STR, strerror(errno));
+        sprintf(err_msg, "Unable to set timeout for reverse proxy socket: %s", strerror(errno));
+        goto proxy_err;
+    }
+
     if (conf->rev_proxy.enc) {
         rev_proxy.ssl = SSL_new(rev_proxy.ctx);
         SSL_set_fd(rev_proxy.ssl, rev_proxy.socket);
@@ -211,6 +253,7 @@ int rev_proxy_init(http_req *req, http_res *res, host_config *conf, sock *client
         rev_proxy.enc = 1;
         if (ret < 0) {
             res->status = http_get_status(502);
+            ctx->origin = SERVER_REQ;
             print(ERR_STR "Unable to perform handshake: %s" CLR_STR, sock_strerror(&rev_proxy));
             sprintf(err_msg, "Unable to perform handshake: %s.", sock_strerror(&rev_proxy));
             goto proxy_err;
@@ -218,19 +261,20 @@ int rev_proxy_init(http_req *req, http_res *res, host_config *conf, sock *client
     }
 
     rev_proxy_host = conf->name;
-    inet_ntop(address.sin6_family, (void *) &address.sin6_addr, buffer, sizeof(buffer));
     print(BLUE_STR "Established new connection with " BLD_STR "[%s]:%i" CLR_STR, buffer, conf->rev_proxy.port);
 
     rev_proxy:
     ret = rev_proxy_request_header(req, (int) client->enc);
     if (ret != 0) {
         res->status = http_get_status(500);
+        ctx->origin = INTERNAL;
         return -1;
     }
 
     ret = http_send_request(&rev_proxy, req);
     if (ret < 0) {
         res->status = http_get_status(502);
+        ctx->origin = SERVER_REQ;
         print(ERR_STR "Unable to send request to server (1): %s" CLR_STR, sock_strerror(&rev_proxy));
         sprintf(err_msg, "Unable to send request to server: %s.", sock_strerror(&rev_proxy));
         retry = tries < 4;
@@ -248,6 +292,7 @@ int rev_proxy_init(http_req *req, http_res *res, host_config *conf, sock *client
             ret = sock_send(&rev_proxy, client->buf, len, 0);
             if (ret <= 0) {
                 res->status = http_get_status(502);
+                ctx->origin = SERVER_REQ;
                 print(ERR_STR "Unable to send request to server (2): %s" CLR_STR, sock_strerror(&rev_proxy));
                 sprintf(err_msg, "Unable to send request to server: %s.", sock_strerror(&rev_proxy));
                 retry = tries < 4;
@@ -260,16 +305,19 @@ int rev_proxy_init(http_req *req, http_res *res, host_config *conf, sock *client
             if (ret <= 0) {
                 if (ret == -1) {
                     res->status = http_get_status(502);
+                    ctx->origin = SERVER_REQ;
                     print(ERR_STR "Unable to send request to server (3): %s" CLR_STR, sock_strerror(&rev_proxy));
                     sprintf(err_msg, "Unable to send request to server: %s.", sock_strerror(&rev_proxy));
                     goto proxy_err;
                 } else if (ret == -2) {
                     res->status = http_get_status(400);
+                    ctx->origin = CLIENT_REQ;
                     print(ERR_STR "Unable to receive request from client: %s" CLR_STR, sock_strerror(client));
                     sprintf(err_msg, "Unable to receive request from client: %s.", sock_strerror(client));
                     return -1;
                 }
                 res->status = http_get_status(500);
+                ctx->origin = INTERNAL;
                 print(ERR_STR "Unknown Error" CLR_STR);
                 return -1;
             }
@@ -278,7 +326,16 @@ int rev_proxy_init(http_req *req, http_res *res, host_config *conf, sock *client
 
     ret = sock_recv(&rev_proxy, buffer, sizeof(buffer), MSG_PEEK);
     if (ret <= 0) {
-        res->status = http_get_status(502);
+        int enc_err = sock_enc_error(&rev_proxy);
+        if (errno == EAGAIN || errno == EINPROGRESS || enc_err == SSL_ERROR_WANT_READ ||
+            enc_err == SSL_ERROR_WANT_WRITE)
+        {
+            res->status = http_get_status(504);
+            ctx->origin = SERVER_RES;
+        } else {
+            res->status = http_get_status(502);
+            ctx->origin = SERVER_RES;
+        }
         print(ERR_STR "Unable to receive response from server: %s" CLR_STR, sock_strerror(&rev_proxy));
         sprintf(err_msg, "Unable to receive response from server: %s.", sock_strerror(&rev_proxy));
         goto proxy_err;
@@ -289,6 +346,7 @@ int rev_proxy_init(http_req *req, http_res *res, host_config *conf, sock *client
 
     if (header_len <= 0) {
         res->status = http_get_status(502);
+        ctx->origin = SERVER_RES;
         print(ERR_STR "Unable to parse header: End of header not found" CLR_STR);
         sprintf(err_msg, "Unable to parser header: End of header not found.");
         goto proxy_err;
@@ -297,6 +355,7 @@ int rev_proxy_init(http_req *req, http_res *res, host_config *conf, sock *client
     for (int i = 0; i < header_len; i++) {
         if ((buf[i] >= 0x00 && buf[i] <= 0x1F && buf[i] != '\r' && buf[i] != '\n') || buf[i] == 0x7F) {
             res->status = http_get_status(502);
+            ctx->origin = SERVER_RES;
             print(ERR_STR "Unable to parse header: Header contains illegal characters" CLR_STR);
             sprintf(err_msg, "Unable to parse header: Header contains illegal characters.");
             goto proxy_err;
@@ -308,6 +367,7 @@ int rev_proxy_init(http_req *req, http_res *res, host_config *conf, sock *client
         char *pos0 = strstr(ptr, "\r\n");
         if (pos0 == NULL) {
             res->status = http_get_status(502);
+            ctx->origin = SERVER_RES;
             print(ERR_STR "Unable to parse header: Invalid header format" CLR_STR);
             sprintf(err_msg, "Unable to parse header: Invalid header format.");
             goto proxy_err;
@@ -315,6 +375,7 @@ int rev_proxy_init(http_req *req, http_res *res, host_config *conf, sock *client
         if (ptr == buf) {
             if (strncmp(ptr, "HTTP/", 5) != 0) {
                 res->status = http_get_status(502);
+                ctx->origin = SERVER_RES;
                 print(ERR_STR "Unable to parse header: Invalid header format" CLR_STR);
                 sprintf(err_msg, "Unable to parse header: Invalid header format.");
                 goto proxy_err;
@@ -324,10 +385,12 @@ int rev_proxy_init(http_req *req, http_res *res, host_config *conf, sock *client
             if (res->status == NULL && status_code >= 100 && status_code <= 999) {
                 custom_status->code = status_code;
                 strcpy(custom_status->type, "");
-                strncpy(custom_status->msg, ptr + 13, strchr(ptr, '\r') - ptr - 13);
+                snprintf(custom_status->msg, sizeof(custom_status->msg), "%.*s",
+                         (int) (strchr(ptr, '\r') - ptr - 13), ptr + 13);
                 res->status = custom_status;
             } else if (res->status == NULL) {
                 res->status = http_get_status(502);
+                ctx->origin = SERVER_RES;
                 print(ERR_STR "Unable to parse header: Invalid or unknown status code" CLR_STR);
                 sprintf(err_msg, "Unable to parse header: Invalid or unknown status code.");
                 goto proxy_err;
@@ -336,6 +399,7 @@ int rev_proxy_init(http_req *req, http_res *res, host_config *conf, sock *client
             ret = http_parse_header_field(&res->hdr, ptr, pos0);
             if (ret != 0) {
                 res->status = http_get_status(502);
+                ctx->origin = SERVER_RES;
                 print(ERR_STR "Unable to parse header" CLR_STR);
                 sprintf(err_msg, "Unable to parse header.");
                 goto proxy_err;
@@ -351,6 +415,7 @@ int rev_proxy_init(http_req *req, http_res *res, host_config *conf, sock *client
     ret = rev_proxy_response_header(req, res);
     if (ret != 0) {
         res->status = http_get_status(500);
+        ctx->origin = INTERNAL;
         return -1;
     }
 
@@ -361,46 +426,116 @@ int rev_proxy_init(http_req *req, http_res *res, host_config *conf, sock *client
     return -1;
 }
 
-int rev_proxy_send(sock *client, int chunked, unsigned long len_to_send) {
+int rev_proxy_send(sock *client, unsigned long len_to_send, int flags) {
+    // TODO handle websockets
     long ret;
     char buffer[CHUNK_SIZE];
+    char comp_out[CHUNK_SIZE];
+    char buf[256];
     long len, snd_len;
-    // TODO handle websockets
+    int finish_comp = 0;
+    char *ptr;
+
+    compress_ctx comp_ctx;
+    if (flags & REV_PROXY_COMPRESS_BR) {
+        flags &= ~REV_PROXY_COMPRESS_GZ;
+        if (compress_init(&comp_ctx, COMPRESS_BR) != 0) {
+            print(ERR_STR "Unable to init brotli: %s" CLR_STR, strerror(errno));
+            flags &= ~REV_PROXY_COMPRESS_BR;
+        }
+    } else if (flags & REV_PROXY_COMPRESS_GZ) {
+        flags &= ~REV_PROXY_COMPRESS_BR;
+        if (compress_init(&comp_ctx, COMPRESS_GZ) != 0) {
+            print(ERR_STR "Unable to init gzip: %s" CLR_STR, strerror(errno));
+            flags &= ~REV_PROXY_COMPRESS_GZ;
+        }
+    }
+
     do {
-        if (chunked) {
+        snd_len = 0;
+        if (flags & REV_PROXY_CHUNKED) {
+            char *pos;
             ret = sock_recv(&rev_proxy, buffer, 16, MSG_PEEK);
-            if (ret <= 0) {
+            if (ret <= 0) goto err0;
-                print("Unable to receive: %s", sock_strerror(&rev_proxy));
-                break;
-            }
 
             len_to_send = strtol(buffer, NULL, 16);
-            char *pos = strstr(buffer, "\r\n");
+            pos = strstr(buffer, "\r\n");
             len = pos - buffer + 2;
-            ret = sock_send(client, buffer, len, 0);
-
             sock_recv(&rev_proxy, buffer, len, 0);
-            if (ret <= 0) break;
-        }
-        snd_len = 0;
-        while (snd_len < len_to_send) {
-            len = sock_recv(&rev_proxy, buffer, CHUNK_SIZE < (len_to_send - snd_len) ? CHUNK_SIZE : len_to_send - snd_len, 0);
-            ret = sock_send(client, buffer, len, 0);
             if (ret <= 0) {
-                print(ERR_STR "Unable to send: %s" CLR_STR, sock_strerror(client));
+                err0:
+                print("Unable to receive from server: %s", sock_strerror(&rev_proxy));
                 break;
             }
-            snd_len += ret;
+
+            if (len_to_send == 0 && (flags & REV_PROXY_COMPRESS)) {
+                finish_comp = 1;
+                len = 0;
+                goto out;
+                finish:
+                compress_free(&comp_ctx);
+            }
+        }
+        while (snd_len < len_to_send) {
+            unsigned long avail_in, avail_out;
+            ret = sock_recv(&rev_proxy, buffer, CHUNK_SIZE < (len_to_send - snd_len) ? CHUNK_SIZE : len_to_send - snd_len, 0);
+            if (ret <= 0) {
+                print("Unable to receive from server: %s", sock_strerror(&rev_proxy));
+                break;
+            }
+            len = ret;
+            ptr = buffer;
+            out:
+            avail_in = len;
+            void *next_in = ptr;
+            do {
+                long buf_len = len;
+                if (flags & REV_PROXY_COMPRESS) {
+                    avail_out = sizeof(comp_out);
+                    compress_compress(&comp_ctx, next_in + len - avail_in, &avail_in, comp_out, &avail_out,
+                                      finish_comp);
+                    ptr = comp_out;
+                    buf_len = (int) (sizeof(comp_out) - avail_out);
+                    snd_len += (long) (len - avail_in);
+                }
+                if (buf_len != 0) {
+                    len = sprintf(buf, "%lX\r\n", buf_len);
+                    ret = 1;
+                    if (flags & REV_PROXY_CHUNKED) ret = sock_send(client, buf, len, 0);
+                    if (ret <= 0) goto err;
+                    ret = sock_send(client, ptr, buf_len, 0);
+                    if (ret <= 0) goto err;
+                    if (!(flags & REV_PROXY_COMPRESS)) snd_len += ret;
+                    if (flags & REV_PROXY_CHUNKED) ret = sock_send(client, "\r\n", 2, 0);
+                    if (ret <= 0) {
+                        err:
+                        print(ERR_STR "Unable to send: %s" CLR_STR, sock_strerror(client));
+                        break;
+                    }
+                }
+            } while ((flags & REV_PROXY_COMPRESS) && (avail_in != 0 || avail_out != sizeof(comp_out)));
+            if (ret <= 0) break;
+            if (finish_comp) goto finish;
         }
         if (ret <= 0) break;
-        if (chunked) {
+        if (flags & REV_PROXY_CHUNKED) sock_recv(&rev_proxy, buffer, 2, 0);
-            sock_recv(&rev_proxy, buffer, 2, 0);
+    } while ((flags & REV_PROXY_CHUNKED) && len_to_send > 0);
-            ret = sock_send(client, "\r\n", 2, 0);
+
-            if (ret <= 0) {
+    if (ret <= 0) return (int) -1;
-                print(ERR_STR "Unable to send: %s" CLR_STR, sock_strerror(client));
+
-                break;
+    if (flags & REV_PROXY_CHUNKED) {
-            }
+        ret = sock_send(client, "0\r\n\r\n", 5, 0);
+        if (ret <= 0) {
+            print(ERR_STR "Unable to send: %s" CLR_STR, sock_strerror(client));
+            return -1;
         }
-    } while (chunked && len_to_send > 0);
+    }
+
+    return 0;
+}
+
+int rev_proxy_dump(char *buf, long len) {
+    sock_recv(&rev_proxy, buf, len, 0);
+    sock_close(&rev_proxy);
     return 0;
 }

src/lib/rev_proxy.h

@@ -0,0 +1,38 @@
+/**
+ * Necronda Web Server
+ * Reverse proxy (header file)
+ * src/lib/rev_proxy.h
+ * Lorenz Stechauner, 2021-01-07
+ */
+
+#ifndef NECRONDA_SERVER_REV_PROXY_H
+#define NECRONDA_SERVER_REV_PROXY_H
+
+#define REV_PROXY_CHUNKED 1
+#define REV_PROXY_COMPRESS_GZ 2
+#define REV_PROXY_COMPRESS_BR 4
+#define REV_PROXY_COMPRESS 6
+
+#ifndef SERVER_NAME
+#   define SERVER_NAME "revproxy"
+#endif
+
+#include "http.h"
+#include "config.h"
+
+extern sock rev_proxy;
+
+int rev_proxy_preload();
+
+int rev_proxy_request_header(http_req *req, int enc);
+
+int rev_proxy_response_header(http_req *req, http_res *res);
+
+int rev_proxy_init(http_req *req, http_res *res, http_status_ctx *ctx, host_config *conf, sock *client,
+                   http_status *custom_status, char *err_msg);
+
+int rev_proxy_send(sock *client, unsigned long len_to_send, int flags);
+
+int rev_proxy_dump(char *buf, long len);
+
+#endif //NECRONDA_SERVER_REV_PROXY_H

src/lib/sock.c

@@ -1,11 +1,20 @@
 /**
  * Necronda Web Server
  * Basic TCP and TLS socket
- * src/sock.c
+ * src/lib/sock.c
  * Lorenz Stechauner, 2021-01-07
  */
 
 #include "sock.h"
+#include <openssl/err.h>
+#include <openssl/ssl.h>
+#include <string.h>
+#include <sys/socket.h>
+#include <unistd.h>
+
+int sock_enc_error(sock *s) {
+    return (int) s->enc ? SSL_get_error(s->ssl, (int) s->_last_ret) : 0;
+}
 
 const char *sock_strerror(sock *s) {
     if (s->_last_ret == 0) {
@@ -16,7 +25,7 @@ const char *sock_strerror(sock *s) {
         }
         const char *err1 = ERR_reason_error_string(s->_ssl_error);
         const char *err2 = strerror(errno);
-        switch (SSL_get_error(s->ssl, (int) s->_last_ret)) {
+        switch (sock_enc_error(s)) {
             case SSL_ERROR_NONE:
                 return NULL;
             case SSL_ERROR_ZERO_RETURN:
@@ -47,12 +56,12 @@ long sock_send(sock *s, void *buf, unsigned long len, int flags) {
     long ret;
     if (s->enc) {
         ret = SSL_write(s->ssl, buf, (int) len);
+        s->_ssl_error = ERR_get_error();
     } else {
         ret = send(s->socket, buf, len, flags);
     }
     s->_last_ret = ret;
     s->_errno = errno;
-    s->_ssl_error = ERR_get_error();
     return ret >= 0 ? ret : -1;
 }
 
@@ -64,12 +73,12 @@ long sock_recv(sock *s, void *buf, unsigned long len, int flags) {
         } else {
             ret = SSL_read(s->ssl, buf, (int) len);
         }
+        s->_ssl_error = ERR_get_error();
     } else {
         ret = recv(s->socket, buf, len, flags);
     }
     s->_last_ret = ret;
     s->_errno = errno;
-    s->_ssl_error = ERR_get_error();
     return ret >= 0 ? ret : -1;
 }
 
@@ -92,14 +101,14 @@ long sock_splice(sock *dst, sock *src, void *buf, unsigned long buf_len, unsigne
 
 int sock_close(sock *s) {
     if ((int) s->enc && s->ssl != NULL) {
-        SSL_shutdown(s->ssl);
+        if (s->_last_ret >= 0) SSL_shutdown(s->ssl);
         SSL_free(s->ssl);
+        s->ssl = NULL;
     }
     shutdown(s->socket, SHUT_RDWR);
     close(s->socket);
     s->socket = 0;
     s->enc = 0;
-    s->ssl = NULL;
     return 0;
 }
 

src/lib/sock.h

@@ -1,19 +1,14 @@
 /**
  * Necronda Web Server
  * Basic TCP and TLS socket (header file)
- * src/sock.h
+ * src/lib/sock.h
  * Lorenz Stechauner, 2021-01-07
  */
 
 #ifndef NECRONDA_SERVER_SOCK_H
 #define NECRONDA_SERVER_SOCK_H
 
-#include <openssl/err.h>
+#include <openssl/crypto.h>
-#include <openssl/pem.h>
-#include <openssl/ssl.h>
-#include <openssl/conf.h>
-#include <openssl/engine.h>
-#include <openssl/dh.h>
 
 typedef struct {
     unsigned int enc:1;
@@ -28,6 +23,8 @@ typedef struct {
     unsigned long _ssl_error;
 } sock;
 
+int sock_enc_error(sock *s);
+
 const char *sock_strerror(sock *s);
 
 long sock_send(sock *s, void *buf, unsigned long len, int flags);

src/lib/uri.c

@@ -1,12 +1,14 @@
 /**
  * Necronda Web Server
  * URI and path handlers
- * src/uri.c
+ * src/lib/uri.c
  * Lorenz Stechauner, 2020-12-13
  */
 
 #include "uri.h"
-
+#include "utils.h"
+#include <stdlib.h>
+#include <string.h>
 
 int path_is_directory(const char *path) {
     struct stat statbuf;
@@ -28,6 +30,7 @@ int uri_init(http_uri *uri, const char *webroot, const char *uri_str, int dir_mo
     char buf1[1024];
     char buf2[1024];
     char buf3[1024];
+    char buf4[1024];
     int p_len;
     uri->webroot = NULL;
     uri->req_path = NULL;
@@ -51,12 +54,12 @@ int uri_init(http_uri *uri, const char *webroot, const char *uri_str, int dir_mo
     } else {
         query[0] = 0;
         query++;
-        ssize_t size = strlen(query) + 1;
+        long size = (long) strlen(query) + 1;
         uri->query = malloc(size);
         strcpy(uri->query, query);
     }
 
-    ssize_t size = strlen(uri_str) + 1;
+    long size = (long) strlen(uri_str) + 1;
     uri->req_path = malloc(size);
     url_decode(uri_str, uri->req_path, &size);
     if (query != NULL) {
@@ -66,7 +69,7 @@ int uri_init(http_uri *uri, const char *webroot, const char *uri_str, int dir_mo
         return 2;
     }
 
-    size = strlen(uri->req_path) + 1;
+    size = (long) strlen(uri->req_path) + 1;
     uri->path = malloc(size);
     uri->pathinfo = malloc(size);
 
@@ -97,50 +100,61 @@ int uri_init(http_uri *uri, const char *webroot, const char *uri_str, int dir_mo
 
     while (1) {
         sprintf(buf0, "%s%s", uri->webroot, uri->path);
-        p_len = snprintf(buf1, sizeof(buf1), "%s.php", buf0);
+        p_len = snprintf(buf1, sizeof(buf1), "%s.ncr", buf0);
         if (p_len < 0 || p_len >= sizeof(buf1)) return -1;
-        p_len = snprintf(buf2, sizeof(buf2), "%s.html", buf0);
+        p_len = snprintf(buf2, sizeof(buf2), "%s.php", buf0);
         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 || 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) ||
+            path_is_file(buf3)) {
             break;
         }
 
         char *ptr;
         parent_dir:
         ptr = strrchr(uri->path, '/');
-        size = strlen(ptr);
+        size = (long) strlen(ptr);
-        sprintf(buf3, "%.*s%s", (int) size, ptr, uri->pathinfo);
+        sprintf(buf4, "%.*s%s", (int) size, ptr, uri->pathinfo);
-        strcpy(uri->pathinfo, buf3);
+        strcpy(uri->pathinfo, buf4);
         ptr[0] = 0;
     }
     if (uri->pathinfo[0] != 0) {
-        sprintf(buf3, "%s", uri->pathinfo + 1);
+        sprintf(buf4, "%s", uri->pathinfo + 1);
-        strcpy(uri->pathinfo, buf3);
+        strcpy(uri->pathinfo, buf4);
     }
 
     if (path_is_file(buf0)) {
         uri->filename = malloc(strlen(buf0) + 1);
         strcpy(uri->filename, buf0);
-        ssize_t len = strlen(uri->path);
+        long len = (long) strlen(uri->path);
-        if (strcmp(uri->path + len - 5, ".html") == 0) {
+        if (strcmp(uri->path + len - 4, ".ncr") == 0 || strcmp(uri->path + len - 4, ".php") == 0) {
-            uri->path[len - 5] = 0;
-        } else if (strcmp(uri->path + len - 4, ".php") == 0) {
             uri->path[len - 4] = 0;
             uri->is_static = 0;
+        } else if (strcmp(uri->path + len - 5, ".html") == 0) {
+            uri->path[len - 5] = 0;
         }
     } else if (path_is_file(buf1)) {
         uri->is_static = 0;
         uri->filename = malloc(strlen(buf1) + 1);
         strcpy(uri->filename, buf1);
     } else if (path_is_file(buf2)) {
+        uri->is_static = 0;
         uri->filename = malloc(strlen(buf2) + 1);
         strcpy(uri->filename, buf2);
+    } else if (path_is_file(buf3)) {
+        uri->filename = malloc(strlen(buf3) + 1);
+        strcpy(uri->filename, buf3);
     } else {
         uri->is_dir = 1;
         strcpy(uri->path + strlen(uri->path), "/");
-        sprintf(buf1, "%s%sindex.php", uri->webroot, uri->path);
+        sprintf(buf1, "%s%sindex.ncr", uri->webroot, uri->path);
-        sprintf(buf2, "%s%sindex.html", uri->webroot, uri->path);
+        sprintf(buf2, "%s%sindex.php", uri->webroot, uri->path);
+        sprintf(buf3, "%s%sindex.html", uri->webroot, uri->path);
         if (path_is_file(buf1)) {
             uri->filename = malloc(strlen(buf1) + 1);
             strcpy(uri->filename, buf1);
@@ -148,6 +162,10 @@ int uri_init(http_uri *uri, const char *webroot, const char *uri_str, int dir_mo
         } else if (path_is_file(buf2)) {
             uri->filename = malloc(strlen(buf2) + 1);
             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 {
             if (dir_mode == URI_DIR_MODE_FORBIDDEN) {
                 uri->is_static = 1;
@@ -167,7 +185,9 @@ 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) {
         uri->path[strlen(uri->path) - 5] = 0;
     }
-    if (strcmp(uri->pathinfo, "index.php") == 0 || strcmp(uri->pathinfo, "index.html") == 0) {
+    if (strcmp(uri->pathinfo, "index.ncr") == 0 ||
+        strcmp(uri->pathinfo, "index.php") == 0 ||
+        strcmp(uri->pathinfo, "index.html") == 0) {
         uri->pathinfo[0] = 0;
     }
 

src/lib/uri.h

@@ -1,26 +1,26 @@
 /**
  * Necronda Web Server
  * URI and path handlers (header file)
- * src/uri.h
+ * src/lib/uri.h
  * Lorenz Stechauner, 2020-12-13
  */
 
 #ifndef NECRONDA_SERVER_URI_H
 #define NECRONDA_SERVER_URI_H
 
+#include <sys/stat.h>
+
 #define URI_DIR_MODE_NO_VALIDATION 0
 #define URI_DIR_MODE_FORBIDDEN 1
 #define URI_DIR_MODE_LIST 2
 #define URI_DIR_MODE_INFO 3
 
-#include <sys/stat.h>
-
-
 typedef struct {
     char etag[64];
     char type[24];
     char charset[16];
-    char filename_comp[256];
+    char filename_comp_gz[256];
+    char filename_comp_br[256];
     struct stat stat;
 } meta_data;
 

src/lib/utils.c

@@ -0,0 +1,145 @@
+/**
+ * Necronda Web Server
+ * Utilities
+ * src/lib/utils.c
+ * Lorenz Stechauner, 2020-12-03
+ */
+
+#include "utils.h"
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+char *log_prefix;
+
+char *format_duration(unsigned long micros, char *buf) {
+    if (micros < 10000) {
+        sprintf(buf, "%.1f ms", (double) micros / 1000);
+    } else if (micros < 1000000) {
+        sprintf(buf, "%li ms", micros / 1000);
+    } else if (micros < 60000000) {
+        sprintf(buf, "%.1f s", (double) micros / 1000000);
+    } else if (micros < 6000000000) {
+        sprintf(buf, "%.1f min", (double) micros / 1000000 / 60);
+    } else {
+        sprintf(buf, "%li min", micros / 1000000 / 60);
+    }
+    return buf;
+}
+
+int url_encode_component(const char *str, char *enc, long *size) {
+    char *ptr = enc;
+    char ch;
+    memset(enc, 0, *size);
+    for (int i = 0; i < strlen(str); i++, ptr++) {
+        if ((ptr - enc) >= *size) {
+            return -1;
+        }
+        ch = str[i];
+        if (ch == ':' || ch == '/' || ch == '?' || ch == '#' || ch == '[' || ch == ']' || ch == '@' || ch == '!' ||
+                ch == '$' || ch == '&' || ch == '\'' || ch == '(' || ch == ')' || ch == '*' || ch == '+' || ch == ',' ||
+                ch == ';' || ch == '=' || ch < ' ' || ch > '~') {
+            if ((ptr - enc + 2) >= *size) {
+                return -1;
+            }
+            sprintf(ptr, "%%%02X", ch);
+            ptr += 2;
+        } else if (ch == ' ') {
+            ptr[0] = '+';
+        } else {
+            ptr[0] = ch;
+        }
+    }
+    *size = ptr - enc;
+    return 0;
+}
+
+int url_encode(const char *str, char *enc, long *size) {
+    char *ptr = enc;
+    unsigned char ch;
+    memset(enc, 0, *size);
+    for (int i = 0; i < strlen(str); i++, ptr++) {
+        if ((ptr - enc) >= *size) {
+            return -1;
+        }
+        ch = str[i];
+        if (ch > 0x7F || ch == ' ') {
+            if ((ptr - enc + 2) >= *size) {
+                return -1;
+            }
+            sprintf(ptr, "%%%02X", ch);
+            ptr += 2;
+        } else {
+            ptr[0] = (char) ch;
+        }
+    }
+    *size = ptr - enc;
+    return 0;
+}
+
+int url_decode(const char *str, char *dec, long *size) {
+    char *ptr = dec;
+    char ch, buf[3];
+    memset(dec, 0, *size);
+    for (int i = 0; i < strlen(str); i++, ptr++) {
+        if ((ptr - dec) >= *size) {
+            return -1;
+        }
+        ch = str[i];
+        if (ch == '+') {
+            ch = ' ';
+        } else if (ch == '%') {
+            memcpy(buf, str + i + 1, 2);
+            buf[2] = 0;
+            ch = (char) strtol(buf, NULL, 16);
+            i += 2;
+        } else if (ch == '?') {
+            strcpy(ptr, str + i);
+            break;
+        }
+        ptr[0] = ch;
+    }
+    *size = ptr - dec;
+    return 0;
+}
+
+int mime_is_compressible(const char *type) {
+    if (type == NULL) return 0;
+    char type_parsed[64];
+    snprintf(type_parsed, sizeof(type_parsed), "%s", 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, "application/x-web-app-manifest+json") == 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;
+}
+
+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;
+}

src/lib/utils.h

@@ -1,14 +1,24 @@
 /**
  * Necronda Web Server
  * Utilities (header file)
- * src/utils.h
+ * src/lib/utils.h
  * Lorenz Stechauner, 2020-12-03
  */
 
 #ifndef NECRONDA_SERVER_UTILS_H
 #define NECRONDA_SERVER_UTILS_H
 
-char *log_prefix;
+#include <stdio.h>
+
+#define ERR_STR "\x1B[1;31m"
+#define CLR_STR "\x1B[0m"
+#define BLD_STR "\x1B[1m"
+#define WRN_STR "\x1B[1;33m"
+#define BLUE_STR "\x1B[34m"
+#define HTTP_STR "\x1B[1;31m"
+#define HTTPS_STR "\x1B[1;32m"
+
+extern char *log_prefix;
 
 #define out_1(fmt) fprintf(stdout, "%s" fmt "\n", log_prefix)
 #define out_2(fmt, args...) fprintf(stdout, "%s" fmt "\n", log_prefix, args)
@@ -22,10 +32,14 @@ char *log_prefix;
 
 char *format_duration(unsigned long micros, char *buf);
 
-int url_encode_component(const char *str, char *enc, ssize_t *size);
+int url_encode_component(const char *str, char *enc, long *size);
 
-int url_encode(const char *str, char *enc, ssize_t *size);
+int url_encode(const char *str, char *enc, long *size);
 
-int url_decode(const char *str, char *dec, ssize_t *size);
+int url_decode(const char *str, char *dec, long *size);
+
+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

src/necronda-server.c

@@ -7,22 +7,38 @@
 
 #define _POSIX_C_SOURCE 199309L
 
+#include "necronda.h"
 #include "necronda-server.h"
-
-#include "config.c"
-#include "utils.c"
-#include "uri.c"
-#include "cache.c"
-#include "sock.c"
-#include "http.c"
-#include "rev_proxy.c"
 #include "client.c"
-#include "fastcgi.c"
 
+#include "lib/cache.h"
+#include "lib/config.h"
+#include "lib/sock.h"
+#include "lib/rev_proxy.h"
+#include "lib/geoip.h"
+
+#include <stdio.h>
+#include <sys/socket.h>
+#include <signal.h>
+#include <unistd.h>
+#include <sys/select.h>
+#include <string.h>
+#include <errno.h>
+#include <arpa/inet.h>
+#include <wait.h>
+#include <sys/types.h>
+#include <openssl/err.h>
+#include <openssl/pem.h>
+#include <openssl/ssl.h>
+#include <openssl/conf.h>
+#include <dirent.h>
 
 int active = 1;
 const char *config_file;
-
+int sockets[NUM_SOCKETS];
+pid_t children[MAX_CHILDREN];
+MMDB_s mmdbs[MAX_MMDB];
+SSL_CTX *contexts[CONFIG_MAX_CERT_CONFIG];
 
 void openssl_init() {
     SSL_library_init();
@@ -31,6 +47,21 @@ void openssl_init() {
     OpenSSL_add_all_algorithms();
 }
 
+static int ssl_servername_cb(SSL *ssl, int *ad, void *arg) {
+    const char *servername = SSL_get_servername(ssl, TLSEXT_NAMETYPE_host_name);
+    if (servername != NULL) {
+        for (int i = 0; i < CONFIG_MAX_HOST_CONFIG; i++) {
+            const host_config *conf = &config->hosts[i];
+            if (conf->type == CONFIG_TYPE_UNSET) break;
+            if (strcmp(conf->name, servername) == 0) {
+                SSL_set_SSL_CTX(ssl, contexts[conf->cert]);
+                break;
+            }
+        }
+    }
+    return SSL_TLSEXT_ERR_OK;
+}
+
 void destroy() {
     fprintf(stderr, "\n" ERR_STR "Terminating forcefully!" CLR_STR "\n");
     int status = 0;
@@ -260,37 +291,55 @@ int main(int argc, const char *argv[]) {
         closedir(geoip);
     }
 
+    ret = cache_init();
+    if (ret < 0) {
+        config_unload();
+        return 1;
+    } else if (ret != 0) {
+        children[0] = ret;  // pid
+    } else {
+        return 0;
+    }
+
     openssl_init();
 
     client.buf = NULL;
     client.buf_len = 0;
     client.buf_off = 0;
-    client.ctx = SSL_CTX_new(TLS_server_method());
-    SSL_CTX_set_options(client.ctx, SSL_OP_SINGLE_DH_USE);
-    SSL_CTX_set_verify(client.ctx, SSL_VERIFY_NONE, NULL);
-    SSL_CTX_set_min_proto_version(client.ctx, TLS1_VERSION);
-    SSL_CTX_set_mode(client.ctx, SSL_MODE_ENABLE_PARTIAL_WRITE);
-    SSL_CTX_set_cipher_list(client.ctx, "HIGH:!aNULL:!kRSA:!PSK:!SRP:!MD5:!RC4");
-    SSL_CTX_set_ecdh_auto(client.ctx, 1);
 
-    rev_proxy.buf = NULL;
+    for (int i = 0; i < CONFIG_MAX_CERT_CONFIG; i++) {
-    rev_proxy.buf_len = 0;
+        const cert_config *conf = &config->certs[i];
-    rev_proxy.buf_off = 0;
+        if (conf->name[0] == 0) break;
-    rev_proxy.ctx = SSL_CTX_new(TLS_client_method());
 
-    if (SSL_CTX_use_certificate_chain_file(client.ctx, cert_file) != 1) {
+        contexts[i] = SSL_CTX_new(TLS_server_method());
-        fprintf(stderr, ERR_STR "Unable to load certificate chain file: %s: %s" CLR_STR "\n",
+        SSL_CTX *ctx = contexts[i];
-                ERR_reason_error_string(ERR_get_error()), cert_file);
+        SSL_CTX_set_options(ctx, SSL_OP_SINGLE_DH_USE);
-        config_unload();
+        SSL_CTX_set_verify(ctx, SSL_VERIFY_NONE, NULL);
-        return 1;
+        SSL_CTX_set_min_proto_version(ctx, TLS1_2_VERSION);
-    }
+        SSL_CTX_set_mode(ctx, SSL_MODE_ENABLE_PARTIAL_WRITE);
-    if (SSL_CTX_use_PrivateKey_file(client.ctx, key_file, SSL_FILETYPE_PEM) != 1) {
+        SSL_CTX_set_cipher_list(ctx, "HIGH:!aNULL:!kRSA:!PSK:!SRP:!MD5:!RC4");
-        fprintf(stderr, ERR_STR "Unable to load private key file: %s: %s" CLR_STR "\n",
+        SSL_CTX_set_ecdh_auto(ctx, 1);
-                ERR_reason_error_string(ERR_get_error()), key_file);
+        SSL_CTX_set_tlsext_servername_callback(ctx, ssl_servername_cb);
-        config_unload();
+
-        return 1;
+        if (SSL_CTX_use_certificate_chain_file(ctx, conf->full_chain) != 1) {
+            fprintf(stderr, ERR_STR "Unable to load certificate chain file: %s: %s" CLR_STR "\n",
+                    ERR_reason_error_string(ERR_get_error()), conf->full_chain);
+            config_unload();
+            return 1;
+        }
+        if (SSL_CTX_use_PrivateKey_file(ctx, conf->priv_key, SSL_FILETYPE_PEM) != 1) {
+            fprintf(stderr, ERR_STR "Unable to load private key file: %s: %s" CLR_STR "\n",
+                    ERR_reason_error_string(ERR_get_error()), conf->priv_key);
+            config_unload();
+            return 1;
+        }
     }
 
+    client.ctx = contexts[0];
+
+
+    rev_proxy_preload();
+
     for (int i = 0; i < NUM_SOCKETS; i++) {
         if (listen(sockets[i], LISTEN_BACKLOG) < 0) {
             fprintf(stderr, ERR_STR "Unable to listen on socket %i: %s" CLR_STR "\n", i, strerror(errno));
@@ -307,14 +356,6 @@ int main(int argc, const char *argv[]) {
         }
     }
 
-    ret = cache_init();
-    if (ret < 0) {
-        config_unload();
-        return 1;
-    } else if (ret != 0) {
-        return 0;
-    }
-
     fprintf(stderr, "Ready to accept connections\n");
 
     while (active) {
@@ -361,6 +402,7 @@ int main(int argc, const char *argv[]) {
             }
         }
 
+        // TODO outsource in thread
         int status = 0;
         for (int i = 0; i < MAX_CHILDREN; i++) {
             if (children[i] != 0) {

src/necronda-server.h

@@ -1,86 +1,34 @@
 /**
  * Necronda Web Server
  * Main executable (header file)
- * src/necronda-server.c
+ * src/necronda-server.h
  * Lorenz Stechauner, 2020-12-03
  */
 
 #ifndef NECRONDA_SERVER_NECRONDA_SERVER_H
 #define NECRONDA_SERVER_NECRONDA_SERVER_H
 
-#include <stdio.h>
+#include <sys/time.h>
-#include <sys/socket.h>
-#include <signal.h>
-#include <unistd.h>
-#include <sys/select.h>
-#include <string.h>
-#include <errno.h>
-#include <arpa/inet.h>
-#include <wait.h>
-#include <sys/types.h>
-#include <stdio.h>
-#include <openssl/err.h>
-#include <openssl/pem.h>
-#include <openssl/ssl.h>
-#include <openssl/conf.h>
-#include <openssl/engine.h>
-#include <openssl/dh.h>
 #include <maxminddb.h>
-#include <dirent.h>
-
 
 #define NUM_SOCKETS 2
 #define MAX_CHILDREN 1024
 #define MAX_MMDB 3
-#define MAX_HOST_CONFIG 64
 #define LISTEN_BACKLOG 16
-#define REQ_PER_CONNECTION 100
+#define REQ_PER_CONNECTION 200
 #define CLIENT_TIMEOUT 3600
-#define SERVER_TIMEOUT 4
+#define SERVER_TIMEOUT_INIT 4
+#define SERVER_TIMEOUT 3600
 
 #define CHUNK_SIZE 8192
-#define CLIENT_MAX_HEADER_SIZE 8192
-#define FILE_CACHE_SIZE 1024
-#define GEOIP_MAX_SIZE 8192
 
-#define SHM_KEY_CACHE 255641
+extern int sockets[NUM_SOCKETS];
-#define SHM_KEY_CONFIG 255642
+extern pid_t children[MAX_CHILDREN];
+extern MMDB_s mmdbs[MAX_MMDB];
 
-#define ERR_STR "\x1B[1;31m"
+extern int server_keep_alive;
-#define CLR_STR "\x1B[0m"
+extern char *log_client_prefix, *log_conn_prefix, *log_req_prefix, *client_geoip;
-#define BLD_STR "\x1B[1m"
+extern char *client_addr_str, *client_addr_str_ptr, *server_addr_str, *server_addr_str_ptr, *client_host_str;
-#define WRN_STR "\x1B[1;33m"
+extern struct timeval client_timeout;
-#define BLUE_STR "\x1B[34m"
-#define HTTP_STR "\x1B[1;31m"
-#define HTTPS_STR "\x1B[1;32m"
-
-#define HTTP_1XX_STR "\x1B[1;32m"
-#define HTTP_2XX_STR "\x1B[1;32m"
-#define HTTP_3XX_STR "\x1B[1;33m"
-#define HTTP_4XX_STR "\x1B[1;31m"
-#define HTTP_5XX_STR "\x1B[1;31m"
-
-#define NECRONDA_VERSION "4.3"
-#define SERVER_STR "Necronda/" NECRONDA_VERSION
-#define NECRONDA_ZLIB_LEVEL 9
-
-#ifndef DEFAULT_HOST
-#define DEFAULT_HOST "www.necronda.net"
-#endif
-#ifndef MAGIC_FILE
-#define MAGIC_FILE "/usr/share/file/misc/magic.mgc"
-#endif
-#ifndef PHP_FPM_SOCKET
-#define PHP_FPM_SOCKET "/var/run/php-fpm/php-fpm.sock"
-#endif
-#ifndef DEFAULT_CONFIG_FILE
-#define DEFAULT_CONFIG_FILE "/etc/necronda-server/necronda-server.conf"
-#endif
-
-int sockets[NUM_SOCKETS];
-pid_t children[MAX_CHILDREN];
-MMDB_s mmdbs[MAX_MMDB];
-
-char *client_addr_str, *client_addr_str_ptr, *server_addr_str, *server_addr_str_ptr, *client_host_str;
 
 #endif //NECRONDA_SERVER_NECRONDA_SERVER_H

src/necronda.h

@@ -0,0 +1,23 @@
+/**
+ * Necronda Web Server
+ * Definitions
+ * src/necronda.h
+ * Lorenz Stechauner, 2021-05-04
+ */
+
+#ifndef NECRONDA_SERVER_NECRONDA_H
+#define NECRONDA_SERVER_NECRONDA_H
+
+#define NECRONDA_VERSION "4.4"
+#define SERVER_STR "Necronda/" NECRONDA_VERSION
+#define SERVER_STR_HTML "Necronda web server " NECRONDA_VERSION
+
+#ifndef DEFAULT_HOST
+#   define DEFAULT_HOST "www.necronda.net"
+#endif
+
+#ifndef SERVER_NAME
+#   define SERVER_NAME DEFAULT_HOST
+#endif
+
+#endif //NECRONDA_SERVER_NECRONDA_H

src/rev_proxy.h

@@ -1,20 +0,0 @@
-/**
- * Necronda Web Server
- * Reverse proxy (header file)
- * src/rev_proxy.h
- * Lorenz Stechauner, 2021-01-07
- */
-
-#ifndef NECRONDA_SERVER_REV_PROXY_H
-#define NECRONDA_SERVER_REV_PROXY_H
-
-int rev_proxy_request_header(http_req *req, int enc);
-
-int rev_proxy_response_header(http_req *req, http_res *res);
-
-int rev_proxy_init(http_req *req, http_res *res, host_config *conf, sock *client, http_status *custom_status,
-                   char *err_msg);
-
-int rev_proxy_send(sock *client, int chunked, unsigned long len_to_send);
-
-#endif //NECRONDA_SERVER_REV_PROXY_H

src/utils.c

@@ -1,161 +0,0 @@
-/**
- * Necronda Web Server
- * Utilities
- * src/utils.c
- * Lorenz Stechauner, 2020-12-03
- */
-
-#include "utils.h"
-
-
-char *format_duration(unsigned long micros, char *buf) {
-    if (micros < 10000) {
-        sprintf(buf, "%.1f ms", (double) micros / 1000);
-    } else if (micros < 1000000) {
-        sprintf(buf, "%li ms", micros / 1000);
-    } else if (micros < 60000000) {
-        sprintf(buf, "%.1f s", (double) micros / 1000000);
-    } else if (micros < 6000000000) {
-        sprintf(buf, "%.1f min", (double) micros / 1000000 / 60);
-    } else {
-        sprintf(buf, "%li min", micros / 1000000 / 60);
-    }
-    return buf;
-}
-
-int url_encode_component(const char *str, char *enc, ssize_t *size) {
-    char *ptr = enc;
-    char ch;
-    memset(enc, 0, *size);
-    for (int i = 0; i < strlen(str); i++, ptr++) {
-        if ((ptr - enc) >= *size) {
-            return -1;
-        }
-        ch = str[i];
-        if (ch == ':' || ch == '/' || ch == '?' || ch == '#' || ch == '[' || ch == ']' || ch == '@' || ch == '!' ||
-            ch == '$' || ch == '&' || ch == '\'' || ch == '(' || ch == ')' || ch == '*' || ch == '+' || ch == ',' ||
-            ch == ';' || ch == '=' || ch < ' ' || ch > '~') {
-            if ((ptr - enc + 2) >= *size) {
-                return -1;
-            }
-            sprintf(ptr, "%%%02X", ch);
-            ptr += 2;
-        } else if (ch == ' ') {
-            ptr[0] = '+';
-        } else {
-            ptr[0] = ch;
-        }
-    }
-    *size = ptr - enc;
-    return 0;
-}
-
-int url_encode(const char *str, char *enc, ssize_t *size) {
-    char *ptr = enc;
-    unsigned char ch;
-    memset(enc, 0, *size);
-    for (int i = 0; i < strlen(str); i++, ptr++) {
-        if ((ptr - enc) >= *size) {
-            return -1;
-        }
-        ch = str[i];
-        if (ch > 0x7F || ch == ' ') {
-            if ((ptr - enc + 2) >= *size) {
-                return -1;
-            }
-            sprintf(ptr, "%%%02X", ch);
-            ptr += 2;
-        } else {
-            ptr[0] = (char) ch;
-        }
-    }
-    *size = ptr - enc;
-    return 0;
-}
-
-int url_decode(const char *str, char *dec, ssize_t *size) {
-    char *ptr = dec;
-    char ch, buf[3];
-    memset(dec, 0, *size);
-    for (int i = 0; i < strlen(str); i++, ptr++) {
-        if ((ptr - dec) >= *size) {
-            return -1;
-        }
-        ch = str[i];
-        if (ch == '+') {
-            ch = ' ';
-        } else if (ch == '%') {
-            memcpy(buf, str + i + 1, 2);
-            buf[2] = 0;
-            ch = (char) strtol(buf, NULL, 16);
-            i += 2;
-        } else if (ch == '?') {
-            strcpy(ptr, str + i);
-            break;
-        }
-        ptr[0] = ch;
-    }
-    *size = ptr - dec;
-    return 0;
-}
-
-MMDB_entry_data_list_s *mmdb_json(MMDB_entry_data_list_s *list, char *str, long *str_off, long str_len) {
-    switch (list->entry_data.type) {
-        case MMDB_DATA_TYPE_MAP:
-            *str_off += sprintf(str + *str_off, "{");
-            break;
-        case MMDB_DATA_TYPE_ARRAY:
-            *str_off += sprintf(str + *str_off, "[");
-            break;
-        case MMDB_DATA_TYPE_UTF8_STRING:
-            *str_off += sprintf(str + *str_off, "\"%.*s\"", list->entry_data.data_size, list->entry_data.utf8_string);
-            break;
-        case MMDB_DATA_TYPE_UINT16:
-            *str_off += sprintf(str + *str_off, "%u", list->entry_data.uint16);
-            break;
-        case MMDB_DATA_TYPE_UINT32:
-            *str_off += sprintf(str + *str_off, "%u", list->entry_data.uint32);
-            break;
-        case MMDB_DATA_TYPE_UINT64:
-            *str_off += sprintf(str + *str_off, "%lu", list->entry_data.uint64);
-            break;
-        case MMDB_DATA_TYPE_UINT128:
-            *str_off += sprintf(str + *str_off, "%llu", (unsigned long long) list->entry_data.uint128);
-            break;
-        case MMDB_DATA_TYPE_INT32:
-            *str_off += sprintf(str + *str_off, "%i", list->entry_data.uint32);
-            break;
-        case MMDB_DATA_TYPE_BOOLEAN:
-            *str_off += sprintf(str + *str_off, "%s", list->entry_data.boolean ? "true" : "false");
-            break;
-        case MMDB_DATA_TYPE_FLOAT:
-            *str_off += sprintf(str + *str_off, "%f", list->entry_data.float_value);
-            break;
-        case MMDB_DATA_TYPE_DOUBLE:
-            *str_off += sprintf(str + *str_off, "%f", list->entry_data.double_value);
-            break;
-    }
-    if (list->entry_data.type != MMDB_DATA_TYPE_MAP && list->entry_data.type != MMDB_DATA_TYPE_ARRAY) {
-        return list->next;
-    }
-    MMDB_entry_data_list_s *next = list->next;
-    int stat = 0;
-    for (int i = 0; i < list->entry_data.data_size; i++) {
-        next = mmdb_json(next, str, str_off, str_len);
-        if (list->entry_data.type == MMDB_DATA_TYPE_MAP) {
-            stat = !stat;
-            if (stat) {
-                i--;
-                *str_off += sprintf(str + *str_off, ":");
-                continue;
-            }
-        }
-        if (i != list->entry_data.data_size - 1) *str_off += sprintf(str + *str_off, ",");
-    }
-    if (list->entry_data.type == MMDB_DATA_TYPE_MAP) {
-        *str_off += sprintf(str + *str_off, "}");
-    } else {
-        *str_off += sprintf(str + *str_off, "]");
-    }
-    return next;
-}