-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2009 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 "transport.h"
+#include "modules/ssl.h"
/* $ModDesc: Provides SSL metadata, including /WHOIS information and /SSLINFO command */
+class SSLCertExt : public ExtensionItem {
+ public:
+ SSLCertExt(Module* parent) : ExtensionItem("ssl_cert", parent) {}
+ ssl_cert* get(const Extensible* item) const
+ {
+ return static_cast<ssl_cert*>(get_raw(item));
+ }
+ void set(Extensible* item, ssl_cert* value)
+ {
+ value->refcount_inc();
+ ssl_cert* old = static_cast<ssl_cert*>(set_raw(item, value));
+ if (old && old->refcount_dec())
+ delete old;
+ }
+
+ std::string serialize(SerializeFormat format, const Extensible* container, void* item) const
+ {
+ return static_cast<ssl_cert*>(item)->GetMetaLine();
+ }
+
+ void unserialize(SerializeFormat format, Extensible* container, const std::string& value)
+ {
+ ssl_cert* cert = new ssl_cert;
+ set(container, cert);
+
+ std::stringstream s(value);
+ std::string v;
+ getline(s,v,' ');
+
+ cert->invalid = (v.find('v') != std::string::npos);
+ cert->trusted = (v.find('T') != std::string::npos);
+ cert->revoked = (v.find('R') != std::string::npos);
+ cert->unknownsigner = (v.find('s') != std::string::npos);
+ if (v.find('E') != std::string::npos)
+ {
+ getline(s,cert->error,'\n');
+ }
+ else
+ {
+ getline(s,cert->fingerprint,' ');
+ getline(s,cert->dn,' ');
+ getline(s,cert->issuer,'\n');
+ }
+ }
+
+ void free(void* item)
+ {
+ ssl_cert* old = static_cast<ssl_cert*>(item);
+ if (old && old->refcount_dec())
+ delete old;
+ }
+};
+
/** Handle /SSLINFO
*/
class CommandSSLInfo : public Command
{
public:
- CommandSSLInfo (InspIRCd* Instance) : Command(Instance,"SSLINFO", 0, 1)
+ SSLCertExt CertExt;
+
+ CommandSSLInfo(Module* Creator) : Command(Creator, "SSLINFO", 1), CertExt(Creator)
{
- this->source = "m_sslinfo.so";
this->syntax = "<nick>";
}
CmdResult Handle (const std::vector<std::string> ¶meters, User *user)
{
- User* target = ServerInstance->FindNick(parameters[0]);
- ssl_cert* cert;
+ User* target = ServerInstance->FindNickOnly(parameters[0]);
- if (target)
+ if ((!target) || (target->registered != REG_ALL))
{
- if (target->GetExt("ssl_cert", 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_LOCALONLY;
- }
- 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->WriteServ("NOTICE %s :*** You cannot view SSL certificate information for other users", user->nick.c_str());
+ return CMD_FAILURE;
+ }
+ ssl_cert* cert = CertExt.get(target);
+ if (!cert)
+ {
+ user->WriteServ("NOTICE %s :*** No SSL certificate for this user", user->nick.c_str());
+ }
+ else 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->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nickname", user->nick.c_str(), parameters[0].c_str());
-
- return CMD_FAILURE;
+ {
+ user->WriteServ("NOTICE %s :*** Distinguished 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;
}
};
class ModuleSSLInfo : public Module
{
CommandSSLInfo cmd;
+
public:
- ModuleSSLInfo(InspIRCd* Me)
- : Module(Me), cmd(Me)
+ ModuleSSLInfo() : cmd(this)
{
- ServerInstance->AddCommand(&cmd);
-
- Implementation eventlist[] = { I_OnSyncUser, I_OnDecodeMetaData, I_OnWhois, I_OnPreCommand };
- ServerInstance->Modules->Attach(eventlist, this, 4);
}
-
- virtual ~ModuleSSLInfo()
+ void init()
{
- }
+ ServerInstance->Modules->AddService(cmd);
- virtual Version GetVersion()
- {
- return Version("$Id$", VF_VENDOR, API_VERSION);
- }
+ ServerInstance->Modules->AddService(cmd.CertExt);
- virtual void OnWhois(User* source, User* dest)
- {
- if(dest->GetExt("ssl"))
- {
- ServerInstance->SendWhoisLine(source, dest, 320, "%s %s :is using a secure connection", source->nick.c_str(), dest->nick.c_str());
- }
+ Implementation eventlist[] = { I_OnWhois, I_OnPreCommand, I_OnSetConnectClass, I_OnUserConnect, I_OnPostConnect };
+ ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
}
- virtual void OnSyncUser(User* user, Module* proto, void* opaque)
+ Version GetVersion()
{
- if (user->GetExt("ssl"))
- proto->ProtoSendMetaData(opaque, user, "ssl", "ON");
-
- ssl_cert* cert;
- if (user->GetExt("ssl_cert", cert))
- proto->ProtoSendMetaData(opaque, user, "ssl_cert", cert->GetMetaLine().c_str());
+ return Version("SSL Certificate Utilities", VF_VENDOR);
}
- virtual void OnDecodeMetaData(Extensible* target, const std::string &extname, const std::string &extdata)
+ void OnWhois(User* source, User* dest)
{
- User* dest = dynamic_cast<User*>(target);
- // check if its our metadata key, and its associated with a user
- if (dest && (extname == "ssl"))
- {
- // if they dont already have an ssl flag, accept the remote server's
- if (!dest->GetExt(extname))
- {
- dest->Extend(extname);
- }
- }
- else if (dest && (extname == "ssl_cert"))
+ ssl_cert* cert = cmd.CertExt.get(dest);
+ if (cert)
{
- if (dest->GetExt(extname))
- return;
-
- ssl_cert* cert = new ssl_cert;
- dest->Extend(extname, cert);
-
- std::stringstream s(extdata);
- std::string v;
- getline(s,v,' ');
-
- cert->invalid = (v.find('v') != std::string::npos);
- cert->trusted = (v.find('T') != std::string::npos);
- cert->revoked = (v.find('R') != std::string::npos);
- cert->unknownsigner = (v.find('s') != std::string::npos);
- if (v.find('E') != std::string::npos)
- {
- getline(s,cert->error,'\n');
- }
- else
- {
- getline(s,cert->fingerprint,' ');
- getline(s,cert->dn,' ');
- getline(s,cert->issuer,'\n');
- }
+ 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());
}
}
return false;
}
- virtual int OnPreCommand(std::string &command, std::vector<std::string> ¶meters, User *user, bool validated, const std::string &original_line)
+ 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))
{
- ConfigReader cf(ServerInstance);
- char TheHost[MAXBUF];
- char TheIP[MAXBUF];
- std::string LoginName;
- std::string Password;
- std::string OperType;
- std::string HostName;
- std::string HashType;
- std::string FingerPrint;
- bool SSLOnly;
- ssl_cert* cert = NULL;
-
- snprintf(TheHost,MAXBUF,"%s@%s",user->ident.c_str(),user->host.c_str());
- snprintf(TheIP, MAXBUF,"%s@%s",user->ident.c_str(),user->GetIPString());
-
- user->GetExt("ssl_cert",cert);
-
- for (int i = 0; i < cf.Enumerate("oper"); i++)
+ OperIndex::iterator i = ServerInstance->Config->oper_blocks.find(parameters[0]);
+ if (i != ServerInstance->Config->oper_blocks.end())
{
- LoginName = cf.ReadValue("oper", "name", i);
- Password = cf.ReadValue("oper", "password", i);
- OperType = cf.ReadValue("oper", "type", i);
- HostName = cf.ReadValue("oper", "host", i);
- HashType = cf.ReadValue("oper", "hash", i);
- FingerPrint = cf.ReadValue("oper", "fingerprint", i);
- SSLOnly = cf.ReadFlag("oper", "sslonly", i);
-
- if (FingerPrint.empty() && !SSLOnly)
- continue;
-
- if (LoginName != parameters[0])
- continue;
+ OperInfo* ifo = i->second;
+ ssl_cert* cert = cmd.CertExt.get(user);
- if (!OneOfMatches(TheHost, TheIP, HostName.c_str()))
- continue;
-
- if (Password.length() && ServerInstance->PassCompare(user, Password.c_str(),parameters[1].c_str(), HashType.c_str()))
- continue;
-
- if (SSLOnly && !user->GetExt("ssl"))
+ if (ifo->oper_block->getBool("sslonly") && !cert)
{
- user->WriteNumeric(491, "%s :This oper login name requires an SSL connection.", user->nick.c_str());
- return 1;
+ user->WriteNumeric(491, "%s :This oper login requires an SSL connection.", user->nick.c_str());
+ user->CommandFloodPenalty += 10000;
+ return MOD_RES_DENY;
}
- /*
- * No cert found or the fingerprint doesn't match
- */
- if ((!cert) || (cert->GetFingerprint() != FingerPrint))
+ std::string fingerprint;
+ if (ifo->oper_block->readString("fingerprint", fingerprint) && (!cert || cert->GetFingerprint() != fingerprint))
{
- user->WriteNumeric(491, "%s :This oper login name requires a matching key fingerprint.",user->nick.c_str());
- ServerInstance->SNO->WriteToSnoMask('o',"'%s' cannot oper, does not match fingerprint", user->nick.c_str());
- ServerInstance->Logs->Log("m_ssl_oper_cert",DEFAULT,"OPER: Failed oper attempt by %s!%s@%s: credentials valid, but wrong fingerprint.", user->nick.c_str(), user->ident.c_str(), user->host.c_str());
- return 1;
+ user->WriteNumeric(491, "%s :This oper login requires a matching SSL fingerprint.",user->nick.c_str());
+ user->CommandFloodPenalty += 10000;
+ return MOD_RES_DENY;
}
}
}
// Let core handle it for extra stuff
- return 0;
+ 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)
+ {
+ SocketCertificateRequest req(&user->eh, this);
+ bool ok = true;
+ if (myclass->config->getString("requiressl") == "trusted")
+ {
+ ok = (req.cert && req.cert->IsCAVerified());
+ }
+ else if (myclass->config->getBool("requiressl"))
+ {
+ ok = (req.cert != NULL);
+ }
+
+ if (!ok)
+ return MOD_RES_DENY;
+ return MOD_RES_PASSTHRU;
+ }
+ void OnRequest(Request& request)
+ {
+ if (strcmp("GET_USER_CERT", request.id) == 0)
+ {
+ UserCertificateRequest& req = static_cast<UserCertificateRequest&>(request);
+ req.cert = cmd.CertExt.get(req.user);
+ }
+ }
};
MODULE_INIT(ModuleSSLInfo)
-
projects / user / henk / code / inspircd.git / blobdiff