#include "modules/ssl.h"
#include "modules/webirc.h"
#include "modules/whois.h"
+#include "modules/who.h"
enum
{
RPL_WHOISSECURE = 671
};
-class SSLCertExt : public ExtensionItem {
+class SSLCertExt : public ExtensionItem
+{
public:
SSLCertExt(Module* parent)
: ExtensionItem("ssl_cert", ExtensionItem::EXT_USER, parent)
{
return static_cast<ssl_cert*>(get_raw(item));
}
+
void set(Extensible* item, ssl_cert* value)
{
value->refcount_inc();
void unset(Extensible* container)
{
- void* old = unset_raw(container);
- delete static_cast<std::string*>(old);
+ free(container, unset_raw(container));
}
- std::string serialize(SerializeFormat format, const Extensible* container, void* item) const CXX11_OVERRIDE
+ std::string ToNetwork(const Extensible* container, void* item) const CXX11_OVERRIDE
{
return static_cast<ssl_cert*>(item)->GetMetaLine();
}
- void unserialize(SerializeFormat format, Extensible* container, const std::string& value) CXX11_OVERRIDE
+ void FromNetwork(Extensible* container, const std::string& value) CXX11_OVERRIDE
{
ssl_cert* cert = new ssl_cert;
set(container, cert);
}
};
-/** 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 = "<nick>";
}
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");
}
};
-class UserCertificateAPIImpl : public UserCertificateAPIBase
-{
- SSLCertExt& ext;
-
- public:
- UserCertificateAPIImpl(Module* mod, SSLCertExt& certext)
- : UserCertificateAPIBase(mod), ext(certext)
- {
- }
-
- ssl_cert* GetCertificate(User* user) CXX11_OVERRIDE
- {
- return ext.get(user);
- }
-
- void SetCertificate(User* user, ssl_cert* cert) CXX11_OVERRIDE
- {
- ext.set(user, cert);
- }
-};
-
class ModuleSSLInfo
: public Module
, public WebIRC::EventListener
, public Whois::EventListener
+ , public Who::EventListener
{
+ private:
CommandSSLInfo cmd;
- UserCertificateAPIImpl APIImpl;
+
+ bool MatchFP(ssl_cert* const cert, const std::string& fp) const
+ {
+ return irc::spacesepstream(fp).Contains(cert->GetFingerprint());
+ }
public:
ModuleSSLInfo()
: WebIRC::EventListener(this)
, Whois::EventListener(this)
+ , Who::EventListener(this)
, cmd(this)
- , APIImpl(this, cmd.CertExt)
{
}
void OnWhois(Whois::Context& whois) CXX11_OVERRIDE
{
- ssl_cert* cert = cmd.CertExt.get(whois.GetTarget());
+ ssl_cert* cert = cmd.sslapi.GetCertificate(whois.GetTarget());
if (cert)
{
whois.SendLine(RPL_WHOISSECURE, "is using a secure connection");
}
}
+ 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))
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)
{
}
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(ERR_NOOPERHOST, "This oper login requires a matching SSL certificate fingerprint.");
user->CommandFloodPenalty += 10000;
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
{
LocalUser* const localuser = IS_LOCAL(user);
return;
const SSLIOHook* const ssliohook = SSLIOHook::IsSSL(&localuser->eh);
- if (!ssliohook)
+ if (!ssliohook || cmd.sslapi.nosslext.get(localuser))
return;
ssl_cert* const cert = ssliohook->GetCertificate();
{
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")
{
else if (myclass->config->getBool("requiressl"))
{
ok = (cert != NULL);
- ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEBUG, "Class requires any SSL cert. Client %s one.", (ok ? "has" : "does not have"));
+ ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEBUG, "Class requires SSL. Client %s using SSL.", (ok ? "is" : "is not"));
}
if (!ok)
// We only care about the tls connection flag if the connection
// between the gateway and the server is secure.
- if (!cmd.CertExt.get(user))
+ if (!cmd.sslapi.GetCertificate(user))
return;
WebIRC::FlagMap::const_iterator iter = flags->find("secure");
{
// If this is not set then the connection between the client and
// the gateway is not secure.
- cmd.CertExt.unset(user);
+ cmd.sslapi.nosslext.set(user, 1);
+ cmd.sslapi.sslext.unset(user);
return;
}
cert->revoked = true;
cert->trusted = false;
cert->unknownsigner = true;
- cmd.CertExt.set(user, cert);
+ cmd.sslapi.SetCertificate(user, cert);
}
};