-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ * Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
*
- * 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 <http://www.gnu.org/licenses/>.
*/
+
#include "inspircd.h"
-#include "ssl.h"
+#include "modules/ssl.h"
/* $ModDesc: Provides SSL metadata, including /WHOIS information and /SSLINFO command */
CmdResult Handle (const std::vector<std::string> ¶meters, User *user)
{
- User* target = ServerInstance->FindNick(parameters[0]);
+ User* target = ServerInstance->FindNickOnly(parameters[0]);
- if (target)
+ if ((!target) || (target->registered != REG_ALL))
{
- ssl_cert* cert = CertExt.get(target);
- if (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;
- }
+ user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nickname", user->nick.c_str(), parameters[0].c_str());
+ 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())
+ {
+ user->WriteNotice("*** No SSL certificate information for this user (" + cert->GetError() + ").");
}
else
- user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nickname", user->nick.c_str(), parameters[0].c_str());
-
- return CMD_FAILURE;
+ {
+ user->WriteNotice("*** Distinguished Name: " + cert->GetDN());
+ user->WriteNotice("*** Issuer: " + cert->GetIssuer());
+ user->WriteNotice("*** Key Fingerprint: " + cert->GetFingerprint());
+ }
+ return CMD_SUCCESS;
}
};
CommandSSLInfo cmd;
public:
- ModuleSSLInfo()
- : cmd(this)
+ ModuleSSLInfo() : cmd(this)
{
- ServerInstance->AddCommand(&cmd);
+ }
- ServerInstance->Extensions.Register(&cmd.CertExt);
+ void init()
+ {
+ ServerInstance->Modules->AddService(cmd);
+
+ ServerInstance->Modules->AddService(cmd.CertExt);
- Implementation eventlist[] = { I_OnWhois, I_OnPreCommand, I_OnSetConnectClass };
- ServerInstance->Modules->Attach(eventlist, this, 3);
+ Implementation eventlist[] = { I_OnWhois, I_OnPreCommand, I_OnSetConnectClass, I_OnUserConnect, I_OnPostConnect };
+ ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
}
Version GetVersion()
void OnWhois(User* source, User* dest)
{
- if (cmd.CertExt.get(dest))
+ ssl_cert* cert = cmd.CertExt.get(dest);
+ if (cert)
{
- ServerInstance->SendWhoisLine(source, dest, 320, "%s %s :is using a secure connection", source->nick.c_str(), dest->nick.c_str());
+ ServerInstance->SendWhoisLine(source, dest, 671, "%s %s :is using a secure connection", source->nick.c_str(), dest->nick.c_str());
+ 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());
}
}
- bool OneOfMatches(const char* host, const char* ip, const char* hostlist)
- {
- std::stringstream hl(hostlist);
- std::string xhost;
- while (hl >> xhost)
- {
- if (InspIRCd::Match(host, xhost, ascii_case_insensitive_map) || InspIRCd::MatchCIDR(ip, xhost, ascii_case_insensitive_map))
- {
- return true;
- }
- }
- return false;
- }
-
ModResult OnPreCommand(std::string &command, std::vector<std::string> ¶meters, LocalUser *user, bool validated, const std::string &original_line)
{
- irc::string pcmd = command.c_str();
-
- if ((pcmd == "OPER") && (validated))
+ if ((command == "OPER") && (validated))
{
OperIndex::iterator i = ServerInstance->Config->oper_blocks.find(parameters[0]);
if (i != ServerInstance->Config->oper_blocks.end())
return MOD_RES_PASSTHRU;
}
+ void OnUserConnect(LocalUser* user)
+ {
+ SocketCertificateRequest req(&user->eh, this);
+ if (!req.cert)
+ return;
+ cmd.CertExt.set(user, req.cert);
+ }
+
+ void OnPostConnect(User* user)
+ {
+ ssl_cert *cert = cmd.CertExt.get(user);
+ if (!cert || cert->fingerprint.empty())
+ 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++)
+ {
+ 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)
{
- ssl_cert* cert = cmd.CertExt.get(user);
+ SocketCertificateRequest req(&user->eh, this);
bool ok = true;
- if (myclass->config->getBool("requiressl"))
+ if (myclass->config->getString("requiressl") == "trusted")
{
- ok = (cert != NULL);
+ ok = (req.cert && req.cert->IsCAVerified());
}
- else if (myclass->config->getString("requiressl") == "trusted")
+ else if (myclass->config->getBool("requiressl"))
{
- ok = (cert && cert->IsCAVerified());
+ ok = (req.cert != NULL);
}
if (!ok)
UserCertificateRequest& req = static_cast<UserCertificateRequest&>(request);
req.cert = cmd.CertExt.get(req.user);
}
- else if (strcmp("SET_CERT", request.id) == 0)
- {
- SSLCertSubmission& req = static_cast<SSLCertSubmission&>(request);
- cmd.CertExt.set(req.item, req.cert);
- }
}
};
MODULE_INIT(ModuleSSLInfo)
-
projects / user / henk / code / inspircd.git / blobdiff