summaryrefslogtreecommitdiff
path: root/src/modules/extra
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2008-03-29 18:10:31 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2008-03-29 18:10:31 +0000
commit235168b93ff76c9cf65485a44f29720128efbf0b (patch)
tree575e2dba0deeca5bcabf3d6cdf26658863da4557 /src/modules/extra
parentf41c42368dd402b11af0b041e9593fee31d96319 (diff)
Allow freeform queries. Allow $nick, $host, $ip, $pass, $md5pass and $sha256pass in the query. Ability of md5pass and sha256pass variables is dependent upon presence of m_sha256.so or m_md5.so.
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9209 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src/modules/extra')
-rw-r--r--src/modules/extra/m_sqlauth.cpp70
1 files changed, 49 insertions, 21 deletions
diff --git a/src/modules/extra/m_sqlauth.cpp b/src/modules/extra/m_sqlauth.cpp
index 7f01f3d32..ed294729f 100644
--- a/src/modules/extra/m_sqlauth.cpp
+++ b/src/modules/extra/m_sqlauth.cpp
@@ -17,19 +17,17 @@
#include "modules.h"
#include "m_sqlv2.h"
#include "m_sqlutils.h"
+#include "m_hash.h"
/* $ModDesc: Allow/Deny connections based upon an arbitary SQL table */
-/* $ModDep: m_sqlv2.h m_sqlutils.h */
+/* $ModDep: m_sqlv2.h m_sqlutils.h m_hash.h */
class ModuleSQLAuth : public Module
{
Module* SQLutils;
Module* SQLprovider;
- std::string usertable;
- std::string userfield;
- std::string passfield;
- std::string encryption;
+ std::string freeformquery;
std::string killreason;
std::string allowpattern;
std::string databaseid;
@@ -66,23 +64,13 @@ public:
virtual void OnRehash(User* user, const std::string &parameter)
{
ConfigReader Conf(ServerInstance);
-
- usertable = Conf.ReadValue("sqlauth", "usertable", 0); /* User table name */
+
databaseid = Conf.ReadValue("sqlauth", "dbid", 0); /* Database ID, given to the SQL service provider */
- 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 */
+ 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 */
- 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.
- */
+ 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 */
-
- if (encryption.find("(") == std::string::npos)
- {
- encryption.append("(");
- }
- }
+ }
virtual int OnUserRegister(User* user)
{
@@ -99,11 +87,51 @@ public:
}
return 0;
}
+ void SearchAndReplace(std::string& newline, const std::string &find, const std::string &replace)
+ {
+ std::string::size_type x = newline.find(find);
+ while (x != std::string::npos)
+ {
+ newline.erase(x, find.length());
+ if (!replace.empty())
+ newline.insert(x, replace);
+ x = newline.find(find);
+ }
+ }
+
bool CheckCredentials(User* user)
{
- SQLrequest req = SQLrequest(this, SQLprovider, databaseid, SQLquery("SELECT ? FROM ? WHERE ? = '?' AND ? = ?'?')") % userfield % usertable % userfield % user->nick %
- passfield % encryption % user->password);
+ std::string thisquery = freeformquery;
+ std::string safepass = user->password;
+
+ /* Search and replace the escaped nick and escaped pass into the query */
+
+ SearchAndReplace(safepass, "\"", "");
+
+ SearchAndReplace(thisquery, "$nick", user->nick);
+ SearchAndReplace(thisquery, "$pass", user->password);
+ SearchAndReplace(thisquery, "$host", user->host);
+ SearchAndReplace(thisquery, "$ip", user->GetIPString());
+
+ Module* HashMod = ServerInstance->Modules->Find("m_md5.so");
+
+ if (HashMod)
+ {
+ HashResetRequest(this, HashMod).Send();
+ SearchAndReplace(thisquery, "$md5pass", HashSumRequest(this, HashMod, user->password).Send());
+ }
+
+ HashMod = ServerInstance->Modules->Find("m_sha256.so");
+
+ if (HashMod)
+ {
+ HashResetRequest(this, HashMod).Send();
+ SearchAndReplace(thisquery, "$sha256pass", HashSumRequest(this, HashMod, user->password).Send());
+ }
+
+ /* Build the query */
+ SQLrequest req = SQLrequest(this, SQLprovider, databaseid, SQLquery(thisquery));
if(req.Send())
{