X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_httpd_acl.cpp;h=ef2ac72ffa7a8d0450551334a39cb63024c13d1b;hb=00fa6d592ed2640fcdf74444786de555c1c3da25;hp=153cb501b461ea9dd9d4e8eed83e1e795bf70631;hpb=bc344671460c1675fbc31504fd1ffc03ff58a135;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_httpd_acl.cpp b/src/modules/m_httpd_acl.cpp index 153cb501b..ef2ac72ff 100644 --- a/src/modules/m_httpd_acl.cpp +++ b/src/modules/m_httpd_acl.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team + * InspIRCd: (C) 2002-2009 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see @@ -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_list; + std::vector 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)); } } @@ -117,31 +116,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,35 +146,33 @@ 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::const_iterator this_acl = acl_list.begin(); this_acl != acl_list.end(); ++this_acl) + for (std::vector::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()) { @@ -187,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()); @@ -205,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; } @@ -230,7 +225,7 @@ class ModuleHTTPAccessList : public Module irc::spacesepstream sep(authorization); std::string authtype; std::string base64; - + sep.GetToken(authtype); if (authtype == "Basic") { @@ -289,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); } };