X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sslinfo.cpp;h=4f784c87cbd46537ea672a617f92739a9b52b970;hb=c5680d6493a07e6625cc84db0639811bb1a45aee;hp=edf3918e2144586d88f7df70488b61eba9224f48;hpb=ad523652ae0ab92df728796a1f082f339f6ddbb6;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_sslinfo.cpp b/src/modules/m_sslinfo.cpp index edf3918e2..4f784c87c 100644 --- a/src/modules/m_sslinfo.cpp +++ b/src/modules/m_sslinfo.cpp @@ -1,7 +1,16 @@ /* * InspIRCd -- Internet Relay Chat Daemon * + * Copyright (C) 2019 linuxdaemon + * Copyright (C) 2013, 2017-2019 Sadie Powell + * Copyright (C) 2013 Christopher 'm4z' Holm + * Copyright (C) 2012-2016 Attila Molnar + * Copyright (C) 2012 Robby + * Copyright (C) 2010 Adam * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2008 Robin Burchell + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2006-2007, 2009-2010 Craig Edwards * * 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 @@ -19,16 +28,32 @@ #include "inspircd.h" #include "modules/ssl.h" +#include "modules/webirc.h" +#include "modules/whois.h" +#include "modules/who.h" -/* $ModDesc: Provides SSL metadata, including /WHOIS information and /SSLINFO command */ +enum +{ + // From oftc-hybrid. + RPL_WHOISCERTFP = 276, + + // From UnrealIRCd. + RPL_WHOISSECURE = 671 +}; -class SSLCertExt : public ExtensionItem { +class SSLCertExt : public ExtensionItem +{ public: - SSLCertExt(Module* parent) : ExtensionItem("ssl_cert", parent) {} + 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(); @@ -37,12 +62,17 @@ class SSLCertExt : public ExtensionItem { delete old; } - std::string serialize(SerializeFormat format, const Extensible* container, void* item) const + void unset(Extensible* container) + { + free(container, unset_raw(container)); + } + + std::string ToNetwork(const Extensible* container, void* item) const CXX11_OVERRIDE { return static_cast(item)->GetMetaLine(); } - void unserialize(SerializeFormat format, Extensible* container, const std::string& value) + void FromNetwork(Extensible* container, const std::string& value) CXX11_OVERRIDE { ssl_cert* cert = new ssl_cert; set(container, cert); @@ -67,7 +97,7 @@ class SSLCertExt : public ExtensionItem { } } - void free(void* item) + void free(Extensible* container, void* item) CXX11_OVERRIDE { ssl_cert* old = static_cast(item); if (old && old->refcount_dec()) @@ -75,25 +105,64 @@ class SSLCertExt : public ExtensionItem { } }; -/** Handle /SSLINFO - */ +class UserCertificateAPIImpl : public UserCertificateAPIBase +{ + public: + LocalIntExt nosslext; + SSLCertExt sslext; + + UserCertificateAPIImpl(Module* mod) + : UserCertificateAPIBase(mod) + , nosslext("no_ssl_cert", ExtensionItem::EXT_USER, mod) + , sslext(mod) + { + } + + ssl_cert* GetCertificate(User* user) CXX11_OVERRIDE + { + ssl_cert* cert = sslext.get(user); + if (cert) + return cert; + + LocalUser* luser = IS_LOCAL(user); + if (!luser || nosslext.get(luser)) + return NULL; + + cert = SSLClientCert::GetCertificate(&luser->eh); + if (!cert) + return NULL; + + SetCertificate(user, cert); + return cert; + } + + void SetCertificate(User* user, ssl_cert* cert) CXX11_OVERRIDE + { + ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Setting SSL certificate for %s: %s", + user->GetFullHost().c_str(), cert->GetMetaLine().c_str()); + sslext.set(user, cert); + } +}; + class CommandSSLInfo : public Command { public: - SSLCertExt CertExt; + UserCertificateAPIImpl sslapi; - CommandSSLInfo(Module* Creator) : Command(Creator, "SSLINFO", 1), CertExt(Creator) + CommandSSLInfo(Module* Creator) + : Command(Creator, "SSLINFO", 1) + , sslapi(Creator) { this->syntax = ""; } - CmdResult Handle (const std::vector ¶meters, User *user) + CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE { User* target = ServerInstance->FindNickOnly(parameters[0]); if ((!target) || (target->registered != REG_ALL)) { - user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nickname", user->nick.c_str(), parameters[0].c_str()); + user->WriteNumeric(Numerics::NoSuchNick(parameters[0])); return CMD_FAILURE; } bool operonlyfp = ServerInstance->Config->ConfValue("sslinfo")->getBool("operonly"); @@ -102,7 +171,7 @@ class CommandSSLInfo : public Command user->WriteNotice("*** You cannot view SSL certificate information for other users"); return CMD_FAILURE; } - ssl_cert* cert = CertExt.get(target); + ssl_cert* cert = sslapi.GetCertificate(target); if (!cert) { user->WriteNotice("*** No SSL certificate for this user"); @@ -121,83 +190,83 @@ class CommandSSLInfo : public Command } }; -class UserCertificateAPIImpl : public UserCertificateAPIBase +class ModuleSSLInfo + : public Module + , public WebIRC::EventListener + , public Whois::EventListener + , public Who::EventListener { - SSLCertExt& ext; + private: + CommandSSLInfo cmd; - public: - UserCertificateAPIImpl(Module* mod, SSLCertExt& certext) - : UserCertificateAPIBase(mod), ext(certext) + bool MatchFP(ssl_cert* const cert, const std::string& fp) const { + return irc::spacesepstream(fp).Contains(cert->GetFingerprint()); } - ssl_cert* GetCertificate(User* user) CXX11_OVERRIDE - { - return ext.get(user); - } -}; - -class ModuleSSLInfo : public Module -{ - CommandSSLInfo cmd; - UserCertificateAPIImpl APIImpl; - public: ModuleSSLInfo() - : cmd(this), APIImpl(this, cmd.CertExt) + : WebIRC::EventListener(this) + , Whois::EventListener(this) + , Who::EventListener(this) + , cmd(this) { } - void init() CXX11_OVERRIDE - { - ServerInstance->Modules->AddService(APIImpl); - ServerInstance->Modules->AddService(cmd); - ServerInstance->Modules->AddService(cmd.CertExt); - - Implementation eventlist[] = { I_OnWhois, I_OnPreCommand, I_OnSetConnectClass, I_OnUserConnect, I_OnPostConnect }; - ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); - } - Version GetVersion() CXX11_OVERRIDE { - return Version("SSL Certificate Utilities", VF_VENDOR); + return Version("Adds user facing TLS (SSL) information, various TLS (SSL) configuration options, and the /SSLINFO command to look up TLS (SSL) certificate information for other users.", VF_VENDOR); } - void OnWhois(User* source, User* dest) CXX11_OVERRIDE + void OnWhois(Whois::Context& whois) CXX11_OVERRIDE { - ssl_cert* cert = cmd.CertExt.get(dest); + ssl_cert* cert = cmd.sslapi.GetCertificate(whois.GetTarget()); if (cert) { - ServerInstance->SendWhoisLine(source, dest, 671, "%s %s :is using a secure connection", source->nick.c_str(), dest->nick.c_str()); + whois.SendLine(RPL_WHOISSECURE, "is using a secure connection"); bool operonlyfp = ServerInstance->Config->ConfValue("sslinfo")->getBool("operonly"); - if ((!operonlyfp || source == dest || source->IsOper()) && !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()); + if ((!operonlyfp || whois.IsSelfWhois() || whois.GetSource()->IsOper()) && !cert->fingerprint.empty()) + whois.SendLine(RPL_WHOISCERTFP, InspIRCd::Format("has client certificate fingerprint %s", cert->fingerprint.c_str())); } } - ModResult OnPreCommand(std::string &command, std::vector ¶meters, LocalUser *user, bool validated, const std::string &original_line) CXX11_OVERRIDE + ModResult OnWhoLine(const Who::Request& request, LocalUser* source, User* user, Membership* memb, Numeric::Numeric& numeric) CXX11_OVERRIDE + { + size_t flag_index; + if (!request.GetFieldIndex('f', flag_index)) + return MOD_RES_PASSTHRU; + + ssl_cert* cert = cmd.sslapi.GetCertificate(user); + if (cert) + numeric.GetParams()[flag_index].push_back('s'); + + return MOD_RES_PASSTHRU; + } + + ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE { if ((command == "OPER") && (validated)) { - OperIndex::iterator i = ServerInstance->Config->oper_blocks.find(parameters[0]); + ServerConfig::OperIndex::const_iterator i = ServerInstance->Config->oper_blocks.find(parameters[0]); if (i != ServerInstance->Config->oper_blocks.end()) { OperInfo* ifo = i->second; - ssl_cert* cert = cmd.CertExt.get(user); + ssl_cert* cert = cmd.sslapi.GetCertificate(user); if (ifo->oper_block->getBool("sslonly") && !cert) { - user->WriteNumeric(491, "%s :This oper login requires an SSL connection.", user->nick.c_str()); + user->WriteNumeric(ERR_NOOPERHOST, "This oper login requires an SSL connection."); user->CommandFloodPenalty += 10000; + ServerInstance->SNO->WriteGlobalSno('o', "WARNING! Failed oper attempt by %s using login '%s': secure connection required.", user->GetFullRealHost().c_str(), parameters[0].c_str()); return MOD_RES_DENY; } std::string fingerprint; - if (ifo->oper_block->readString("fingerprint", fingerprint) && (!cert || cert->GetFingerprint() != fingerprint)) + if (ifo->oper_block->readString("fingerprint", fingerprint) && (!cert || !MatchFP(cert, fingerprint))) { - user->WriteNumeric(491, "%s :This oper login requires a matching SSL fingerprint.",user->nick.c_str()); + user->WriteNumeric(ERR_NOOPERHOST, "This oper login requires a matching SSL certificate fingerprint."); user->CommandFloodPenalty += 10000; + ServerInstance->SNO->WriteGlobalSno('o', "WARNING! Failed oper attempt by %s using login '%s': client certificate fingerprint does not match.", user->GetFullRealHost().c_str(), parameters[0].c_str()); return MOD_RES_DENY; } } @@ -207,45 +276,94 @@ 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()) + LocalUser* const localuser = IS_LOCAL(user); + if (!localuser) + return; + + const SSLIOHook* const ssliohook = SSLIOHook::IsSSL(&localuser->eh); + if (!ssliohook || cmd.sslapi.nosslext.get(localuser)) + return; + + ssl_cert* const cert = ssliohook->GetCertificate(); + + { + std::string text = "*** You are connected to "; + if (!ssliohook->GetServerName(text)) + text.append(ServerInstance->Config->ServerName); + text.append(" using SSL cipher '"); + ssliohook->GetCiphersuite(text); + text.push_back('\''); + if ((cert) && (!cert->GetFingerprint().empty())) + text.append(" and your SSL certificate fingerprint is ").append(cert->GetFingerprint()); + user->WriteNotice(text); + } + + if (!cert) 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++) + 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")) + if (MatchFP(cert, fp) && ifo->oper_block->getBool("autologin")) user->Oper(ifo); } } ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass) CXX11_OVERRIDE { - ssl_cert* cert = SSLClientCert::GetCertificate(&user->eh); + ssl_cert* cert = cmd.sslapi.GetCertificate(user); bool ok = true; - if (myclass->config->getString("requiressl") == "trusted") + const std::string requiressl = myclass->config->getString("requiressl"); + if (stdalgo::string::equalsci(requiressl, "trusted")) { ok = (cert && cert->IsCAVerified()); + ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEBUG, "Class requires a trusted SSL cert. Client %s one.", (ok ? "has" : "does not have")); } else if (myclass->config->getBool("requiressl")) { ok = (cert != NULL); + ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEBUG, "Class requires SSL. Client %s using SSL.", (ok ? "is" : "is not")); } if (!ok) return MOD_RES_DENY; return MOD_RES_PASSTHRU; } + + void OnWebIRCAuth(LocalUser* user, const WebIRC::FlagMap* flags) CXX11_OVERRIDE + { + // We are only interested in connection flags. If none have been + // given then we have nothing to do. + if (!flags) + return; + + // We only care about the tls connection flag if the connection + // between the gateway and the server is secure. + if (!cmd.sslapi.GetCertificate(user)) + return; + + WebIRC::FlagMap::const_iterator iter = flags->find("secure"); + if (iter == flags->end()) + { + // If this is not set then the connection between the client and + // the gateway is not secure. + cmd.sslapi.nosslext.set(user, 1); + cmd.sslapi.sslext.unset(user); + return; + } + + // Create a fake ssl_cert for the user. + ssl_cert* cert = new ssl_cert; + cert->error = "WebIRC users can not specify valid certs yet"; + cert->invalid = true; + cert->revoked = true; + cert->trusted = false; + cert->unknownsigner = true; + cmd.sslapi.SetCertificate(user, cert); + } }; MODULE_INIT(ModuleSSLInfo)