Some modules throw CoreException, this is wrong wrongitty wrong! Throw ModuleExceptio...

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

diff --git a/src/modules/extra/m_sqlauth.cpp b/src/modules/extra/m_sqlauth.cpp
index 3a88c05c9605faef32a25e146b8f6be422aac5f3..bf367a583ea61ee02760d3e6e127cc0e391c0e25 100644 (file)
--- 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)
        {
@@ -94,16 +82,56 @@ public:
                
                if (!CheckCredentials(user))
                {
-                       User::QuitUser(ServerInstance,user,killreason);
+                       ServerInstance->Users->QuitUser(user, killreason);
                        return 1;
                }
                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", safepass);
+               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())
                {
@@ -121,12 +149,12 @@ public:
                else
                {
                        if (verbose)
-                               ServerInstance->SNO->WriteToSnoMask('O', "Forbidden connection from %s!%s@%s (SQL query failed: %s)", user->nick, user->ident, user->host, req.error.Str());
+                               ServerInstance->SNO->WriteToSnoMask('A', "Forbidden connection from %s!%s@%s (SQL query failed: %s)", user->nick, user->ident, user->host, req.error.Str());
                        return false;
                }
        }
        
-       virtual char* OnRequest(Request* request)
+       virtual const char* OnRequest(Request* request)
        {
                if(strcmp(SQLRESID, request->GetId()) == 0)
                {
@@ -147,13 +175,13 @@ public:
                                        else if (verbose)
                                        {
                                                /* No rows in result, this means there was no record matching the user */
-                                               ServerInstance->SNO->WriteToSnoMask('O', "Forbidden connection from %s!%s@%s (SQL query returned no matches)", user->nick, user->ident, user->host);
+                                               ServerInstance->SNO->WriteToSnoMask('A', "Forbidden connection from %s!%s@%s (SQL query returned no matches)", user->nick, user->ident, user->host);
                                                user->Extend("sqlauth_failed");
                                        }
                                }
                                else if (verbose)
                                {
-                                       ServerInstance->SNO->WriteToSnoMask('O', "Forbidden connection from %s!%s@%s (SQL query failed: %s)", user->nick, user->ident, user->host, res->error.Str());
+                                       ServerInstance->SNO->WriteToSnoMask('A', "Forbidden connection from %s!%s@%s (SQL query failed: %s)", user->nick, user->ident, user->host, res->error.Str());
                                        user->Extend("sqlauth_failed");
                                }
                        }
@@ -164,7 +192,7 @@ public:
 
                        if (!user->GetExt("sqlauthed"))
                        {
-                               User::QuitUser(ServerInstance,user,killreason);
+                               ServerInstance->Users->QuitUser(user, killreason);
                        }
                        return SQLSUCCESS;
                }               
@@ -184,7 +212,7 @@ public:
 
        virtual Version GetVersion()
        {
-               return Version(1,1,1,0,VF_VENDOR,API_VERSION);
+               return Version(1,2,1,0,VF_VENDOR,API_VERSION);
        }
        
 };