-/* +------------------------------------+
- * | 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"
{
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)
+ {
+ }
void OnResult(SQLResult& res)
{
+ 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 (OperUser(user, row[2], row[3]))
+#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
fallback();
}
void OnError(SQLerror& error)
{
+ ServerInstance->Logs->Log("m_sqloper",DEFAULT, "SQLOPER: query failed (%s)", error.Str());
fallback();
}
{
OperIndex::iterator iter = ServerInstance->Config->oper_blocks.find(" " + type);
if (iter == ServerInstance->Config->oper_blocks.end())
+ {
+ ServerInstance->Logs->Log("m_sqloper",DEFAULT, "SQLOPER: 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);
- if (OneOfMatches(hostname.c_str(), user->GetIPString(), pattern.c_str()))
+ if (OneOfMatches(hostname.c_str(), user->GetIPString(), pattern))
{
/* Opertype and host match, looks like this is it. */
class ModuleSQLOper : public Module
{
- std::string databaseid;
+ std::string query;
std::string hashtype;
dynamic_reference<SQLProvider> SQL;
OnRehash(NULL);
Implementation eventlist[] = { I_OnRehash, I_OnPreCommand };
- ServerInstance->Modules->Attach(eventlist, this, 2);
+ ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
}
void OnRehash(User* user)
{
- ConfigReader Conf;
+ ConfigTag* tag = ServerInstance->Config->ConfValue("sqloper");
+
+ std::string dbid = tag->getString("dbid");
+ if (dbid.empty())
+ SQL.SetProvider("SQL");
+ else
+ SQL.SetProvider("SQL/" + dbid);
- databaseid = Conf.ReadValue("sqloper", "dbid", 0); /* Database ID of a database configured for the service provider module */
- hashtype = Conf.ReadValue("sqloper", "hash", 0);
+ 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> ¶meters, 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;
}
{
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 username, password, 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()
projects / user / henk / code / inspircd.git / blobdiff