X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_ssl_oper_cert.cpp;h=3d0e819289a469f1e44bf5c0d220e5632f3a81a0;hb=2b68243097f98ace4a53b21520718874b0ed7db5;hp=0d1ab045c3a0c38e7645643e19deb79c434e8a59;hpb=547ee1342e8b07bcdf46bc81343d1a1f7a2998e5;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 0d1ab045c..3d0e81928 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-2007 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,138 +12,169 @@ */ /* $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" -class cmd_fingerprint : public command_t +/** Handle /FINGERPRINT + */ +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 = ""; } - void Handle (const char** parameters, int pcnt, userrec *user) + CmdResult Handle (const char** parameters, int pcnt, User *user) { - userrec* target = ServerInstance->FindNick(parameters[0]); + User* target = ServerInstance->FindNick(parameters[0]); if (target) { ssl_cert* cert; if (target->GetExt("ssl_cert",cert)) { if (cert->GetFingerprint().length()) + { user->WriteServ("NOTICE %s :Certificate fingerprint for %s is %s",user->nick,target->nick,cert->GetFingerprint().c_str()); + return CMD_SUCCESS; + } else + { user->WriteServ("NOTICE %s :Certificate fingerprint for %s does not exist!", user->nick,target->nick); + return CMD_FAILURE; + } } else { user->WriteServ("NOTICE %s :Certificate fingerprint for %s does not exist!", user->nick, target->nick); + return CMD_FAILURE; } } else { user->WriteServ("401 %s %s :No such nickname", user->nick, parameters[0]); + return CMD_FAILURE; } } }; + 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); } - + virtual ~ModuleOperSSLCert() { + delete cf; } void Implements(char* List) { - List[I_OnOperCompare] = List[I_OnPreCommand] = 1; + List[I_OnPreCommand] = List[I_OnRehash] = 1; + } + + virtual void OnRehash(User* user, const std::string ¶meter) + { + delete cf; + cf = new ConfigReader(ServerInstance); } - virtual int OnOperCompare(const std::string &data, const std::string &input) + bool OneOfMatches(const char* host, const char* ip, const char* hostlist) { - ServerInstance->Log(DEBUG,"HasCert=%d, data='%s' input='%s'",HasCert,data.c_str(), input.c_str()); - if (((data.length()) && (data.length() == cert->GetFingerprint().length()))) + std::stringstream hl(hostlist); + std::string xhost; + while (hl >> xhost) { - ServerInstance->Log(DEBUG,"Lengths match, cert='%s'",cert->GetFingerprint().c_str()); - if (data == cert->GetFingerprint()) - { - ServerInstance->Log(DEBUG,"Return 1"); - return 1; - } - else + if (match(host,xhost.c_str()) || match(ip,xhost.c_str(),true)) { - ServerInstance->Log(DEBUG,"'%s' != '%s'",data.c_str(), cert->GetFingerprint().c_str()); - return 0; + return true; } } - else - { - ServerInstance->Log(DEBUG,"Lengths dont match"); - return 0; - } + return false; } - virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated) + + 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(); - if ((cmd == "OPER") && (validated == 1)) + if ((cmd == "OPER") && (validated)) { + char TheHost[MAXBUF]; + char TheIP[MAXBUF]; + std::string LoginName; + std::string Password; + std::string OperType; + std::string HostName; + 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 < cf->Enumerate("oper"); i++) + { + LoginName = cf->ReadValue("oper", "name", i); + Password = cf->ReadValue("oper", "password", i); + OperType = cf->ReadValue("oper", "type", i); + HostName = cf->ReadValue("oper", "host", 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 (SSLOnly && !user->GetExt("ssl", dummy)) + { + user->WriteServ("491 %s :This oper login name requires an SSL connection.", user->nick); + return 1; + } + + /* This oper would match */ + if ((!cert) || (cert->GetFingerprint() != FingerPrint)) + { + user->WriteServ("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); + return 1; + } + } + } + } } return 0; } virtual Version GetVersion() { - return Version(1,1,0,0,VF_VENDOR); - } -}; - -class ModuleOperSSLCertFactory : public ModuleFactory -{ - public: - ModuleOperSSLCertFactory() - { + return Version(1,1,0,0,VF_VENDOR,API_VERSION); } - - ~ModuleOperSSLCertFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleOperSSLCert(Me); - } - }; +MODULE_INIT(ModuleOperSSLCert); -extern "C" void * init_module( void ) -{ - return new ModuleOperSSLCertFactory; -}