*/
#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)
+ {
+ return static_cast<ssl_cert*>(get_raw(item));
+ }
+ void set(Extensible* item, ssl_cert* value)
+ {
+ ssl_cert* old = static_cast<ssl_cert*>(set_raw(item, value));
+ delete old;
+ }
+
+ std::string serialize(SerializeFormat format, const Extensible* container, void* item)
+ {
+ 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)
+ {
+ delete static_cast<ssl_cert*>(item);
+ }
+};
+
/** 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;
if (target)
{
- if (target->GetExt("ssl_cert", cert))
+ ssl_cert* cert = CertExt.get(target);
+ if (cert)
{
if (cert->GetError().length())
{
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;
+ return CMD_SUCCESS;
}
else
{
class ModuleSSLInfo : public Module
{
CommandSSLInfo cmd;
+
public:
- ModuleSSLInfo(InspIRCd* Me)
- : Module(Me), cmd(Me)
+ ModuleSSLInfo()
+ : cmd(this)
{
ServerInstance->AddCommand(&cmd);
- Implementation eventlist[] = { I_OnSyncUserMetaData, I_OnDecodeMetaData, I_OnWhois, I_OnPreCommand };
- ServerInstance->Modules->Attach(eventlist, this, 4);
- }
-
-
- virtual ~ModuleSSLInfo()
- {
- }
+ Extensible::Register(&cmd.CertExt);
- virtual Version GetVersion()
- {
- return Version("$Id$", VF_VENDOR, API_VERSION);
+ Implementation eventlist[] = { I_OnWhois, I_OnPreCommand };
+ ServerInstance->Modules->Attach(eventlist, this, 2);
+ ServerInstance->Modules->PublishInterface("SSLCertInfo", this);
}
- virtual void OnWhois(User* source, User* dest)
+ ~ModuleSSLInfo()
{
- if(dest->GetExt("ssl"))
- {
- ServerInstance->SendWhoisLine(source, dest, 320, "%s %s :is using a secure connection", source->nick.c_str(), dest->nick.c_str());
- }
+ ServerInstance->Modules->UnpublishInterface("SSLCertInfo", this);
}
- virtual void OnSyncUserMetaData(User* user, Module* proto, void* opaque, const std::string &extname, bool displayable)
+ Version GetVersion()
{
- // check if the linking module wants to know about OUR metadata
- if (extname == "ssl")
- {
- // check if this user has an ssl field to send
- if (!user->GetExt(extname))
- return;
-
- // call this function in the linking module, let it format the data how it
- // sees fit, and send it on its way. We dont need or want to know how.
- proto->ProtoSendMetaData(opaque, TYPE_USER, user, extname, displayable ? "Enabled" : "ON");
- }
- else if (extname == "ssl_cert")
- {
- ssl_cert* cert;
- if (!user->GetExt("ssl_cert", cert))
- return;
-
- proto->ProtoSendMetaData(opaque, TYPE_USER, user, extname, cert->GetMetaLine().c_str());
- }
+ return Version("SSL Certificate Utilities", VF_VENDOR | VF_SERVICEPROVIDER);
}
- virtual void OnDecodeMetaData(int target_type, void* target, const std::string &extname, const std::string &extdata)
+ void OnWhois(User* source, User* dest)
{
- // check if its our metadata key, and its associated with a user
- if ((target_type == TYPE_USER) && (extname == "ssl"))
- {
- User* dest = static_cast<User*>(target);
- // if they dont already have an ssl flag, accept the remote server's
- if (!dest->GetExt(extname))
- {
- dest->Extend(extname);
- }
- }
- else if ((target_type == TYPE_USER) && (extname == "ssl_cert"))
+ if (cmd.CertExt.get(dest))
{
- User* dest = static_cast<User*>(target);
- 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, 320, "%s %s :is using a secure connection", source->nick.c_str(), dest->nick.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, User *user, bool validated, const std::string &original_line)
{
- irc::string cmd = command.c_str();
+ irc::string pcmd = command.c_str();
- if ((cmd == "OPER") && (validated))
+ if ((pcmd == "OPER") && (validated))
{
- ConfigReader cf(ServerInstance);
+ ConfigReader cf;
char TheHost[MAXBUF];
char TheIP[MAXBUF];
std::string LoginName;
std::string HashType;
std::string FingerPrint;
bool SSLOnly;
- ssl_cert* cert = NULL;
+ 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());
- user->GetExt("ssl_cert",cert);
-
for (int i = 0; i < cf.Enumerate("oper"); i++)
{
LoginName = cf.ReadValue("oper", "name", i);
if (Password.length() && ServerInstance->PassCompare(user, Password.c_str(),parameters[1].c_str(), HashType.c_str()))
continue;
- if (SSLOnly && !user->GetExt("ssl"))
+ if (SSLOnly && !cert)
{
user->WriteNumeric(491, "%s :This oper login name requires an SSL connection.", user->nick.c_str());
- return 1;
+ return MOD_RES_DENY;
}
/*
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;
+ return MOD_RES_DENY;
}
}
}
// Let core handle it for extra stuff
- return 0;
+ return MOD_RES_PASSTHRU;
}
-
+ void OnRequest(Request& request)
+ {
+ if (strcmp("GET_CERT", request.id) == 0)
+ {
+ SSLCertificateRequest& req = static_cast<SSLCertificateRequest&>(request);
+ req.cert = cmd.CertExt.get(req.item);
+ }
+ 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