X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_oper.cpp;h=1af42fffaa98e0536fcd8d63b241d4d8cbd33734;hb=4487dde76ffbdb21e7dc319b3b87d09c3cf60d8c;hp=12d420567bb646010d9d9f2672baafb9cb1fc002;hpb=f6394033121a43396477c22520b5d057f3f00efe;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/cmd_oper.cpp b/src/cmd_oper.cpp index 12d420567..1af42fffa 100644 --- a/src/cmd_oper.cpp +++ b/src/cmd_oper.cpp @@ -2,24 +2,19 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * + * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits * - * Written by Craig Edwards, Craig McLure, and others. * This program is free but copyrighted software; see * the file COPYING for details. * * --------------------------------------------------- */ -#include "configreader.h" -#include "typedefs.h" -#include "users.h" -#include "modules.h" +#include "inspircd.h" #include "wildcard.h" #include "commands/cmd_oper.h" +#include "hashcomp.h" bool OneOfMatches(const char* host, const char* ip, const char* hostlist) { @@ -35,20 +30,19 @@ bool OneOfMatches(const char* host, const char* ip, const char* hostlist) return false; } - - -extern "C" command_t* init_command(InspIRCd* Instance) +extern "C" DllExport Command* init_command(InspIRCd* Instance) { return new cmd_oper(Instance); } -CmdResult cmd_oper::Handle (const char** parameters, int pcnt, userrec *user) +CmdResult cmd_oper::Handle (const char** parameters, int pcnt, User *user) { char LoginName[MAXBUF]; char Password[MAXBUF]; char OperType[MAXBUF]; char TypeName[MAXBUF]; char HostName[MAXBUF]; + char ClassName[MAXBUF]; char TheHost[MAXBUF]; char TheIP[MAXBUF]; int j; @@ -70,7 +64,7 @@ CmdResult cmd_oper::Handle (const char** parameters, int pcnt, userrec *user) ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "oper", "host", i, HostName, MAXBUF); match_login = !strcmp(LoginName,parameters[0]); - match_pass = !ServerInstance->OperPassCompare(Password,parameters[1]); + match_pass = !ServerInstance->OperPassCompare(Password,parameters[1], i); match_hosts = OneOfMatches(TheHost,TheIP,HostName); if (match_login && match_pass && match_hosts) @@ -78,14 +72,12 @@ CmdResult cmd_oper::Handle (const char** parameters, int pcnt, userrec *user) type_invalid = true; for (j =0; j < ServerInstance->Config->ConfValueEnum(ServerInstance->Config->config_data, "type"); j++) { - ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "type","name", j, TypeName, MAXBUF); + ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "type", "name", j, TypeName, MAXBUF); + ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "type", "class", j, ClassName, MAXBUF); if (!strcmp(TypeName,OperType)) { /* found this oper's opertype */ - ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "type","host", j, HostName, MAXBUF); - if (*HostName) - user->ChangeDisplayedHost(HostName); if (!ServerInstance->IsNick(TypeName)) { user->WriteServ("491 %s :Invalid oper type (oper types must follow the same syntax as nicknames)",user->nick); @@ -93,6 +85,11 @@ CmdResult cmd_oper::Handle (const char** parameters, int pcnt, userrec *user) ServerInstance->Log(DEFAULT,"OPER: Failed oper attempt by %s!%s@%s: credentials valid, but oper type erroneous.",user->nick,user->ident,user->host); return CMD_FAILURE; } + ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "type","host", j, HostName, MAXBUF); + if (*HostName) + user->ChangeDisplayedHost(HostName); + if (*ClassName) + user->CheckClass(ClassName); found = true; type_invalid = false; break; @@ -105,31 +102,51 @@ CmdResult cmd_oper::Handle (const char** parameters, int pcnt, userrec *user) if (found) { /* correct oper credentials */ - ServerInstance->SNO->WriteToSnoMask('o',"%s (%s@%s) is now an IRC operator of type %s (using oper '%s')",user->nick,user->ident,user->host,OperType,parameters[0]); - user->WriteServ("381 %s :You are now an IRC operator of type %s",user->nick,OperType); - if (!user->modes[UM_OPERATOR]) + ServerInstance->SNO->WriteToSnoMask('o',"%s (%s@%s) is now an IRC operator of type %s (using oper '%s')",user->nick,user->ident,user->host,irc::Spacify(OperType),parameters[0]); + user->WriteServ("381 %s :You are now %s %s",user->nick, strchr("aeiouAEIOU", *OperType) ? "an" : "a", irc::Spacify(OperType)); + if (!user->IsModeSet('o')) user->Oper(OperType); } else { + std::deque n; + n.push_back("o"); + char broadcast[MAXBUF]; + if (!type_invalid) { - std::string fields = ""; + std::string fields; if (!match_login) fields.append("login "); - if (!match_pass) - fields.append("password "); - if (!match_hosts) - fields.append("hosts"); + else + { + if (!match_pass) + fields.append("password "); + if (!match_hosts) + fields.append("hosts"); + } user->WriteServ("491 %s :Invalid oper credentials",user->nick); - ServerInstance->SNO->WriteToSnoMask('o',"WARNING! Failed oper attempt by %s!%s@%s using login '%s': The following fields do not match: %s",user->nick,user->ident,user->host, parameters[0], fields.c_str()); + + snprintf(broadcast, MAXBUF, "WARNING! Failed oper attempt by %s!%s@%s using login '%s': The following fields do not match: %s",user->nick,user->ident,user->host, parameters[0], fields.c_str()); + ServerInstance->SNO->WriteToSnoMask('o',std::string(broadcast)); + n.push_back(broadcast); + Event rmode2((char *)&n, NULL, "send_snoset"); + rmode2.Send(ServerInstance); + ServerInstance->Log(DEFAULT,"OPER: Failed oper attempt by %s!%s@%s using login '%s': The following fields did not match: %s",user->nick,user->ident,user->host,parameters[0],fields.c_str()); return CMD_FAILURE; } else { user->WriteServ("491 %s :Your oper block does not have a valid opertype associated with it",user->nick); - ServerInstance->SNO->WriteToSnoMask('o',"CONFIGURATION ERROR! Oper block '%s': missing OperType %s",parameters[0],OperType); + + snprintf(broadcast, MAXBUF, "CONFIGURATION ERROR! Oper block '%s': missing OperType %s",parameters[0],OperType); + + ServerInstance->SNO->WriteToSnoMask('o', std::string(broadcast)); + n.push_back(broadcast); + Event rmode2((char *)&n, NULL, "send_snoset"); + rmode2.Send(ServerInstance); + ServerInstance->Log(DEFAULT,"OPER: Failed oper attempt by %s!%s@%s using login '%s': credentials valid, but oper type nonexistent.",user->nick,user->ident,user->host,parameters[0]); return CMD_FAILURE; }