X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_nick.cpp;h=4e2ebcf6e425de17bdc7797a0dac2c03475dd4b5;hb=bfdf503e5204ba17479084e688a3605dbc9007a2;hp=ddcb04940603b2b291a9782232e677128535a635;hpb=a5c9214743e76bd8bee1cb5f4d0d6dc3d1171c58;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/cmd_nick.cpp b/src/cmd_nick.cpp index ddcb04940..4e2ebcf6e 100644 --- a/src/cmd_nick.cpp +++ b/src/cmd_nick.cpp @@ -2,111 +2,113 @@ * | 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 -#include -#include "inspircd_config.h" +#include "inspircd.h" #include "configreader.h" -#include "hash_map.h" #include "users.h" #include "modules.h" -#include "commands.h" #include "xline.h" -#include "dnsqueue.h" -#include "dns.h" -#include "helperfuncs.h" -#include "hashcomp.h" #include "commands/cmd_nick.h" -extern ServerConfig* Config; -extern int MODCOUNT; -extern std::vector modules; -extern std::vector factory; -extern time_t TIME; +extern "C" DllExport command_t* init_command(InspIRCd* Instance) +{ + return new cmd_nick(Instance); +} -void cmd_nick::Handle (const char** parameters, int pcnt, userrec *user) +/** Handle nick changes from users. + * NOTE: If you are used to ircds based on ircd2.8, and are looking + * for the client introduction code in here, youre in the wrong place. + * You need to look in the spanningtree module for this! + */ +CmdResult cmd_nick::Handle (const char** parameters, int pcnt, userrec *user) { char oldnick[NICKMAX]; - if (pcnt < 1) - { - log(DEBUG,"not enough params for handle_nick"); - return; - } - if (!parameters[0]) - { - log(DEBUG,"invalid parameter passed to handle_nick"); - return; - } - if (!parameters[0][0]) + if (!*parameters[0] || !*user->nick) { - log(DEBUG,"zero length new nick passed to handle_nick"); - return; - } - if (!user) - { - log(DEBUG,"invalid user passed to handle_nick"); - return; - } - if (!user->nick) - { - log(DEBUG,"invalid old nick passed to handle_nick"); - return; + /* We cant put blanks in the parameters, so for this (extremely rare) issue we just put '*' here. */ + user->WriteServ("432 %s * :Erroneous Nickname", *user->nick ? user->nick : "*"); + return CMD_FAILURE; } + if (irc::string(user->nick) == irc::string(parameters[0])) { /* If its exactly the same, even case, dont do anything. */ if (!strcmp(user->nick,parameters[0])) - return; + return CMD_SUCCESS; + /* Its a change of case. People insisted that they should be * able to do silly things like this even though the RFC says * the nick AAA is the same as the nick aaa. */ - log(DEBUG,"old nick is new nick, not updating hash (case change only)"); strlcpy(oldnick, user->nick, NICKMAX - 1); int MOD_RESULT = 0; FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(user,parameters[0])); if (MOD_RESULT) - return; + return CMD_FAILURE; if (user->registered == REG_ALL) - WriteCommon(user,"NICK %s",parameters[0]); + user->WriteCommon("NICK %s",parameters[0]); strlcpy(user->nick, parameters[0], NICKMAX - 1); + user->InvalidateCache(); FOREACH_MOD(I_OnUserPostNick,OnUserPostNick(user,oldnick)); - return; + return CMD_SUCCESS; } else { - if ((*parameters[0] == ':') && (*(parameters[0]+1) != 0)) + QLine* mq = ServerInstance->XLines->matches_qline(parameters[0]); + if (mq) { - parameters[0]++; + ServerInstance->SNO->WriteToSnoMask('x', "Q-Lined nickname %s from %s!%s@%s: %s", parameters[0], user->nick, user->ident, user->host, mq->reason); + user->WriteServ("432 %s %s :Invalid nickname: %s",user->nick,parameters[0], mq->reason); + return CMD_FAILURE; } - if (matches_qline(parameters[0])) - { - WriteOpers("*** Q-Lined nickname %s from %s!%s@%s: %s",parameters[0],user->nick,user->ident,user->host,matches_qline(parameters[0])); - WriteServ(user->fd,"432 %s %s :Invalid nickname: %s",user->nick,parameters[0],matches_qline(parameters[0])); - return; - } - if ((Find(parameters[0])) && (Find(parameters[0]) != user)) + /* Check for nickname overruled - + * This happens when one user has connected and sent only NICK, and is essentially + * "camping" upon a nickname. To give the new user connecting a fair chance of having + * the nickname too, we force a nickchange on the older user (Simply the one who was + * here first, no TS checks need to take place here) + */ + userrec* InUse = ServerInstance->FindNick(parameters[0]); + if (InUse && (InUse != user) && (ServerInstance->IsNick(parameters[0]))) { - WriteServ(user->fd,"433 %s %s :Nickname is already in use.",user->nick,parameters[0]); - return; + if (InUse->registered != REG_ALL) + { + /* change the nick of the older user to nnn-overruled, + * where nnn is their file descriptor. We know this to be unique. + * NOTE: We must do this and not quit the user, even though we do + * not have UID support yet. This is because if we set this user + * as quitting and then introduce the new user before the old one + * has quit, then the user hash gets totally buggered. + * (Yes, that is a technical term). -- Brain + */ + std::string changeback = ConvToStr(InUse->GetFd()) + "-overruled"; + InUse->WriteTo(InUse, "NICK %s", changeback.c_str()); + InUse->WriteServ("433 %s %s :Nickname overruled.", InUse->nick, InUse->nick); + InUse->UpdateNickHash(changeback.c_str()); + strlcpy(InUse->nick, changeback.c_str(), NICKMAX - 1); + InUse->InvalidateCache(); + /* Take away their nickname-sent state forcing them to send a nick again */ + InUse->registered &= ~REG_NICK; + } + else + { + user->WriteServ("433 %s %s :Nickname is already in use.", user->registered >= REG_NICK ? user->nick : "*", parameters[0]); + return CMD_FAILURE; + } } } - if ((isnick(parameters[0]) == 0) && (IS_LOCAL(user))) + if ((!ServerInstance->IsNick(parameters[0])) && (IS_LOCAL(user))) { - WriteServ(user->fd,"432 %s %s :Erroneous Nickname",user->nick,parameters[0]); - return; + user->WriteServ("432 %s %s :Erroneous Nickname",user->nick,parameters[0]); + return CMD_FAILURE; } if (user->registered == REG_ALL) @@ -115,53 +117,73 @@ void cmd_nick::Handle (const char** parameters, int pcnt, userrec *user) FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(user,parameters[0])); if (MOD_RESULT) { // if a module returns true, the nick change is silently forbidden. - return; + return CMD_FAILURE; } - WriteCommon(user,"NICK %s",parameters[0]); - + user->WriteCommon("NICK %s",parameters[0]); + } strlcpy(oldnick, user->nick, NICKMAX - 1); /* change the nick of the user in the users_hash */ - user = ReHashNick(user->nick, parameters[0]); + user = user->UpdateNickHash(parameters[0]); + /* actually change the nick within the record */ - if (!user) return; - if (!user->nick) return; + if (!user) return CMD_FAILURE; + if (!*user->nick) return CMD_FAILURE; strlcpy(user->nick, parameters[0], NICKMAX - 1); - log(DEBUG,"new nick set: %s",user->nick); - + user->InvalidateCache(); + + /* Update display nicks */ + for (UCListIter v = user->chans.begin(); v != user->chans.end(); v++) + { + CUList* ulist = v->first->GetUsers(); + CUList::iterator i = ulist->find(user); + if (i != ulist->end()) + i->second = user->nick; + } + if (user->registered < REG_NICKUSER) { user->registered = (user->registered | REG_NICK); - // dont attempt to look up the dns until they pick a nick... because otherwise their pointer WILL change - // and unless we're lucky we'll get a duff one later on. - //user->dns_done = (!lookup_dns(user->nick)); - //if (user->dns_done) - // log(DEBUG,"Aborting dns lookup of %s because dns server experienced a failure.",user->nick); - if (Config->NoUserDns) + if (ServerInstance->Config->NoUserDns) { user->dns_done = true; + ServerInstance->next_call = ServerInstance->Time(); } else { - user->dns_done = (!lookup_dns(user->nick)); + user->StartDNSLookup(); if (user->dns_done) - log(DEBUG,"Aborting dns lookup of %s because dns server experienced a failure.",user->nick); + { + /* Cached result or instant failure - fall right through if possible */ + ServerInstance->next_call = ServerInstance->Time(); + } + else + { + if (ServerInstance->next_call > ServerInstance->Time() + ServerInstance->Config->dns_timeout) + ServerInstance->next_call = ServerInstance->Time() + ServerInstance->Config->dns_timeout; + } } } if (user->registered == REG_NICKUSER) { /* user is registered now, bit 0 = USER command, bit 1 = sent a NICK command */ - FOREACH_MOD(I_OnUserRegister,OnUserRegister(user)); - //ConnectUser(user,NULL); + int MOD_RESULT = 0; + FOREACH_RESULT(I_OnUserRegister,OnUserRegister(user)); + if (MOD_RESULT > 0) + return CMD_FAILURE; } if (user->registered == REG_ALL) { FOREACH_MOD(I_OnUserPostNick,OnUserPostNick(user,oldnick)); } + + return CMD_SUCCESS; + } +