X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_oper.cpp;h=7fa598934614688fc2beedcd2fbc484195b53436;hb=eb28eaea35d9d109a0b7b890de9d957d562da675;hp=2e9a0b457222da8d263d81674c5832947ef1e907;hpb=c116475922dc1669d540bf2fa911c126f1dd8c40;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/cmd_oper.cpp b/src/cmd_oper.cpp index 2e9a0b457..7fa598934 100644 --- a/src/cmd_oper.cpp +++ b/src/cmd_oper.cpp @@ -14,24 +14,13 @@ * --------------------------------------------------- */ -using namespace std; - -#include "inspircd_config.h" -#include "inspircd.h" -#include "inspircd_io.h" -#include #include -#ifdef GCC3 -#include -#else -#include -#endif -#include #include #include -#include +#include "inspircd_config.h" +#include "configreader.h" +#include "typedefs.h" #include "users.h" -#include "ctables.h" #include "globals.h" #include "modules.h" #include "dynamic.h" @@ -41,34 +30,27 @@ using namespace std; #include "mode.h" #include "xline.h" #include "inspstring.h" -#include "dnsqueue.h" #include "helperfuncs.h" #include "hashcomp.h" #include "socketengine.h" -#include "typedefs.h" + #include "command_parse.h" -#include "cmd_oper.h" +#include "commands/cmd_oper.h" -extern ServerConfig* Config; extern InspIRCd* ServerInstance; extern int MODCOUNT; -extern std::vector modules; -extern std::vector factory; +extern ModuleList modules; +extern FactoryList factory; extern time_t TIME; -extern user_hash clientlist; -extern chan_hash chanlist; -extern std::vector all_opers; -extern std::vector local_users; -extern userrec* fd_ref_table[MAX_DESCRIPTORS]; -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; } @@ -76,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]; @@ -84,93 +66,72 @@ 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("oper",&Config->config_f); i++) + for (int i = 0; i < ServerInstance->Config->ConfValueEnum(ServerInstance->Config->config_data, "oper"); i++) { - Config->ConfValue("oper","name",i,LoginName,&Config->config_f); - Config->ConfValue("oper","password",i,Password,&Config->config_f); - Config->ConfValue("oper","type",i,OperType,&Config->config_f); - Config->ConfValue("oper","host",i,HostName,&Config->config_f); + 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])) + if ((!strcmp(LoginName,parameters[0])) && (!operstrcmp(Password,parameters[1])) && (OneOfMatches(TheHost,TheIP,HostName))) { - /* login name matches */ - if (!operstrcmp(Password, parameters[1])) + fail2 = true; + for (j =0; j < ServerInstance->Config->ConfValueEnum(ServerInstance->Config->config_data, "type"); j++) { - /* password matches */ - if (OneOfMatches(TheHost, HostName)) + ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "type","name", j, TypeName, MAXBUF); + + if (!strcmp(TypeName,OperType)) { - for (j =0; j < Config->ConfValueEnum("type",&Config->config_f); j++) + /* found this oper's opertype */ + ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "type","host", j, HostName, MAXBUF); + if (*HostName) + user->ChangeDisplayedHost(HostName); + if (!isnick(TypeName)) { - Config->ConfValue("type","name",j,TypeName,&Config->config_f); - - if (!strcmp(TypeName,OperType)) - { - /* found this oper's opertype */ - Config->ConfValue("type","host",j,HostName,&Config->config_f); - if (*HostName) - ChangeDisplayedHost(user,HostName); - if (!isnick(TypeName)) - { - WriteServ(user->fd,"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; - } - - /* 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)); - } - - strlcpy(user->oper,TypeName,NICKMAX-1); - return; - } + 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; } - - /* if we get to here, we have NOT found their opertype. */ - WriteServ(user->fd,"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); - return; - } - else - { - /* no host matches */ - WriteServ(user->fd, "491 %s :Invalid Credentials", user->nick); - WriteOpers("*** WARNING! Failed oper attempt by %s!%s@%s (incorrect hostname)!", user->nick, user->ident, user->host); - log(DEFAULT, "OPER: Failed oper attempt by %s!%s@%s: host did not match.", user->nick, user->ident, user->host); - return; + found = true; + fail2 = false; + break; } } - else - { - /* password WRONG */ - WriteServ(user->fd, "491 %s :Invalid Credentials", user->nick); - WriteOpers("*** WARNING! Failed oper attempt by %s!%s@%s (incorrect password)!", user->nick, user->ident, user->host); - log(DEFAULT, "OPER: Failed oper attempt by %s!%s@%s: password did not match.", user->nick, user->ident, user->host); - return; - } + } + if (found) + break; + } + if (found) + { + /* correct oper credentials */ + WriteOpers("*** %s (%s@%s) is now an IRC operator of type %s",user->nick,user->ident,user->host,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) + { + 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 + { + 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); } } - - /* if we get here, invalid oper login */ - WriteServ(user->fd, "491 %s :Invalid Credentials", user->nick); - WriteOpers("*** WARNING! Failed oper attempt by %s!%s@%s (incorrect oper (%s))!", user->nick, user->ident, user->host, parameters[0]); - log(DEFAULT, "OPER: Failed oper attempt by %s!%s@%s: incorrect oper (%s)", user->nick, user->ident, user->host, parameters[0]); return; } - -