]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/m_httpd_acl.cpp
projects / user / henk / code / inspircd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix a bunch of weird indentation and spacing issues.
[user/henk/code/inspircd.git] / src / modules / m_httpd_acl.cpp
diff --git a/src/modules/m_httpd_acl.cpp b/src/modules/m_httpd_acl.cpp
index 25b7a73f5ea2d624bbf77cb5dcb943e092d8c00f..270e8b007ec94ef93e18122594f8bc83f70b25cf 100644 (file)
--- a/src/modules/m_httpd_acl.cpp
+++ b/src/modules/m_httpd_acl.cpp
@@ -2,7 +2,7 @@
  * InspIRCd -- Internet Relay Chat Daemon
  *
  *   Copyright (C) 2018-2019 linuxdaemon <linuxdaemon.irc@gmail.com>
- *   Copyright (C) 2013, 2017-2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013, 2017-2018, 2020 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2013, 2015 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
@@ -43,12 +43,12 @@ class HTTPACL
 
 class ModuleHTTPAccessList : public Module, public HTTPACLEventListener
 {
-       std::string stylesheet;
+ private:
        std::vector<HTTPACL> acl_list;
        HTTPdAPI API;
 
  public:
-       ModuleHTTPAccessList()
+       ModuleHTTPAccessList()
                : HTTPACLEventListener(this)
                , API(this)
        {
@@ -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())
@@ -194,20 +200,30 @@ class ModuleHTTPAccessList : public Module, public HTTPACLEventListener
                                                                                return true;
                                                                        }
                                                                        else
+                                                                       {
                                                                                /* Invalid password */
+                                                                               ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "HTTP authorization: password and username do not match");
                                                                                BlockAccess(http, 401, "WWW-Authenticate", "Basic realm=\"Restricted Object\"");
+                                                                       }
                                                                }
                                                                else
+                                                               {
                                                                        /* Malformed user:pass pair */
+                                                                       ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "HTTP authorization: password and username malformed");
                                                                        BlockAccess(http, 401, "WWW-Authenticate", "Basic realm=\"Restricted Object\"");
+                                                               }
                                                        }
                                                        else
+                                                       {
                                                                /* Unsupported authentication type */
+                                                               ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "HTTP authorization: unsupported auth type: %s", authtype.c_str());
                                                                BlockAccess(http, 401, "WWW-Authenticate", "Basic realm=\"Restricted Object\"");
+                                                       }
                                                }
                                                else
                                                {
                                                        /* No password given at all, access denied */
+                                                       ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "HTTP authorization: password and username not sent");
                                                        BlockAccess(http, 401, "WWW-Authenticate", "Basic realm=\"Restricted Object\"");
                                                }
                                                return false;
@@ -230,7 +246,7 @@ class ModuleHTTPAccessList : public Module, public HTTPACLEventListener
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides access control lists (passwording of resources, IP restrictions, etc) to m_httpd dependent modules", VF_VENDOR);
+               return Version("Allows the server administrator to control who can access resources served over HTTP with the httpd module.", VF_VENDOR);
        }
 };