* | 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.
#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:
std::string path;
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:
void ReadConfig()
{
acl_list.clear();
- ConfigReader c(ServerInstance);
+ ConfigReader c;
int n_items = c.Enumerate("httpdacl");
for (int i = 0; i < n_items; ++i)
{
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));
}
}
- ModuleHTTPAccessList(InspIRCd* Me) : Module(Me)
- {
+ ModuleHTTPAccessList() {
ReadConfig();
- Implementation eventlist[] = { I_OnEvent, I_OnRequest };
- ServerInstance->Modules->Attach(eventlist, this, 2);
+ Implementation eventlist[] = { I_OnEvent };
+ ServerInstance->Modules->Attach(eventlist, this, 1);
}
- void BlockAccess(HTTPRequest* http, Event* event, int returnval, const std::string &extraheaderkey = "", const std::string &extraheaderval="")
+ void BlockAccess(HTTPRequest* http, int returnval, const std::string &extraheaderkey = "", const std::string &extraheaderval="")
{
ServerInstance->Logs->Log("m_httpd_acl", DEBUG, "BlockAccess (%d)", returnval);
std::stringstream data("Access to this resource is denied by an access control list. Please contact your IRC administrator.");
- HTTPDocument response(http->sock, &data, returnval);
+ HTTPDocumentResponse response(this, *http, &data, returnval);
response.headers.SetHeader("X-Powered-By", "m_httpd_acl.so");
if (!extraheaderkey.empty())
response.headers.SetHeader(extraheaderkey, extraheaderval);
- Request req((char*)&response, (Module*)this, event->GetSource());
- req.Send();
+ response.Send();
}
bool IsBase64(unsigned char c)
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;
}
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)
+ void OnEvent(Event& event)
{
- std::stringstream data("");
-
- if (event->GetEventID() == "httpd_acl")
+ if (event.id == "httpd_acl")
{
ServerInstance->Logs->Log("m_http_stats", DEBUG,"Handling httpd acl event");
- HTTPRequest* http = (HTTPRequest*)event->GetData();
+ HTTPRequest* http = (HTTPRequest*)&event;
- 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())
{
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());
- BlockAccess(http, event, 403);
+ BlockAccess(http, 403);
return;
}
}
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());
- BlockAccess(http, event, 403);
+ 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, 403);
return;
}
}
irc::spacesepstream sep(authorization);
std::string authtype;
std::string base64;
-
+
sep.GetToken(authtype);
if (authtype == "Basic")
{
}
else
/* Invalid password */
- BlockAccess(http, event, 401, "WWW-Authenticate", "Basic realm=\"Restricted Object\"");
+ BlockAccess(http, 401, "WWW-Authenticate", "Basic realm=\"Restricted Object\"");
}
else
/* Malformed user:pass pair */
- BlockAccess(http, event, 401, "WWW-Authenticate", "Basic realm=\"Restricted Object\"");
+ BlockAccess(http, 401, "WWW-Authenticate", "Basic realm=\"Restricted Object\"");
}
else
/* Unsupported authentication type */
- BlockAccess(http, event, 401, "WWW-Authenticate", "Basic realm=\"Restricted Object\"");
+ BlockAccess(http, 401, "WWW-Authenticate", "Basic realm=\"Restricted Object\"");
}
else
{
/* No password given at all, access denied */
- BlockAccess(http, event, 401, "WWW-Authenticate", "Basic realm=\"Restricted Object\"");
+ BlockAccess(http, 401, "WWW-Authenticate", "Basic realm=\"Restricted Object\"");
}
}
}
}
- const char* OnRequest(Request* request)
- {
- return NULL;
- }
-
virtual ~ModuleHTTPAccessList()
{
}
virtual Version GetVersion()
{
- return Version(1, 2, 0, 0, VF_VENDOR, API_VERSION);
+ return Version("Provides access control lists (passwording of resources, ip restrictions etc) to m_httpd.so dependent modules", VF_VENDOR);
}
};
projects / user / henk / code / inspircd.git / blobdiff