X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sslinfo.cpp;h=ac02908c4e5d887e3bb7907a0da4700dc138beee;hb=da29af8cba49d51e53d6e68237ccbf6370b6dd1f;hp=715d9110a87a006cce7acd953dc5a82ea606e521;hpb=1c1c5fc3f01c42a09d34594989679bbc8fb21c0d;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_sslinfo.cpp b/src/modules/m_sslinfo.cpp index 715d9110a..ac02908c4 100644 --- a/src/modules/m_sslinfo.cpp +++ b/src/modules/m_sslinfo.cpp @@ -1,228 +1,196 @@ -/* +------------------------------------+ - * | 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" -/** Handle /SSLINFO - */ -class CommandSSLInfo : public Command -{ +class SSLCertExt : public ExtensionItem { public: - CommandSSLInfo(InspIRCd* Instance, Module* Creator) : Command(Instance, Creator, "SSLINFO", 0, 1) + SSLCertExt(Module* parent) + : ExtensionItem("ssl_cert", ExtensionItem::EXT_USER, parent) { - this->syntax = ""; } - CmdResult Handle (const std::vector ¶meters, User *user) + ssl_cert* get(const Extensible* item) const + { + return static_cast(get_raw(item)); + } + void set(Extensible* item, ssl_cert* value) { - User* target = ServerInstance->FindNick(parameters[0]); - ssl_cert* cert; + value->refcount_inc(); + ssl_cert* old = static_cast(set_raw(item, value)); + if (old && old->refcount_dec()) + delete old; + } - if (target) + std::string serialize(SerializeFormat format, const Extensible* container, void* item) const + { + return static_cast(item)->GetMetaLine(); + } + + void unserialize(SerializeFormat format, Extensible* container, const std::string& value) + { + ssl_cert* cert = new ssl_cert; + set(container, cert); + + std::stringstream s(value); + std::string v; + getline(s,v,' '); + + cert->invalid = (v.find('v') != std::string::npos); + cert->trusted = (v.find('T') != std::string::npos); + cert->revoked = (v.find('R') != std::string::npos); + cert->unknownsigner = (v.find('s') != std::string::npos); + if (v.find('E') != std::string::npos) { - if (target->GetExt("ssl_cert", 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; - } + getline(s,cert->error,'\n'); } else - user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nickname", user->nick.c_str(), parameters[0].c_str()); + { + getline(s,cert->fingerprint,' '); + getline(s,cert->dn,' '); + getline(s,cert->issuer,'\n'); + } + } - return CMD_FAILURE; + void free(void* item) + { + ssl_cert* old = static_cast(item); + if (old && old->refcount_dec()) + delete old; } }; -class ModuleSSLInfo : public Module +/** Handle /SSLINFO + */ +class CommandSSLInfo : public Command { - CommandSSLInfo cmd; public: - ModuleSSLInfo(InspIRCd* Me) - : Module(Me), cmd(Me, this) - { - ServerInstance->AddCommand(&cmd); - - Implementation eventlist[] = { I_OnSyncUser, I_OnDecodeMetaData, I_OnWhois, I_OnPreCommand }; - ServerInstance->Modules->Attach(eventlist, this, 4); - } + SSLCertExt CertExt; - - virtual ~ModuleSSLInfo() + CommandSSLInfo(Module* Creator) : Command(Creator, "SSLINFO", 1), CertExt(Creator) { + this->syntax = ""; } - virtual Version GetVersion() - { - return Version("$Id$", VF_VENDOR, API_VERSION); - } - - virtual void OnCleanup(int target_type, void* item) + CmdResult Handle (const std::vector ¶meters, User *user) { - if (target_type != TYPE_USER) - return; - User* user = static_cast(item); - user->Shrink("ssl_cert"); - } + User* target = ServerInstance->FindNickOnly(parameters[0]); - virtual void OnWhois(User* source, User* dest) - { - if(dest->GetExt("ssl")) + if ((!target) || (target->registered != REG_ALL)) + { + 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()) { - ServerInstance->SendWhoisLine(source, dest, 320, "%s %s :is using a secure connection", source->nick.c_str(), dest->nick.c_str()); + user->WriteNotice("*** No SSL certificate information for this user (" + cert->GetError() + ")."); } + else + { + user->WriteNotice("*** Distinguished Name: " + cert->GetDN()); + user->WriteNotice("*** Issuer: " + cert->GetIssuer()); + user->WriteNotice("*** Key Fingerprint: " + cert->GetFingerprint()); + } + return CMD_SUCCESS; } +}; - virtual void OnSyncUser(User* user, Module* proto, void* opaque) +class UserCertificateAPIImpl : public UserCertificateAPIBase +{ + SSLCertExt& ext; + + public: + UserCertificateAPIImpl(Module* mod, SSLCertExt& certext) + : UserCertificateAPIBase(mod), ext(certext) { - if (user->GetExt("ssl")) - proto->ProtoSendMetaData(opaque, user, "ssl", "ON"); - - ssl_cert* cert; - if (user->GetExt("ssl_cert", cert)) - proto->ProtoSendMetaData(opaque, user, "ssl_cert", cert->GetMetaLine().c_str()); } - virtual void OnDecodeMetaData(Extensible* target, const std::string &extname, const std::string &extdata) - { - User* dest = dynamic_cast(target); - // check if its our metadata key, and its associated with a user - if (dest && (extname == "ssl")) - { - // if they dont already have an ssl flag, accept the remote server's - if (!dest->GetExt(extname)) - { - dest->Extend(extname); - } - } - else if (dest && (extname == "ssl_cert")) - { - if (dest->GetExt(extname)) - return; + ssl_cert* GetCertificate(User* user) CXX11_OVERRIDE + { + return ext.get(user); + } +}; - ssl_cert* cert = new ssl_cert; - dest->Extend(extname, cert); +class ModuleSSLInfo : public Module, public Whois::EventListener +{ + CommandSSLInfo cmd; + UserCertificateAPIImpl APIImpl; - std::stringstream s(extdata); - std::string v; - getline(s,v,' '); + public: + ModuleSSLInfo() + : Whois::EventListener(this) + , cmd(this) + , APIImpl(this, cmd.CertExt) + { + } - cert->invalid = (v.find('v') != std::string::npos); - cert->trusted = (v.find('T') != std::string::npos); - cert->revoked = (v.find('R') != std::string::npos); - cert->unknownsigner = (v.find('s') != std::string::npos); - if (v.find('E') != std::string::npos) - { - getline(s,cert->error,'\n'); - } - else - { - getline(s,cert->fingerprint,' '); - getline(s,cert->dn,' '); - getline(s,cert->issuer,'\n'); - } - } + Version GetVersion() CXX11_OVERRIDE + { + return Version("SSL Certificate Utilities", VF_VENDOR); } - bool OneOfMatches(const char* host, const char* ip, const char* hostlist) + void OnWhois(Whois::Context& whois) CXX11_OVERRIDE { - std::stringstream hl(hostlist); - std::string xhost; - while (hl >> xhost) + ssl_cert* cert = cmd.CertExt.get(whois.GetTarget()); + if (cert) { - if (InspIRCd::Match(host, xhost, ascii_case_insensitive_map) || InspIRCd::MatchCIDR(ip, xhost, ascii_case_insensitive_map)) - { - return true; - } + 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()); } - return false; } - virtual 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) CXX11_OVERRIDE { - irc::string pcmd = command.c_str(); - - if ((pcmd == "OPER") && (validated)) + if ((command == "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 = NULL; - - snprintf(TheHost,MAXBUF,"%s@%s",user->ident.c_str(),user->host.c_str()); - snprintf(TheIP, MAXBUF,"%s@%s",user->ident.c_str(),user->GetIPString()); - - user->GetExt("ssl_cert",cert); - - for (int i = 0; i < cf.Enumerate("oper"); i++) + ServerConfig::OperIndex::const_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 && !user->GetExt("ssl")) + 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; } } @@ -232,8 +200,45 @@ class ModuleSSLInfo : public Module return MOD_RES_PASSTHRU; } + void OnUserConnect(LocalUser* user) CXX11_OVERRIDE + { + 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) + { + OperInfo* ifo = i->second; + std::string fp = ifo->oper_block->getString("fingerprint"); + if (fp == cert->fingerprint && ifo->oper_block->getBool("autologin")) + user->Oper(ifo); + } + } + + 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")) + { + ok = (cert != NULL); + } + if (!ok) + return MOD_RES_DENY; + return MOD_RES_PASSTHRU; + } }; MODULE_INIT(ModuleSSLInfo) -