X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fuid.cpp;h=86933dc729d871621028de8f692b99b9b24a6fee;hb=8cb20e354533fbec24aafd4e61ff6fa69b434aa2;hp=f1a4e625666237859a6f4a995a0c676be9fac43d;hpb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp index f1a4e6256..86933dc72 100644 --- a/src/modules/m_spanningtree/uid.cpp +++ b/src/modules/m_spanningtree/uid.cpp @@ -1,180 +1,167 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://wiki.inspircd.org/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.h" -#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 */ +#include "remoteuser.h" -bool TreeSocket::ParseUID(const std::string &source, parameterlist ¶ms) +CmdResult CommandUID::HandleServer(TreeServer* remoteserver, CommandBase::Params& params) { - /** 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 */ - if (params.size() < 10) - { - 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[7]); + time_t age_t = ServerCommand::ExtractTS(params[1]); + time_t signon = ServerCommand::ExtractTS(params[7]); std::string empty; - - TreeServer* remoteserver = Utils->FindServer(source); - - if (!remoteserver) - { - this->SendError("Invalid client introduction (Unknown server "+source+")"); - return false; - } - /* Check parameters for validity before introducing the client, discovered by dmb */ - else if (!age_t) - { - this->SendError("Invalid client introduction (Invalid TS?)"); - return false; - } - else if (!signon) + const std::string& modestr = params[8]; + + // 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] != '+') + throw ProtocolException("Invalid mode string"); + + // See if there is a nick collision + User* collideswith = ServerInstance->FindNickOnly(params[2]); + if ((collideswith) && (collideswith->registered != REG_ALL)) { - this->SendError("Invalid client introduction (Invalid signon?)"); - return false; + // 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(collideswith); + localuser->OverruleNick(); } - else if (params[8][0] != '+') + else if (collideswith) { - this->SendError("Invalid client introduction (Malformed MODE sequence?)"); - return false; - } - - /* check for collision */ - user_hash::iterator iter = ServerInstance->Users->clientlist->find(params[2]); - - if (iter != ServerInstance->Users->clientlist->end()) - { - /* - * Nick collision. - */ - 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 != 1) + // 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 changed, make sure we change their nick for the hash too */ + // 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 User(params[0]); - } - catch (...) - { - this->SendError("Protocol violation - Duplicate UUID '" + params[0] + "' on introduction of new user"); - return false; - } - (*(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 = ServerInstance->FindServerNamePtr(remoteserver->GetName().c_str()); - _new->ident.assign(params[5], 0, MAXBUF); - _new->fullname.assign(params[params.size() - 1], 0, MAXBUF); + RemoteUser* _new = new SpanningTree::RemoteUser(params[0], remoteserver); + ServerInstance->Users->clientlist[params[2]] = _new; + _new->nick = params[2]; + _new->ChangeRealHost(params[3], false); + _new->ChangeDisplayedHost(params[4]); + _new->ident = params[5]; + _new->fullname = params.back(); _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) + throw ProtocolException("Unrecognised mode '" + std::string(1, *v) + "'"); - if (mh) + if (mh->NeedsParam(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); + if (paramptr >= params.size() - 1) + 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. + * 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 - { - this->SendError(std::string("Warning: Broken UID command, unknown user mode '")+(*v)+"' in the mode string! (mismatched module?)"); - return false; - } + mh->OnModeChange(_new, _new, NULL, empty, true); + _new->SetMode(mh, true); } - /* now we've done with modes processing, put the + back for remote servers */ - if (params[8][0] != '+') - params[8] = "+" + params[8]; + _new->SetClientIP(params[6]); - _new->SetClientIP(params[6].c_str()); - - ServerInstance->Users->AddGlobalClone(_new); - remoteserver->SetUserCount(1); // increment by 1 + ServerInstance->Users->AddClone(_new); + remoteserver->UserCount++; bool dosend = true; - if ((this->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 [%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]", remoteserver->GetName().c_str(), _new->GetFullRealHost().c_str(), _new->GetIPString().c_str(), _new->fullname.c_str()); - params[params.size() - 1] = ":" + params[params.size() - 1]; - Utils->DoOneToAllButSender(source, "UID", params, source); + FOREACH_MOD(OnPostConnect, (_new)); - FOREACH_MOD(I_OnPostConnect,OnPostConnect(_new)); + return CMD_SUCCESS; +} - return true; +CmdResult CommandFHost::HandleRemote(RemoteUser* src, Params& params) +{ + src->ChangeDisplayedHost(params[0]); + return CMD_SUCCESS; } +CmdResult CommandFIdent::HandleRemote(RemoteUser* src, Params& params) +{ + src->ChangeIdent(params[0]); + return CMD_SUCCESS; +} + +CmdResult CommandFName::HandleRemote(RemoteUser* src, Params& 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->GetRealHost()); + push(user->GetDisplayedHost()); + push(user->ident); + push(user->GetIPString()); + push_int(user->signon); + push(user->GetModeLetters(true)); + push_last(user->fullname); +}