Replace copyright headers with headers granting specific authors copyright

[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 dd68f3087f93324545d9f6cbd2b37bab3dd77f34..abbab1d872bfd267660d92a74795816705f37c40 100644 (file)
--- a/src/modules/m_httpd_acl.cpp
+++ b/src/modules/m_httpd_acl.cpp
@@ -1,24 +1,30 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 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"
 
 /* $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;
@@ -47,12 +53,12 @@ class ModuleHTTPAccessList : public Module
        void ReadConfig()
        {
                acl_list.clear();
-               ConfigReader c;
-               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;
@@ -64,16 +70,16 @@ class ModuleHTTPAccessList : public Module
                        {
                                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
                                {
@@ -106,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")
@@ -231,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, ':');
@@ -277,7 +228,7 @@ class ModuleHTTPAccessList : public Module
 
        virtual Version GetVersion()
        {
-               return Version("Provides access control lists (passwording of resources, ip restrictions etc) to m_httpd.so dependent modules", VF_VENDOR, API_VERSION);
+               return Version("Provides access control lists (passwording of resources, ip restrictions etc) to m_httpd.so dependent modules", VF_VENDOR);
        }
 };