X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fuid.cpp;h=5152ef274185e8938994b2f4e936c6ea6823c438;hb=845135ba55d2bad81588a80546c8abe2b76ed47c;hp=0c456471935ab10593ca60ad738f4068f4816b50;hpb=e5d87abd352a5e2ea3d13e89adb61d40871421b9;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp index 0c4564719..5152ef274 100644 --- a/src/modules/m_spanningtree/uid.cpp +++ b/src/modules/m_spanningtree/uid.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-2010 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -12,72 +12,58 @@ */ #include "inspircd.h" -#include "commands/cmd_whois.h" -#include "commands/cmd_stats.h" -#include "socket.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/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 */ - -bool TreeSocket::ParseUID(const std::string &source, std::deque ¶ms) +#include "commands.h" + +#include "utils.h" +#include "link.h" +#include "treesocket.h" +#include "treeserver.h" +#include "resolvers.h" + +CmdResult CommandUID::Handle(const parameterlist ¶ms, User* serversrc) { + SpanningTreeUtilities* Utils = ((ModuleSpanningTree*)(Module*)creator)->Utils; /** Do we have enough parameters: - * 1 2 3 4 5 6 7 8 9 10 - * UID uuid age nick host dhost ident +modestr +snomasks ip.string signon :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() != 11) - { - 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; - } + if (params.size() < 10) + return CMD_INVALID; time_t age_t = ConvToInt(params[1]); - time_t signon = ConvToInt(params[9]); + time_t signon = ConvToInt(params[7]); std::string empty; + std::string nick(params[2]); + std::string modestr(params[8]); - TreeServer* remoteserver = Utils->FindServer(source); + TreeServer* remoteserver = Utils->FindServer(serversrc->server); if (!remoteserver) - { - this->WriteLine(std::string(":")+this->Instance->Config->GetSID()+" KILL "+params[0]+" :Invalid client introduction (Unknown server "+source+")"); - return true; - } - + 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; - } + 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->Instance->Users->clientlist->find(params[2]); + user_hash::iterator iter = ServerInstance->Users->clientlist->find(nick); - if (iter != this->Instance->Users->clientlist->end()) + if (iter != ServerInstance->Users->clientlist->end()) { /* * Nick collision. */ - Instance->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], modestr, params[0]); + ServerInstance->Logs->Log("m_spanningtree",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]; + nick = params[0]; } } @@ -87,71 +73,109 @@ 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->GetName()); } catch (...) { - SendError("Protocol violation - Duplicate UUID '" + params[0] + "' on introduction of new user"); - return false; + return CMD_INVALID; } - (*(this->Instance->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->Instance->FindServerNamePtr(remoteserver->GetName().c_str()); - _new->ident.assign(params[5], 0, MAXBUF); - _new->fullname.assign(params[10], 0, MAXBUF); + (*(ServerInstance->Users->clientlist))[nick] = _new; + _new->nick = nick; + _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('+'); + std::string::size_type pos_after_plus = modestr.find_first_not_of('+'); if (pos_after_plus != std::string::npos) - params[6] = params[6].substr(pos_after_plus); + modestr = modestr.substr(pos_after_plus); - for (std::string::iterator v = params[6].begin(); v != params[6].end(); v++) + 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 = Instance->Modes->FindMode(*v, MODETYPE_USER); + ModeHandler* mh = ServerInstance->Modes->FindMode(*v, MODETYPE_USER); if (mh) { - mh->OnModeChange(_new, _new, NULL, empty, true); + 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(*v, true); - mh->ChangeCount(1); } } - _new->ProcessNoticeMasks(params[7].c_str()); - /* now we've done with modes processing, put the + back for remote servers */ - params[6] = "+" + params[6]; + if (modestr[0] != '+') + modestr = "+" + modestr; -#ifdef SUPPORT_IP6LINKS - if (params[8].find_first_of(":") != std::string::npos) - _new->SetSockAddr(AF_INET6, params[8].c_str(), 0); - else -#endif - _new->SetSockAddr(AF_INET, params[8].c_str(), 0); + _new->SetClientIP(params[6].c_str()); - Instance->Users->AddGlobalClone(_new); + ServerInstance->Users->AddGlobalClone(_new); + remoteserver->SetUserCount(1); // increment by 1 bool dosend = true; - if ((this->Utils->quiet_bursts && remoteserver->bursting) || this->Instance->SilentULine(_new->server)) + if ((Utils->quiet_bursts && remoteserver->bursting) || ServerInstance->SilentULine(_new->server)) 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.c_str(), _new->GetIPString(), _new->fullname.c_str()); + 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()); + + FOREACH_MOD(I_OnPostConnect,OnPostConnect(_new)); - params[10] = ":" + params[10]; - Utils->DoOneToAllButSender(source, "UID", params, source); + return CMD_SUCCESS; +} - Instance->PI->Introduce(_new); - FOREACH_MOD_I(Instance,I_OnPostConnect,OnPostConnect(_new)); +CmdResult CommandFHost::Handle(const parameterlist ¶ms, User* src) +{ + if (params.size() < 1) + return CMD_INVALID; + if (IS_SERVER(src)) + return CMD_FAILURE; + src->ChangeDisplayedHost(params[0].c_str()); + return CMD_SUCCESS; +} - return true; +CmdResult CommandFIdent::Handle(const parameterlist ¶ms, User* src) +{ + if (params.size() < 1) + return CMD_INVALID; + if (IS_SERVER(src)) + return CMD_FAILURE; + src->ChangeIdent(params[0].c_str()); + return CMD_SUCCESS; +} + +CmdResult CommandFName::Handle(const parameterlist ¶ms, User* src) +{ + if (params.size() < 1) + return CMD_INVALID; + if (IS_SERVER(src)) + return CMD_FAILURE; + src->ChangeName(params[0].c_str()); + return CMD_SUCCESS; }