Fix m_spanningtree sending the wrong setter in S2S ADDLINE.

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / uid.cpp

diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp
index 118bdc500c0073877283adbb89ee2cb26df9c53f..6620dd13ac8e2aeee81b06c344da5d73dc1e8143 100644 (file)
--- a/src/modules/m_spanningtree/uid.cpp
+++ b/src/modules/m_spanningtree/uid.cpp
@@ -1,16 +1,24 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * 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
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 #include "commands.h"
 
@@ -27,9 +35,6 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
         *      0    1    2    3    4    5        6        7     8        9       (n-1)
         * UID uuid age nick host dhost ident ip.string signon +modes (modepara) :gecos
         */
-       if (params.size() < 10)
-               return CMD_INVALID;
-
        time_t age_t = ConvToInt(params[1]);
        time_t signon = ConvToInt(params[7]);
        std::string empty;
@@ -39,6 +44,9 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
 
        if (!remoteserver)
                return CMD_INVALID;
+       /* Is this a valid UID, and not misrouted? */
+       if (params[0].length() != 9 || params[0].substr(0,3) != serversrc->uuid)
+               return CMD_INVALID;
        /* Check parameters for validity before introducing the client, discovered by dmb */
        if (!age_t)
                return CMD_INVALID;
@@ -49,19 +57,34 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
        TreeSocket* sock = remoteserver->GetRoute()->GetSocket();
 
        /* check for collision */
-       user_hash::iterator iter = ServerInstance->Users->clientlist->find(params[2]);
+       User* const collideswith = ServerInstance->FindNickOnly(params[2]);
 
-       if (iter != ServerInstance->Users->clientlist->end())
+       if ((collideswith) && (collideswith->registered != REG_ALL))
+       {
+               // User that the incoming user is colliding with is not fully registered, we force nick change the
+               // unregistered user to their uuid and tell them what happened
+               collideswith->WriteFrom(collideswith, "NICK %s", collideswith->uuid.c_str());
+               collideswith->WriteNumeric(433, "%s %s :Nickname overruled.", collideswith->nick.c_str(), collideswith->nick.c_str());
+
+               // Clear the bit before calling User::ChangeNick() to make it NOT run the OnUserPostNick() hook
+               collideswith->registered &= ~REG_NICK;
+               collideswith->ChangeNick(collideswith->uuid, true);
+       }
+       else if (collideswith)
        {
                /*
                 * Nick collision.
                 */
-               int collide = sock->DoCollision(iter->second, age_t, params[5], modestr, params[0]);
+               int collide = sock->DoCollision(collideswith, age_t, params[5], params[6], params[0]);
                ServerInstance->Logs->Log("m_spanningtree",DEBUG,"*** Collision on %s, collide=%d", params[2].c_str(), collide);
 
                if (collide != 1)
                {
-                       /* remote client changed, make sure we change their nick for the hash too */
+                       /* remote client lost, make sure we change their nick for the hash too
+                        *
+                        * This alters the line that will be sent to other servers, which
+                        * commands normally shouldn't do; hence the required const_cast.
+                        */
                        const_cast<parameterlist&>(params)[2] = params[0];
                }
        }
@@ -97,9 +120,6 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
        unsigned int paramptr = 9;
        for (std::string::iterator v = modestr.begin(); v != modestr.end(); v++)
        {
-               if (*v == '+')
-                       continue;
-
                /* For each mode thats set, increase counter */
                ModeHandler* mh = ServerInstance->Modes->FindMode(*v, MODETYPE_USER);
 
@@ -142,7 +162,7 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
                dosend = false;
 
        if (dosend)
-               ServerInstance->SNO->WriteToSnoMask('C',"Client connecting at %s: %s!%s@%s [%s] [%s]", _new->server.c_str(), _new->nick.c_str(), _new->ident.c_str(), _new->host.c_str(), _new->GetIPString(), _new->fullname.c_str());
+               ServerInstance->SNO->WriteToSnoMask('C',"Client connecting at %s: %s (%s) [%s]", _new->server.c_str(), _new->GetFullRealHost().c_str(), _new->GetIPString(), _new->fullname.c_str());
 
        FOREACH_MOD(I_OnPostConnect,OnPostConnect(_new));
 
@@ -151,8 +171,6 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
 
 CmdResult CommandFHost::Handle(const parameterlist &params, User* src)
 {
-       if (params.size() < 1)
-               return CMD_INVALID;
        if (IS_SERVER(src))
                return CMD_FAILURE;
        src->ChangeDisplayedHost(params[0].c_str());
@@ -161,8 +179,6 @@ CmdResult CommandFHost::Handle(const parameterlist &params, User* src)
 
 CmdResult CommandFIdent::Handle(const parameterlist &params, User* src)
 {
-       if (params.size() < 1)
-               return CMD_INVALID;
        if (IS_SERVER(src))
                return CMD_FAILURE;
        src->ChangeIdent(params[0].c_str());
@@ -171,8 +187,6 @@ CmdResult CommandFIdent::Handle(const parameterlist &params, User* src)
 
 CmdResult CommandFName::Handle(const parameterlist &params, User* src)
 {
-       if (params.size() < 1)
-               return CMD_INVALID;
        if (IS_SERVER(src))
                return CMD_FAILURE;
        src->ChangeName(params[0].c_str());