Textual improvements and fixes such as typos, casing, etc. (#1612)

[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 866fa0e866a137f80df22ca45384bb77a79c0fc4..9845e5b0ff45bbe6d7e9813b87474a597d177fde 100644 (file)
--- a/src/modules/m_httpd_acl.cpp
+++ b/src/modules/m_httpd_acl.cpp
@@ -51,7 +51,7 @@ class ModuleHTTPAccessList : public Module, public HTTPACLEventListener
 
        void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
-               acl_list.clear();
+               std::vector<HTTPACL> new_acls;
                ConfigTagList acls = ServerInstance->Config->ConfTags("httpdacl");
                for (ConfigIter i = acls.first; i != acls.second; i++)
                {
@@ -67,16 +67,16 @@ class ModuleHTTPAccessList : public Module, public HTTPACLEventListener
 
                        while (sep.GetToken(type))
                        {
-                               if (type == "password")
+                               if (stdalgo::string::equalsci(type, "password"))
                                {
                                        username = c->getString("username");
                                        password = c->getString("password");
                                }
-                               else if (type == "whitelist")
+                               else if (stdalgo::string::equalsci(type, "whitelist"))
                                {
                                        whitelist = c->getString("whitelist");
                                }
-                               else if (type == "blacklist")
+                               else if (stdalgo::string::equalsci(type, "blacklist"))
                                {
                                        blacklist = c->getString("blacklist");
                                }
@@ -89,13 +89,14 @@ class ModuleHTTPAccessList : public Module, public HTTPACLEventListener
                        ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Read ACL: path=%s pass=%s whitelist=%s blacklist=%s", path.c_str(),
                                        password.c_str(), whitelist.c_str(), blacklist.c_str());
 
-                       acl_list.push_back(HTTPACL(path, username, password, whitelist, blacklist));
+                       new_acls.push_back(HTTPACL(path, username, password, whitelist, blacklist));
                }
+               acl_list.swap(new_acls);
        }
 
-       void BlockAccess(HTTPRequest* http, int returnval, const std::string &extraheaderkey = "", const std::string &extraheaderval="")
+       void BlockAccess(HTTPRequest* http, unsigned int returnval, const std::string &extraheaderkey = "", const std::string &extraheaderval="")
        {
-               ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "BlockAccess (%d)", returnval);
+               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.");
                HTTPDocumentResponse response(this, *http, &data, returnval);
@@ -112,7 +113,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())
                                        {
@@ -125,7 +126,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;
                                                        }
@@ -147,7 +148,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;
                                                }
@@ -156,7 +157,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"))
                                                {
@@ -224,7 +225,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.so dependent modules", VF_VENDOR);
+               return Version("Provides access control lists (passwording of resources, IP restrictions, etc) to m_httpd dependent modules", VF_VENDOR);
        }
 };