X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fuid.cpp;h=dd4591a9ba71185f8473e662767a08e90fdac3af;hb=8710724b5518ae9858309e548514f76e620a8459;hp=3cc4c9618fae2949474fd89911e5c7a9459a1ad1;hpb=d8e63234c47852f55811dacbbe9d4240e2d6e484;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp index 3cc4c9618..dd4591a9b 100644 --- a/src/modules/m_spanningtree/uid.cpp +++ b/src/modules/m_spanningtree/uid.cpp @@ -1,76 +1,77 @@ -/* +------------------------------------+ - * | 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 "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" +#include "inspircd.h" +#include "commands.h" -/* $ModDep: 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 m_spanningtree/handshaketimer.h */ +#include "utils.h" +#include "treeserver.h" -bool TreeSocket::ParseUID(const std::string &source, std::deque ¶ms) +CmdResult CommandUID::Handle(const parameterlist ¶ms, User* serversrc) { + 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 */ - if (params.size() < 10) - { - if (!params.empty()) - this->WriteLine(std::string(":")+this->ServerInstance->Config->GetSID()+" KILL "+params[0]+" :Invalid client introduction ("+params[0]+" with only "+ - ConvToStr(params.size())+" of 10 or more parameters?)"); - return true; - } - time_t age_t = ConvToInt(params[1]); time_t signon = ConvToInt(params[7]); std::string empty; + const std::string& modestr = params[8]; - TreeServer* remoteserver = Utils->FindServer(source); + TreeServer* remoteserver = Utils->FindServer(serversrc->server); if (!remoteserver) - { - this->WriteLine(std::string(":")+this->ServerInstance->Config->GetSID()+" KILL "+params[0]+" :Invalid client introduction (Unknown server "+source+")"); - return true; - } - + 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) - { - this->WriteLine(std::string(":")+this->ServerInstance->Config->GetSID()+" KILL "+params[0]+" :Invalid client introduction (Invalid TS?)"); - return true; - } + return CMD_INVALID; + if (!signon) + return CMD_INVALID; + if (modestr[0] != '+') + return CMD_INVALID; + TreeSocket* sock = remoteserver->GetRoute()->GetSocket(); /* check for collision */ - user_hash::iterator iter = this->ServerInstance->Users->clientlist->find(params[2]); + user_hash::iterator iter = ServerInstance->Users->clientlist->find(params[2]); - if (iter != this->ServerInstance->Users->clientlist->end()) + if (iter != ServerInstance->Users->clientlist->end()) { /* * Nick collision. */ - ServerInstance->Logs->Log("m_spanningtree",DEBUG,"*** Collision on %s", params[2].c_str()); - int collide = this->DoCollision(iter->second, age_t, params[5], params[8], params[0]); + 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 == 2) + if (collide != 1) { - /* remote client changed, make sure we change their nick for the hash too */ - params[2] = params[0]; + /* 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(params)[2] = params[0]; } } @@ -80,86 +81,99 @@ bool TreeSocket::ParseUID(const std::string &source, std::deque &pa User* _new = NULL; try { - _new = new User(this->ServerInstance, params[0]); + _new = new RemoteUser(params[0], remoteserver->GetName()); } 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->ServerInstance->Users->clientlist))[params[2]] = _new; - _new->SetFd(FD_MAGIC_NUMBER); - _new->nick.assign(params[2], 0, MAXBUF); - _new->host.assign(params[3], 0, 64); - _new->dhost.assign(params[4], 0, 64); - _new->server = this->ServerInstance->FindServerNamePtr(remoteserver->GetName().c_str()); - _new->ident.assign(params[5], 0, MAXBUF); - _new->fullname.assign(params[params.size() - 1], 0, MAXBUF); + (*(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[8].find_first_not_of('+'); - if (pos_after_plus != std::string::npos) - params[8] = params[8].substr(pos_after_plus); - unsigned int paramptr = 9; - for (std::string::iterator v = params[8].begin(); v != params[8].end(); v++) + + for (std::string::const_iterator v = modestr.begin(); v != modestr.end(); ++v) { + // Accept more '+' chars, for now if (*v == '+') continue; - /* For each mode thats set, increase counter */ + /* 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; + } - if (mh) + if (mh->GetNumParams(true)) { - if (mh->GetNumParams(true)) - { - if (paramptr < params.size() - 1) - mh->OnModeChange(_new, _new, NULL, params[paramptr++], true); - else - ServerInstance->Logs->Log("m_spanningtree", DEBUG, "Warning: Broken UID command, expected a parameter for user mode '%c' but there aren't enough parameters in the command!", *v); - } - else - mh->OnModeChange(_new, _new, NULL, empty, true); - _new->SetMode(*v, true); - mh->ChangeCount(1); + 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 - ServerInstance->Logs->Log("m_spanningtree", DEBUG, "Warning: Broken UID command, unknown user mode '%c' in the mode string!", *v); + mh->OnModeChange(_new, _new, NULL, empty, true); + _new->SetMode(mh, true); } - //_new->ProcessNoticeMasks(params[7].c_str()); - - /* now we've done with modes processing, put the + back for remote servers */ - if (params[8][0] != '+') - params[8] = "+" + params[8]; - -#ifdef SUPPORT_IP6LINKS - if (params[6].find_first_of(":") != std::string::npos) - _new->SetSockAddr(AF_INET6, params[6].c_str(), 0); - else -#endif - _new->SetSockAddr(AF_INET, params[6].c_str(), 0); + _new->SetClientIP(params[6].c_str()); ServerInstance->Users->AddGlobalClone(_new); + remoteserver->UserCount++; bool dosend = true; - if ((this->Utils->quiet_bursts && remoteserver->bursting) || this->ServerInstance->SilentULine(_new->server)) + if ((Utils->quiet_bursts && remoteserver->bursting) || ServerInstance->SilentULine(_new->server)) dosend = false; if (dosend) - this->ServerInstance->SNO->WriteToSnoMask('C',"Client connecting at %s: %s!%s@%s [%s] [%s]", _new->server, _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().c_str(), _new->fullname.c_str()); + + FOREACH_MOD(OnPostConnect, (_new)); + + return CMD_SUCCESS; +} - params[params.size() - 1] = ":" + params[params.size() - 1]; - Utils->DoOneToAllButSender(source, "UID", params, source); +CmdResult CommandFHost::Handle(const parameterlist ¶ms, User* src) +{ + if (IS_SERVER(src)) + return CMD_FAILURE; + src->ChangeDisplayedHost(params[0].c_str()); + return CMD_SUCCESS; +} - ServerInstance->PI->Introduce(_new); - FOREACH_MOD_I(ServerInstance,I_OnPostConnect,OnPostConnect(_new)); +CmdResult CommandFIdent::Handle(const parameterlist ¶ms, User* src) +{ + if (IS_SERVER(src)) + return CMD_FAILURE; + src->ChangeIdent(params[0].c_str()); + return CMD_SUCCESS; +} - return true; +CmdResult CommandFName::Handle(const parameterlist ¶ms, User* src) +{ + if (IS_SERVER(src)) + return CMD_FAILURE; + src->ChangeName(params[0].c_str()); + return CMD_SUCCESS; }