X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nicklock.cpp;h=d475d59e0eeeaa136fa4f1b5f1008ed368f44278;hb=00fa6d592ed2640fcdf74444786de555c1c3da25;hp=9dc1bca69f84a01038c15726aa190afdd109ed84;hpb=e4acbc95b8b6cd5b28d38a2242c02e8ff4991e4a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp index 9dc1bca69..d475d59e0 100644 --- a/src/modules/m_nicklock.cpp +++ b/src/modules/m_nicklock.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team + * InspIRCd: (C) 2002-2009 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see @@ -19,53 +19,71 @@ */ class CommandNicklock : public Command { - char* dummy; + public: - CommandNicklock (InspIRCd* Instance) : Command(Instance,"NICKLOCK", 'o', 2) + CommandNicklock (InspIRCd* Instance) : Command(Instance,"NICKLOCK", "o", 2) { this->source = "m_nicklock.so"; syntax = " "; TRANSLATE3(TR_NICK, TR_TEXT, TR_END); } - CmdResult Handle(const char** parameters, int pcnt, User *user) + CmdResult Handle(const std::vector& parameters, User *user) { - User* source = ServerInstance->FindNick(parameters[0]); - irc::string server; - irc::string me; - - // check user exists - if (!source) - { - return CMD_FAILURE; - } + User* target = ServerInstance->FindNick(parameters[0]); - // check if user is locked - if (source->GetExt("nick_locked", dummy)) + /* Do local sanity checks and bails */ + if (IS_LOCAL(user)) { - user->WriteServ("946 %s %s :This user's nickname is already locked.",user->nick,source->nick); - return CMD_FAILURE; + if (target && ServerInstance->ULine(target->server)) + { + user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Cannot use an NICKLOCK command on a u-lined client",user->nick.c_str()); + return CMD_FAILURE; + } + + if (!target) + { + user->WriteServ("NOTICE %s :*** No such nickname: '%s'", user->nick.c_str(), parameters[0].c_str()); + return CMD_FAILURE; + } + + if (target->GetExt("nick_locked")) + { + user->WriteNumeric(946, "%s %s :This user's nickname is already locked.",user->nick.c_str(),target->nick.c_str()); + return CMD_FAILURE; + } + + if (!ServerInstance->IsNick(parameters[1].c_str(), ServerInstance->Config->Limits.NickMax)) + { + user->WriteServ("NOTICE %s :*** Invalid nickname '%s'", user->nick.c_str(), parameters[1].c_str()); + return CMD_FAILURE; + } } - // check nick is valid - if (!ServerInstance->IsNick(parameters[1])) + /* If we made it this far, extend the user */ + if (target) { - return CMD_FAILURE; + target->Extend("nick_locked", "ON"); + ServerInstance->SNO->WriteToSnoMask('A', user->nick+" used NICKLOCK to change and hold "+target->nick+" to "+parameters[1]); + + /* Only send out nick from local server */ + if (IS_LOCAL(target)) + { + std::string oldnick = user->nick; + std::string newnick = target->nick; + if (!target->ForceNickChange(parameters[1].c_str())) + { + /* XXX: We failed, this *should* not happen but if it does + * tell everybody. Note user is still nick locked on their old + * nick instead. + */ + ServerInstance->SNO->WriteToSnoMask('A', oldnick+" failed nickchange on NICKLOCK (from "+newnick+" to "+parameters[1]+") Locked to "+newnick+" instead"); + ServerInstance->PI->SendSNONotice("A", oldnick+" failed nickchange on NICKLOCK (from "+newnick+" to "+parameters[1]+") Locked to "+newnick+" instead"); + } + } } - // let others know - ServerInstance->WriteOpers(std::string(user->nick)+" used NICKLOCK to change and hold "+parameters[0]+" to "+parameters[1]); - - if (!source->ForceNickChange(parameters[1])) - { - // ugh, nickchange failed for some reason -- possibly existing nick? - User::QuitUser(ServerInstance, source, "Nickname collision"); - } - - // give them a lock flag - source->Extend("nick_locked", "ON"); - - /* route */ + /* Route it */ return CMD_SUCCESS; } }; @@ -75,24 +93,50 @@ class CommandNicklock : public Command class CommandNickunlock : public Command { public: - CommandNickunlock (InspIRCd* Instance) : Command(Instance,"NICKUNLOCK", 'o', 1) + CommandNickunlock (InspIRCd* Instance) : Command(Instance,"NICKUNLOCK", "o", 1) { this->source = "m_nicklock.so"; syntax = ""; } - CmdResult Handle (const char** parameters, int pcnt, User *user) + CmdResult Handle (const std::vector& parameters, User *user) { - User* source = ServerInstance->FindNick(parameters[0]); - if (source) + User* target = ServerInstance->FindNick(parameters[0]); + + /* Do local sanity checks and bails */ + if (IS_LOCAL(user)) { - source->Shrink("nick_locked"); - user->WriteServ("945 %s %s :Nickname now unlocked.",user->nick,source->nick); - ServerInstance->WriteOpers(std::string(user->nick)+" used NICKUNLOCK on "+parameters[0]); - return CMD_SUCCESS; + if (target && ServerInstance->ULine(target->server)) + { + user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Cannot use an NICKUNLOCK command on a u-lined client",user->nick.c_str()); + return CMD_FAILURE; + } + + if (!target) + { + user->WriteServ("NOTICE %s :*** No such nickname: '%s'", user->nick.c_str(), parameters[0].c_str()); + return CMD_FAILURE; + } + + if (!target->GetExt("nick_locked")) + { + user->WriteNumeric(946, "%s %s :This user's nickname is not locked.",user->nick.c_str(),target->nick.c_str()); + return CMD_FAILURE; + } } - return CMD_FAILURE; + /* If we made it this far, the command is going out on the wire so send local snotice */ + ServerInstance->SNO->WriteToSnoMask('A', std::string(user->nick)+" used NICKUNLOCK on "+parameters[0]); + + if (target) + { + target->Shrink("nick_locked"); + if (IS_LOCAL(user)) + user->WriteNumeric(945, "%s %s :Nickname now unlocked.",user->nick.c_str(),target->nick.c_str()); + } + + /* Route it */ + return CMD_SUCCESS; } }; @@ -106,7 +150,7 @@ class ModuleNickLock : public Module ModuleNickLock(InspIRCd* Me) : Module(Me) { - + cmd1 = new CommandNicklock(ServerInstance); cmd2 = new CommandNickunlock(ServerInstance); ServerInstance->AddCommand(cmd1); @@ -114,25 +158,31 @@ class ModuleNickLock : public Module Implementation eventlist[] = { I_OnUserPreNick, I_OnUserQuit, I_OnCleanup }; ServerInstance->Modules->Attach(eventlist, this, 3); } - + virtual ~ModuleNickLock() { } - + virtual Version GetVersion() { - return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION); + return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION); } virtual int OnUserPreNick(User* user, const std::string &newnick) { - if (isdigit(newnick[0])) /* allow a switch to a UID */ + if (!IS_LOCAL(user)) + return 0; + + if (isdigit(newnick[0])) /* Allow a switch to a UID */ + return 0; + + if (user->GetExt("NICKForced")) /* Allow forced nick changes */ return 0; if (user->GetExt("nick_locked", n)) { - user->WriteServ("447 %s :You cannot change your nickname (your nick is locked)",user->nick); + user->WriteNumeric(447, "%s :You cannot change your nickname (your nick is locked)",user->nick.c_str()); return 1; } return 0; @@ -143,6 +193,12 @@ class ModuleNickLock : public Module user->Shrink("nick_locked"); } + void Prioritize() + { + Module *nflood = ServerInstance->Modules->Find("m_nickflood.so"); + ServerInstance->Modules->SetPriority(this, I_OnUserPreJoin, PRIORITY_BEFORE, &nflood); + } + virtual void OnCleanup(int target_type, void* item) { if(target_type == TYPE_USER)