X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcoremods%2Fcore_user%2Fcmd_nick.cpp;h=44bcb95fa86bc334bc411c3349e3df4e58ad9a9a;hb=092f2b181848d4575f4317267866dade7312c542;hp=49e5efacc5643db2ecb4423c7879de2043bcd70e;hpb=4ab1eb3d1e54d205317dafad538138bb40feace9;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 49e5efacc..44bcb95fa 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, 2010 Craig Edwards <brain@inspircd.org>
+ *   Copyright (C) 2007 Dennis Friis <peavey@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
@@ -36,7 +41,7 @@ CommandNick::CommandNick(Module* parent)
  * for the client introduction code in here, youre in the wrong place.
  * You need to look in the spanningtree module for this!
  */
-CmdResult CommandNick::HandleLocal(const std::vector<std::string>& parameters, LocalUser* user)
+CmdResult CommandNick::HandleLocal(LocalUser* user, const Params& parameters)
 {
 	std::string oldnick = user->nick;
 	std::string newnick = parameters[0];
@@ -47,7 +52,7 @@ CmdResult CommandNick::HandleLocal(const std::vector<std::string>& parameters, L
 
 	if (newnick.empty())
 	{
-		user->WriteNumeric(ERR_ERRONEUSNICKNAME, "* :Erroneous Nickname");
+		user->WriteNumeric(ERR_NONICKNAMEGIVEN, "No nickname given");
 		return CMD_FAILURE;
 	}
 
@@ -57,28 +62,42 @@ CmdResult CommandNick::HandleLocal(const std::vector<std::string>& parameters, L
 	}
 	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, (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;
+			}
 		}
 	}
 
+	if (!user->ChangeNick(newnick))
+		return CMD_FAILURE;
+
+	if (user->registered < REG_NICKUSER)
+	{
+		user->registered = (user->registered | REG_NICK);
+		return CommandUser::CheckRegister(user);
+	}
+
 	return CMD_SUCCESS;
 }