Stop hiding users when a prefix is set on them, fixes apparent desyncs

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

diff --git a/src/modules/m_sqloper.cpp b/src/modules/m_sqloper.cpp
index 3b2f6719657a2c10270281c3e8bed934aabf7c65..bded0ea04e9f74785281158f9ab674f7e1b7fbf6 100644 (file)
--- a/src/modules/m_sqloper.cpp
+++ b/src/modules/m_sqloper.cpp
@@ -35,25 +35,37 @@ class OpMeQuery : public SQLQuery
 {
  public:
        const std::string uid, username, password;
-       OpMeQuery(Module* me, const std::string& db, const std::string& q, const std::string& u, const std::string& un, const std::string& pw)
-               : SQLQuery(me, db, q), uid(u), username(un), password(pw)
+       OpMeQuery(Module* me, const std::string& u, const std::string& un, const std::string& pw)
+               : SQLQuery(me), uid(u), username(un), password(pw)
        {
-               ServerInstance->Logs->Log("m_sqloper",DEBUG, "SQLOPER: db=%s query=\"%s\"", db.c_str(), q.c_str());
        }
 
        void OnResult(SQLResult& res)
        {
-               ServerInstance->Logs->Log("m_sqloper",DEBUG, "SQLOPER: result on db=%s for %s", dbid.c_str(), uid.c_str());
+               ServerInstance->Logs->Log("m_sqloper",DEBUG, "SQLOPER: result for %s", uid.c_str());
                User* user = ServerInstance->FindNick(uid);
                if (!user)
                        return;
 
-               // multiple rows may exist for multiple hosts
-               parameterlist row;
+               // multiple rows may exist
+               SQLEntries row;
                while (res.GetRow(row))
                {
+#if 0
+                       parameterlist cols;
+                       res.GetCols(cols);
+
+                       std::vector<KeyVal>* items;
+                       reference<ConfigTag> tag = ConfigTag::create("oper", "<m_sqloper>", 0, items);
+                       for(unsigned int i=0; i < cols.size(); i++)
+                       {
+                               if (!row[i].nul)
+                                       items->insert(std::make_pair(cols[i], row[i]));
+                       }
+#else
                        if (OperUser(user, row[0], row[1]))
                                return;
+#endif
                }
                ServerInstance->Logs->Log("m_sqloper",DEBUG, "SQLOPER: no matches for %s (checked %d rows)", uid.c_str(), res.Rows());
                // nobody succeeded... fall back to OPER
@@ -62,6 +74,7 @@ class OpMeQuery : public SQLQuery
 
        void OnError(SQLerror& error)
        {
+               ServerInstance->Logs->Log("m_sqloper",DEFAULT, "SQLOPER: query failed (%s)", error.Str());
                fallback();
        }
 
@@ -114,7 +127,7 @@ class OpMeQuery : public SQLQuery
 
 class ModuleSQLOper : public Module
 {
-       std::string databaseid;
+       std::string query;
        std::string hashtype;
        dynamic_reference<SQLProvider> SQL;
 
@@ -131,19 +144,29 @@ public:
 
        void OnRehash(User* user)
        {
-               ConfigReader Conf;
+               ConfigTag* tag = ServerInstance->Config->ConfValue("sqloper");
 
-               databaseid = Conf.ReadValue("sqloper", "dbid", 0); /* Database ID of a database configured for the service provider module */
-               hashtype = Conf.ReadValue("sqloper", "hash", 0);
+               std::string dbid = tag->getString("dbid");
+               if (dbid.empty())
+                       SQL.SetProvider("SQL");
+               else
+                       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'");
        }
 
        ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, LocalUser *user, bool validated, const std::string &original_line)
        {
-               if (validated && command == "OPER" && parameters.size() == 2 && SQL)
+               if (validated && command == "OPER" && parameters.size() >= 2)
                {
-                       LookupOper(user, parameters[0], parameters[1]);
-                       /* Query is in progress, it will re-invoke OPER if needed */
-                       return MOD_RES_DENY;
+                       if (SQL)
+                       {
+                               LookupOper(user, parameters[0], parameters[1]);
+                               /* Query is in progress, it will re-invoke OPER if needed */
+                               return MOD_RES_DENY;
+                       }
+                       ServerInstance->Logs->Log("m_sqloper",DEFAULT, "SQLOPER: database not present");
                }
                return MOD_RES_PASSTHRU;
        }
@@ -152,13 +175,12 @@ public:
        {
                HashProvider* hash = ServerInstance->Modules->FindDataService<HashProvider>("hash/" + hashtype);
 
-               parameterlist params;
-               params.push_back(username);
-               params.push_back(hash ? hash->hexsum(password) : password);
+               ParamM userinfo;
+               SQL->PopulateUserInfo(user, userinfo);
+               userinfo["username"] = username;
+               userinfo["password"] = hash ? hash->hexsum(password) : password;
 
-               SQL->submit(new OpMeQuery(this, databaseid, SQL->FormatQuery(
-                       "SELECT hostname, type FROM ircd_opers WHERE username = '?' AND password='?'", params
-                       ), user->uuid, username, password));
+               SQL->submit(new OpMeQuery(this, user->uuid, username, password), query, userinfo);
        }
 
        Version GetVersion()