]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/m_httpd_acl.cpp
Fix a bunch of weird indentation and spacing issues.
[user/henk/code/inspircd.git] / src / modules / m_httpd_acl.cpp
index 49710c2194dd645cf5aac419dcde43a0774ed026..270e8b007ec94ef93e18122594f8bc83f70b25cf 100644 (file)
@@ -1,8 +1,13 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2018-2019 linuxdaemon <linuxdaemon.irc@gmail.com>
+ *   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>
- *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2008, 2010 Craig Edwards <brain@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -38,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)
        {
@@ -98,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())
@@ -113,7 +124,7 @@ class ModuleHTTPAccessList : public Module, public HTTPACLEventListener
 
                        for (std::vector<HTTPACL>::const_iterator this_acl = acl_list.begin(); this_acl != acl_list.end(); ++this_acl)
                        {
-                               if (InspIRCd::Match(http->GetURI(), this_acl->path, ascii_case_insensitive_map))
+                               if (InspIRCd::Match(http->GetPath(), this_acl->path, ascii_case_insensitive_map))
                                {
                                        if (!this_acl->blacklist.empty())
                                        {
@@ -126,7 +137,7 @@ class ModuleHTTPAccessList : public Module, public HTTPACLEventListener
                                                        if (InspIRCd::Match(http->GetIP(), entry, ascii_case_insensitive_map))
                                                        {
                                                                ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Denying access to blacklisted resource %s (matched by pattern %s) from ip %s (matched by entry %s)",
-                                                                               http->GetURI().c_str(), this_acl->path.c_str(), http->GetIP().c_str(), entry.c_str());
+                                                                               http->GetPath().c_str(), this_acl->path.c_str(), http->GetIP().c_str(), entry.c_str());
                                                                BlockAccess(http, 403);
                                                                return false;
                                                        }
@@ -148,7 +159,7 @@ class ModuleHTTPAccessList : public Module, public HTTPACLEventListener
                                                if (!allow_access)
                                                {
                                                        ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Denying access to whitelisted resource %s (matched by pattern %s) from ip %s (Not in whitelist)",
-                                                                       http->GetURI().c_str(), this_acl->path.c_str(), http->GetIP().c_str());
+                                                                       http->GetPath().c_str(), this_acl->path.c_str(), http->GetIP().c_str());
                                                        BlockAccess(http, 403);
                                                        return false;
                                                }
@@ -157,7 +168,7 @@ class ModuleHTTPAccessList : public Module, public HTTPACLEventListener
                                        {
                                                /* Password auth, first look to see if we have a basic authentication header */
                                                ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Checking HTTP auth password for resource %s (matched by pattern %s) from ip %s, against username %s",
-                                                               http->GetURI().c_str(), this_acl->path.c_str(), http->GetIP().c_str(), this_acl->username.c_str());
+                                                               http->GetPath().c_str(), this_acl->path.c_str(), http->GetIP().c_str(), this_acl->username.c_str());
 
                                                if (http->headers->IsSet("Authorization"))
                                                {
@@ -189,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;
@@ -225,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);
        }
 };