-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
*
- * This program is free but copyrighted software; see
- * the file COPYING for details.
+ * This file is part of InspIRCd. InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
*
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+
#include "inspircd.h"
#include "httpd.h"
#include "protocol.h"
/* $ModDesc: Provides access control lists (passwording of resources, ip restrictions etc) to m_httpd.so dependent modules */
-/* $ModDep: httpd.h */
-class HTTPACL : public Extensible
+class HTTPACL
{
public:
std::string path;
{
std::string stylesheet;
- bool changed;
std::vector<HTTPACL> acl_list;
public:
void ReadConfig()
{
acl_list.clear();
- ConfigReader c(ServerInstance);
- int n_items = c.Enumerate("httpdacl");
- for (int i = 0; i < n_items; ++i)
+ ConfigTagList acls = ServerInstance->Config->ConfTags("httpdacl");
+ for (ConfigIter i = acls.first; i != acls.second; i++)
{
- std::string path = c.ReadValue("httpdacl", "path", i);
- std::string types = c.ReadValue("httpdacl", "types", i);
+ ConfigTag* c = i->second;
+ std::string path = c->getString("path");
+ std::string types = c->getString("types");
irc::commasepstream sep(types);
std::string type;
std::string username;
{
if (type == "password")
{
- username = c.ReadValue("httpdacl", "username", i);
- password = c.ReadValue("httpdacl", "password", i);
+ username = c->getString("username");
+ password = c->getString("password");
}
else if (type == "whitelist")
{
- whitelist = c.ReadValue("httpdacl", "whitelist", i);
+ whitelist = c->getString("whitelist");
}
else if (type == "blacklist")
{
- blacklist = c.ReadValue("httpdacl", "blacklist", i);
+ blacklist = c->getString("blacklist");
}
else
{
}
}
- ModuleHTTPAccessList(InspIRCd* Me) : Module(Me)
+ void init()
{
ReadConfig();
- Implementation eventlist[] = { I_OnEvent, I_OnRequest };
- ServerInstance->Modules->Attach(eventlist, this, 2);
+ Implementation eventlist[] = { I_OnEvent };
+ ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
}
- 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)
+ void OnEvent(Event& event)
{
- return (isalnum(c) || (c == '+') || (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 "";
-
- while (inputlen-- && (base64[input] != '=') && IsBase64(base64[input]))
- {
- longbuf[i++] = base64[input];
- input++;
- if (i == 4)
- {
- 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];
-
- for (i = 0; i < 3; ++i)
- retval += shortbuf[i];
-
- i = 0;
- }
- }
-
- if (i)
- {
- for (j = i; j < 4; ++j)
- longbuf[j] = 0;
-
- 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];
-
- for (j = 0; j < i - 1; ++j)
- retval += shortbuf[j];
- }
-
- return retval;
- }
-
- void OnEvent(Event* event)
- {
- 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<HTTPACL>::const_iterator this_acl = acl_list.begin(); this_acl != acl_list.end(); ++this_acl)
{
{
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;
}
}
{
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);
+ BlockAccess(http, 403);
return;
}
}
std::string pass;
sep.GetToken(base64);
- std::string userpass = Base64Decode(base64);
+ std::string userpass = Base64ToBin(base64);
ServerInstance->Logs->Log("m_httpd_acl", DEBUG, "HTTP authorization: %s (%s)", userpass.c_str(), base64.c_str());
irc::sepstream userpasspair(userpass, ':');
}
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("$Id$", 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