*
* Copyright (C) 2020 Matt Schatz <genius3000@g3k.solutions>
* Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
- * Copyright (C) 2013, 2017-2020 Sadie Powell <sadie@witchery.services>
+ * Copyright (C) 2013, 2017-2021 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2012-2016 Attila Molnar <attilamolnar@hush.com>
* Copyright (C) 2012 Robby <robby@chatbelgie.be>
* Copyright (C) 2010 Adam <Adam@anope.org>
* Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
- * Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
* Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
* Copyright (C) 2006-2007, 2009-2010 Craig Edwards <brain@inspircd.org>
*
}
};
-class CommandSSLInfo : public Command
+class CommandSSLInfo : public SplitCommand
{
- public:
- UserCertificateAPIImpl sslapi;
+ private:
+ ChanModeReference sslonlymode;
- CommandSSLInfo(Module* Creator)
- : Command(Creator, "SSLINFO", 1)
- , sslapi(Creator)
+ void HandleUserInternal(LocalUser* source, User* target, bool verbose)
{
- syntax = "<nick>";
+ ssl_cert* cert = sslapi.GetCertificate(target);
+ if (!cert)
+ {
+ source->WriteNotice(InspIRCd::Format("*** %s is not connected using TLS (SSL).", target->nick.c_str()));
+ }
+ else if (cert->GetError().length())
+ {
+ source->WriteNotice(InspIRCd::Format("*** %s is connected using TLS (SSL) but has not specified a valid client certificate (%s).",
+ target->nick.c_str(), cert->GetError().c_str()));
+ }
+ else if (!verbose)
+ {
+ source->WriteNotice(InspIRCd::Format("*** %s is connected using TLS (SSL) with a valid client certificate (%s).",
+ target->nick.c_str(), cert->GetFingerprint().c_str()));
+ }
+ else
+ {
+ source->WriteNotice("*** Distinguished Name: " + cert->GetDN());
+ source->WriteNotice("*** Issuer: " + cert->GetIssuer());
+ source->WriteNotice("*** Key Fingerprint: " + cert->GetFingerprint());
+ }
}
- CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
+ CmdResult HandleUser(LocalUser* source, const std::string& nick)
{
- User* target = ServerInstance->FindNickOnly(parameters[0]);
+ User* target = ServerInstance->FindNickOnly(nick);
+ if (!target || target->registered != REG_ALL)
+ {
+ source->WriteNumeric(Numerics::NoSuchNick(nick));
+ return CMD_FAILURE;
+ }
- if ((!target) || (target->registered != REG_ALL))
+ if (operonlyfp && !source->IsOper() && source != target)
{
- user->WriteNumeric(Numerics::NoSuchNick(parameters[0]));
+ source->WriteNumeric(ERR_NOPRIVILEGES, "You must be a server operator to view TLS (SSL) client certificate information for other users.");
return CMD_FAILURE;
}
- bool operonlyfp = ServerInstance->Config->ConfValue("sslinfo")->getBool("operonly");
- if (operonlyfp && !user->IsOper() && target != user)
+ HandleUserInternal(source, target, true);
+ return CMD_SUCCESS;
+ }
+
+ CmdResult HandleChannel(LocalUser* source, const std::string& channel)
+ {
+ Channel* chan = ServerInstance->FindChan(channel);
+ if (!chan)
{
- user->WriteNotice("*** You cannot view TLS (SSL) client certificate information for other users");
+ source->WriteNumeric(Numerics::NoSuchChannel(channel));
return CMD_FAILURE;
}
- ssl_cert* cert = sslapi.GetCertificate(target);
- if (!cert)
+ if (operonlyfp && !source->IsOper())
{
- user->WriteNotice(InspIRCd::Format("*** %s is not connected using TLS (SSL).", target->nick.c_str()));
+ source->WriteNumeric(ERR_NOPRIVILEGES, "You must be a server operator to view TLS (SSL) client certificate information for channels.");
+ return CMD_FAILURE;
}
- else if (cert->GetError().length())
+
+ if (!source->IsOper() && chan->GetPrefixValue(source) < OP_VALUE)
{
- user->WriteNotice(InspIRCd::Format("*** %s is connected using TLS (SSL) but has not specified a valid client certificate (%s).",
- target->nick.c_str(), cert->GetError().c_str()));
+ source->WriteNumeric(ERR_CHANOPRIVSNEEDED, chan->name, "You must be a channel operator.");
+ return CMD_FAILURE;
}
- else
+
+ if (sslonlymode)
{
- user->WriteNotice("*** Distinguished Name: " + cert->GetDN());
- user->WriteNotice("*** Issuer: " + cert->GetIssuer());
- user->WriteNotice("*** Key Fingerprint: " + cert->GetFingerprint());
+ source->WriteNotice(InspIRCd::Format("*** %s %s have channel mode +%c (%s) set.",
+ chan->name.c_str(), chan->IsModeSet(sslonlymode) ? "does" : "does not",
+ sslonlymode->GetModeChar(), sslonlymode->name.c_str()));
}
+ const Channel::MemberMap& userlist = chan->GetUsers();
+ for (Channel::MemberMap::const_iterator i = userlist.begin(); i != userlist.end(); ++i)
+ HandleUserInternal(source, i->first, false);
+
return CMD_SUCCESS;
}
+
+ public:
+ UserCertificateAPIImpl sslapi;
+ bool operonlyfp;
+
+ CommandSSLInfo(Module* Creator)
+ : SplitCommand(Creator, "SSLINFO", 1)
+ , sslonlymode(Creator, "sslonly")
+ , sslapi(Creator)
+ {
+ allow_empty_last_param = false;
+ syntax = "<channel|nick>";
+ }
+
+ CmdResult HandleLocal(LocalUser* user, const Params& parameters) CXX11_OVERRIDE
+ {
+ if (ServerInstance->IsChannel(parameters[0]))
+ return HandleChannel(user, parameters[0]);
+ else
+ return HandleUser(user, parameters[0]);
+ }
};
class ModuleSSLInfo
{
}
+ void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
+ {
+ ConfigTag* tag = ServerInstance->Config->ConfValue("sslinfo");
+ cmd.operonlyfp = tag->getBool("operonly");
+ }
+
Version GetVersion() CXX11_OVERRIDE
{
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);
if (cert)
{
whois.SendLine(RPL_WHOISSECURE, "is using a secure connection");
- bool operonlyfp = ServerInstance->Config->ConfValue("sslinfo")->getBool("operonly");
- if ((!operonlyfp || whois.IsSelfWhois() || whois.GetSource()->IsOper()) && !cert->fingerprint.empty())
+ if ((!cmd.operonlyfp || whois.IsSelfWhois() || whois.GetSource()->IsOper()) && !cert->fingerprint.empty())
whois.SendLine(RPL_WHOISCERTFP, InspIRCd::Format("has TLS (SSL) client certificate fingerprint %s", cert->fingerprint.c_str()));
}
}
std::string text = "*** You are connected to ";
if (!ssliohook->GetServerName(text))
- text.append(ServerInstance->Config->ServerName);
+ text.append(ServerInstance->Config->GetServerName());
text.append(" using TLS (SSL) cipher '");
ssliohook->GetCiphersuite(text);
text.push_back('\'');
ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass) CXX11_OVERRIDE
{
ssl_cert* cert = cmd.sslapi.GetCertificate(user);
- bool ok = true;
+ const char* error = NULL;
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 TLS (SSL) client certificate. Client %s one.", (ok ? "has" : "does not have"));
+ if (!cert || !cert->IsCAVerified())
+ error = "a trusted TLS (SSL) client certificate";
}
else if (myclass->config->getBool("requiressl"))
{
- ok = (cert != NULL);
- ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEBUG, "Class requires a secure connection. Client %s on a secure connection.", (ok ? "is" : "is not"));
+ if (!cert)
+ error = "a TLS (SSL) connection";
}
- if (!ok)
+ if (error)
+ {
+ ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEBUG, "The %s connect class is not suitable as it requires %s",
+ myclass->GetName().c_str(), error);
return MOD_RES_DENY;
+ }
return MOD_RES_PASSTHRU;
}
projects / user / henk / code / inspircd.git / blobdiff