Passing invalid instance to dns isnt a good idea

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

diff --git a/src/cmd_oper.cpp b/src/cmd_oper.cpp
index a209c7e645f1da59c1440940573d7cb01c8be5ae..7fa598934614688fc2beedcd2fbc484195b53436 100644 (file)
--- a/src/cmd_oper.cpp
+++ b/src/cmd_oper.cpp
@@ -30,7 +30,6 @@
 #include "mode.h"
 #include "xline.h"
 #include "inspstring.h"
-#include "dnsqueue.h"
 #include "helperfuncs.h"
 #include "hashcomp.h"
 #include "socketengine.h"
@@ -38,20 +37,20 @@
 #include "command_parse.h"
 #include "commands/cmd_oper.h"
 
-extern ServerConfig* Config;
+extern InspIRCd* ServerInstance;
 extern int MODCOUNT;
 extern ModuleList modules;
 extern FactoryList factory;
 extern time_t TIME;
 
-bool OneOfMatches(const char* host, const char* hostlist)
+bool OneOfMatches(const char* host, const char* ip, const char* hostlist)
 {
        std::stringstream hl(hostlist);
        std::string xhost;
        while (hl >> xhost)
        {
                log(DEBUG,"Oper: Matching host %s",xhost.c_str());
-               if (match(host,xhost.c_str()))
+               if (match(host,xhost.c_str()) || match(ip,xhost.c_str(),true))
                {
                        return true;
                }
@@ -59,7 +58,7 @@ bool OneOfMatches(const char* host, const char* hostlist)
        return false;
 }
 
-void cmd_oper::Handle (char **parameters, int pcnt, userrec *user)
+void cmd_oper::Handle (const char** parameters, int pcnt, userrec *user)
 {
        char LoginName[MAXBUF];
        char Password[MAXBUF];
@@ -67,40 +66,41 @@ void cmd_oper::Handle (char **parameters, int pcnt, userrec *user)
        char TypeName[MAXBUF];
        char HostName[MAXBUF];
        char TheHost[MAXBUF];
+       char TheIP[MAXBUF];
        int j;
        bool found = false;
        bool fail2 = false;
 
        snprintf(TheHost,MAXBUF,"%s@%s",user->ident,user->host);
+       snprintf(TheIP, MAXBUF,"%s@%s",user->ident,user->GetIPString());
 
-       for (int i = 0; i < Config->ConfValueEnum(Config->config_data, "oper"); i++)
+       for (int i = 0; i < ServerInstance->Config->ConfValueEnum(ServerInstance->Config->config_data, "oper"); i++)
        {
-               Config->ConfValue(Config->config_data, "oper", "name", i, LoginName, MAXBUF);
-               Config->ConfValue(Config->config_data, "oper", "password", i, Password, MAXBUF);
-               Config->ConfValue(Config->config_data, "oper", "type", i, OperType, MAXBUF);
-               Config->ConfValue(Config->config_data, "oper", "host", i, HostName, MAXBUF);
+               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);
 
-               if ((!strcmp(LoginName,parameters[0])) && (!operstrcmp(Password,parameters[1])) && (OneOfMatches(TheHost,HostName)))
+               if ((!strcmp(LoginName,parameters[0])) && (!operstrcmp(Password,parameters[1])) && (OneOfMatches(TheHost,TheIP,HostName)))
                {
                        fail2 = true;
-                       for (j =0; j < Config->ConfValueEnum(Config->config_data, "type"); j++)
+                       for (j =0; j < ServerInstance->Config->ConfValueEnum(ServerInstance->Config->config_data, "type"); j++)
                        {
-                               Config->ConfValue(Config->config_data, "type","name", j, TypeName, MAXBUF);
+                               ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "type","name", j, TypeName, MAXBUF);
 
                                if (!strcmp(TypeName,OperType))
                                {
                                        /* found this oper's opertype */
-                                       Config->ConfValue(Config->config_data, "type","host", j, HostName, MAXBUF);
+                                       ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "type","host", j, HostName, MAXBUF);
                                        if (*HostName)
-                                               ChangeDisplayedHost(user,HostName);
+                                               user->ChangeDisplayedHost(HostName);
                                        if (!isnick(TypeName))
                                        {
-                                               WriteServ(user->fd,"491 %s :Invalid oper type (oper types must follow the same syntax as nicknames)",user->nick);
+                                               user->WriteServ("491 %s :Invalid oper type (oper types must follow the same syntax as nicknames)",user->nick);
                                                WriteOpers("*** CONFIGURATION ERROR! Oper type invalid for OperType '%s'",OperType);
                                                log(DEFAULT,"OPER: Failed oper attempt by %s!%s@%s: credentials valid, but oper type erroneous.",user->nick,user->ident,user->host);
                                                return;
                                        }
-                                       strlcpy(user->oper,TypeName,NICKMAX-1);
                                        found = true;
                                        fail2 = false;
                                        break;
@@ -114,28 +114,21 @@ void cmd_oper::Handle (char **parameters, int pcnt, userrec *user)
        {
                /* correct oper credentials */
                WriteOpers("*** %s (%s@%s) is now an IRC operator of type %s",user->nick,user->ident,user->host,OperType);
-               WriteServ(user->fd,"381 %s :You are now an IRC operator of type %s",user->nick,OperType);
-               if (!strchr(user->modes,'o'))
-               {
-                       strcat(user->modes,"o");
-                       WriteServ(user->fd,"MODE %s :+o",user->nick);
-                       FOREACH_MOD(I_OnOper,OnOper(user,OperType));
-                       log(DEFAULT,"OPER: %s!%s@%s opered as type: %s",user->nick,user->ident,user->host,OperType);
-                       AddOper(user);
-                       FOREACH_MOD(I_OnPostOper,OnPostOper(user,OperType));
-               }
+               user->WriteServ("381 %s :You are now an IRC operator of type %s",user->nick,OperType);
+               if (!user->modes[UM_OPERATOR])
+                       user->Oper(OperType);
        }
        else
        {
                if (!fail2)
                {
-                       WriteServ(user->fd,"491 %s :Invalid oper credentials",user->nick);
+                       user->WriteServ("491 %s :Invalid oper credentials",user->nick);
                        WriteOpers("*** WARNING! Failed oper attempt by %s!%s@%s!",user->nick,user->ident,user->host);
                        log(DEFAULT,"OPER: Failed oper attempt by %s!%s@%s: user, host or password did not match.",user->nick,user->ident,user->host);
                }
                else
                {
-                       WriteServ(user->fd,"491 %s :Your oper block does not have a valid opertype associated with it",user->nick);
+                       user->WriteServ("491 %s :Your oper block does not have a valid opertype associated with it",user->nick);
                        WriteOpers("*** CONFIGURATION ERROR! Oper block mismatch for OperType %s",OperType);
                        log(DEFAULT,"OPER: Failed oper attempt by %s!%s@%s: credentials valid, but oper type nonexistent.",user->nick,user->ident,user->host);
                }