Use Utils->ServerUser instead of ServerInstance->FakeClient in m_spanningtree

[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 e29c50c31535ce819308ac38690bb2e606acba8f..ceb3294719bf24af5cc4a2680649abdab5200699 100644 (file)
--- a/src/modules/m_httpd_acl.cpp
+++ b/src/modules/m_httpd_acl.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *         the file COPYING for details.
@@ -14,12 +14,11 @@
 #include "inspircd.h"
 #include "httpd.h"
 #include "protocol.h"
-#include "wildcard.h"
 
 /* $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,20 +27,20 @@ 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
 {
-       
+
        std::string stylesheet;
        bool changed;
-       std::vector<ACL> acl_list;
+       std::vector<HTTPACL> acl_list;
 
  public:
 
@@ -85,7 +84,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));
                }
        }
 
@@ -171,9 +170,9 @@ class ModuleHTTPAccessList : public Module
                        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))
+                               if (InspIRCd::Match(http->GetURI(), this_acl->path, ascii_case_insensitive_map))
                                {
                                        if (!this_acl->blacklist.empty())
                                        {
@@ -183,7 +182,7 @@ class ModuleHTTPAccessList : public Module
 
                                                while (sep.GetToken(entry))
                                                {
-                                                       if (match(http->GetIP(), entry))
+                                                       if (InspIRCd::Match(http->GetIP(), entry, ascii_case_insensitive_map))
                                                        {
                                                                ServerInstance->Logs->Log("m_httpd_acl", 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());
@@ -201,14 +200,14 @@ class ModuleHTTPAccessList : public Module
 
                                                while (sep.GetToken(entry))
                                                {
-                                                       if (match(http->GetIP(), entry))
+                                                       if (InspIRCd::Match(http->GetIP(), entry, ascii_case_insensitive_map))
                                                                allow_access = true;
                                                }
 
                                                if (!allow_access)
                                                {
-                                                       ServerInstance->Logs->Log("m_httpd_acl", DEBUG, "Denying access to whitelisted 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());
+                                                       ServerInstance->Logs->Log("m_httpd_acl", 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());
                                                        BlockAccess(http, event, 403);
                                                        return;
                                                }
@@ -226,7 +225,7 @@ class ModuleHTTPAccessList : public Module
                                                        irc::spacesepstream sep(authorization);
                                                        std::string authtype;
                                                        std::string base64;
-                                                       
+
                                                        sep.GetToken(authtype);
                                                        if (authtype == "Basic")
                                                        {
@@ -285,7 +284,7 @@ class ModuleHTTPAccessList : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1, 2, 0, 0, VF_VENDOR, API_VERSION);
+               return Version("$Id$", VF_VENDOR, API_VERSION);
        }
 };