X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_oper.cpp;h=e1018f805c4f73cca58857d1275f4514fab5c61b;hb=fd1d19d6345943ecdb5ce4ef947f9b3c5c8bca86;hp=3efafca5b96060ca95222d42703fb2e284d363ca;hpb=f4472dd6dcdfbb5d4a2a50ddc615644c3b2c8145;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/commands/cmd_oper.cpp b/src/commands/cmd_oper.cpp index 3efafca5b..e1018f805 100644 --- a/src/commands/cmd_oper.cpp +++ b/src/commands/cmd_oper.cpp @@ -1,181 +1,87 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2008 Thomas Stagner + * Copyright (C) 2007 Robin Burchell * - * This program is free but copyrighted software; see - * the file COPYING for details. + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. * - * --------------------------------------------------- + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ -#include "inspircd.h" - -#ifndef __CMD_OPER_H__ -#define __CMD_OPER_H__ - -// include the common header files -#include "users.h" -#include "channels.h" - -bool OneOfMatches(const char* host, const char* ip, const char* hostlist); +#include "inspircd.h" /** 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 +class CommandOper : public SplitCommand { public: /** Constructor for oper. */ - CommandOper (InspIRCd* Instance, Module* parent) : Command(Instance,parent,"OPER",0,2,false,2) { syntax = " "; } + CommandOper ( Module* parent) : SplitCommand(parent,"OPER",2,2) { syntax = " "; } /** 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& parameters, User *user); + CmdResult HandleLocal(const std::vector& parameters, LocalUser *user); }; -#endif - -#include "hashcomp.h" - -bool OneOfMatches(const char* host, const char* ip, const char* hostlist) +CmdResult CommandOper::HandleLocal(const std::vector& parameters, LocalUser *user) { - std::stringstream hl(hostlist); - std::string xhost; - while (hl >> xhost) - { - if (InspIRCd::Match(host, xhost, ascii_case_insensitive_map) || InspIRCd::MatchCIDR(ip, xhost, ascii_case_insensitive_map)) - { - return true; - } - } - return false; -} - -CmdResult CommandOper::Handle (const std::vector& parameters, 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]; - char HashType[MAXBUF]; - int j; - bool found = false; - bool type_invalid = false; - bool match_login = false; bool match_pass = false; bool match_hosts = false; - snprintf(TheHost,MAXBUF,"%s@%s",user->ident.c_str(),user->host.c_str()); - snprintf(TheIP, MAXBUF,"%s@%s",user->ident.c_str(),user->GetIPString()); + const std::string userHost = user->ident + "@" + user->host; + const std::string userIP = user->ident + "@" + user->GetIPString(); - for (int i = 0; i < ServerInstance->Config->ConfValueEnum("oper"); i++) + OperIndex::iterator i = ServerInstance->Config->oper_blocks.find(parameters[0]); + if (i != ServerInstance->Config->oper_blocks.end()) { - 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); + OperInfo* ifo = i->second; + ConfigTag* tag = ifo->oper_block; + match_login = true; + match_pass = !ServerInstance->PassCompare(user, tag->getString("password"), parameters[1], tag->getString("hash")); + match_hosts = InspIRCd::MatchMask(tag->getString("host"), userHost, userIP); - match_login = (LoginName == parameters[0]); - match_pass = !ServerInstance->PassCompare(user, Password, parameters[1], HashType); - match_hosts = OneOfMatches(TheHost,TheIP,HostName); - - if (match_login && match_pass && match_hosts) + if (match_pass && match_hosts) { - type_invalid = true; - for (j =0; j < ServerInstance->Config->ConfValueEnum("type"); j++) - { - ServerInstance->Config->ConfValue("type", "name", j, TypeName, MAXBUF); - ServerInstance->Config->ConfValue("type", "class", j, ClassName, MAXBUF); - - if (!strcmp(TypeName,OperType)) - { - /* found this oper's opertype */ - if (!ServerInstance->IsNick(TypeName, ServerInstance->Config->Limits.NickMax)) - { - user->WriteNumeric(491, "%s :Invalid oper type (oper types must follow the same syntax as nicknames)",user->nick.c_str()); - ServerInstance->SNO->WriteToSnoMask('o',"CONFIGURATION ERROR! Oper type '%s' contains invalid characters",OperType); - 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("type","host", j, HostName, MAXBUF); - if (*HostName) - user->ChangeDisplayedHost(HostName); - if (*ClassName) - { - user->SetClass(ClassName); - user->CheckClass(); - } - found = true; - type_invalid = false; - break; - } - } + /* found this oper's opertype */ + user->Oper(ifo); + return CMD_SUCCESS; } - if (match_login || found) - break; - } - if (found) - { - /* correct oper credentials */ - user->Oper(OperType, LoginName); } - else - { - char broadcast[MAXBUF]; - - if (!type_invalid) - { - std::string fields; - if (!match_login) - fields.append("login "); - else - { - if (!match_pass) - fields.append("password "); - if (!match_hosts) - fields.append("hosts"); - } - - // 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); - - ServerInstance->Logs->Log("OPER",DEFAULT,"OPER: Failed oper attempt by %s!%s@%s using login '%s': The following fields did not match: %s", user->nick.c_str(), user->ident.c_str(), user->host.c_str(), parameters[0].c_str(), fields.c_str()); - return CMD_FAILURE; - } - else - { - user->WriteNumeric(491, "%s :Your oper block does not have a valid opertype associated with it",user->nick.c_str()); - - snprintf(broadcast, MAXBUF, "CONFIGURATION ERROR! Oper block '%s': missing OperType %s",parameters[0].c_str(),OperType); - - ServerInstance->SNO->WriteToSnoMask('o', std::string(broadcast)); - - ServerInstance->Logs->Log("OPER",DEFAULT,"OPER: Failed oper attempt by %s!%s@%s using login '%s': credentials valid, but oper type nonexistent.", user->nick.c_str(), user->ident.c_str(), user->host.c_str(), parameters[0].c_str()); - return CMD_FAILURE; - } - } - return CMD_SUCCESS; + std::string fields; + if (!match_login) + fields.append("login "); + if (!match_pass) + fields.append("password "); + if (!match_hosts) + fields.append("hosts"); + + // 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->CommandFloodPenalty += 10000; + + ServerInstance->SNO->WriteGlobalSno('o', "WARNING! Failed oper attempt by %s using login '%s': The following fields do not match: %s", user->GetFullRealHost().c_str(), parameters[0].c_str(), fields.c_str()); + ServerInstance->Logs->Log("OPER", LOG_DEFAULT, "OPER: Failed oper attempt by %s using login '%s': The following fields did not match: %s", user->GetFullRealHost().c_str(), parameters[0].c_str(), fields.c_str()); + return CMD_FAILURE; } COMMAND_INIT(CommandOper)