]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/m_spanningtree/uid.cpp
Replace most usages of "GECOS" with "real" or "real name".
[user/henk/code/inspircd.git] / src / modules / m_spanningtree / uid.cpp
index dd4591a9ba71185f8473e662767a08e90fdac3af..86933dc729d871621028de8f692b99b9b24a6fee 100644 (file)
 
 #include "utils.h"
 #include "treeserver.h"
+#include "remoteuser.h"
 
-CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
+CmdResult CommandUID::HandleServer(TreeServer* remoteserver, CommandBase::Params& params)
 {
-       SpanningTreeUtilities* Utils = ((ModuleSpanningTree*)(Module*)creator)->Utils;
-       /** Do we have enough parameters:
+       /**
         *      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
+        * UID uuid age nick host dhost ident ip.string signon +modes (modepara) :real
         */
-       time_t age_t = ConvToInt(params[1]);
-       time_t signon = ConvToInt(params[7]);
+       time_t age_t = ServerCommand::ExtractTS(params[1]);
+       time_t signon = ServerCommand::ExtractTS(params[7]);
        std::string empty;
        const std::string& modestr = params[8];
 
-       TreeServer* remoteserver = Utils->FindServer(serversrc->server);
-
-       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;
-       if (!signon)
-               return CMD_INVALID;
+       // Check if the length of the uuid is correct and confirm the sid portion of the uuid matches the sid of the server introducing the user
+       if (params[0].length() != UIDGenerator::UUID_LENGTH || params[0].compare(0, 3, remoteserver->GetID()))
+               throw ProtocolException("Bogus UUID");
+       // Sanity check on mode string: must begin with '+'
        if (modestr[0] != '+')
-               return CMD_INVALID;
-       TreeSocket* sock = remoteserver->GetRoute()->GetSocket();
+               throw ProtocolException("Invalid mode string");
 
-       /* check for collision */
-       user_hash::iterator iter = ServerInstance->Users->clientlist->find(params[2]);
-
-       if (iter != ServerInstance->Users->clientlist->end())
+       // See if there is a nick collision
+       User* collideswith = ServerInstance->FindNickOnly(params[2]);
+       if ((collideswith) && (collideswith->registered != REG_ALL))
        {
-               /*
-                * Nick collision.
-                */
-               int collide = sock->DoCollision(iter->second, age_t, params[5], params[6], params[0]);
-               ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "*** Collision on %s, collide=%d", params[2].c_str(), collide);
-
-               if (collide != 1)
+               // 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
+               LocalUser* const localuser = static_cast<LocalUser*>(collideswith);
+               localuser->OverruleNick();
+       }
+       else if (collideswith)
+       {
+               // The user on this side is registered, handle the collision
+               bool they_change = Utils->DoCollision(collideswith, remoteserver, age_t, params[5], params[6], params[0], "UID");
+               if (they_change)
                {
-                       /* 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];
+                       // The client being introduced needs to change nick to uuid, change the nick in the message before
+                       // processing/forwarding it. Also change the nick TS to CommandSave::SavedTimestamp.
+                       age_t = CommandSave::SavedTimestamp;
+                       params[1] = ConvToStr(CommandSave::SavedTimestamp);
+                       params[2] = params[0];
                }
        }
 
-       /* IMPORTANT NOTE: For remote users, we pass the UUID in the constructor. This automatically
-        * sets it up in the UUID hash for us.
+       /* For remote users, we pass the UUID they sent to the constructor.
+        * If the UUID already exists User::User() throws an exception which causes this connection to be closed.
         */
-       User* _new = NULL;
-       try
-       {
-               _new = new RemoteUser(params[0], remoteserver->GetName());
-       }
-       catch (...)
-       {
-               ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Duplicate UUID %s in client introduction", params[0].c_str());
-               return CMD_INVALID;
-       }
-       (*(ServerInstance->Users->clientlist))[params[2]] = _new;
+       RemoteUser* _new = new SpanningTree::RemoteUser(params[0], remoteserver);
+       ServerInstance->Users->clientlist[params[2]] = _new;
        _new->nick = params[2];
-       _new->host = params[3];
-       _new->dhost = params[4];
+       _new->ChangeRealHost(params[3], false);
+       _new->ChangeDisplayedHost(params[4]);
        _new->ident = params[5];
-       _new->fullname = params[params.size() - 1];
+       _new->fullname = params.back();
        _new->registered = REG_ALL;
        _new->signon = signon;
        _new->age = age_t;
@@ -109,15 +92,12 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
                /* For each mode thats set, find the mode handler and set it on the new user */
                ModeHandler* mh = ServerInstance->Modes->FindMode(*v, MODETYPE_USER);
                if (!mh)
-               {
-                       ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Unrecognised mode '%c' for a user in UID, dropping link", *v);
-                       return CMD_INVALID;
-               }
+                       throw ProtocolException("Unrecognised mode '" + std::string(1, *v) + "'");
 
-               if (mh->GetNumParams(true))
+               if (mh->NeedsParam(true))
                {
                        if (paramptr >= params.size() - 1)
-                               return CMD_INVALID;
+                               throw ProtocolException("Out of parameters while processing modes");
                        std::string mp = params[paramptr++];
                        /* IMPORTANT NOTE:
                         * All modes are assumed to succeed here as they are being set by a remote server.
@@ -135,45 +115,53 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
                _new->SetMode(mh, true);
        }
 
-       _new->SetClientIP(params[6].c_str());
+       _new->SetClientIP(params[6]);
 
-       ServerInstance->Users->AddGlobalClone(_new);
+       ServerInstance->Users->AddClone(_new);
        remoteserver->UserCount++;
 
        bool dosend = true;
 
-       if ((Utils->quiet_bursts && remoteserver->bursting) || ServerInstance->SilentULine(_new->server))
+       if ((Utils->quiet_bursts && remoteserver->IsBehindBursting()) || _new->server->IsSilentULine())
                dosend = false;
 
        if (dosend)
-               ServerInstance->SNO->WriteToSnoMask('C',"Client connecting at %s: %s (%s) [%s]", _new->server.c_str(), _new->GetFullRealHost().c_str(), _new->GetIPString().c_str(), _new->fullname.c_str());
+               ServerInstance->SNO->WriteToSnoMask('C',"Client connecting at %s: %s (%s) [%s]", remoteserver->GetName().c_str(), _new->GetFullRealHost().c_str(), _new->GetIPString().c_str(), _new->fullname.c_str());
 
        FOREACH_MOD(OnPostConnect, (_new));
 
        return CMD_SUCCESS;
 }
 
-CmdResult CommandFHost::Handle(const parameterlist &params, User* src)
-{
-       if (IS_SERVER(src))
-               return CMD_FAILURE;
-       src->ChangeDisplayedHost(params[0].c_str());
+CmdResult CommandFHost::HandleRemote(RemoteUser* src, Params& params)
+{              
+       src->ChangeDisplayedHost(params[0]);
        return CMD_SUCCESS;
 }
 
-CmdResult CommandFIdent::Handle(const parameterlist &params, User* src)
+CmdResult CommandFIdent::HandleRemote(RemoteUser* src, Params& params)
 {
-       if (IS_SERVER(src))
-               return CMD_FAILURE;
-       src->ChangeIdent(params[0].c_str());
+       src->ChangeIdent(params[0]);
        return CMD_SUCCESS;
 }
 
-CmdResult CommandFName::Handle(const parameterlist &params, User* src)
+CmdResult CommandFName::HandleRemote(RemoteUser* src, Params& params)
 {
-       if (IS_SERVER(src))
-               return CMD_FAILURE;
-       src->ChangeName(params[0].c_str());
+       src->ChangeName(params[0]);
        return CMD_SUCCESS;
 }
 
+CommandUID::Builder::Builder(User* user)
+       : CmdBuilder(TreeServer::Get(user)->GetID(), "UID")
+{
+       push(user->uuid);
+       push_int(user->age);
+       push(user->nick);
+       push(user->GetRealHost());
+       push(user->GetDisplayedHost());
+       push(user->ident);
+       push(user->GetIPString());
+       push_int(user->signon);
+       push(user->GetModeLetters(true));
+       push_last(user->fullname);
+}