Tidy up source files:

[user/henk/code/inspircd.git] / src / modules / m_sqlauth.cpp

diff --git a/src/modules/m_sqlauth.cpp b/src/modules/m_sqlauth.cpp
index 29554b03176533756c3a062c041c7b6379a1700e..e92eea3a5c02ef434ef22eb895c6955c61a2c64d 100644 (file)
--- a/src/modules/m_sqlauth.cpp
+++ b/src/modules/m_sqlauth.cpp
@@ -1,21 +1,27 @@
-/*       +------------------------------------+
- *       | 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>
  *
- * 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 "sql.h"
-#include "hash.h"
+#include "modules/sql.h"
+#include "modules/hash.h"
 
-/* $ModDesc: Allow/Deny connections based upon an arbitary SQL table */
+/* $ModDesc: Allow/Deny connections based upon an arbitrary SQL table */
 
 enum AuthState {
        AUTH_STATE_NONE = 0,
@@ -33,7 +39,7 @@ class AuthQuery : public SQLQuery
                : SQLQuery(me), uid(u), pendingExt(e), verbose(v)
        {
        }
-       
+
        void OnResult(SQLResult& res)
        {
                User* user = ServerInstance->FindNick(uid);
@@ -46,7 +52,7 @@ class AuthQuery : public SQLQuery
                else
                {
                        if (verbose)
-                               ServerInstance->SNO->WriteGlobalSno('a', "Forbidden connection from %s!%s@%s (SQL query returned no matches)", user->nick.c_str(), user->ident.c_str(), user->host.c_str());
+                               ServerInstance->SNO->WriteGlobalSno('a', "Forbidden connection from %s (SQL query returned no matches)", user->GetFullRealHost().c_str());
                        pendingExt.set(user, AUTH_STATE_FAIL);
                }
        }
@@ -58,7 +64,7 @@ class AuthQuery : public SQLQuery
                        return;
                pendingExt.set(user, AUTH_STATE_FAIL);
                if (verbose)
-                       ServerInstance->SNO->WriteGlobalSno('a', "Forbidden connection from %s!%s@%s (SQL query failed: %s)", user->nick.c_str(), user->ident.c_str(), user->host.c_str(), error.Str());
+                       ServerInstance->SNO->WriteGlobalSno('a', "Forbidden connection from %s (SQL query failed: %s)", user->GetFullRealHost().c_str(), error.Str());
        }
 };
 
@@ -81,20 +87,22 @@ class ModuleSQLAuth : public Module
        {
                ServerInstance->Modules->AddService(pendingExt);
                OnRehash(NULL);
-               Implementation eventlist[] = { I_OnUserDisconnect, I_OnCheckReady, I_OnRehash, I_OnUserRegister };
-               ServerInstance->Modules->Attach(eventlist, this, 4);
+               Implementation eventlist[] = { I_OnCheckReady, I_OnRehash, I_OnUserRegister };
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
        void OnRehash(User* user)
        {
-               ConfigReader Conf;
-
-               SQL.SetProvider("SQL/" + Conf.ReadValue("sqlauth", "dbid", 0));         /* Database ID, given to the SQL service provider */
-               freeformquery   = Conf.ReadValue("sqlauth", "query", 0);        /* Field name where username can be found */
-               killreason      = Conf.ReadValue("sqlauth", "killreason", 0);   /* Reason to give when access is denied to a user (put your reg details here) */
-               allowpattern    = Conf.ReadValue("sqlauth", "allowpattern",0 ); /* Allow nicks matching this pattern without requiring auth */
-               verbose         = Conf.ReadFlag("sqlauth", "verbose", 0);               /* Set to true if failed connects should be reported to operators */
-               SQL.lookup();
+               ConfigTag* conf = ServerInstance->Config->ConfValue("sqlauth");
+               std::string dbid = conf->getString("dbid");
+               if (dbid.empty())
+                       SQL.SetProvider("SQL");
+               else
+                       SQL.SetProvider("SQL/" + dbid);
+               freeformquery = conf->getString("query");
+               killreason = conf->getString("killreason");
+               allowpattern = conf->getString("allowpattern");
+               verbose = conf->getBool("verbose");
        }
 
        ModResult OnUserRegister(LocalUser* user)
@@ -110,6 +118,13 @@ class ModuleSQLAuth : public Module
                if (pendingExt.get(user))
                        return MOD_RES_PASSTHRU;
 
+               if (!SQL)
+               {
+                       ServerInstance->SNO->WriteGlobalSno('a', "Forbiding connection from %s (SQL database not present)", user->GetFullRealHost().c_str());
+                       ServerInstance->Users->QuitUser(user, killreason);
+                       return MOD_RES_PASSTHRU;
+               }
+
                pendingExt.set(user, AUTH_STATE_BUSY);
 
                ParamM userinfo;
@@ -146,7 +161,7 @@ class ModuleSQLAuth : public Module
 
        Version GetVersion()
        {
-               return Version("Allow/Deny connections based upon an arbitary SQL table", VF_VENDOR);
+               return Version("Allow/Deny connections based upon an arbitrary SQL table", VF_VENDOR);
        }
 };