]> git.netwichtig.de Git - user/henk/code/inspircd.git/commitdiff
projects / user / henk / code / inspircd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7324001)
Marginally improve the error pages created by httpd and httpd_acl.
authorSadie Powell <sadie@witchery.services>
Fri, 14 Feb 2020 06:25:06 +0000 (06:25 +0000)
committerSadie Powell <sadie@witchery.services>
Fri, 14 Feb 2020 06:25:06 +0000 (06:25 +0000)
src/modules/m_httpd.cpp patch | blob | history
src/modules/m_httpd_acl.cpp patch | blob | history

diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp
index cec52f66a48a680dc70e7b0144479dca86794ba2..bdb1d50fcb296b99742036eb460c6a370f61c999 100644 (file)
--- a/src/modules/m_httpd.cpp
+++ b/src/modules/m_httpd.cpp
@@ -251,10 +251,12 @@ class HttpServerSocket : public BufferedSocket, public Timer, public insp::intru
 
        void SendHTTPError(unsigned int response)
        {
-               HTTPHeaders empty;
+               static HTTPHeaders empty;
                std::string data = InspIRCd::Format(
-                       "<html><head></head><body>Server error %u: %s<br>"
-                       "<small>Powered by <a href='https://www.inspircd.org'>InspIRCd</a></small></body></html>", response, http_status_str((http_status)response));
+                       "<html><head></head><body style='font-family: sans-serif; text-align: center'>"
+                       "<h1 style='font-size: 48pt'>Error %u</h1><h2 style='font-size: 24pt'>%s</h2><hr>"
+                       "<small>Powered by <a href='https://www.inspircd.org'>InspIRCd</a></small></body></html>",
+                       response, http_status_str((http_status)response));
 
                Page(data, response, &empty);
        }
diff --git a/src/modules/m_httpd_acl.cpp b/src/modules/m_httpd_acl.cpp
index 25b7a73f5ea2d624bbf77cb5dcb943e092d8c00f..cb82b15fa78acb9188c1b4038b300d5815ca5d73 100644 (file)
--- a/src/modules/m_httpd_acl.cpp
+++ b/src/modules/m_httpd_acl.cpp
@@ -103,7 +103,13 @@ class ModuleHTTPAccessList : public Module, public HTTPACLEventListener
        {
                ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "BlockAccess (%u)", returnval);
 
-               std::stringstream data("Access to this resource is denied by an access control list. Please contact your IRC administrator.");
+               std::stringstream data;
+               data << "<html><head></head><body style='font-family: sans-serif; text-align: center'>"
+                       << "<h1 style='font-size: 48pt'>Error " << returnval << "</h1>"
+                       << "<h2 style='font-size: 24pt'>Access to this resource is denied by an access control list.</h2>"
+                       << "<h2 style='font-size: 24pt'>Please contact your IRC administrator.</h2><hr>"
+                       << "<small>Powered by <a href='https://www.inspircd.org'>InspIRCd</a></small></body></html>";
+
                HTTPDocumentResponse response(this, *http, &data, returnval);
                response.headers.SetHeader("X-Powered-By", MODNAME);
                if (!extraheaderkey.empty())