X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sqloper.cpp;h=b6aa90f490f080819611a27795a463c95c45bfca;hb=4aa27e75af8da0a5bc2e35f931f0165339f5f289;hp=84ae280ab7f72194364fa4e88656edbf752349a4;hpb=4b41feea830fc84e8c1b2fd0982f3e8d8840af96;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sqloper.cpp b/src/modules/m_sqloper.cpp
index 84ae280ab..b6aa90f49 100644
--- a/src/modules/m_sqloper.cpp
+++ b/src/modules/m_sqloper.cpp
@@ -21,8 +21,6 @@
 #include "modules/sql.h"
 #include "modules/hash.h"
 
-/* $ModDesc: Allows storage of oper credentials in an SQL table */
-
 class OpMeQuery : public SQLQuery
 {
  public:
@@ -34,7 +32,7 @@ class OpMeQuery : public SQLQuery
 
 	void OnResult(SQLResult& res) CXX11_OVERRIDE
 	{
-		ServerInstance->Logs->Log("m_sqloper",LOG_DEBUG, "SQLOPER: result for %s", uid.c_str());
+		ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "result for %s", uid.c_str());
 		User* user = ServerInstance->FindNick(uid);
 		if (!user)
 			return;
@@ -46,14 +44,14 @@ class OpMeQuery : public SQLQuery
 			if (OperUser(user, row[0], row[1]))
 				return;
 		}
-		ServerInstance->Logs->Log("m_sqloper",LOG_DEBUG, "SQLOPER: no matches for %s (checked %d rows)", uid.c_str(), res.Rows());
+		ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "no matches for %s (checked %d rows)", uid.c_str(), res.Rows());
 		// nobody succeeded... fall back to OPER
 		fallback();
 	}
 
 	void OnError(SQLerror& error) CXX11_OVERRIDE
 	{
-		ServerInstance->Logs->Log("m_sqloper",LOG_DEFAULT, "SQLOPER: query failed (%s)", error.Str());
+		ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "query failed (%s)", error.Str());
 		fallback();
 	}
 
@@ -63,7 +61,7 @@ class OpMeQuery : public SQLQuery
 		if (!user)
 			return;
 
-		Command* oper_command = ServerInstance->Parser->GetHandler("OPER");
+		Command* oper_command = ServerInstance->Parser.GetHandler("OPER");
 
 		if (oper_command)
 		{
@@ -74,23 +72,23 @@ class OpMeQuery : public SQLQuery
 		}
 		else
 		{
-			ServerInstance->Logs->Log("m_sqloper",LOG_SPARSE, "BUG: WHAT?! Why do we have no OPER command?!");
+			ServerInstance->Logs->Log(MODNAME, LOG_SPARSE, "BUG: WHAT?! Why do we have no OPER command?!");
 		}
 	}
 
 	bool OperUser(User* user, const std::string &pattern, const std::string &type)
 	{
-		OperIndex::iterator iter = ServerInstance->Config->oper_blocks.find(" " + type);
-		if (iter == ServerInstance->Config->oper_blocks.end())
+		ServerConfig::OperIndex::const_iterator iter = ServerInstance->Config->OperTypes.find(type);
+		if (iter == ServerInstance->Config->OperTypes.end())
 		{
-			ServerInstance->Logs->Log("m_sqloper",LOG_DEFAULT, "SQLOPER: bad type '%s' in returned row for oper %s", type.c_str(), username.c_str());
+			ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "bad type '%s' in returned row for oper %s", type.c_str(), username.c_str());
 			return false;
 		}
 		OperInfo* ifo = iter->second;
 
 		std::string hostname(user->ident);
 
-		hostname.append("@").append(user->host);
+		hostname.append("@").append(user->GetRealHost());
 
 		if (InspIRCd::MatchMask(pattern, hostname, user->GetIPString()))
 		{
@@ -113,15 +111,7 @@ class ModuleSQLOper : public Module
 public:
 	ModuleSQLOper() : SQL(this, "SQL") {}
 
-	void init() CXX11_OVERRIDE
-	{
-		OnRehash(NULL);
-
-		Implementation eventlist[] = { I_OnRehash, I_OnPreCommand };
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
-	}
-
-	void OnRehash(User* user) CXX11_OVERRIDE
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
 		ConfigTag* tag = ServerInstance->Config->ConfValue("sqloper");
 
@@ -132,7 +122,7 @@ public:
 			SQL.SetProvider("SQL/" + dbid);
 
 		hashtype = tag->getString("hash");
-		query = tag->getString("query", "SELECT hostname as host, type FROM ircd_opers WHERE username='$username' AND password='$password'");
+		query = tag->getString("query", "SELECT hostname as host, type FROM ircd_opers WHERE username='$username' AND password='$password' AND active=1;");
 	}
 
 	ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, LocalUser *user, bool validated, const std::string &original_line) CXX11_OVERRIDE
@@ -145,7 +135,7 @@ public:
 				/* Query is in progress, it will re-invoke OPER if needed */
 				return MOD_RES_DENY;
 			}
-			ServerInstance->Logs->Log("m_sqloper",LOG_DEFAULT, "SQLOPER: database not present");
+			ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "database not present");
 		}
 		return MOD_RES_PASSTHRU;
 	}
@@ -157,7 +147,7 @@ public:
 		ParamM userinfo;
 		SQL->PopulateUserInfo(user, userinfo);
 		userinfo["username"] = username;
-		userinfo["password"] = hash ? hash->hexsum(password) : password;
+		userinfo["password"] = hash ? hash->Generate(password) : password;
 
 		SQL->submit(new OpMeQuery(this, user->uuid, username, password), query, userinfo);
 	}