/*
* InspIRCd -- Internet Relay Chat Daemon
*
+ * Copyright (C) 2020 Matt Schatz <genius3000@g3k.solutions>
* Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
- * Copyright (C) 2013, 2017-2019 Sadie Powell <sadie@witchery.services>
- * Copyright (C) 2013 Christopher 'm4z' Holm <them4z@gmail.com>
+ * Copyright (C) 2013, 2017-2020 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>
: Command(Creator, "SSLINFO", 1)
, sslapi(Creator)
{
- this->syntax = "<nick>";
+ syntax = "<nick>";
}
CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
ssl_cert* cert = sslapi.GetCertificate(target);
if (!cert)
{
- user->WriteNotice("*** No TLS (SSL) client certificate for this user");
+ user->WriteNotice(InspIRCd::Format("*** %s is not connected using TLS (SSL).", target->nick.c_str()));
}
else if (cert->GetError().length())
{
- user->WriteNotice("*** No TLS (SSL) client certificate information for this user (" + cert->GetError() + ").");
+ 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()));
}
else
{
user->WriteNotice("*** Issuer: " + cert->GetIssuer());
user->WriteNotice("*** Key Fingerprint: " + cert->GetFingerprint());
}
+
return CMD_SUCCESS;
}
};
if (ifo->oper_block->getBool("sslonly") && !cert)
{
- user->WriteNumeric(ERR_NOOPERHOST, "This oper login requires an SSL connection.");
+ user->WriteNumeric(ERR_NOOPERHOST, "Invalid oper credentials");
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());
+ ServerInstance->SNO->WriteGlobalSno('o', "WARNING! Failed oper attempt by %s using login '%s': a secure connection is required.", user->GetFullRealHost().c_str(), parameters[0].c_str());
return MOD_RES_DENY;
}
std::string 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->WriteNumeric(ERR_NOOPERHOST, "Invalid oper credentials");
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());
+ ServerInstance->SNO->WriteGlobalSno('o', "WARNING! Failed oper attempt by %s using login '%s': their TLS (SSL) client certificate fingerprint does not match.", user->GetFullRealHost().c_str(), parameters[0].c_str());
return MOD_RES_DENY;
}
}
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);
- }
+ std::string text = "*** You are connected to ";
+ if (!ssliohook->GetServerName(text))
+ text.append(ServerInstance->Config->ServerName);
+ text.append(" using TLS (SSL) cipher '");
+ ssliohook->GetCiphersuite(text);
+ text.push_back('\'');
+ if (cert && !cert->GetFingerprint().empty())
+ text.append(" and your TLS (SSL) client certificate fingerprint is ").append(cert->GetFingerprint());
+ user->WriteNotice(text);
if (!cert)
return;
- // find an auto-oper block for this user
+
+ // 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;
if (!ok)
return MOD_RES_DENY;
+
return MOD_RES_PASSTHRU;
}