X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sqlauth.cpp;h=df97145be95d51744ae1588b127e0bd38a521e6e;hb=4c751dbbe8945e5efc230a59b0ed51c2ba10cf92;hp=52f0d5d4fea8af52ef70a1711461cded1ecde69e;hpb=11e45f2cb78c0667e2c7c7e2370944bf64b140b8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sqlauth.cpp b/src/modules/m_sqlauth.cpp
index 52f0d5d4f..df97145be 100644
--- 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"
 
-/* $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,
@@ -29,10 +35,9 @@ class AuthQuery : public SQLQuery
 	const std::string uid;
 	LocalIntExt& pendingExt;
 	bool verbose;
-	AuthQuery(Module* me, const std::string& q, const std::string& u, LocalIntExt& e, bool v)
-		: SQLQuery(me, q), uid(u), pendingExt(e), verbose(v)
+	AuthQuery(Module* me, const std::string& u, LocalIntExt& e, bool v)
+		: SQLQuery(me), uid(u), pendingExt(e), verbose(v)
 	{
-		ServerInstance->Logs->Log("m_sqlauth",DEBUG, "SQLAUTH: query=\"%s\"", q.c_str());
 	}
 	
 	void OnResult(SQLResult& res)
@@ -47,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);
 		}
 	}
@@ -59,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());
 	}
 };
 
@@ -82,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)
@@ -111,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;
@@ -125,7 +139,7 @@ class ModuleSQLAuth : public Module
 		if (sha256)
 			userinfo["sha256pass"] = sha256->hexsum(user->password);
 
-		SQL->submit(new AuthQuery(this, SQL->FormatQuery(freeformquery, userinfo), user->uuid, pendingExt, verbose));
+		SQL->submit(new AuthQuery(this, user->uuid, pendingExt, verbose), freeformquery, userinfo);
 
 		return MOD_RES_PASSTHRU;
 	}
@@ -147,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);
 	}
 };