X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcoremods%2Fcore_user%2Fcmd_nick.cpp;h=65906935107e3d524959b267fd6a37056bad5bd6;hb=7b1ab06a9551d8db141ebc9213836af6b5369284;hp=486fce7ebf0a8cbd5138c2a4cff6cc19a0959222;hpb=c67d3103e9f7397f0ab9631bf07a5e5547deb2c3;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/coremods/core_user/cmd_nick.cpp b/src/coremods/core_user/cmd_nick.cpp
index 486fce7eb..659069351 100644
--- a/src/coremods/core_user/cmd_nick.cpp
+++ b/src/coremods/core_user/cmd_nick.cpp
@@ -1,10 +1,15 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2017 B00mX0r <b00mx0r@aureus.pw>
+ *   Copyright (C) 2014, 2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2013, 2016, 2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
- *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
  *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006-2007, 2010 Craig Edwards <brain@inspircd.org>
  *
  * 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
@@ -21,40 +26,33 @@
 
 
 #include "inspircd.h"
+#include "core_user.h"
 
-/** Handle /NICK.
- */
-class CommandNick : public Command
+CommandNick::CommandNick(Module* parent)
+	: SplitCommand(parent, "NICK", 1, 1)
 {
- public:
-	/** Constructor for nick.
-	 */
-	CommandNick ( Module* parent) : Command(parent,"NICK", 1, 1) { works_before_reg = true; syntax = "<newnick>"; Penalty = 0; }
-	/** Handle command.
-	 * @param parameters The parameters to the command
-	 * @param user The user issuing the command
-	 * @return A value from CmdResult to indicate command success or failure.
-	 */
-	CmdResult Handle(const std::vector<std::string>& parameters, User *user);
-};
+	works_before_reg = true;
+	syntax = "<newnick>";
+	Penalty = 0;
+}
 
 /** 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 CommandNick::Handle (const std::vector<std::string>& parameters, User *user)
+CmdResult CommandNick::HandleLocal(LocalUser* user, const Params& parameters)
 {
 	std::string oldnick = user->nick;
 	std::string newnick = parameters[0];
 
 	// anything except the initial NICK gets a flood penalty
-	if (user->registered == REG_ALL && IS_LOCAL(user))
-		IS_LOCAL(user)->CommandFloodPenalty += 4000;
+	if (user->registered == REG_ALL)
+		user->CommandFloodPenalty += 4000;
 
 	if (newnick.empty())
 	{
-		user->WriteNumeric(ERR_ERRONEUSNICKNAME, "* :Erroneous Nickname");
+		user->WriteNumeric(ERR_NONICKNAMEGIVEN, "No nickname given");
 		return CMD_FAILURE;
 	}
 
@@ -64,31 +62,42 @@ CmdResult CommandNick::Handle (const std::vector<std::string>& parameters, User
 	}
 	else if (!ServerInstance->IsNick(newnick))
 	{
-		user->WriteNumeric(ERR_ERRONEUSNICKNAME, "%s :Erroneous Nickname", newnick.c_str());
+		user->WriteNumeric(ERR_ERRONEUSNICKNAME, newnick, "Erroneous Nickname");
 		return CMD_FAILURE;
 	}
 
-	if (!user->ChangeNick(newnick, false))
+	ModResult MOD_RESULT;
+	FIRST_MOD_RESULT(OnUserPreNick, MOD_RESULT, (user, newnick));
+
+	// If a module denied the change, abort now
+	if (MOD_RESULT == MOD_RES_DENY)
 		return CMD_FAILURE;
 
-	if (user->registered < REG_NICKUSER)
+	// Disallow the nick change if <security:restrictbannedusers> is on and there is a ban matching this user in
+	// one of the channels they are on
+	if (ServerInstance->Config->RestrictBannedUsers != ServerConfig::BUT_NORMAL)
 	{
-		user->registered = (user->registered | REG_NICK);
-		if (user->registered == REG_NICKUSER)
+		for (User::ChanList::iterator i = user->chans.begin(); i != user->chans.end(); ++i)
 		{
-			/* user is registered now, bit 0 = USER command, bit 1 = sent a NICK command */
-			ModResult MOD_RESULT;
-			FIRST_MOD_RESULT(OnUserRegister, MOD_RESULT, (IS_LOCAL(user)));
-			if (MOD_RESULT == MOD_RES_DENY)
+			Channel* chan = (*i)->chan;
+			if (chan->GetPrefixValue(user) < VOICE_VALUE && chan->IsBanned(user))
+			{
+				if (ServerInstance->Config->RestrictBannedUsers == ServerConfig::BUT_RESTRICT_NOTIFY)
+					user->WriteNumeric(ERR_CANTCHANGENICK, InspIRCd::Format("Cannot change nickname while on %s (you're banned)",
+						chan->name.c_str()));
 				return CMD_FAILURE;
-
-			// return early to not penalize new users
-			return CMD_SUCCESS;
+			}
 		}
 	}
 
-	return CMD_SUCCESS;
-}
+	if (!user->ChangeNick(newnick))
+		return CMD_FAILURE;
 
+	if (user->registered < REG_NICKUSER)
+	{
+		user->registered = (user->registered | REG_NICK);
+		return CommandUser::CheckRegister(user);
+	}
 
-COMMAND_INIT(CommandNick)
+	return CMD_SUCCESS;
+}