X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_httpd_acl.cpp;h=c25cabc0ae5eb40cc135ed4acf268718ca835914;hb=571714e28b26cc59cbc8d27098a5ba981240ee2d;hp=94cc4045f0b86869342708d2e7df9ecab2ff2723;hpb=9d4004e8d477232c143830508a7a6e41fd2d31b7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_httpd_acl.cpp b/src/modules/m_httpd_acl.cpp
index 94cc4045f..c25cabc0a 100644
--- a/src/modules/m_httpd_acl.cpp
+++ b/src/modules/m_httpd_acl.cpp
@@ -1,16 +1,23 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/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"
@@ -38,12 +45,11 @@ class ModuleHTTPAccessList : public Module
 {
 
 	std::string stylesheet;
-	bool changed;
 	std::vector<HTTPACL> acl_list;
 
  public:
 
-	void ReadConfig()
+	void OnRehash(User* user)
 	{
 		acl_list.clear();
 		ConfigTagList acls = ServerInstance->Config->ConfTags("httpdacl");
@@ -87,10 +93,11 @@ class ModuleHTTPAccessList : public Module
 		}
 	}
 
-	ModuleHTTPAccessList() 	{
-		ReadConfig();
-		Implementation eventlist[] = { I_OnEvent };
-		ServerInstance->Modules->Attach(eventlist, this, 1);
+	void init()
+	{
+		OnRehash(NULL);
+		Implementation eventlist[] = { I_OnEvent, I_OnRehash };
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
 	void BlockAccess(HTTPRequest* http, int returnval, const std::string &extraheaderkey = "", const std::string &extraheaderval="")
@@ -105,61 +112,6 @@ class ModuleHTTPAccessList : public Module
 		response.Send();
 	}
 
-	bool IsBase64(unsigned char c)
-	{
-		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.id == "httpd_acl")
@@ -230,7 +182,7 @@ class ModuleHTTPAccessList : public Module
 								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, ':');