X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sslinfo.cpp;h=ac02908c4e5d887e3bb7907a0da4700dc138beee;hb=da29af8cba49d51e53d6e68237ccbf6370b6dd1f;hp=bf02ed87918686e8613c4b41aa6107d37b5456d5;hpb=6d57bbe05c31c79eaad02fe81cfb9c1ed6b79c58;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_sslinfo.cpp b/src/modules/m_sslinfo.cpp index bf02ed879..ac02908c4 100644 --- a/src/modules/m_sslinfo.cpp +++ b/src/modules/m_sslinfo.cpp @@ -1,40 +1,50 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * Copyright (C) 2009-2010 Daniel De Graaf * - * This program is free but copyrighted software; see - * the file COPYING for details. + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. * - * --------------------------------------------------- + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ -#include "inspircd.h" -#include "transport.h" -/* $ModDesc: Provides SSL metadata, including /WHOIS information and /SSLINFO command */ +#include "inspircd.h" +#include "modules/ssl.h" class SSLCertExt : public ExtensionItem { public: - SSLCertExt(Module* parent) : ExtensionItem("ssl_cert", parent) {} - ssl_cert* get(const Extensible* item) + SSLCertExt(Module* parent) + : ExtensionItem("ssl_cert", ExtensionItem::EXT_USER, parent) + { + } + + ssl_cert* get(const Extensible* item) const { return static_cast(get_raw(item)); } 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(Module* requestor, const Extensible* container, void* item) + std::string serialize(SerializeFormat format, const Extensible* container, void* item) const { return static_cast(item)->GetMetaLine(); } - void unserialize(Module* requestor, Extensible* container, const std::string& value) + void unserialize(SerializeFormat format, Extensible* container, const std::string& value) { ssl_cert* cert = new ssl_cert; set(container, cert); @@ -61,7 +71,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; } }; @@ -72,149 +84,113 @@ class CommandSSLInfo : public Command public: SSLCertExt CertExt; - CommandSSLInfo(InspIRCd* Instance, Module* Creator) : Command(Instance, Creator, "SSLINFO", 0, 1), CertExt(Creator) + CommandSSLInfo(Module* Creator) : Command(Creator, "SSLINFO", 1), CertExt(Creator) { this->syntax = ""; } CmdResult Handle (const std::vector ¶meters, User *user) { - User* target = ServerInstance->FindNick(parameters[0]); + User* target = ServerInstance->FindNickOnly(parameters[0]); - if (target) + if ((!target) || (target->registered != REG_ALL)) { - 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(Numerics::NoSuchNick(parameters[0])); + return CMD_FAILURE; + } + bool operonlyfp = ServerInstance->Config->ConfValue("sslinfo")->getBool("operonly"); + if (operonlyfp && !user->IsOper() && target != user) + { + user->WriteNotice("*** You cannot view SSL certificate information for other users"); + return CMD_FAILURE; + } + ssl_cert* cert = CertExt.get(target); + if (!cert) + { + user->WriteNotice("*** No SSL certificate for this user"); + } + else if (cert->GetError().length()) + { + user->WriteNotice("*** No SSL certificate information for this user (" + cert->GetError() + ")."); } else - user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nickname", user->nick.c_str(), parameters[0].c_str()); - - return CMD_FAILURE; + { + user->WriteNotice("*** Distinguished Name: " + cert->GetDN()); + user->WriteNotice("*** Issuer: " + cert->GetIssuer()); + user->WriteNotice("*** Key Fingerprint: " + cert->GetFingerprint()); + } + return CMD_SUCCESS; } }; -class ModuleSSLInfo : public Module +class UserCertificateAPIImpl : public UserCertificateAPIBase { - CommandSSLInfo cmd; + SSLCertExt& ext; public: - ModuleSSLInfo(InspIRCd* Me) - : Module(Me), cmd(Me, this) + UserCertificateAPIImpl(Module* mod, SSLCertExt& certext) + : UserCertificateAPIBase(mod), ext(certext) { - ServerInstance->AddCommand(&cmd); + } - Extensible::Register(&cmd.CertExt); + ssl_cert* GetCertificate(User* user) CXX11_OVERRIDE + { + return ext.get(user); + } +}; - Implementation eventlist[] = { I_OnSyncUser, I_OnDecodeMetaData, I_OnWhois, I_OnPreCommand }; - ServerInstance->Modules->Attach(eventlist, this, 4); - } +class ModuleSSLInfo : public Module, public Whois::EventListener +{ + CommandSSLInfo cmd; + UserCertificateAPIImpl APIImpl; - virtual ~ModuleSSLInfo() + public: + ModuleSSLInfo() + : Whois::EventListener(this) + , cmd(this) + , APIImpl(this, cmd.CertExt) { } - virtual Version GetVersion() + Version GetVersion() CXX11_OVERRIDE { return Version("SSL Certificate Utilities", VF_VENDOR); } - virtual void OnWhois(User* source, User* dest) + void OnWhois(Whois::Context& whois) CXX11_OVERRIDE { - if (cmd.CertExt.get(dest)) + ssl_cert* cert = cmd.CertExt.get(whois.GetTarget()); + if (cert) { - ServerInstance->SendWhoisLine(source, dest, 320, "%s %s :is using a secure connection", source->nick.c_str(), dest->nick.c_str()); + whois.SendLine(671, ":is using a secure connection"); + bool operonlyfp = ServerInstance->Config->ConfValue("sslinfo")->getBool("operonly"); + if ((!operonlyfp || whois.IsSelfWhois() || whois.GetSource()->IsOper()) && !cert->fingerprint.empty()) + whois.SendLine(276, ":has client certificate fingerprint %s", cert->fingerprint.c_str()); } } - bool OneOfMatches(const char* host, const char* ip, const char* hostlist) + ModResult OnPreCommand(std::string &command, std::vector ¶meters, LocalUser *user, bool validated, const std::string &original_line) CXX11_OVERRIDE { - std::stringstream hl(hostlist); - std::string xhost; - while (hl >> xhost) + if ((command == "OPER") && (validated)) { - if (InspIRCd::Match(host, xhost, ascii_case_insensitive_map) || InspIRCd::MatchCIDR(ip, xhost, ascii_case_insensitive_map)) + ServerConfig::OperIndex::const_iterator i = ServerInstance->Config->oper_blocks.find(parameters[0]); + if (i != ServerInstance->Config->oper_blocks.end()) { - return true; - } - } - return false; - } - - virtual ModResult OnPreCommand(std::string &command, std::vector ¶meters, User *user, bool validated, const std::string &original_line) - { - irc::string pcmd = command.c_str(); - - if ((pcmd == "OPER") && (validated)) - { - ConfigReader cf(ServerInstance); - 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++) - { - 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; + OperInfo* ifo = i->second; + ssl_cert* cert = cmd.CertExt.get(user); - if (!OneOfMatches(TheHost, TheIP, HostName.c_str())) - continue; - - 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, "This oper login requires an SSL connection."); + 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, "This oper login requires a matching SSL certificate fingerprint."); + user->CommandFloodPenalty += 10000; return MOD_RES_DENY; } } @@ -224,21 +200,45 @@ class ModuleSSLInfo : public Module return MOD_RES_PASSTHRU; } - const char* OnRequest(Request* request) + void OnUserConnect(LocalUser* user) CXX11_OVERRIDE { - if (strcmp("GET_CERT", request->GetId()) == 0) + ssl_cert* cert = SSLClientCert::GetCertificate(&user->eh); + if (cert) + cmd.CertExt.set(user, cert); + } + + void OnPostConnect(User* user) CXX11_OVERRIDE + { + ssl_cert *cert = cmd.CertExt.get(user); + if (!cert || cert->fingerprint.empty()) + return; + // find an auto-oper block for this user + for (ServerConfig::OperIndex::const_iterator i = ServerInstance->Config->oper_blocks.begin(); i != ServerInstance->Config->oper_blocks.end(); ++i) { - BufferedSocketCertificateRequest* 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 == cert->fingerprint && ifo->oper_block->getBool("autologin")) + user->Oper(ifo); } - else if (strcmp("SET_CERT", request->GetId()) == 0) + } + + ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass) CXX11_OVERRIDE + { + ssl_cert* cert = SSLClientCert::GetCertificate(&user->eh); + bool ok = true; + if (myclass->config->getString("requiressl") == "trusted") + { + ok = (cert && cert->IsCAVerified()); + } + else if (myclass->config->getBool("requiressl")) { - BufferedSocketFingerprintSubmission* req = static_cast(request); - cmd.CertExt.set(req->item, req->cert); + ok = (cert != NULL); } - return NULL; + + if (!ok) + return MOD_RES_DENY; + return MOD_RES_PASSTHRU; } }; MODULE_INIT(ModuleSSLInfo) -