* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * InspIRCd: (C) 2002-2010 InspIRCd Development Team
* See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
*/
#include "inspircd.h"
-#include "transport.h"
+#include "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)
+ 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));
- delete old;
+ if (old && old->refcount_dec())
+ delete old;
}
- std::string serialize(Module* requestor, const Extensible* container, void* item)
+ std::string serialize(SerializeFormat format, const Extensible* container, void* item) const
{
return static_cast<ssl_cert*>(item)->GetMetaLine();
}
- void unserialize(Module* requestor, Extensible* container, const std::string& value)
+ void unserialize(SerializeFormat format, Extensible* container, const std::string& value)
{
ssl_cert* cert = new ssl_cert;
set(container, cert);
void free(void* item)
{
- delete static_cast<ssl_cert*>(item);
+ ssl_cert* old = static_cast<ssl_cert*>(item);
+ if (old && old->refcount_dec())
+ delete old;
}
};
public:
SSLCertExt CertExt;
- CommandSSLInfo(InspIRCd* Instance, Module* Creator) : Command(Instance, Creator, "SSLINFO", 0, 1), CertExt(Creator)
+ CommandSSLInfo(Module* Creator) : Command(Creator, "SSLINFO", 1), CertExt(Creator)
{
this->syntax = "<nick>";
}
CommandSSLInfo cmd;
public:
- ModuleSSLInfo(InspIRCd* Me)
- : Module(Me), cmd(Me, this)
+ ModuleSSLInfo()
+ : cmd(this)
{
ServerInstance->AddCommand(&cmd);
- Extensible::Register(&cmd.CertExt);
+ ServerInstance->Extensions.Register(&cmd.CertExt);
- Implementation eventlist[] = { I_OnSyncUser, I_OnDecodeMetaData, I_OnWhois, I_OnPreCommand };
- ServerInstance->Modules->Attach(eventlist, this, 4);
+ Implementation eventlist[] = { I_OnWhois, I_OnPreCommand, I_OnSetConnectClass };
+ ServerInstance->Modules->Attach(eventlist, this, 3);
}
- virtual ~ModuleSSLInfo()
- {
- }
-
- virtual Version GetVersion()
+ Version GetVersion()
{
return Version("SSL Certificate Utilities", VF_VENDOR);
}
- virtual void OnWhois(User* source, User* dest)
+ void OnWhois(User* source, User* dest)
{
if (cmd.CertExt.get(dest))
{
return false;
}
- virtual ModResult 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))
{
- 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 = cmd.CertExt.get(user);
-
- snprintf(TheHost,MAXBUF,"%s@%s",user->ident.c_str(),user->host.c_str());
- snprintf(TheIP, MAXBUF,"%s@%s",user->ident.c_str(),user->GetIPString());
-
- 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;
-
- if (!OneOfMatches(TheHost, TheIP, HostName.c_str()))
- continue;
+ OperInfo* ifo = i->second;
+ ssl_cert* cert = cmd.CertExt.get(user);
- if (Password.length() && ServerInstance->PassCompare(user, Password.c_str(),parameters[1].c_str(), HashType.c_str()))
- continue;
-
- if (SSLOnly && !cert)
+ if (ifo->oper_block->getBool("sslonly") && !cert)
{
- user->WriteNumeric(491, "%s :This oper login name requires an SSL connection.", user->nick.c_str());
+ 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());
+ user->WriteNumeric(491, "%s :This oper login requires a matching SSL fingerprint.",user->nick.c_str());
+ user->CommandFloodPenalty += 10000;
return MOD_RES_DENY;
}
}
return MOD_RES_PASSTHRU;
}
- const char* OnRequest(Request* request)
+ ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass)
+ {
+ if (myclass->config->getBool("requiressl") && !cmd.CertExt.get(user))
+ return MOD_RES_DENY;
+ return MOD_RES_PASSTHRU;
+ }
+
+ void OnRequest(Request& request)
{
- if (strcmp("GET_CERT", request->GetId()) == 0)
+ if (strcmp("GET_USER_CERT", request.id) == 0)
{
- BufferedSocketCertificateRequest* req = static_cast<BufferedSocketCertificateRequest*>(request);
- req->cert = cmd.CertExt.get(req->item);
+ UserCertificateRequest& req = static_cast<UserCertificateRequest&>(request);
+ req.cert = cmd.CertExt.get(req.user);
}
- else if (strcmp("SET_CERT", request->GetId()) == 0)
+ else if (strcmp("SET_CERT", request.id) == 0)
{
- BufferedSocketFingerprintSubmission* req = static_cast<BufferedSocketFingerprintSubmission*>(request);
- cmd.CertExt.set(req->item, req->cert);
+ SSLCertSubmission& req = static_cast<SSLCertSubmission&>(request);
+ cmd.CertExt.set(req.item, req.cert);
}
- return NULL;
}
};
projects / user / henk / code / inspircd.git / blobdiff