X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fextra%2Fm_ssl_oper_cert.cpp;h=e06d746b7aeb38c4000508eb3b2bf9d4f1d92c57;hb=b07868e77c0527642ed72bce84bf5895bf921e87;hp=e441755fb8db66058b76d3fcb05904e237e70e14;hpb=3a7dd5b129450b94e0a87b8ad5009da70905b8e5;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/extra/m_ssl_oper_cert.cpp b/src/modules/extra/m_ssl_oper_cert.cpp index e441755fb..e06d746b7 100644 --- a/src/modules/extra/m_ssl_oper_cert.cpp +++ b/src/modules/extra/m_ssl_oper_cert.cpp @@ -2,12 +2,9 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. + * InspIRCd: (C) 2002-2008 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits + * * This program is free but copyrighted software; see * the file COPYING for details. * @@ -15,32 +12,30 @@ */ /* $ModDesc: Allows for MD5 encrypted oper passwords */ +/* $ModDep: transport.h */ -using namespace std; - -#include +#include "inspircd.h" #include "inspircd_config.h" #include "users.h" #include "channels.h" #include "modules.h" -#include "inspircd.h" -#include "ssl_cert.h" +#include "transport.h" #include "wildcard.h" /** Handle /FINGERPRINT */ -class cmd_fingerprint : public command_t +class cmd_fingerprint : public Command { public: - cmd_fingerprint (InspIRCd* Instance) : command_t(Instance,"FINGERPRINT", 0, 1) + cmd_fingerprint (InspIRCd* Instance) : Command(Instance,"FINGERPRINT", 0, 1) { this->source = "m_ssl_oper_cert.so"; syntax = ""; } - CmdResult Handle (const char** parameters, int pcnt, userrec *user) + CmdResult Handle (const char* const* parameters, int pcnt, User *user) { - userrec* target = ServerInstance->FindNick(parameters[0]); + User* target = ServerInstance->FindNick(parameters[0]); if (target) { ssl_cert* cert; @@ -65,7 +60,7 @@ class cmd_fingerprint : public command_t } else { - user->WriteServ("401 %s %s :No such nickname", user->nick, parameters[0]); + user->WriteNumeric(401, "%s %s :No such nickname", user->nick, parameters[0]); return CMD_FAILURE; } } @@ -78,26 +73,31 @@ class ModuleOperSSLCert : public Module ssl_cert* cert; bool HasCert; cmd_fingerprint* mycommand; + ConfigReader* cf; public: ModuleOperSSLCert(InspIRCd* Me) - : Module::Module(Me) + : Module(Me) { - mycommand = new cmd_fingerprint(ServerInstance); ServerInstance->AddCommand(mycommand); + cf = new ConfigReader(ServerInstance); + Implementation eventlist[] = { I_OnPreCommand, I_OnRehash }; + ServerInstance->Modules->Attach(eventlist, this, 2); } - + virtual ~ModuleOperSSLCert() { + delete cf; } - void Implements(char* List) + + virtual void OnRehash(User* user, const std::string ¶meter) { - List[I_OnPreCommand] = 1; + delete cf; + cf = new ConfigReader(ServerInstance); } - bool OneOfMatches(const char* host, const char* ip, const char* hostlist) { std::stringstream hl(hostlist); @@ -112,44 +112,54 @@ class ModuleOperSSLCert : public Module return false; } - - virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line) + virtual int OnPreCommand(const std::string &command, const char* const* parameters, int pcnt, User *user, bool validated, const std::string &original_line) { irc::string cmd = command.c_str(); if ((cmd == "OPER") && (validated)) { - char LoginName[MAXBUF]; - char Password[MAXBUF]; - char OperType[MAXBUF]; - char HostName[MAXBUF]; char TheHost[MAXBUF]; char TheIP[MAXBUF]; - char FingerPrint[MAXBUF]; + std::string LoginName; + std::string Password; + std::string OperType; + std::string HostName; + std::string HashType; + std::string FingerPrint; + bool SSLOnly; + char* dummy; snprintf(TheHost,MAXBUF,"%s@%s",user->ident,user->host); snprintf(TheIP, MAXBUF,"%s@%s",user->ident,user->GetIPString()); HasCert = user->GetExt("ssl_cert",cert); - ServerInstance->Log(DEBUG,"HasCert=%d",HasCert); - for (int i = 0; i < ServerInstance->Config->ConfValueEnum(ServerInstance->Config->config_data, "oper"); i++) + + for (int i = 0; i < cf->Enumerate("oper"); i++) { - ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "oper", "name", i, LoginName, MAXBUF); - ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "oper", "password", i, Password, MAXBUF); - ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "oper", "type", i, OperType, MAXBUF); - ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "oper", "host", i, HostName, MAXBUF); - ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "oper", "fingerprint", i, FingerPrint, MAXBUF); - - if (*FingerPrint) + LoginName = cf->ReadValue("oper", "name", i); + 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,parameters[0])) && (!ServerInstance->OperPassCompare(Password,parameters[1])) && (OneOfMatches(TheHost,TheIP,HostName))) + 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)) + { + user->WriteNumeric(491, "%s :This oper login name requires an SSL connection.", user->nick); + return 1; + } + /* This oper would match */ - if (cert->GetFingerprint() != FingerPrint) + if ((!cert) || (cert->GetFingerprint() != FingerPrint)) { - user->WriteServ("491 %s :This oper login name requires a matching key fingerprint.",user->nick); + user->WriteNumeric(491, "%s :This oper login name requires a matching key fingerprint.",user->nick); ServerInstance->SNO->WriteToSnoMask('o',"'%s' cannot oper, does not match fingerprint", user->nick); - ServerInstance->Log(DEFAULT,"OPER: Failed oper attempt by %s!%s@%s: credentials valid, but wrong fingerprint.",user->nick,user->ident,user->host); + ServerInstance->Logs->Log("m_ssl_oper_cert",DEFAULT,"OPER: Failed oper attempt by %s!%s@%s: credentials valid, but wrong fingerprint.",user->nick,user->ident,user->host); return 1; } } @@ -161,30 +171,9 @@ class ModuleOperSSLCert : public Module virtual Version GetVersion() { - return Version(1,1,0,0,VF_VENDOR); - } -}; - -class ModuleOperSSLCertFactory : public ModuleFactory -{ - public: - ModuleOperSSLCertFactory() - { - } - - ~ModuleOperSSLCertFactory() - { + return Version(1,2,0,0,VF_VENDOR,API_VERSION); } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleOperSSLCert(Me); - } - }; +MODULE_INIT(ModuleOperSSLCert) -extern "C" void * init_module( void ) -{ - return new ModuleOperSSLCertFactory; -}