#include "inspircd.h"
#include "transport.h"
-/* $ModDesc: Provides /sslinfo command used to test who a mask matches */
-/* $ModDep: transport.h */
+/* $ModDesc: Provides SSL metadata, including /WHOIS information and /SSLINFO command */
/** Handle /SSLINFO
*/
class CommandSSLInfo : public Command
{
public:
- CommandSSLInfo (InspIRCd* Instance) : Command(Instance,"SSLINFO", 0, 1)
+ CommandSSLInfo(InspIRCd* Instance, Module* Creator) : Command(Instance, Creator, "SSLINFO", 0, 1)
{
- this->source = "m_sslinfo.so";
this->syntax = "<nick>";
}
class ModuleSSLInfo : public Module
{
- CommandSSLInfo* newcommand;
+ CommandSSLInfo cmd;
public:
ModuleSSLInfo(InspIRCd* Me)
- : Module(Me)
+ : Module(Me), cmd(Me, this)
{
+ ServerInstance->AddCommand(&cmd);
- newcommand = new CommandSSLInfo(ServerInstance);
- ServerInstance->AddCommand(newcommand);
-
+ Implementation eventlist[] = { I_OnSyncUser, I_OnDecodeMetaData, I_OnWhois, I_OnPreCommand };
+ ServerInstance->Modules->Attach(eventlist, this, 4);
}
{
return Version("$Id$", VF_VENDOR, API_VERSION);
}
+
+ virtual void OnCleanup(int target_type, void* item)
+ {
+ if (target_type != TYPE_USER)
+ return;
+ User* user = static_cast<User*>(item);
+ user->Shrink("ssl_cert");
+ }
+
+ 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());
+ }
+ }
+
+ virtual void OnSyncUser(User* user, Module* proto, void* opaque)
+ {
+ 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());
+ }
+
+ virtual void OnDecodeMetaData(Extensible* target, const std::string &extname, const std::string &extdata)
+ {
+ 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"))
+ {
+ 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');
+ }
+ }
+ }
+
+ 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;
+ }
+
+ virtual ModResult OnPreCommand(std::string &command, std::vector<std::string> ¶meters, User *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 = 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++)
+ {
+ 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;
+
+ if (Password.length() && ServerInstance->PassCompare(user, Password.c_str(),parameters[1].c_str(), HashType.c_str()))
+ continue;
+
+ if (SSLOnly && !user->GetExt("ssl"))
+ {
+ user->WriteNumeric(491, "%s :This oper login name requires an SSL connection.", user->nick.c_str());
+ return MOD_RES_DENY;
+ }
+
+ /*
+ * No cert found or the fingerprint doesn't match
+ */
+ if ((!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 MOD_RES_DENY;
+ }
+ }
+ }
+
+ // Let core handle it for extra stuff
+ return MOD_RES_PASSTHRU;
+ }
+
+
};
MODULE_INIT(ModuleSSLInfo)
projects / user / henk / code / inspircd.git / blobdiff