X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fuid.cpp;h=f248b3860743880d0e2720d8c9852e0faac5ba5d;hb=ea590a5d80741c3bc030cb0a2fcb3c59da4fd078;hp=f68da8a1c79e862b49674bb8473d780df9fd3dce;hpb=3699b899c0eadadaba960a3263c82894685a86c4;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp index f68da8a1c..f248b3860 100644 --- a/src/modules/m_spanningtree/uid.cpp +++ b/src/modules/m_spanningtree/uid.cpp @@ -1,97 +1,65 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2010 Daniel De Graaf + * Copyright (C) 2008 Robin Burchell + * Copyright (C) 2008 Craig Edwards * - * 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 . */ + #include "inspircd.h" -#include "commands/cmd_whois.h" -#include "commands/cmd_stats.h" -#include "socket.h" -#include "wildcard.h" -#include "xline.h" -#include "transport.h" -#include "m_hash.h" -#include "socketengine.h" - -#include "m_spanningtree/main.h" -#include "m_spanningtree/utils.h" -#include "m_spanningtree/treeserver.h" -#include "m_spanningtree/link.h" -#include "m_spanningtree/treesocket.h" -#include "m_spanningtree/resolvers.h" -#include "m_spanningtree/handshaketimer.h" - -/* $ModDep: m_spanningtree/timesynctimer.h m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h m_hash.h */ - -bool TreeSocket::ParseUID(const std::string &source, std::deque ¶ms) +#include "commands.h" + +#include "utils.h" +#include "treeserver.h" + +CmdResult CommandUID::HandleServer(TreeServer* remoteserver, std::vector& params) { /** Do we have enough parameters: - * UID uuid age nick host dhost ident +modestr ip.string :gecos + * 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) - { - if (!params.empty()) - this->WriteLine(std::string(":")+this->Instance->Config->GetSID()+" KILL "+params[0]+" :Invalid client introduction ("+params[0]+" with only "+ - ConvToStr(params.size())+" of 10 parameters?)"); - return true; - } - time_t age_t = ConvToInt(params[1]); - time_t signon = ConvToInt(params[8]); - const char* tempnick = params[2].c_str(); + time_t signon = ConvToInt(params[7]); std::string empty; + const std::string& modestr = params[8]; - /* XXX probably validate UID length too -- w00t */ - cmd_validation valid[] = { {"Nickname", 2, NICKMAX}, {"Hostname", 3, 64}, {"Displayed hostname", 4, 64}, {"Ident", 5, IDENTMAX + 1}, {"GECOS", 9, MAXGECOS}, {"", 0, 0} }; - - TreeServer* remoteserver = Utils->FindServer(source); - - if (!remoteserver) - { - this->WriteLine(std::string(":")+this->Instance->Config->GetSID()+" KILL "+params[0]+" :Invalid client introduction (Unknown server "+source+")"); - return true; - } - + /* Is this a valid UID, and not misrouted? */ + if (params[0].length() != UIDGenerator::UUID_LENGTH || params[0].substr(0, 3) != remoteserver->GetID()) + return CMD_INVALID; /* Check parameters for validity before introducing the client, discovered by dmb */ if (!age_t) - { - this->WriteLine(std::string(":")+this->Instance->Config->GetSID()+" KILL "+params[0]+" :Invalid client introduction (Invalid TS?)"); - return true; - } - - for (size_t x = 0; valid[x].length; ++x) - { - if (params[valid[x].param].length() > valid[x].length) - { - this->WriteLine(std::string(":")+this->Instance->Config->GetSID()+" KILL "+params[0]+" :Invalid client introduction (" + valid[x].item + " > " + ConvToStr(valid[x].length) + ")"); - return true; - } - } - + return CMD_INVALID; + if (!signon) + return CMD_INVALID; + if (modestr[0] != '+') + return CMD_INVALID; /* check for collision */ - user_hash::iterator iter = this->Instance->Users->clientlist->find(tempnick); - - if (iter != this->Instance->Users->clientlist->end()) + User* collideswith = ServerInstance->FindNickOnly(params[2]); + if (collideswith) { /* * Nick collision. */ - Instance->Logs->Log("m_spanningtree",DEBUG,"*** Collision on %s", tempnick); - int collide = this->DoCollision(iter->second, age_t, params[5].c_str(), params[7].c_str(), params[0].c_str()); + int collide = Utils->DoCollision(collideswith, remoteserver, 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 == 2) + if (collide != 1) { - /* remote client changed, make sure we change their nick for the hash too */ - tempnick = params[0].c_str(); + // Remote client lost, make sure we change their nick for the hash too params[2] = params[0]; } } @@ -102,68 +70,107 @@ bool TreeSocket::ParseUID(const std::string &source, std::deque &pa User* _new = NULL; try { - _new = new User(this->Instance, params[0]); + _new = new RemoteUser(params[0], remoteserver); } catch (...) { - SendError("Protocol violation - Duplicate UUID '" + params[0] + "' on introduction of new user"); - return false; + ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Duplicate UUID %s in client introduction", params[0].c_str()); + return CMD_INVALID; } - (*(this->Instance->Users->clientlist))[tempnick] = _new; - _new->SetFd(FD_MAGIC_NUMBER); - _new->nick.assign(tempnick, NICKMAX - 1); - strlcpy(_new->host, params[3].c_str(),64); - _new->dhost.assign(params[4], 0, 64); - _new->server = this->Instance->FindServerNamePtr(remoteserver->GetName().c_str()); - _new->ident.assign(params[5], 0, IDENTMAX + 1); - _new->fullname.assign(params[9], 0, MAXGECOS); + ServerInstance->Users->clientlist[params[2]] = _new; + _new->nick = params[2]; + _new->host = params[3]; + _new->dhost = params[4]; + _new->ident = params[5]; + _new->fullname = params[params.size() - 1]; _new->registered = REG_ALL; _new->signon = signon; _new->age = age_t; - /* we need to remove the + from the modestring, so we can do our stuff */ - std::string::size_type pos_after_plus = params[6].find_first_not_of('+'); - if (pos_after_plus != std::string::npos) - params[6] = params[6].substr(pos_after_plus); + unsigned int paramptr = 9; - for (std::string::iterator v = params[6].begin(); v != params[6].end(); v++) + for (std::string::const_iterator v = modestr.begin(); v != modestr.end(); ++v) { - /* For each mode thats set, increase counter */ - ModeHandler* mh = Instance->Modes->FindMode(*v, MODETYPE_USER); + // Accept more '+' chars, for now + if (*v == '+') + continue; - if (mh) + /* 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) { - mh->OnModeChange(_new, _new, NULL, empty, true); - _new->SetMode(*v, true); - mh->ChangeCount(1); + ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Unrecognised mode '%c' for a user in UID, dropping link", *v); + return CMD_INVALID; } - } - /* now we've done with modes processing, put the + back for remote servers */ - params[6] = "+" + params[6]; + if (mh->GetNumParams(true)) + { + if (paramptr >= params.size() - 1) + return CMD_INVALID; + std::string mp = params[paramptr++]; + /* IMPORTANT NOTE: + * All modes are assumed to succeed here as they are being set by a remote server. + * Modes CANNOT FAIL here. If they DO fail, then the failure is ignored. This is important + * to note as all but one modules currently cannot ever fail in this situation, except for + * m_servprotect which specifically works this way to prevent the mode being set ANYWHERE + * but here, at client introduction. You may safely assume this behaviour is standard and + * will not change in future versions if you want to make use of this protective behaviour + * yourself. + */ + mh->OnModeChange(_new, _new, NULL, mp, true); + } + else + mh->OnModeChange(_new, _new, NULL, empty, true); + _new->SetMode(mh, true); + } -#ifdef SUPPORT_IP6LINKS - if (params[7].find_first_of(":") != std::string::npos) - _new->SetSockAddr(AF_INET6, params[7].c_str(), 0); - else -#endif - _new->SetSockAddr(AF_INET, params[7].c_str(), 0); + _new->SetClientIP(params[6].c_str()); - Instance->Users->AddGlobalClone(_new); + ServerInstance->Users->AddGlobalClone(_new); + remoteserver->UserCount++; bool dosend = true; - - if ((this->Utils->quiet_bursts && remoteserver->bursting) || this->Instance->SilentULine(_new->server)) + + if ((Utils->quiet_bursts && remoteserver->bursting) || _new->server->IsSilentULine()) dosend = false; - + if (dosend) - this->Instance->SNO->WriteToSnoMask('C',"Client connecting at %s: %s!%s@%s [%s] [%s]",_new->server,_new->nick.c_str(),_new->ident.c_str(),_new->host, _new->GetIPString(), _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()); - params[9] = ":" + params[9]; - Utils->DoOneToAllButSender(source, "UID", params, source); + FOREACH_MOD(OnPostConnect, (_new)); - FOREACH_MOD_I(Instance,I_OnPostConnect,OnPostConnect(_new)); + return CMD_SUCCESS; +} - return true; +CmdResult CommandFHost::HandleRemote(RemoteUser* src, std::vector& params) +{ + src->ChangeDisplayedHost(params[0]); + return CMD_SUCCESS; } +CmdResult CommandFIdent::HandleRemote(RemoteUser* src, std::vector& params) +{ + src->ChangeIdent(params[0]); + return CMD_SUCCESS; +} + +CmdResult CommandFName::HandleRemote(RemoteUser* src, std::vector& params) +{ + 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->host); + push(user->dhost); + push(user->ident); + push(user->GetIPString()); + push_int(user->signon); + push('+').push_raw(user->FormatModes(true)); + push_last(user->fullname); +}