X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sslinfo.cpp;h=e27161dac02c809e76afae2e274a041f2e8c3562;hb=3cf993500544c2157992650da2487bfa89be405d;hp=0ab749703bfec88eb9de3aa9d569fad102278488;hpb=a59d08fffd3dc8a9850ce34c9928fb6382b9b37f;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_sslinfo.cpp b/src/modules/m_sslinfo.cpp index 0ab749703..e27161dac 100644 --- a/src/modules/m_sslinfo.cpp +++ b/src/modules/m_sslinfo.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * InspIRCd: (C) 2002-2010 InspIRCd Development Team * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see @@ -25,8 +25,10 @@ class SSLCertExt : public ExtensionItem { } void set(Extensible* item, ssl_cert* value) { + value->refcount_inc(); ssl_cert* old = static_cast(set_raw(item, value)); - delete old; + if (old && old->refcount_dec()) + delete old; } std::string serialize(SerializeFormat format, const Extensible* container, void* item) const @@ -61,7 +63,9 @@ class SSLCertExt : public ExtensionItem { void free(void* item) { - delete static_cast(item); + ssl_cert* old = static_cast(item); + if (old && old->refcount_dec()) + delete old; } }; @@ -79,35 +83,35 @@ class CommandSSLInfo : public Command CmdResult Handle (const std::vector ¶meters, User *user) { - User* target = ServerInstance->FindNick(parameters[0]); + User* target = ServerInstance->FindNickOnly(parameters[0]); - if (target) + if (!target) { - ssl_cert* cert = CertExt.get(target); - if (cert) - { - if (cert->GetError().length()) - { - user->WriteServ("NOTICE %s :*** No SSL certificate information for this user (%s).", user->nick.c_str(), cert->GetError().c_str()); - } - else - { - user->WriteServ("NOTICE %s :*** Distinguised Name: %s", user->nick.c_str(), cert->GetDN().c_str()); - user->WriteServ("NOTICE %s :*** Issuer: %s", user->nick.c_str(), cert->GetIssuer().c_str()); - user->WriteServ("NOTICE %s :*** Key Fingerprint: %s", user->nick.c_str(), cert->GetFingerprint().c_str()); - } - return CMD_SUCCESS; - } - else - { - user->WriteServ("NOTICE %s :*** No SSL certificate information for this user.", user->nick.c_str()); - return CMD_FAILURE; - } + user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nickname", user->nick.c_str(), parameters[0].c_str()); + return CMD_FAILURE; + } + bool operonlyfp = ServerInstance->Config->ConfValue("sslinfo")->getBool("operonly"); + if (operonlyfp && !IS_OPER(user) && target != user) + { + user->WriteServ("NOTICE %s :*** You cannot view SSL certificate information for other users", user->nick.c_str()); + return CMD_FAILURE; + } + ssl_cert* cert = CertExt.get(target); + if (!cert) + { + user->WriteServ("NOTICE %s :*** No SSL certificate for this user", user->nick.c_str()); + } + else if (cert->GetError().length()) + { + user->WriteServ("NOTICE %s :*** No SSL certificate information for this user (%s).", user->nick.c_str(), cert->GetError().c_str()); } else - user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nickname", user->nick.c_str(), parameters[0].c_str()); - - return CMD_FAILURE; + { + user->WriteServ("NOTICE %s :*** Distinguished Name: %s", user->nick.c_str(), cert->GetDN().c_str()); + user->WriteServ("NOTICE %s :*** Issuer: %s", user->nick.c_str(), cert->GetIssuer().c_str()); + user->WriteServ("NOTICE %s :*** Key Fingerprint: %s", user->nick.c_str(), cert->GetFingerprint().c_str()); + } + return CMD_SUCCESS; } }; @@ -116,21 +120,18 @@ class ModuleSSLInfo : public Module CommandSSLInfo cmd; public: - ModuleSSLInfo() - : cmd(this) + ModuleSSLInfo() : cmd(this) + { + } + + void init() { ServerInstance->AddCommand(&cmd); ServerInstance->Extensions.Register(&cmd.CertExt); - Implementation eventlist[] = { I_OnWhois, I_OnPreCommand }; - ServerInstance->Modules->Attach(eventlist, this, 2); - ServerInstance->Modules->PublishInterface("SSLCertInfo", this); - } - - ~ModuleSSLInfo() - { - ServerInstance->Modules->UnpublishInterface("SSLCertInfo", this); + Implementation eventlist[] = { I_OnWhois, I_OnPreCommand, I_OnSetConnectClass, I_OnUserConnect }; + ServerInstance->Modules->Attach(eventlist, this, 4); } Version GetVersion() @@ -140,9 +141,14 @@ class ModuleSSLInfo : public Module void OnWhois(User* source, User* dest) { - if (cmd.CertExt.get(dest)) + ssl_cert* cert = cmd.CertExt.get(dest); + if (cert) { - ServerInstance->SendWhoisLine(source, dest, 320, "%s %s :is using a secure connection", source->nick.c_str(), dest->nick.c_str()); + ServerInstance->SendWhoisLine(source, dest, 671, "%s %s :is using a secure connection", source->nick.c_str(), dest->nick.c_str()); + bool operonlyfp = ServerInstance->Config->ConfValue("sslinfo")->getBool("operonly"); + if ((!operonlyfp || source == dest || IS_OPER(source)) && !cert->fingerprint.empty()) + ServerInstance->SendWhoisLine(source, dest, 276, "%s %s :has client certificate fingerprint %s", + source->nick.c_str(), dest->nick.c_str(), cert->fingerprint.c_str()); } } @@ -160,63 +166,30 @@ class ModuleSSLInfo : public Module return false; } - ModResult OnPreCommand(std::string &command, std::vector ¶meters, User *user, bool validated, const std::string &original_line) + ModResult OnPreCommand(std::string &command, std::vector ¶meters, LocalUser *user, bool validated, const std::string &original_line) { irc::string pcmd = command.c_str(); if ((pcmd == "OPER") && (validated)) { - ConfigReader cf; - char TheHost[MAXBUF]; - char TheIP[MAXBUF]; - std::string LoginName; - std::string Password; - std::string OperType; - std::string HostName; - std::string HashType; - std::string FingerPrint; - bool SSLOnly; - ssl_cert* cert = cmd.CertExt.get(user); - - snprintf(TheHost,MAXBUF,"%s@%s",user->ident.c_str(),user->host.c_str()); - snprintf(TheIP, MAXBUF,"%s@%s",user->ident.c_str(),user->GetIPString()); - - for (int i = 0; i < cf.Enumerate("oper"); i++) + OperIndex::iterator i = ServerInstance->Config->oper_blocks.find(parameters[0]); + if (i != ServerInstance->Config->oper_blocks.end()) { - 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 (FingerPrint.empty() && !SSLOnly) - continue; - - if (LoginName != parameters[0]) - continue; - - if (!OneOfMatches(TheHost, TheIP, HostName.c_str())) - continue; + OperInfo* ifo = i->second; + ssl_cert* cert = cmd.CertExt.get(user); - if (Password.length() && ServerInstance->PassCompare(user, Password.c_str(),parameters[1].c_str(), HashType.c_str())) - continue; - - if (SSLOnly && !cert) + if (ifo->oper_block->getBool("sslonly") && !cert) { - user->WriteNumeric(491, "%s :This oper login name requires an SSL connection.", user->nick.c_str()); + user->WriteNumeric(491, "%s :This oper login requires an SSL connection.", user->nick.c_str()); + user->CommandFloodPenalty += 10000; return MOD_RES_DENY; } - /* - * No cert found or the fingerprint doesn't match - */ - if ((!cert) || (cert->GetFingerprint() != FingerPrint)) + std::string fingerprint; + if (ifo->oper_block->readString("fingerprint", fingerprint) && (!cert || cert->GetFingerprint() != fingerprint)) { - user->WriteNumeric(491, "%s :This oper login name requires a matching key fingerprint.",user->nick.c_str()); - ServerInstance->SNO->WriteToSnoMask('o',"'%s' cannot oper, does not match fingerprint", user->nick.c_str()); - ServerInstance->Logs->Log("m_ssl_oper_cert",DEFAULT,"OPER: Failed oper attempt by %s!%s@%s: credentials valid, but wrong fingerprint.", user->nick.c_str(), user->ident.c_str(), user->host.c_str()); + user->WriteNumeric(491, "%s :This oper login requires a matching SSL fingerprint.",user->nick.c_str()); + user->CommandFloodPenalty += 10000; return MOD_RES_DENY; } } @@ -226,17 +199,48 @@ class ModuleSSLInfo : public Module return MOD_RES_PASSTHRU; } - void OnRequest(Request& request) + void OnUserConnect(LocalUser* user) { - if (strcmp("GET_CERT", request.id) == 0) + SocketCertificateRequest req(&user->eh, this); + if (!req.cert) + return; + cmd.CertExt.set(user, req.cert); + if (req.cert->fingerprint.empty()) + return; + // find an auto-oper block for this user + for(OperIndex::iterator i = ServerInstance->Config->oper_blocks.begin(); i != ServerInstance->Config->oper_blocks.end(); i++) { - SSLCertificateRequest& req = static_cast(request); - req.cert = cmd.CertExt.get(req.item); + OperInfo* ifo = i->second; + std::string fp = ifo->oper_block->getString("fingerprint"); + if (fp == req.cert->fingerprint && ifo->oper_block->getBool("autologin")) + user->Oper(ifo); } - else if (strcmp("SET_CERT", request.id) == 0) + } + + ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass) + { + SocketCertificateRequest req(&user->eh, this); + bool ok = true; + if (myclass->config->getString("requiressl") == "trusted") + { + ok = (req.cert && req.cert->IsCAVerified()); + } + else if (myclass->config->getBool("requiressl")) + { + ok = (req.cert != NULL); + } + + if (!ok) + return MOD_RES_DENY; + return MOD_RES_PASSTHRU; + } + + void OnRequest(Request& request) + { + if (strcmp("GET_USER_CERT", request.id) == 0) { - SSLCertSubmission& req = static_cast(request); - cmd.CertExt.set(req.item, req.cert); + UserCertificateRequest& req = static_cast(request); + req.cert = cmd.CertExt.get(req.user); } } };