summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2005-04-21 17:26:33 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2005-04-21 17:26:33 +0000
commit753b5f5a9a75e82e4a86a25f6ffcc7e86a28ffca (patch)
tree0264c9eef92e810579f33680d1c8626a9ba97d6f
parentdc4339dbde226231426cc51b3853a97a42d184d8 (diff)
Added user/password checks and connection code
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@1157 e03df62e-2008-0410-955e-edbf42e46eb7
-rw-r--r--src/modules/extra/m_sqlauth.cpp46
1 files changed, 30 insertions, 16 deletions
diff --git a/src/modules/extra/m_sqlauth.cpp b/src/modules/extra/m_sqlauth.cpp
index 71eb2b9bc..f6ac25a56 100644
--- a/src/modules/extra/m_sqlauth.cpp
+++ b/src/modules/extra/m_sqlauth.cpp
@@ -40,6 +40,10 @@ class ModuleSQLAuth : public Module
{
ConfigReader* Conf;
std::string usertable;
+ std::string userfield;
+ std::string passfield;
+ std::string encryption;
+ std::string killreason;
unsigned long dbid;
Module* SQLModule;
@@ -47,10 +51,17 @@ class ModuleSQLAuth : public Module
bool ReadConfig()
{
Conf = new ConfigReader();
- usertable = Conf->ReadValue("sqlauth","usertable",0);
- dbid = Conf->ReadInteger("sqlauth","dbid",0,true);
+ usertable = Conf->ReadValue("sqlauth","usertable",0); // user table name
+ dbid = Conf->ReadInteger("sqlauth","dbid",0,true); // database id of a database configured in m_sql (see m_sql config)
+ userfield = Conf->ReadValue("sqlauth","userfield",0); // field name where username can be found
+ passfield = Conf->ReadValue("sqlauth","passfield",0); // field name where password can be found
+ killreason = Conf->ReadValue("sqlauth","killreason",0); // reason to give when access is denied to a user (put your reg details here)
+ encryption = Conf->ReadValue("sqlauth","encryption",0); // name of sql function used to encrypt password, e.g. "md5" or "passwd".
+ // define, but leave blank if no encryption is to be used.
delete Conf;
SQLModule = Srv->FindModule("m_sql.so");
+ if (!SQLModule)
+ Srv->Log(DEFAULT,"WARNING: m_sqlauth.so could not initialize because m_sql.so is not loaded. Load the module and rehash your server.");
return (SQLModule);
}
@@ -65,7 +76,15 @@ class ModuleSQLAuth : public Module
ReadConfig();
}
- bool CheckCredentials(std::string username, std::string password,std::string usertable)
+ virtual void OnUserRegister(userrec* user)
+ {
+ if (!CheckCredentials(user->nick,user->password))
+ {
+ Srv->QuitUser(user,killreason);
+ }
+ }
+
+ bool CheckCredentials(std::string username, std::string password)
{
bool found = false;
@@ -74,7 +93,7 @@ class ModuleSQLAuth : public Module
return false;
// Create a request containing the SQL query and send it to m_sql.so
- SQLRequest* query = new SQLRequest(SQL_RESULT,1,"SELECT * FROM "+usertable+" WHERE user='"+username+"' AND pass=md5('"+password+"')");
+ SQLRequest* query = new SQLRequest(SQL_RESULT,1,"SELECT * FROM "+usertable+" WHERE "+userfield+"='"+username+"' AND "+passfield+"="+encmethod+"('"+password+"')");
Request queryrequest((char*)query, this, SQLModule);
SQLResult* result = (SQLResult*)queryrequest.Send();
@@ -91,10 +110,13 @@ class ModuleSQLAuth : public Module
// did we get a row? If we did, we can now do something with the fields
if (rowresult->GetType() == SQL_ROW)
{
- Srv->Log(DEBUG,"*********** SQL TEST MODULE - RESULTS *************");
- Srv->Log(DEBUG,"Result, field 'qcount': '" + rowrequest->GetField("qcount"));
- Srv->Log(DEBUG,"Result, field 'asked': '" + rowrequest->GetField("asked"));
- found = true;
+ if (rowrequest->GetField(userfield) == username)
+ {
+ // because the query directly asked for the password hash, we do not need to check it -
+ // if it didnt match it wont be returned in the first place from the SELECT.
+ // This just checks we didnt get an empty row by accident.
+ found = true;
+ }
delete rowresult;
}
else
@@ -118,14 +140,6 @@ class ModuleSQLAuth : public Module
return found;
}
- virtual bool OnCheckReady(userrec* user)
- {
- }
-
- virtual void OnUserDisconnect(userrec* user)
- {
- }
-
virtual ~ModuleSQLAuth()
{
delete Srv;