Update m_cloaking to use free-form keys instead of weakening the hash IV

[user/henk/code/inspircd.git] / src / commands / cmd_oper.cpp

diff --git a/src/commands/cmd_oper.cpp b/src/commands/cmd_oper.cpp
index da07d631c34d40b94577509b168b24ccdd3f4340..da53d2b1a83557a15d2ef4627a96f9ab2ad89e0c 100644 (file)
--- a/src/commands/cmd_oper.cpp
+++ b/src/commands/cmd_oper.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -12,9 +12,30 @@
  */
 
 #include "inspircd.h"
-#include "commands/cmd_oper.h"
 #include "hashcomp.h"
 
+bool OneOfMatches(const char* host, const char* ip, const char* hostlist);
+
+/** Handle /OPER. These command handlers can be reloaded by the core,
+ * and handle basic RFC1459 commands. Commands within modules work
+ * the same way, however, they can be fully unloaded, where these
+ * may not.
+ */
+class CommandOper : public Command
+{
+ public:
+       /** Constructor for oper.
+        */
+       CommandOper ( Module* parent) : Command(parent,"OPER",2,2) { syntax = "<username> <password>"; }
+       /** Handle command.
+        * @param parameters The parameters to the comamnd
+        * @param pcnt The number of parameters passed to teh command
+        * @param user The user issuing the command
+        * @return A value from CmdResult to indicate command success or failure.
+        */
+       CmdResult Handle(const std::vector<std::string>& parameters, User *user);
+};
+
 bool OneOfMatches(const char* host, const char* ip, const char* hostlist)
 {
        std::stringstream hl(hostlist);
@@ -29,11 +50,6 @@ bool OneOfMatches(const char* host, const char* ip, const char* hostlist)
        return false;
 }
 
-extern "C" DllExport Command* init_command(InspIRCd* Instance)
-{
-       return new CommandOper(Instance);
-}
-
 CmdResult CommandOper::Handle (const std::vector<std::string>& parameters, User *user)
 {
        char LoginName[MAXBUF];
@@ -56,13 +72,13 @@ CmdResult CommandOper::Handle (const std::vector<std::string>& parameters, 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 < ServerInstance->Config->ConfValueEnum(ServerInstance->Config->config_data, "oper"); i++)
+       for (int i = 0; i < ServerInstance->Config->ConfValueEnum("oper"); i++)
        {
-               ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "oper", "name", i, LoginName, MAXBUF);
-               ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "oper", "password", i, Password, MAXBUF);
-               ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "oper", "type", i, OperType, MAXBUF);
-               ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "oper", "host", i, HostName, MAXBUF);
-               ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "oper", "hash", i, HashType, MAXBUF);
+               ServerInstance->Config->ConfValue("oper", "name", i, LoginName, MAXBUF);
+               ServerInstance->Config->ConfValue("oper", "password", i, Password, MAXBUF);
+               ServerInstance->Config->ConfValue("oper", "type", i, OperType, MAXBUF);
+               ServerInstance->Config->ConfValue("oper", "host", i, HostName, MAXBUF);
+               ServerInstance->Config->ConfValue("oper", "hash", i, HashType, MAXBUF);
 
                match_login = (LoginName == parameters[0]);
                match_pass = !ServerInstance->PassCompare(user, Password, parameters[1], HashType);
@@ -71,10 +87,10 @@ CmdResult CommandOper::Handle (const std::vector<std::string>& parameters, User
                if (match_login && match_pass && match_hosts)
                {
                        type_invalid = true;
-                       for (j =0; j < ServerInstance->Config->ConfValueEnum(ServerInstance->Config->config_data, "type"); j++)
+                       for (j =0; j < ServerInstance->Config->ConfValueEnum("type"); j++)
                        {
-                               ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "type", "name", j, TypeName, MAXBUF);
-                               ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "type", "class", j, ClassName, MAXBUF);
+                               ServerInstance->Config->ConfValue("type", "name", j, TypeName, MAXBUF);
+                               ServerInstance->Config->ConfValue("type", "class", j, ClassName, MAXBUF);
 
                                if (!strcmp(TypeName,OperType))
                                {
@@ -86,7 +102,7 @@ CmdResult CommandOper::Handle (const std::vector<std::string>& parameters, User
                                                ServerInstance->Logs->Log("OPER",DEFAULT,"OPER: Failed oper attempt by %s!%s@%s: credentials valid, but oper type erroneous.", user->nick.c_str(), user->ident.c_str(), user->host.c_str());
                                                return CMD_FAILURE;
                                        }
-                                       ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "type","host", j, HostName, MAXBUF);
+                                       ServerInstance->Config->ConfValue("type","host", j, HostName, MAXBUF);
                                        if (*HostName)
                                                user->ChangeDisplayedHost(HostName);
                                        if (*ClassName)
@@ -128,7 +144,7 @@ CmdResult CommandOper::Handle (const std::vector<std::string>& parameters, User
                        // tell them they suck, and lag them up to help prevent brute-force attacks
                        user->WriteNumeric(491, "%s :Invalid oper credentials",user->nick.c_str());
                        user->IncreasePenalty(10);
-                       
+
                        snprintf(broadcast, MAXBUF, "WARNING! Failed oper attempt by %s!%s@%s using login '%s': The following fields do not match: %s", user->nick.c_str(), user->ident.c_str(), user->host.c_str(), parameters[0].c_str(), fields.c_str());
                        ServerInstance->SNO->WriteToSnoMask('o',std::string(broadcast));
                        ServerInstance->PI->SendSNONotice("o", std::string("OPER: ") + broadcast);
@@ -151,3 +167,4 @@ CmdResult CommandOper::Handle (const std::vector<std::string>& parameters, User
        return CMD_SUCCESS;
 }
 
+COMMAND_INIT(CommandOper)