diff options
author | aquanight <aquanight@e03df62e-2008-0410-955e-edbf42e46eb7> | 2008-01-27 00:12:11 +0000 |
---|---|---|
committer | aquanight <aquanight@e03df62e-2008-0410-955e-edbf42e46eb7> | 2008-01-27 00:12:11 +0000 |
commit | 20bea3078d67a090ebcca64bf3cdbd7e6ab6adb6 (patch) | |
tree | 154357b8fdc476393e110ac48686a1160b508058 /src/modules | |
parent | 5773bcf973708ee2d9b0eca42fd0f8076a93f4c9 (diff) |
Change API OnOperCompare to OnPassCompare, password hashing is now available for <connect:allow>, <power die= restart=>, <title> (m_customtitle.so), <vhost> (m_vhost.so), this works the same was as for <oper>: load m_password_hash.so (after all hasher modules, of course), and add hash="md5/sha256/whatever" to the relevant tag. Also fix m_callerid.cpp crashing on unload.
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8755 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src/modules')
-rw-r--r-- | src/modules/extra/m_ssl_oper_cert.cpp | 5 | ||||
-rw-r--r-- | src/modules/m_callerid.cpp | 14 | ||||
-rw-r--r-- | src/modules/m_customtitle.cpp | 3 | ||||
-rw-r--r-- | src/modules/m_password_hash.cpp (renamed from src/modules/m_oper_hash.cpp) | 5 | ||||
-rw-r--r-- | src/modules/m_vhost.cpp | 3 |
5 files changed, 20 insertions, 10 deletions
diff --git a/src/modules/extra/m_ssl_oper_cert.cpp b/src/modules/extra/m_ssl_oper_cert.cpp index 074a75713..f82537c95 100644 --- a/src/modules/extra/m_ssl_oper_cert.cpp +++ b/src/modules/extra/m_ssl_oper_cert.cpp @@ -112,7 +112,6 @@ class ModuleOperSSLCert : public Module return false; } - virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line) { irc::string cmd = command.c_str(); @@ -125,6 +124,7 @@ class ModuleOperSSLCert : public Module std::string Password; std::string OperType; std::string HostName; + std::string HashType; std::string FingerPrint; bool SSLOnly; char* dummy; @@ -140,12 +140,13 @@ class ModuleOperSSLCert : public Module Password = cf->ReadValue("oper", "password", i); OperType = cf->ReadValue("oper", "type", i); HostName = cf->ReadValue("oper", "host", i); + HashType = cf->ReadValue("oper", "hash", i); FingerPrint = cf->ReadValue("oper", "fingerprint", i); SSLOnly = cf->ReadFlag("oper", "sslonly", i); if (SSLOnly || !FingerPrint.empty()) { - if ((!strcmp(LoginName.c_str(),parameters[0])) && (!ServerInstance->OperPassCompare(Password.c_str(),parameters[1],i)) && (OneOfMatches(TheHost,TheIP,HostName.c_str()))) + if ((!strcmp(LoginName.c_str(),parameters[0])) && (!ServerInstance->PassCompare(user, Password.c_str(),parameters[1], HashType.c_str())) && (OneOfMatches(TheHost,TheIP,HostName.c_str()))) { if (SSLOnly && !user->GetExt("ssl", dummy)) { diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp index 6d7d8413f..d3df1948b 100644 --- a/src/modules/m_callerid.cpp +++ b/src/modules/m_callerid.cpp @@ -222,13 +222,13 @@ public: delete myumode; throw new ModuleException("Could not add usermode and command!"); } - Implementation eventlist[] = { I_OnRehash, I_OnUserPreNick, I_OnUserQuit, I_On005Numeric, I_OnUserPreNotice, I_OnUserPreMessage }; - ServerInstance->Modules->Attach(eventlist, this, 6); + Implementation eventlist[] = { I_OnRehash, I_OnUserPreNick, I_OnUserQuit, I_On005Numeric, I_OnUserPreNotice, I_OnUserPreMessage, I_OnCleanup }; + ServerInstance->Modules->Attach(eventlist, this, 7); } ~ModuleCallerID() { - delete mycommand; + delete myumode; } Version GetVersion() @@ -279,6 +279,14 @@ public: return 0; } + void OnCleanup(int type, void* item) + { + if (type != TYPE_USER) return; + User* u = (User*)item; + /* Cleanup only happens on unload (before dtor), so keep this O(n) instead of O(n^2) which deferring to OnUserQuit would do. */ + RemoveData(u); + } + int OnUserPreNick(User* user, const std::string& newnick) { if (!tracknick) diff --git a/src/modules/m_customtitle.cpp b/src/modules/m_customtitle.cpp index e3d84e10f..0caa2d6f5 100644 --- a/src/modules/m_customtitle.cpp +++ b/src/modules/m_customtitle.cpp @@ -59,11 +59,12 @@ bool OneOfMatches(const char* host, const char* ip, const char* hostlist) { std::string name = Conf.ReadValue("title", "name", "", i); std::string pass = Conf.ReadValue("title", "password", "", i); + std::string hash = Conf.ReadValue("title", "hash", "", i); std::string host = Conf.ReadValue("title", "host", "*@*", i); std::string title = Conf.ReadValue("title", "title", "", i); std::string vhost = Conf.ReadValue("title", "vhost", "", i); - if (!strcmp(name.c_str(),parameters[0]) && !strcmp(pass.c_str(),parameters[1]) && OneOfMatches(TheHost,TheIP,host.c_str()) && !title.empty()) + if (!strcmp(name.c_str(),parameters[0]) && !ServerInstance->PassCompare(user, pass.c_str(), parameters[1], hash.c_str()) && OneOfMatches(TheHost,TheIP,host.c_str()) && !title.empty()) { std::string* text; user->GetExt("ctitle", text); diff --git a/src/modules/m_oper_hash.cpp b/src/modules/m_password_hash.cpp index e0ea8246a..45f986be8 100644 --- a/src/modules/m_oper_hash.cpp +++ b/src/modules/m_password_hash.cpp @@ -108,7 +108,7 @@ class ModuleOperHash : public Module mycommand = new CommandMkpasswd(ServerInstance, this, hashers, names); ServerInstance->AddCommand(mycommand); - Implementation eventlist[] = { I_OnRehash, I_OnOperCompare }; + Implementation eventlist[] = { I_OnRehash, I_OnPassCompare }; ServerInstance->Modules->Attach(eventlist, this, 2); } @@ -127,10 +127,9 @@ class ModuleOperHash : public Module Conf = new ConfigReader(ServerInstance); } - virtual int OnOperCompare(const std::string &data, const std::string &input, int tagnumber) + virtual int OnPassCompare(Extensible* ex, const std::string &data, const std::string &input, const std::string &hashtype) { /* First, lets see what hash theyre using on this oper */ - std::string hashtype = Conf->ReadValue("oper", "hash", tagnumber); hashymodules::iterator x = hashers.find(hashtype.c_str()); /* Is this a valid hash name? (case insensitive) */ diff --git a/src/modules/m_vhost.cpp b/src/modules/m_vhost.cpp index 130a8acc5..371f99dfa 100644 --- a/src/modules/m_vhost.cpp +++ b/src/modules/m_vhost.cpp @@ -35,8 +35,9 @@ class CommandVhost : public Command std::string mask = Conf->ReadValue("vhost","host",index); std::string username = Conf->ReadValue("vhost","user",index); std::string pass = Conf->ReadValue("vhost","pass",index); + std::string hash = Conf->ReadValue("vhost","hash",index); - if ((!strcmp(parameters[0],username.c_str())) && (!strcmp(parameters[1],pass.c_str()))) + if ((!strcmp(parameters[0],username.c_str())) && !ServerInstance->PassCompare(user, pass.c_str(), parameters[1], hash.c_str())) { if (!mask.empty()) { |