Read multiple GnuTLS records in one RawSocketRead operation

[user/henk/code/inspircd.git] / src / commands / cmd_nick.cpp

diff --git a/src/commands/cmd_nick.cpp b/src/commands/cmd_nick.cpp
index 72e3ff17ea31ba9a257f5428e788f26eeb35ceb6..a926913753673dff7071090773cae9baac6b9525 100644 (file)
--- a/src/commands/cmd_nick.cpp
+++ b/src/commands/cmd_nick.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -27,7 +27,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
  */
 CmdResult CommandNick::Handle (const std::vector<std::string>& parameters, User *user)
 {
-       char oldnick[NICKMAX];
+       std::string oldnick;
 
        if (parameters[0].empty())
        {
@@ -36,7 +36,7 @@ CmdResult CommandNick::Handle (const std::vector<std::string>& parameters, User
                return CMD_FAILURE;
        }
 
-       if (((!ServerInstance->IsNick(parameters[0].c_str()))) && (IS_LOCAL(user)))
+       if (((!ServerInstance->IsNick(parameters[0].c_str(), ServerInstance->Config->Limits.NickMax))) && (IS_LOCAL(user)))
        {
                if (!allowinvalid)
                {
@@ -57,24 +57,26 @@ CmdResult CommandNick::Handle (const std::vector<std::string>& parameters, User
                }
        }
 
-       if (irc::string(user->nick.c_str()) == assign(parameters[0]))
+       if (assign(user->nick) == parameters[0])
        {
                /* If its exactly the same, even case, dont do anything. */
                if (parameters[0] == user->nick)
+               {
                        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.
                 */
-               strlcpy(oldnick, user->nick.c_str(), NICKMAX - 1);
+               oldnick.assign(user->nick, 0, IS_LOCAL(user) ? ServerInstance->Config->Limits.NickMax : MAXBUF);
                int MOD_RESULT = 0;
-               FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(user,parameters[0].c_str()));
+               FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(user,parameters[0]));
                if (MOD_RESULT)
                        return CMD_FAILURE;
                if (user->registered == REG_ALL)
                        user->WriteCommon("NICK %s",parameters[0].c_str());
-               user->nick.assign(parameters[0], 0, NICKMAX - 1);
+               user->nick.assign(parameters[0], 0, IS_LOCAL(user) ? ServerInstance->Config->Limits.NickMax : MAXBUF);
                user->InvalidateCache();
                FOREACH_MOD(I_OnUserPostNick,OnUserPostNick(user,oldnick));
                return CMD_SUCCESS;
@@ -94,10 +96,26 @@ CmdResult CommandNick::Handle (const std::vector<std::string>& parameters, User
                        XLine* mq = ServerInstance->XLines->MatchesLine("Q",parameters[0]);
                        if (mq)
                        {
-                               ServerInstance->SNO->WriteToSnoMask('x', "Q-Lined nickname %s from %s!%s@%s: %s", parameters[0].c_str(), user->nick.c_str(), user->ident.c_str(), user->host.c_str(), mq->reason);
+                               if (user->registered == REG_ALL)
+                               {
+                                       ServerInstance->SNO->WriteToSnoMask('x', "Q-Lined nickname %s from %s!%s@%s: %s", parameters[0].c_str(), user->nick.c_str(), user->ident.c_str(), user->host.c_str(), mq->reason);
+                               }
                                user->WriteNumeric(432, "%s %s :Invalid nickname: %s",user->nick.c_str(), parameters[0].c_str(), mq->reason);
                                return CMD_FAILURE;
                        }
+
+                       if (ServerInstance->Config->RestrictBannedUsers)
+                       {
+                               for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++)
+                               {
+                                       Channel *chan = i->first;
+                                       if (chan->GetStatus(user) < STATUS_VOICE && chan->IsBanned(user))
+                                       {
+                                               user->WriteNumeric(404, "%s %s :Cannot send to channel (you're banned)", user->nick.c_str(), chan->name.c_str());
+                                               return CMD_FAILURE;
+                                       }
+                               }
+                       }
                }
 
                /*
@@ -118,7 +136,7 @@ CmdResult CommandNick::Handle (const std::vector<std::string>& parameters, User
                                InUse->WriteTo(InUse, "NICK %s", InUse->uuid.c_str());
                                InUse->WriteNumeric(433, "%s %s :Nickname overruled.", InUse->nick.c_str(), InUse->nick.c_str());
                                InUse->UpdateNickHash(InUse->uuid.c_str());
-                               InUse->nick.assign(InUse->uuid, 0, NICKMAX - 1);
+                               InUse->nick.assign(InUse->uuid, 0, IS_LOCAL(InUse) ? ServerInstance->Config->Limits.NickMax : MAXBUF);
                                InUse->InvalidateCache();
                                InUse->registered &= ~REG_NICK;
                        }
@@ -141,7 +159,7 @@ CmdResult CommandNick::Handle (const std::vector<std::string>& parameters, User
        if (user->registered == REG_ALL)
                user->WriteCommon("NICK %s", parameters[0].c_str());
 
-       strlcpy(oldnick, user->nick.c_str(), NICKMAX - 1);
+       oldnick.assign(user->nick, 0, IS_LOCAL(user) ? ServerInstance->Config->Limits.NickMax : MAXBUF);
 
        /* change the nick of the user in the users_hash */
        user = user->UpdateNickHash(parameters[0].c_str());
@@ -150,7 +168,7 @@ CmdResult CommandNick::Handle (const std::vector<std::string>& parameters, User
        if (!user)
                return CMD_FAILURE;
 
-       user->nick.assign(parameters[0], 0, NICKMAX - 1);
+       user->nick.assign(parameters[0], 0, IS_LOCAL(user) ? ServerInstance->Config->Limits.NickMax : MAXBUF);
        user->InvalidateCache();
 
        /* Update display nicks */
@@ -165,19 +183,23 @@ CmdResult CommandNick::Handle (const std::vector<std::string>& parameters, User
        if (user->registered < REG_NICKUSER)
        {
                user->registered = (user->registered | REG_NICK);
+               if (user->registered == REG_NICKUSER)
+               {
+                       /* user is registered now, bit 0 = USER command, bit 1 = sent a NICK command */
+                       MOD_RESULT = 0;
+                       FOREACH_RESULT(I_OnUserRegister,OnUserRegister(user));
+                       if (MOD_RESULT > 0)
+                               return CMD_FAILURE;
+
+                       // return early to not penalize new users
+                       return CMD_SUCCESS;
+               }
        }
-       if (user->registered == REG_NICKUSER)
-       {
-               /* user is registered now, bit 0 = USER command, bit 1 = sent a NICK command */
-               MOD_RESULT = 0;
-               FOREACH_RESULT(I_OnUserRegister,OnUserRegister(user));
-               if (MOD_RESULT > 0)
-                       return CMD_FAILURE;
-       }
+
        if (user->registered == REG_ALL)
        {
                user->IncreasePenalty(10);
-               FOREACH_MOD(I_OnUserPostNick,OnUserPostNick(user,oldnick));
+               FOREACH_MOD(I_OnUserPostNick,OnUserPostNick(user, oldnick));
        }
 
        return CMD_SUCCESS;