Fix user->host not being assigned correctly for new connections

[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 153cb501b461ea9dd9d4e8eed83e1e795bf70631..685eae5c69ad8fc5dd2a7af40d3080b441fce790 100644 (file)
--- a/src/modules/m_httpd_acl.cpp
+++ b/src/modules/m_httpd_acl.cpp
@@ -19,7 +19,7 @@
 /* $ModDesc: Provides access control lists (passwording of resources, ip restrictions etc) to m_httpd.so dependent modules */
 /* $ModDep: httpd.h */
 
-class ACL : public Extensible
+class HTTPACL : public Extensible
 {
  public:
        std::string path;
@@ -28,12 +28,12 @@ class ACL : public Extensible
        std::string whitelist;
        std::string blacklist;
 
-       ACL(const std::string &set_path, const std::string &set_username, const std::string &set_password,
+       HTTPACL(const std::string &set_path, const std::string &set_username, const std::string &set_password,
                const std::string &set_whitelist, const std::string &set_blacklist)
                : path(set_path), username(set_username), password(set_password), whitelist(set_whitelist),
                blacklist(set_blacklist) { }
 
-       ~ACL() { }
+       ~HTTPACL() { }
 };
 
 class ModuleHTTPAccessList : public Module
@@ -41,7 +41,7 @@ class ModuleHTTPAccessList : public Module
        
        std::string stylesheet;
        bool changed;
-       std::vector<ACL> acl_list;
+       std::vector<HTTPACL> acl_list;
 
  public:
 
@@ -85,7 +85,7 @@ class ModuleHTTPAccessList : public Module
                        ServerInstance->Logs->Log("m_httpd_acl", 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(ACL(path, username, password, whitelist, blacklist));
+                       acl_list.push_back(HTTPACL(path, username, password, whitelist, blacklist));
                }
        }
 
@@ -117,31 +117,29 @@ class ModuleHTTPAccessList : public Module
        std::string Base64Decode(const std::string &base64)
        {
                const std::string base64_chars("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/");
-
                int inputlen = base64.length();
+               int i = 0, j = 0, input = 0;
+               unsigned char longbuf[4], shortbuf[3];
+               std::string retval;
 
                if (inputlen == 0)
                        return "";
 
-               int i = 0, j = 0, input = 0;
-
-               unsigned char longbuf[4], shortbuf[3];
-               std::string ret;
-
-               while (inputlen-- && ( base64[input] != '=') && IsBase64(base64[input]))
+               while (inputlen-- && (base64[input] != '=') && IsBase64(base64[input]))
                {
-                       longbuf[i++] = base64[input]; input++;
-                       if (i ==4)
+                       longbuf[i++] = base64[input];
+                       input++;
+                       if (i == 4)
                        {
-                               for (i = 0; i <4; i++)
+                               for (i = 0; i < 4; ++i)
                                        longbuf[i] = base64_chars.find(longbuf[i]);
 
-                               shortbuf[0] = (longbuf[0] << 2) + ((longbuf[1] & 0x30) >> 4);
-                               shortbuf[1] = ((longbuf[1] & 0xf) << 4) + ((longbuf[2] & 0x3c) >> 2);
-                               shortbuf[2] = ((longbuf[2] & 0x3) << 6) + longbuf[3];
+                               shortbuf[0] = (longbuf[0] << 2)         + ((longbuf[1] & 0x30) >> 4);
+                               shortbuf[1] = ((longbuf[1] & 0xf) << 4) + ((longbuf[2] & 0x3c) >> 2);
+                               shortbuf[2] = ((longbuf[2] & 0x3) << 6) + longbuf[3];
 
-                               for (i = 0; (i < 3); i++)
-                                       ret += shortbuf[i];
+                               for (i = 0; i < 3; ++i)
+                                       retval += shortbuf[i];
 
                                i = 0;
                        }
@@ -149,33 +147,31 @@ class ModuleHTTPAccessList : public Module
 
                if (i)
                {
-                       for (j = i; j <4; j++)
+                       for (j = i; j < 4; ++j)
                                longbuf[j] = 0;
 
-                       for (j = 0; j <4; j++)
+                       for (j = 0; j < 4; ++j)
                                longbuf[j] = base64_chars.find(longbuf[j]);
 
-                       shortbuf[0] = (longbuf[0] << 2) + ((longbuf[1] & 0x30) >> 4);
-                       shortbuf[1] = ((longbuf[1] & 0xf) << 4) + ((longbuf[2] & 0x3c) >> 2);
-                       shortbuf[2] = ((longbuf[2] & 0x3) << 6) + longbuf[3];
+                       shortbuf[0] = (longbuf[0] << 2)         + ((longbuf[1] & 0x30) >> 4);
+                       shortbuf[1] = ((longbuf[1] & 0xf) << 4) + ((longbuf[2] & 0x3c) >> 2);
+                       shortbuf[2] = ((longbuf[2] & 0x3) << 6) + longbuf[3];
 
-                       for (j = 0; (j < i - 1); j++)
-                               ret += shortbuf[j];
+                       for (j = 0; j < i - 1; ++j)
+                               retval += shortbuf[j];
                }
 
-               return ret;
+               return retval;
        }
 
        void OnEvent(Event* event)
        {
-               std::stringstream data("");
-
                if (event->GetEventID() == "httpd_acl")
                {
                        ServerInstance->Logs->Log("m_http_stats", DEBUG,"Handling httpd acl event");
                        HTTPRequest* http = (HTTPRequest*)event->GetData();
 
-                       for (std::vector<ACL>::const_iterator this_acl = acl_list.begin(); this_acl != acl_list.end(); ++this_acl)
+                       for (std::vector<HTTPACL>::const_iterator this_acl = acl_list.begin(); this_acl != acl_list.end(); ++this_acl)
                        {
                                if (match(http->GetURI(), this_acl->path))
                                {