X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fuid.cpp;h=0f0e75a1d8e06d3f0bb5d386fe8ea4f83f7fc9b8;hb=e2af2347fc035d702e45f12e772223a8d578410d;hp=d5caedd8e28c923af20a2e094c33df5695621150;hpb=24d34de00efac5ff04c53a09cab995654bf6f5b7;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp index d5caedd8e..0f0e75a1d 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-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -12,86 +12,71 @@ */ #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 "main.h" +#include "utils.h" +#include "treeserver.h" +#include "link.h" +#include "treesocket.h" +#include "resolvers.h" +#include "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, parameterlist ¶ms) { /** 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.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; + this->SendError("Invalid client introduction (wanted 10 or more parameters, got " + (params.empty() ? "0" : ConvToStr(params.size())) + "!)"); + return false; } 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; - /* 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; + this->SendError("Invalid client introduction (Unknown server "+source+")"); + return false; } - /* Check parameters for validity before introducing the client, discovered by dmb */ - if (!age_t) + else if (!age_t) { - this->WriteLine(std::string(":")+this->Instance->Config->GetSID()+" KILL "+params[0]+" :Invalid client introduction (Invalid TS?)"); - return true; + this->SendError("Invalid client introduction (Invalid TS?)"); + return false; } - - for (size_t x = 0; valid[x].length; ++x) + else if (!signon) { - 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; - } + this->SendError("Invalid client introduction (Invalid signon?)"); + return false; + } + else if (params[8][0] != '+') + { + this->SendError("Invalid client introduction (Malformed MODE sequence?)"); + return false; } - /* check for collision */ - user_hash::iterator iter = this->Instance->Users->clientlist->find(tempnick); + user_hash::iterator iter = ServerInstance->Users->clientlist->find(params[2]); - if (iter != this->Instance->Users->clientlist->end()) + if (iter != ServerInstance->Users->clientlist->end()) { /* * Nick collision. */ - Instance->Logs->Log("m_spanningtree",DEBUG,"*** Collision on %s", tempnick); - int collide = this->DoCollision(iter->second, age_t, params[5], params[7], params[0]); + int collide = this->DoCollision(iter->second, age_t, params[5], params[8], 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 */ - tempnick = params[0].c_str(); params[2] = params[0]; } } @@ -102,67 +87,93 @@ bool TreeSocket::ParseUID(const std::string &source, std::deque &pa User* _new = NULL; try { - _new = new User(this->Instance, params[0]); + _new = new User(ServerInstance, params[0]); } catch (...) { - SendError("Protocol violation - Duplicate UUID '" + params[0] + "' on introduction of new user"); + this->SendError("Protocol violation - Duplicate UUID '" + params[0] + "' on introduction of new user"); return false; } - (*(this->Instance->Users->clientlist))[tempnick] = _new; + (*(ServerInstance->Users->clientlist))[params[2]] = _new; _new->SetFd(FD_MAGIC_NUMBER); - _new->nick.assign(tempnick, NICKMAX - 1); + _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, IDENTMAX + 1); - _new->fullname.assign(params[9], 0, MAXGECOS); + _new->server = ServerInstance->FindServerNamePtr(remoteserver->GetName().c_str()); + _new->ident.assign(params[5], 0, MAXBUF); + _new->fullname.assign(params[params.size() - 1], 0, MAXBUF); _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 = params[8].find_first_not_of('+'); if (pos_after_plus != std::string::npos) - params[6] = params[6].substr(pos_after_plus); + params[8] = params[8].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 = params[8].begin(); v != params[8].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)) + { + /* 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. + */ + if (paramptr < params.size() - 1) + mh->OnModeChange(_new, _new, NULL, params[paramptr++], true); + else + { + this->SendError(std::string("Broken UID command, expected a parameter for user mode '")+(*v)+"' but there aren't enough parameters in the command!"); + return false; + } + } + else + mh->OnModeChange(_new, _new, NULL, empty, true); _new->SetMode(*v, true); mh->ChangeCount(1); } + else + { + this->SendError(std::string("Warning: Broken UID command, unknown user mode '")+(*v)+"' in the mode string! (mismatched module?)"); + return false; + } } /* now we've done with modes processing, put the + back for remote servers */ - params[6] = "+" + params[6]; + if (params[8][0] != '+') + params[8] = "+" + params[8]; -#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->SetUserCount(1); // increment by 1 bool dosend = true; - - if ((this->Utils->quiet_bursts && remoteserver->bursting) || this->Instance->SilentULine(_new->server)) + + if ((this->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, _new->nick.c_str(), _new->ident.c_str(), _new->host.c_str(), _new->GetIPString(), _new->fullname.c_str()); - params[9] = ":" + params[9]; + params[params.size() - 1] = ":" + params[params.size() - 1]; Utils->DoOneToAllButSender(source, "UID", params, source); - FOREACH_MOD_I(Instance,I_OnPostConnect,OnPostConnect(_new)); + FOREACH_MOD_I(ServerInstance,I_OnPostConnect,OnPostConnect(_new)); return true; }