From 93973c6e77a631823606c86bbfb1d71d9c3637cf Mon Sep 17 00:00:00 2001
From: Lorenz Stechauner <lorenz.stechauner@necronda.net>
Date: Tue, 15 Dec 2020 19:53:21 +0100
Subject: [PATCH] Refactored http default error document

---
 src/client.c |  8 +++++---
 src/http.h   | 53 ++++++++++++++--------------------------------------
 2 files changed, 19 insertions(+), 42 deletions(-)
diff --git a/src/client.c b/src/client.c
index 1332ab6..6519ad4 100644
--- a/src/client.c
+++ b/src/client.c
@@ -40,6 +40,7 @@ int client_request_handler(sock *client, int req_num) {
     int ret, client_keep_alive;
     char buf[64];
     char msg_buf[4096];
+    char msg_pre_buf[4096];
     char err_msg[256];
     err_msg[0] = 0;
     char *host, *hdr_connection, *webroot;
@@ -107,9 +108,10 @@ int client_request_handler(sock *client, int req_num) {
     int len = 0;
     if (res.status->code >= 300 && res.status->code < 600) {
         http_error_msg *http_msg = http_get_error_msg(res.status->code);
-        len = sprintf(msg_buf, http_error_document, res.status->code, res.status->msg,
-                      http_msg != NULL ? http_msg->err_msg : "", err_msg[0] != 0 ? err_msg : "",
-                      res.status->code >= 300 && res.status->code < 400 ? "info" : "error");
+        sprintf(msg_pre_buf, http_error_document, res.status->code, res.status->msg,
+                http_msg != NULL ? http_msg->err_msg : "", err_msg[0] != 0 ? err_msg : "");
+        len = sprintf(msg_buf, http_default_document, res.status->code, res.status->msg,
+                      msg_pre_buf, res.status->code >= 300 && res.status->code < 400 ? "info" : "error");
         sprintf(buf, "%i", len);
         http_add_header_field(&res.hdr, "Content-Length", buf);
         http_add_header_field(&res.hdr, "Content-Type", "text/html; charset=UTF-8");
diff --git a/src/http.h b/src/http.h
index 7031933..d03f8e6 100644
--- a/src/http.h
+++ b/src/http.h
@@ -111,7 +111,7 @@ http_error_msg http_error_messages[] = {
         {505, "The server does not support, or refuses to support, the HTTP protocol version that was used in the request message."}
 };
 
-const char *http_error_document =
+const char *http_default_document =
         "<!DOCTYPE html>\n"
         "<html lang=\"en\">\n"
         "<head>\n"
@@ -119,53 +119,28 @@ const char *http_error_document =
         "    <meta charset=\"UTF-8\"/>\n"
         "    <meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\"/>\n"
         "    <style>\n"
-        "        html {\n"
-        "            font-family: \"Arial\", sans-serif;\n"
-        "            --error: #C00000;\n"
-        "            --info: #E0C000;\n"
-        "            --color: var(--%5$s);\n"
-        "        }\n"
-        "        body {\n"
-        "            background-color: #F0F0F0;\n"
-        "            margin: 0.5em;\n"
-        "        }\n"
-        "        main {\n"
-        "            max-width: 600px;\n"
-        "            margin: 2em auto;\n"
-        "            background-color: #FFFFFF;\n"
-        "            border: 1px solid var(--color);\n"
-        "            border-radius: 4px;\n"
-        "            padding: 1em 2em;\n"
-        "        }\n"
-        "        h1, h2, h3, h4, h5, h6, h7 {\n"
-        "            text-align: center;\n"
-        "            color: var(--color);\n"
-        "        }\n"
-        "        h1 {\n"
-        "            margin: 0.5em 0;\n"
-        "            font-size: 1.5em;\n"
-        "        }\n"
-        "        p {\n"
-        "            text-align: center;\n"
-        "        }\n"
-        "        div.footer {\n"
-        "            color: #808080;\n"
-        "            font-size: 0.75em;\n"
-        "            text-align: center;\n"
-        "            margin: 0.5em 0;\n"
-        "        }\n"
+        "        html {font-family: \"Arial\", sans-serif; --error: #C00000; --info: #E0C000; --color: var(--%4$s);}\n"
+        "        body {background-color: #F0F0F0; margin: 0.5em;}\n"
+        "        main {max-width: 600px; margin: 2em auto; background-color: #FFFFFF; border: 1px solid var(--color); border-radius: 4px; padding: 1em 2em;}\n"
+        "        h1, h2, h3, h4, h5, h6, h7 {text-align: center;color: var(--color);}\n"
+        "        h1 {margin: 0.5em 0; font-size: 1.5em;}\n"
+        "        p {text-align: center;}\n"
+        "        div.footer {color: #808080; font-size: 0.75em; text-align: center; margin: 0.5em 0;}\n"
         "    </style>\n"
         "</head>\n"
         "<body>\n"
         "    <main>\n"
-        "        <h1>%1$i %2$s</h1>\n"
-        "        <p>%3$s</p>\n"
-        "        <p>%4$s</p>\n"
+        "%3$s"
         "        <div class=\"footer\">Necronda web server " NECRONDA_VERSION "</div>\n"
         "    </main>\n"
         "</body>\n"
         "</html>\n";
 
+const char *http_error_document =
+        "        <h1>%1$i %2$s :(</h1>\n"
+        "        <p>%3$s</p>\n"
+        "        <p>%4$s</p>\n";
+
 
 void http_to_camel_case(char *str);
 
