* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * InspIRCd: (C) 2002-2008 InspIRCd Development Team
* See: http://www.inspircd.org/wiki/index.php/Credits
*
* This program is free but copyrighted software; see
/** Handle /FINGERPRINT
*/
-class cmd_fingerprint : public command_t
+class cmd_fingerprint : public Command
{
public:
- cmd_fingerprint (InspIRCd* Instance) : command_t(Instance,"FINGERPRINT", 0, 1)
+ cmd_fingerprint (InspIRCd* Instance) : Command(Instance,"FINGERPRINT", 0, 1)
{
this->source = "m_ssl_oper_cert.so";
syntax = "<nickname>";
}
- CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+ CmdResult Handle (const char* const* parameters, int pcnt, User *user)
{
- userrec* target = ServerInstance->FindNick(parameters[0]);
+ User* target = ServerInstance->FindNick(parameters[0]);
if (target)
{
ssl_cert* cert;
}
else
{
- user->WriteServ("401 %s %s :No such nickname", user->nick, parameters[0]);
+ user->WriteNumeric(401, "%s %s :No such nickname", user->nick, parameters[0]);
return CMD_FAILURE;
}
}
mycommand = new cmd_fingerprint(ServerInstance);
ServerInstance->AddCommand(mycommand);
cf = new ConfigReader(ServerInstance);
+ Implementation eventlist[] = { I_OnPreCommand, I_OnRehash };
+ ServerInstance->Modules->Attach(eventlist, this, 2);
}
virtual ~ModuleOperSSLCert()
delete cf;
}
- void Implements(char* List)
- {
- List[I_OnPreCommand] = List[I_OnRehash] = 1;
- }
- virtual void OnRehash(userrec* user, const std::string ¶meter)
+ virtual void OnRehash(User* user, const std::string ¶meter)
{
delete cf;
cf = new ConfigReader(ServerInstance);
return false;
}
-
- virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line)
+ virtual int OnPreCommand(const std::string &command, const char* const* parameters, int pcnt, User *user, bool validated, const std::string &original_line)
{
irc::string cmd = command.c_str();
std::string Password;
std::string OperType;
std::string HostName;
+ std::string HashType;
std::string FingerPrint;
bool SSLOnly;
char* dummy;
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 (SSLOnly || !FingerPrint.empty())
{
- if ((!strcmp(LoginName.c_str(),parameters[0])) && (!ServerInstance->OperPassCompare(Password.c_str(),parameters[1],i)) && (OneOfMatches(TheHost,TheIP,HostName.c_str())))
+ if ((!strcmp(LoginName.c_str(),parameters[0])) && (!ServerInstance->PassCompare(user, Password.c_str(),parameters[1], HashType.c_str())) && (OneOfMatches(TheHost,TheIP,HostName.c_str())))
{
if (SSLOnly && !user->GetExt("ssl", dummy))
{
- user->WriteServ("491 %s :This oper login name requires an SSL connection.", user->nick);
+ user->WriteNumeric(491, "%s :This oper login name requires an SSL connection.", user->nick);
return 1;
}
/* This oper would match */
if ((!cert) || (cert->GetFingerprint() != FingerPrint))
{
- user->WriteServ("491 %s :This oper login name requires a matching key fingerprint.",user->nick);
+ user->WriteNumeric(491, "%s :This oper login name requires a matching key fingerprint.",user->nick);
ServerInstance->SNO->WriteToSnoMask('o',"'%s' cannot oper, does not match fingerprint", user->nick);
- ServerInstance->Log(DEFAULT,"OPER: Failed oper attempt by %s!%s@%s: credentials valid, but wrong fingerprint.",user->nick,user->ident,user->host);
+ ServerInstance->Logs->Log("m_ssl_oper_cert",DEFAULT,"OPER: Failed oper attempt by %s!%s@%s: credentials valid, but wrong fingerprint.",user->nick,user->ident,user->host);
return 1;
}
}
virtual Version GetVersion()
{
- return Version(1,1,0,0,VF_VENDOR,API_VERSION);
- }
-};
-
-class ModuleOperSSLCertFactory : public ModuleFactory
-{
- public:
- ModuleOperSSLCertFactory()
- {
- }
-
- ~ModuleOperSSLCertFactory()
- {
+ return Version(1,2,0,0,VF_VENDOR,API_VERSION);
}
-
- virtual Module * CreateModule(InspIRCd* Me)
- {
- return new ModuleOperSSLCert(Me);
- }
-
};
+MODULE_INIT(ModuleOperSSLCert)
-extern "C" DllExport void * init_module( void )
-{
- return new ModuleOperSSLCertFactory;
-}