X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fusers.cpp;h=aebc66bfc48472110fb375c1dbe5a0fa1950ec28;hb=6e8584b0f642afeec73990832f54ed4ba750b11f;hp=dfb386871be45b24da09bf4b5fc4c4c2fb41146c;hpb=123eac3f25ce4dd3142b4ac66eb321f7df1e23e4;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/users.cpp b/src/users.cpp index dfb386871..aebc66bfc 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -1,16 +1,28 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon + * + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2006-2009 Robin Burchell + * Copyright (C) 2006-2007, 2009 Dennis Friis + * Copyright (C) 2008 John Brooks + * Copyright (C) 2008 Thomas Stagner + * Copyright (C) 2008 Oliver Lupton + * Copyright (C) 2003-2008 Craig Edwards * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * 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 free but copyrighted software; see - * the file COPYING for details. + * 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 #include "socketengine.h" @@ -18,37 +30,7 @@ #include "bancache.h" #include "commands/cmd_whowas.h" -typedef unsigned int uniq_id_t; -class sent -{ - uniq_id_t uniq_id; - uniq_id_t* array; - void init() - { - if (!array) - array = new uniq_id_t[ServerInstance->SE->GetMaxFds()]; - memset(array, 0, ServerInstance->SE->GetMaxFds() * sizeof(uniq_id_t)); - uniq_id++; - } - public: - sent() : uniq_id(static_cast(-1)), array(NULL) {} - inline uniq_id_t operator++() - { - if (++uniq_id == 0) - init(); - return uniq_id; - } - inline uniq_id_t& operator[](int i) - { - return array[i]; - } - ~sent() - { - delete[] array; - } -}; - -static sent already_sent; +already_sent_t LocalUser::already_sent_id = 0; std::string User::ProcessNoticeMasks(const char *sm) { @@ -67,9 +49,9 @@ std::string User::ProcessNoticeMasks(const char *sm) adding = false; break; case '*': - for (unsigned char d = 'A'; d <= 'z'; d++) + for (unsigned char d = 'a'; d <= 'z'; d++) { - if (ServerInstance->SNO->IsEnabled(d)) + if (!ServerInstance->SNO->masks[d - 'a'].Description.empty()) { if ((!IsNoticeMaskSet(d) && adding) || (IsNoticeMaskSet(d) && !adding)) { @@ -80,12 +62,23 @@ std::string User::ProcessNoticeMasks(const char *sm) output += d; } + oldadding = adding; + char u = toupper(d); + if ((!IsNoticeMaskSet(u) && adding) || (IsNoticeMaskSet(u) && !adding)) + { + if ((oldadding != adding) || (!output.length())) + output += (adding ? '+' : '-'); + + this->SetNoticeMask(u, adding); + + output += u; + } + oldadding = adding; } - oldadding = adding; } break; default: - if ((*c >= 'A') && (*c <= 'z') && (ServerInstance->SNO->IsEnabled(*c))) + if (isalpha(*c)) { if ((!IsNoticeMaskSet(*c) && adding) || (IsNoticeMaskSet(*c) && !adding)) { @@ -104,7 +97,7 @@ std::string User::ProcessNoticeMasks(const char *sm) break; } - *c++; + c++; } std::string s = this->FormatNoticeMasks(); @@ -132,6 +125,8 @@ void LocalUser::StartDNSLookup() catch (CoreException& e) { ServerInstance->Logs->Log("USERS", DEBUG,"Error in resolver: %s",e.GetReason()); + dns_done = true; + ServerInstance->stats->statsDnsBad++; } } @@ -203,34 +198,14 @@ const char* User::FormatModes(bool showparameters) return data; } -void User::DecrementModes() -{ - ServerInstance->Logs->Log("USERS", DEBUG, "DecrementModes()"); - for (unsigned char n = 'A'; n <= 'z'; n++) - { - if (modes[n-65]) - { - ServerInstance->Logs->Log("USERS", DEBUG,"DecrementModes() found mode %c", n); - ModeHandler* mh = ServerInstance->Modes->FindMode(n, MODETYPE_USER); - if (mh) - { - ServerInstance->Logs->Log("USERS", DEBUG,"Found handler %c and call ChangeCount", n); - mh->ChangeCount(-1); - } - } - } -} - -User::User(const std::string &uid) +User::User(const std::string &uid, const std::string& sid, int type) + : uuid(uid), server(sid), usertype(type) { - server = ServerInstance->Config->ServerName; age = ServerInstance->Time(); - Penalty = 0; - lastping = signon = idle_lastmsg = nping = registered = 0; + signon = idle_lastmsg = 0; + registered = 0; quietquit = quitting = exempt = dns_done = false; - fd = -1; - AllowedPrivs = AllowedOperCommands = NULL; - uuid = uid; + quitting_sendq = false; client_sa.sa.sa_family = AF_UNSPEC; ServerInstance->Logs->Log("USERS", DEBUG, "New UUID for user: %s", uuid.c_str()); @@ -242,16 +217,39 @@ User::User(const std::string &uid) throw CoreException("Duplicate UUID "+std::string(uuid)+" in User constructor"); } -LocalUser::LocalUser() : User(ServerInstance->GetUID()) +LocalUser::LocalUser(int myfd, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* servaddr) + : User(ServerInstance->GetUID(), ServerInstance->Config->ServerName, USERTYPE_LOCAL), eh(this), + bytes_in(0), bytes_out(0), cmds_in(0), cmds_out(0), nping(0), CommandFloodPenalty(0), + already_sent(0) { - bytes_in = bytes_out = cmds_in = cmds_out = 0; - server_sa.sa.sa_family = AF_UNSPEC; + ident = "unknown"; + lastping = 0; + eh.SetFd(myfd); + memcpy(&server_sa, servaddr, sizeof(irc::sockets::sockaddrs)); + + /* + * Initialize host and dhost here to the user's IP. + * It is important to do this before calling SetClientIP() + * as that passes execution to modules that expect these + * fields to be valid. + * + * We cannot call GetIPString() now as that will access + * client_sa, and that's only initialized after the first + * SetClientIP() call. + */ + + int port; + irc::sockets::satoap(*client, host, port); + if (host[0] == ':') + host.insert(0, 1, '0'); + dhost = host; + SetClientIP(*client); } User::~User() { - if (uuid.length()) - ServerInstance->Logs->Log("USERS", ERROR, "User destructor for %s called without cull", uuid.c_str()); + if (ServerInstance->Users->uuidlist->find(uuid) != ServerInstance->Users->uuidlist->end()) + ServerInstance->Logs->Log("USERS", DEFAULT, "User destructor for %s called without cull", uuid.c_str()); } const std::string& User::MakeHost() @@ -294,7 +292,7 @@ const std::string& User::MakeHostIP() return this->cached_hostip; } -const std::string User::GetFullHost() +const std::string& User::GetFullHost() { if (!this->cached_fullhost.empty()) return this->cached_fullhost; @@ -328,7 +326,7 @@ char* User::MakeWildHost() return nresult; } -const std::string User::GetFullRealHost() +const std::string& User::GetFullRealHost() { if (!this->cached_fullrealhost.empty()) return this->cached_fullrealhost; @@ -350,129 +348,97 @@ const std::string User::GetFullRealHost() return this->cached_fullrealhost; } -bool User::IsInvited(const irc::string &channel) +bool LocalUser::IsInvited(const irc::string &channel) { - time_t now = ServerInstance->Time(); - InvitedList::iterator safei; - for (InvitedList::iterator i = invites.begin(); i != invites.end(); ++i) - { - if (channel == i->first) - { - if (i->second != 0 && now > i->second) - { - /* Expired invite, remove it. */ - safei = i; - --i; - invites.erase(safei); - continue; - } - return true; - } - } - return false; + Channel* chan = ServerInstance->FindChan(channel.c_str()); + if (!chan) + return false; + + return (Invitation::Find(chan, this) != NULL); } -InvitedList* User::GetInviteList() +InviteList& LocalUser::GetInviteList() { - time_t now = ServerInstance->Time(); - /* Weed out expired invites here. */ - InvitedList::iterator safei; - for (InvitedList::iterator i = invites.begin(); i != invites.end(); ++i) - { - if (i->second != 0 && now > i->second) - { - /* Expired invite, remove it. */ - safei = i; - --i; - invites.erase(safei); - } - } - return &invites; + RemoveExpiredInvites(); + return invites; } -void User::InviteTo(const irc::string &channel, time_t invtimeout) +void LocalUser::InviteTo(const irc::string &channel, time_t invtimeout) { - time_t now = ServerInstance->Time(); - if (invtimeout != 0 && now > invtimeout) return; /* Don't add invites that are expired from the get-go. */ - for (InvitedList::iterator i = invites.begin(); i != invites.end(); ++i) + Channel* chan = ServerInstance->FindChan(channel.c_str()); + if (chan) + Invitation::Create(chan, this, invtimeout); +} + +void LocalUser::RemoveInvite(const irc::string &channel) +{ + Channel* chan = ServerInstance->FindChan(channel.c_str()); + if (chan) { - if (channel == i->first) + Invitation* inv = Invitation::Find(chan, this); + if (inv) { - if (i->second != 0 && invtimeout > i->second) - { - i->second = invtimeout; - } - - return; + inv->cull(); + delete inv; } } - invites.push_back(std::make_pair(channel, invtimeout)); } -void User::RemoveInvite(const irc::string &channel) +void LocalUser::RemoveExpiredInvites() { - for (InvitedList::iterator i = invites.begin(); i != invites.end(); i++) - { - if (channel == i->first) - { - invites.erase(i); - return; - } - } + Invitation::Find(NULL, this); } -bool User::HasModePermission(unsigned char mode, ModeType type) +bool User::HasModePermission(unsigned char, ModeType) { - if (!IS_LOCAL(this)) - return true; + return true; +} +bool LocalUser::HasModePermission(unsigned char mode, ModeType type) +{ if (!IS_OPER(this)) return false; if (mode < 'A' || mode > ('A' + 64)) return false; - return ((type == MODETYPE_USER ? AllowedUserModes : AllowedChanModes))[(mode - 'A')]; + return ((type == MODETYPE_USER ? oper->AllowedUserModes : oper->AllowedChanModes))[(mode - 'A')]; } - -bool User::HasPermission(const std::string &command) +/* + * users on remote servers can completely bypass all permissions based checks. + * This prevents desyncs when one server has different type/class tags to another. + * That having been said, this does open things up to the possibility of source changes + * allowing remote kills, etc - but if they have access to the src, they most likely have + * access to the conf - so it's an end to a means either way. + */ +bool User::HasPermission(const std::string&) { - /* - * users on remote servers can completely bypass all permissions based checks. - * This prevents desyncs when one server has different type/class tags to another. - * That having been said, this does open things up to the possibility of source changes - * allowing remote kills, etc - but if they have access to the src, they most likely have - * access to the conf - so it's an end to a means either way. - */ - if (!IS_LOCAL(this)) - return true; + return true; +} +bool LocalUser::HasPermission(const std::string &command) +{ // are they even an oper at all? if (!IS_OPER(this)) { return false; } - if (!AllowedOperCommands) - return false; - - if (AllowedOperCommands->find(command) != AllowedOperCommands->end()) + if (oper->AllowedOperCommands.find(command) != oper->AllowedOperCommands.end()) return true; - else if (AllowedOperCommands->find("*") != AllowedOperCommands->end()) + else if (oper->AllowedOperCommands.find("*") != oper->AllowedOperCommands.end()) return true; return false; } - bool User::HasPrivPermission(const std::string &privstr, bool noisy) { - if (!IS_LOCAL(this)) - { - ServerInstance->Logs->Log("PRIVS", DEBUG, "Remote (yes)"); - return true; - } + return true; +} +bool LocalUser::HasPrivPermission(const std::string &privstr, bool noisy) +{ if (!IS_OPER(this)) { if (noisy) @@ -480,50 +446,39 @@ bool User::HasPrivPermission(const std::string &privstr, bool noisy) return false; } - if (!AllowedPrivs) - { - if (noisy) - this->WriteServ("NOTICE %s :Privset empty(!?)", this->nick.c_str()); - return false; - } - - if (AllowedPrivs->find(privstr) != AllowedPrivs->end()) + if (oper->AllowedPrivs.find(privstr) != oper->AllowedPrivs.end()) { return true; } - else if (AllowedPrivs->find("*") != AllowedPrivs->end()) + else if (oper->AllowedPrivs.find("*") != oper->AllowedPrivs.end()) { return true; } if (noisy) - this->WriteServ("NOTICE %s :Oper type %s does not have access to priv %s", this->nick.c_str(), this->oper.c_str(), privstr.c_str()); + this->WriteServ("NOTICE %s :Oper type %s does not have access to priv %s", this->nick.c_str(), oper->NameStr(), privstr.c_str()); return false; } -void User::OnDataReady() -{ -} - -void LocalUser::OnDataReady() +void UserIOHandler::OnDataReady() { - if (quitting) + if (user->quitting) return; - if (MyClass && recvq.length() > MyClass->GetRecvqMax() && !HasPrivPermission("users/flood/increased-buffers")) + if (recvq.length() > user->MyClass->GetRecvqMax() && !user->HasPrivPermission("users/flood/increased-buffers")) { - ServerInstance->Users->QuitUser(this, "RecvQ exceeded"); + ServerInstance->Users->QuitUser(user, "RecvQ exceeded"); ServerInstance->SNO->WriteToSnoMask('a', "User %s RecvQ of %lu exceeds connect class maximum of %lu", - nick.c_str(), (unsigned long)recvq.length(), MyClass->GetRecvqMax()); + user->nick.c_str(), (unsigned long)recvq.length(), user->MyClass->GetRecvqMax()); } unsigned long sendqmax = ULONG_MAX; - if (MyClass && !HasPrivPermission("users/flood/increased-buffers")) - sendqmax = MyClass->GetSendqSoftMax(); - int penaltymax = MyClass->GetPenaltyThreshold(); - if (penaltymax == 0 || HasPrivPermission("users/flood/no-fakelag")) - penaltymax = INT_MAX; + if (!user->HasPrivPermission("users/flood/increased-buffers")) + sendqmax = user->MyClass->GetSendqSoftMax(); + unsigned long penaltymax = ULONG_MAX; + if (!user->HasPrivPermission("users/flood/no-fakelag")) + penaltymax = user->MyClass->GetPenaltyThreshold() * 1000; - while (Penalty < penaltymax && getSendQSize() < sendqmax) + while (user->CommandFloodPenalty < penaltymax && getSendQSize() < sendqmax) { std::string line; line.reserve(MAXBUF); @@ -552,29 +507,26 @@ eol_found: // TODO should this be moved to when it was inserted in recvq? ServerInstance->stats->statsRecv += qpos; - this->bytes_in += qpos; - this->cmds_in++; + user->bytes_in += qpos; + user->cmds_in++; - ServerInstance->Parser->ProcessBuffer(line, this); - if (quitting) + ServerInstance->Parser->ProcessBuffer(line, user); + if (user->quitting) return; } - // Add pseudo-penalty so that we continue processing after sendq recedes - if (Penalty == 0 && getSendQSize() >= sendqmax) - Penalty++; + if (user->CommandFloodPenalty >= penaltymax && !user->MyClass->fakelag) + ServerInstance->Users->QuitUser(user, "Excess Flood"); } -void LocalUser::AddWriteBuf(const std::string &data) +void UserIOHandler::AddWriteBuf(const std::string &data) { - if (!quitting && MyClass && getSendQSize() + data.length() > MyClass->GetSendqHardMax() && !HasPrivPermission("users/flood/increased-buffers")) + if (user->quitting_sendq) + return; + if (!user->quitting && getSendQSize() + data.length() > user->MyClass->GetSendqHardMax() && + !user->HasPrivPermission("users/flood/increased-buffers")) { - /* - * Quit the user FIRST, because otherwise we could recurse - * here and hit the same limit. - */ - ServerInstance->Users->QuitUser(this, "SendQ exceeded"); - ServerInstance->SNO->WriteToSnoMask('a', "User %s SendQ exceeds connect class maximum of %lu", - nick.c_str(), MyClass->GetSendqHardMax()); + user->quitting_sendq = true; + ServerInstance->GlobalCulls.AddSQItem(user); return; } @@ -584,41 +536,20 @@ void LocalUser::AddWriteBuf(const std::string &data) WriteData(data); } -void User::OnError(BufferedSocketError) +void UserIOHandler::OnError(BufferedSocketError) { - ServerInstance->Users->QuitUser(this, getError()); + ServerInstance->Users->QuitUser(user, getError()); } CullResult User::cull() { if (!quitting) ServerInstance->Users->QuitUser(this, "Culled without QuitUser"); - if (uuid.empty()) - { - ServerInstance->Logs->Log("USERS", DEBUG, "User culled twice? UUID empty"); - return Extensible::cull(); - } PurgeEmptyChannels(); - if (IS_LOCAL(this) && fd != INT_MAX) - Close(); - - if (this->AllowedOperCommands) - { - delete AllowedOperCommands; - AllowedOperCommands = NULL; - } - - if (this->AllowedPrivs) - { - delete AllowedPrivs; - AllowedPrivs = NULL; - } - this->InvalidateCache(); - this->DecrementModes(); + if (client_sa.sa.sa_family != AF_UNSPEC) + ServerInstance->Users->RemoveCloneCounts(this); - ServerInstance->Users->uuidlist->erase(uuid); - uuid.clear(); return Extensible::cull(); } @@ -630,149 +561,146 @@ CullResult LocalUser::cull() else ServerInstance->Logs->Log("USERS", DEBUG, "Failed to remove user from vector"); - if (client_sa.sa.sa_family != AF_UNSPEC) - ServerInstance->Users->RemoveCloneCounts(this); + ClearInvites(); + eh.cull(); return User::cull(); } -void User::Oper(const std::string &opertype, const std::string &opername) +CullResult FakeUser::cull() +{ + // Fake users don't quit, they just get culled. + quitting = true; + ServerInstance->Users->clientlist->erase(nick); + ServerInstance->Users->uuidlist->erase(uuid); + return User::cull(); +} + +void User::Oper(OperInfo* info) { if (this->IsModeSet('o')) this->UnOper(); this->modes[UM_OPERATOR] = 1; + this->oper = info; this->WriteServ("MODE %s :+o", this->nick.c_str()); - FOREACH_MOD(I_OnOper, OnOper(this, opertype)); + FOREACH_MOD(I_OnOper, OnOper(this, info->name)); - ServerInstance->SNO->WriteToSnoMask('o',"%s (%s@%s) is now an IRC operator of type %s (using oper '%s')", this->nick.c_str(), this->ident.c_str(), this->host.c_str(), irc::Spacify(opertype.c_str()), opername.c_str()); - this->WriteNumeric(381, "%s :You are now %s %s", this->nick.c_str(), strchr("aeiouAEIOU", *opertype.c_str()) ? "an" : "a", irc::Spacify(opertype.c_str())); + std::string opername; + if (info->oper_block) + opername = info->oper_block->getString("name"); - ServerInstance->Logs->Log("OPER", DEFAULT, "%s!%s@%s opered as type: %s", this->nick.c_str(), this->ident.c_str(), this->host.c_str(), opertype.c_str()); - this->oper.assign(opertype, 0, 512); + if (IS_LOCAL(this)) + { + LocalUser* l = IS_LOCAL(this); + std::string vhost = oper->getConfig("vhost"); + if (!vhost.empty()) + l->ChangeDisplayedHost(vhost.c_str()); + std::string opClass = oper->getConfig("class"); + if (!opClass.empty()) + l->SetClass(opClass); + } + + ServerInstance->SNO->WriteToSnoMask('o',"%s (%s@%s) is now an IRC operator of type %s (using oper '%s')", + nick.c_str(), ident.c_str(), host.c_str(), oper->NameStr(), opername.c_str()); + this->WriteNumeric(381, "%s :You are now %s %s", nick.c_str(), strchr("aeiouAEIOU", oper->name[0]) ? "an" : "a", oper->NameStr()); + + ServerInstance->Logs->Log("OPER", DEFAULT, "%s opered as type: %s", GetFullRealHost().c_str(), oper->NameStr()); ServerInstance->Users->all_opers.push_back(this); - /* - * This might look like it's in the wrong place. - * It is *not*! - * - * For multi-network servers, we may not have the opertypes of the remote server, but we still want to mark the user as an oper of that type. - * -- w00t - */ - TagIndex::iterator iter_opertype = ServerInstance->Config->opertypes.find(this->oper.c_str()); - if (iter_opertype != ServerInstance->Config->opertypes.end()) - { - if (AllowedOperCommands) - AllowedOperCommands->clear(); - else - AllowedOperCommands = new std::set; + // Expand permissions from config for faster lookup + if (IS_LOCAL(this)) + oper->init(); - if (AllowedPrivs) - AllowedPrivs->clear(); - else - AllowedPrivs = new std::set; + FOREACH_MOD(I_OnPostOper,OnPostOper(this, oper->name, opername)); +} - AllowedUserModes.reset(); - AllowedChanModes.reset(); - this->AllowedUserModes['o' - 'A'] = true; // Call me paranoid if you want. +void OperInfo::init() +{ + AllowedOperCommands.clear(); + AllowedPrivs.clear(); + AllowedUserModes.reset(); + AllowedChanModes.reset(); + AllowedUserModes['o' - 'A'] = true; // Call me paranoid if you want. - std::string myclass, mycmd, mypriv; - irc::spacesepstream Classes(iter_opertype->second->getString("classes")); - while (Classes.GetToken(myclass)) + for(std::vector >::iterator iter = class_blocks.begin(); iter != class_blocks.end(); ++iter) + { + ConfigTag* tag = *iter; + std::string mycmd, mypriv; + /* Process commands */ + irc::spacesepstream CommandList(tag->getString("commands")); + while (CommandList.GetToken(mycmd)) { - TagIndex::iterator iter_operclass = ServerInstance->Config->operclass.find(myclass.c_str()); - if (iter_operclass != ServerInstance->Config->operclass.end()) - { - /* Process commands */ - irc::spacesepstream CommandList(iter_operclass->second->getString("commands")); - while (CommandList.GetToken(mycmd)) - { - this->AllowedOperCommands->insert(mycmd); - } + AllowedOperCommands.insert(mycmd); + } - irc::spacesepstream PrivList(iter_operclass->second->getString("privs")); - while (PrivList.GetToken(mypriv)) - { - this->AllowedPrivs->insert(mypriv); - } + irc::spacesepstream PrivList(tag->getString("privs")); + while (PrivList.GetToken(mypriv)) + { + AllowedPrivs.insert(mypriv); + } - for (unsigned char* c = (unsigned char*)iter_operclass->second->getString("usermodes").c_str(); *c; ++c) - { - if (*c == '*') - { - this->AllowedUserModes.set(); - } - else - { - this->AllowedUserModes[*c - 'A'] = true; - } - } + std::string modes = tag->getString("usermodes"); + for (std::string::const_iterator c = modes.begin(); c != modes.end(); ++c) + { + if (*c == '*') + { + this->AllowedUserModes.set(); + } + else if (*c >= 'A' && *c < 'z') + { + this->AllowedUserModes[*c - 'A'] = true; + } + } - for (unsigned char* c = (unsigned char*)iter_operclass->second->getString("chanmodes").c_str(); *c; ++c) - { - if (*c == '*') - { - this->AllowedChanModes.set(); - } - else - { - this->AllowedChanModes[*c - 'A'] = true; - } - } + modes = tag->getString("chanmodes"); + for (std::string::const_iterator c = modes.begin(); c != modes.end(); ++c) + { + if (*c == '*') + { + this->AllowedChanModes.set(); + } + else if (*c >= 'A' && *c < 'z') + { + this->AllowedChanModes[*c - 'A'] = true; } } } - - FOREACH_MOD(I_OnPostOper,OnPostOper(this, opertype, opername)); } void User::UnOper() { - if (IS_OPER(this)) - { - /* - * unset their oper type (what IS_OPER checks). - * note, order is important - this must come before modes as -o attempts - * to call UnOper. -- w00t - */ - this->oper.clear(); - + if (!IS_OPER(this)) + return; - /* Remove all oper only modes from the user when the deoper - Bug #466*/ - std::string moderemove("-"); + /* + * unset their oper type (what IS_OPER checks). + * note, order is important - this must come before modes as -o attempts + * to call UnOper. -- w00t + */ + oper = NULL; - for (unsigned char letter = 'A'; letter <= 'z'; letter++) - { - ModeHandler* mh = ServerInstance->Modes->FindMode(letter, MODETYPE_USER); - if (mh && mh->NeedsOper()) - moderemove += letter; - } + /* Remove all oper only modes from the user when the deoper - Bug #466*/ + std::string moderemove("-"); - std::vector parameters; - parameters.push_back(this->nick); - parameters.push_back(moderemove); + for (unsigned char letter = 'A'; letter <= 'z'; letter++) + { + ModeHandler* mh = ServerInstance->Modes->FindMode(letter, MODETYPE_USER); + if (mh && mh->NeedsOper()) + moderemove += letter; + } - ServerInstance->Parser->CallHandler("MODE", parameters, this); - /* remove the user from the oper list. Will remove multiple entries as a safeguard against bug #404 */ - ServerInstance->Users->all_opers.remove(this); + std::vector parameters; + parameters.push_back(this->nick); + parameters.push_back(moderemove); - if (AllowedOperCommands) - { - delete AllowedOperCommands; - AllowedOperCommands = NULL; - } + ServerInstance->Parser->CallHandler("MODE", parameters, this); - if (AllowedPrivs) - { - delete AllowedPrivs; - AllowedPrivs = NULL; - } + /* remove the user from the oper list. Will remove multiple entries as a safeguard against bug #404 */ + ServerInstance->Users->all_opers.remove(this); - AllowedUserModes.reset(); - AllowedChanModes.reset(); - this->modes[UM_OPERATOR] = 0; - } + this->modes[UM_OPERATOR] = 0; } /* adds or updates an entry in the whowas list */ @@ -790,25 +718,32 @@ void User::AddToWhoWas() /* * Check class restrictions */ -void User::CheckClass() +void LocalUser::CheckClass() { ConnectClass* a = this->MyClass; - if ((!a) || (a->type == CC_DENY)) + if (!a) { - ServerInstance->Users->QuitUser(this, "Unauthorised connection"); + ServerInstance->Users->QuitUser(this, "Access denied by configuration"); + return; + } + else if (a->type == CC_DENY) + { + ServerInstance->Users->QuitUser(this, a->config->getString("reason", "Unauthorised connection")); return; } else if ((a->GetMaxLocal()) && (ServerInstance->Users->LocalCloneCount(this) > a->GetMaxLocal())) { ServerInstance->Users->QuitUser(this, "No more connections allowed from your host via this connect class (local)"); - ServerInstance->SNO->WriteToSnoMask('a', "WARNING: maximum LOCAL connections (%ld) exceeded for IP %s", a->GetMaxLocal(), this->GetIPString()); + if (a->maxconnwarn) + ServerInstance->SNO->WriteToSnoMask('a', "WARNING: maximum LOCAL connections (%ld) exceeded for IP %s", a->GetMaxLocal(), this->GetIPString()); return; } else if ((a->GetMaxGlobal()) && (ServerInstance->Users->GlobalCloneCount(this) > a->GetMaxGlobal())) { ServerInstance->Users->QuitUser(this, "No more connections allowed from your host via this connect class (global)"); - ServerInstance->SNO->WriteToSnoMask('a', "WARNING: maximum GLOBAL connections (%ld) exceeded for IP %s", a->GetMaxGlobal(), this->GetIPString()); + if (a->maxconnwarn) + ServerInstance->SNO->WriteToSnoMask('a', "WARNING: maximum GLOBAL connections (%ld) exceeded for IP %s", a->GetMaxGlobal(), this->GetIPString()); return; } @@ -847,47 +782,49 @@ void LocalUser::FullConnect() * may put the user into a totally seperate class with different restrictions! so we *must* check again. * Don't remove this! -- w00t */ - this->SetClass(); - - /* Check the password, if one is required by the user's connect class. - * This CANNOT be in CheckClass(), because that is called prior to PASS as well! - */ - if (MyClass && !MyClass->pass.empty()) - { - if (ServerInstance->PassCompare(this, MyClass->pass.c_str(), password.c_str(), MyClass->hash.c_str())) - { - ServerInstance->Users->QuitUser(this, "Invalid password"); - return; - } - } + MyClass = NULL; + SetClass(); + CheckClass(); + CheckLines(); - if (this->CheckLines()) + if (quitting) return; - this->WriteServ("NOTICE Auth :Welcome to \002%s\002!",ServerInstance->Config->Network.c_str()); - this->WriteNumeric(RPL_WELCOME, "%s :Welcome to the %s IRC Network %s!%s@%s",this->nick.c_str(), ServerInstance->Config->Network.c_str(), this->nick.c_str(), this->ident.c_str(), this->host.c_str()); - this->WriteNumeric(RPL_YOURHOSTIS, "%s :Your host is %s, running version InspIRCd-2.0",this->nick.c_str(),ServerInstance->Config->ServerName.c_str()); + if (ServerInstance->Config->WelcomeNotice) + this->WriteServ("NOTICE Auth :Welcome to \002%s\002!",ServerInstance->Config->Network.c_str()); + this->WriteNumeric(RPL_WELCOME, "%s :Welcome to the %s IRC Network %s",this->nick.c_str(), ServerInstance->Config->Network.c_str(), GetFullRealHost().c_str()); + this->WriteNumeric(RPL_YOURHOSTIS, "%s :Your host is %s, running version %s",this->nick.c_str(),ServerInstance->Config->ServerName.c_str(),BRANCH); this->WriteNumeric(RPL_SERVERCREATED, "%s :This server was created %s %s", this->nick.c_str(), __TIME__, __DATE__); - this->WriteNumeric(RPL_SERVERVERSION, "%s %s InspIRCd-2.0 %s %s %s", this->nick.c_str(), ServerInstance->Config->ServerName.c_str(), ServerInstance->Modes->UserModeList().c_str(), ServerInstance->Modes->ChannelModeList().c_str(), ServerInstance->Modes->ParaModeList().c_str()); + + std::string umlist = ServerInstance->Modes->UserModeList(); + std::string cmlist = ServerInstance->Modes->ChannelModeList(); + std::string pmlist = ServerInstance->Modes->ParaModeList(); + this->WriteNumeric(RPL_SERVERVERSION, "%s %s %s %s %s %s", this->nick.c_str(), ServerInstance->Config->ServerName.c_str(), BRANCH, umlist.c_str(), cmlist.c_str(), pmlist.c_str()); ServerInstance->Config->Send005(this); this->WriteNumeric(RPL_YOURUUID, "%s %s :your unique ID", this->nick.c_str(), this->uuid.c_str()); - - this->ShowMOTD(); - /* Now registered */ if (ServerInstance->Users->unregistered_count) ServerInstance->Users->unregistered_count--; - /* Trigger LUSERS output, give modules a chance too */ + /* Trigger MOTD and LUSERS output, give modules a chance too */ ModResult MOD_RESULT; - std::string command("LUSERS"); + std::string command("MOTD"); std::vector parameters; - FIRST_MOD_RESULT(OnPreCommand, MOD_RESULT, (command, parameters, this, true, "LUSERS")); + FIRST_MOD_RESULT(OnPreCommand, MOD_RESULT, (command, parameters, this, true, command)); + if (!MOD_RESULT) + ServerInstance->CallCommandHandler(command, parameters, this); + + MOD_RESULT = MOD_RES_PASSTHRU; + command = "LUSERS"; + FIRST_MOD_RESULT(OnPreCommand, MOD_RESULT, (command, parameters, this, true, command)); if (!MOD_RESULT) ServerInstance->CallCommandHandler(command, parameters, this); + if (ServerInstance->Config->RawLog) + WriteServ("PRIVMSG %s :*** Raw I/O logging is enabled on this server. All messages, passwords, and commands are being recorded.", nick.c_str()); + /* * We don't set REG_ALL until triggering OnUserConnect, so some module events don't spew out stuff * for a user that doesn't exist yet. @@ -898,31 +835,12 @@ void LocalUser::FullConnect() FOREACH_MOD(I_OnPostConnect,OnPostConnect(this)); - ServerInstance->SNO->WriteToSnoMask('c',"Client connecting on port %d: %s!%s@%s [%s] [%s]", - this->GetServerPort(), this->nick.c_str(), this->ident.c_str(), this->host.c_str(), this->GetIPString(), this->fullname.c_str()); + ServerInstance->SNO->WriteToSnoMask('c',"Client connecting on port %d (class %s): %s (%s) [%s]", + this->GetServerPort(), this->MyClass->name.c_str(), GetFullRealHost().c_str(), this->GetIPString(), this->fullname.c_str()); ServerInstance->Logs->Log("BANCACHE", DEBUG, "BanCache: Adding NEGATIVE hit for %s", this->GetIPString()); ServerInstance->BanCache->AddHit(this->GetIPString(), "", ""); -} - -/** User::UpdateNick() - * re-allocates a nick in the user_hash after they change nicknames, - * returns a pointer to the new user as it may have moved - */ -User* User::UpdateNickHash(const char* New) -{ - //user_hash::iterator newnick; - user_hash::iterator oldnick = ServerInstance->Users->clientlist->find(this->nick); - - if (!irc::string(this->nick.c_str()).compare(New)) - return oldnick->second; - - if (oldnick == ServerInstance->Users->clientlist->end()) - return NULL; /* doesnt exist */ - - User* olduser = oldnick->second; - ServerInstance->Users->clientlist->erase(oldnick); - (*(ServerInstance->Users->clientlist))[New] = olduser; - return olduser; + // reset the flood penalty (which could have been raised due to things like auto +x) + CommandFloodPenalty = 0; } void User::InvalidateCache() @@ -934,13 +852,12 @@ void User::InvalidateCache() cached_fullrealhost.clear(); } -bool User::ForceNickChange(const char* newnick) +bool User::ChangeNick(const std::string& newnick, bool force) { ModResult MOD_RESULT; - this->InvalidateCache(); - - ServerInstance->NICKForced.set(this, 1); + if (force) + ServerInstance->NICKForced.set(this, 1); FIRST_MOD_RESULT(OnUserPreNick, MOD_RESULT, (this, newnick)); ServerInstance->NICKForced.set(this, 0); @@ -950,128 +867,110 @@ bool User::ForceNickChange(const char* newnick) return false; } - std::deque dummy; - Command* nickhandler = ServerInstance->Parser->GetHandler("NICK"); - if (nickhandler) // wtfbbq, when would this not be here - { - std::vector parameters; - parameters.push_back(newnick); - ServerInstance->NICKForced.set(this, 1); - bool result = (ServerInstance->Parser->CallHandler("NICK", parameters, this) == CMD_SUCCESS); - ServerInstance->NICKForced.set(this, 0); - return result; - } - - // Unreachable, we hope - return false; -} - -int LocalUser::GetServerPort() -{ - switch (this->server_sa.sa.sa_family) + if (assign(newnick) == assign(nick)) { - case AF_INET6: - return htons(this->server_sa.in6.sin6_port); - case AF_INET: - return htons(this->server_sa.in4.sin_port); + // case change, don't need to check Q:lines and such + // and, if it's identical including case, we can leave right now + if (newnick == nick) + return true; } - return 0; -} - -const char* User::GetCIDRMask(int range) -{ - static char buf[44]; - - if (range < 0) - throw "Negative range, sorry, no."; - - /* - * Original code written by Oliver Lupton (Om). - * Integrated by me. Thanks. :) -- w00t - */ - switch (this->client_sa.sa.sa_family) + else { - case AF_INET6: + /* + * Don't check Q:Lines if it's a server-enforced change, just on the off-chance some fucking *moron* + * tries to Q:Line SIDs, also, this means we just get our way period, as it really should be. + * Thanks Kein for finding this. -- w00t + * + * Also don't check Q:Lines for remote nickchanges, they should have our Q:Lines anyway to enforce themselves. + * -- w00t + */ + if (IS_LOCAL(this) && !force) { - /* unsigned char s6_addr[16]; */ - struct in6_addr v6; - int i, bytestozero, extrabits; - char buffer[40]; - - if(range > 128) - throw "CIDR mask width greater than address width (IPv6, 128 bit)"; - - /* To create the CIDR mask we want to set all the bits after 'range' bits of the address - * to zero. This means the last (128 - range) bits of the address must be set to zero. - * Hence this number divided by 8 is the number of whole bytes from the end of the address - * which must be set to zero. - */ - bytestozero = (128 - range) / 8; - - /* Some of the least significant bits of the next most significant byte may also have to - * be zeroed. The number of bits is the remainder of the above division. - */ - extrabits = (128 - range) % 8; - - /* Populate our working struct with the parts of the user's IP which are required in the - * final CIDR mask. Set all the subsequent bytes to zero. - * (16 - bytestozero) is the number of bytes which must be populated with actual IP data. - */ - for(i = 0; i < (16 - bytestozero); i++) + XLine* mq = ServerInstance->XLines->MatchesLine("Q",newnick); + if (mq) { - v6.s6_addr[i] = client_sa.in6.sin6_addr.s6_addr[i]; + if (this->registered == REG_ALL) + { + ServerInstance->SNO->WriteGlobalSno('a', "Q-Lined nickname %s from %s: %s", + newnick.c_str(), GetFullRealHost().c_str(), mq->reason.c_str()); + } + this->WriteNumeric(432, "%s %s :Invalid nickname: %s",this->nick.c_str(), newnick.c_str(), mq->reason.c_str()); + return false; } - /* And zero all the remaining bytes in the IP. */ - for(; i < 16; i++) + if (ServerInstance->Config->RestrictBannedUsers) { - v6.s6_addr[i] = 0; + for (UCListIter i = this->chans.begin(); i != this->chans.end(); i++) + { + Channel *chan = *i; + if (chan->GetPrefixValue(this) < VOICE_VALUE && chan->IsBanned(this)) + { + this->WriteNumeric(404, "%s %s :Cannot send to channel (you're banned)", this->nick.c_str(), chan->name.c_str()); + return false; + } + } } - - /* And finally, zero the extra bits required. */ - v6.s6_addr[15 - bytestozero] = (v6.s6_addr[15 - bytestozero] >> extrabits) << extrabits; - - snprintf(buf, 44, "%s/%d", inet_ntop(AF_INET6, &v6, buffer, 40), range); - return buf; } - break; - case AF_INET: - { - struct in_addr v4; - char buffer[16]; - if (range > 32) - throw "CIDR mask width greater than address width (IPv4, 32 bit)"; + /* + * Uh oh.. if the nickname is in use, and it's not in use by the person using it (doh) -- + * then we have a potential collide. Check whether someone else is camping on the nick + * (i.e. connect -> send NICK, don't send USER.) If they are camping, force-change the + * camper to their UID, and allow the incoming nick change. + * + * If the guy using the nick is already using it, tell the incoming nick change to gtfo, + * because the nick is already (rightfully) in use. -- w00t + */ + User* InUse = ServerInstance->FindNickOnly(newnick); + if (InUse && (InUse != this)) + { + if (InUse->registered != REG_ALL) + { + /* force the camper to their UUID, and ask them to re-send a NICK. */ + InUse->WriteTo(InUse, "NICK %s", InUse->uuid.c_str()); + InUse->WriteNumeric(433, "%s %s :Nickname overruled.", InUse->nick.c_str(), InUse->nick.c_str()); - /* Users already have a sockaddr* pointer (User::ip) which contains either a v4 or v6 structure */ - v4.s_addr = client_sa.in4.sin_addr.s_addr; + ServerInstance->Users->clientlist->erase(InUse->nick); + (*(ServerInstance->Users->clientlist))[InUse->uuid] = InUse; - /* To create the CIDR mask we want to set all the bits after 'range' bits of the address - * to zero. This means the last (32 - range) bits of the address must be set to zero. - * This is done by shifting the value right and then back left by (32 - range) bits. - */ - if(range > 0) - { - v4.s_addr = ntohl(v4.s_addr); - v4.s_addr = (v4.s_addr >> (32 - range)) << (32 - range); - v4.s_addr = htonl(v4.s_addr); + InUse->nick = InUse->uuid; + InUse->InvalidateCache(); + InUse->registered &= ~REG_NICK; } else { - /* a range of zero would cause a 32 bit value to be shifted by 32 bits. - * this has undefined behaviour, but for CIDR purposes the resulting mask - * from a.b.c.d/0 is 0.0.0.0/0 - */ - v4.s_addr = 0; + /* No camping, tell the incoming user to stop trying to change nick ;p */ + this->WriteNumeric(433, "%s %s :Nickname is already in use.", this->registered >= REG_NICK ? this->nick.c_str() : "*", newnick.c_str()); + return false; } - - snprintf(buf, 44, "%s/%d", inet_ntop(AF_INET, &v4, buffer, 16), range); - return buf; } - break; } - return ""; // unused, but oh well + if (this->registered == REG_ALL) + this->WriteCommon("NICK %s",newnick.c_str()); + std::string oldnick = nick; + nick = newnick; + + InvalidateCache(); + ServerInstance->Users->clientlist->erase(oldnick); + (*(ServerInstance->Users->clientlist))[newnick] = this; + + if (registered == REG_ALL) + FOREACH_MOD(I_OnUserPostNick,OnUserPostNick(this,oldnick)); + + return true; +} + +int LocalUser::GetServerPort() +{ + switch (this->server_sa.sa.sa_family) + { + case AF_INET6: + return htons(this->server_sa.in6.sin6_port); + case AF_INET: + return htons(this->server_sa.in4.sin_port); + } + return 0; } const char* User::GetIPString() @@ -1079,7 +978,7 @@ const char* User::GetIPString() int port; if (cachedip.empty()) { - irc::sockets::satoap(&client_sa, cachedip, port); + irc::sockets::satoap(client_sa, cachedip, port); /* IP addresses starting with a : on irc are a Bad Thing (tm) */ if (cachedip.c_str()[0] == ':') cachedip.insert(0,1,'0'); @@ -1088,10 +987,51 @@ const char* User::GetIPString() return cachedip.c_str(); } +irc::sockets::cidr_mask User::GetCIDRMask() +{ + int range = 0; + switch (client_sa.sa.sa_family) + { + case AF_INET6: + range = ServerInstance->Config->c_ipv6_range; + break; + case AF_INET: + range = ServerInstance->Config->c_ipv4_range; + break; + } + return irc::sockets::cidr_mask(client_sa, range); +} + bool User::SetClientIP(const char* sip) { - this->cachedip = ""; - return irc::sockets::aptosa(sip, 0, &client_sa); + cachedip.clear(); + return irc::sockets::aptosa(sip, 0, client_sa); +} + +void User::SetClientIP(const irc::sockets::sockaddrs& sa) +{ + cachedip.clear(); + memcpy(&client_sa, &sa, sizeof(irc::sockets::sockaddrs)); +} + +bool LocalUser::SetClientIP(const char* sip) +{ + irc::sockets::sockaddrs sa; + if (!irc::sockets::aptosa(sip, 0, sa)) + // Invalid + return false; + + LocalUser::SetClientIP(sa); + return true; +} + +void LocalUser::SetClientIP(const irc::sockets::sockaddrs& sa) +{ + if (sa != client_sa) + { + User::SetClientIP(sa); + FOREACH_MOD(I_OnSetUserIP,OnSetUserIP(this)); + } } static std::string wide_newline("\r\n"); @@ -1106,7 +1046,7 @@ void User::Write(const char *text, ...) void LocalUser::Write(const std::string& text) { - if (!ServerInstance->SE->BoundsCheckFd(this)) + if (!ServerInstance->SE->BoundsCheckFd(&eh)) return; if (text.length() > MAXBUF - 2) @@ -1117,10 +1057,10 @@ void LocalUser::Write(const std::string& text) return; } - ServerInstance->Logs->Log("USEROUTPUT", DEBUG,"C[%d] O %s", this->GetFd(), text.c_str()); + ServerInstance->Logs->Log("USEROUTPUT", RAWIO, "C[%s] O %s", uuid.c_str(), text.c_str()); - this->AddWriteBuf(text); - this->AddWriteBuf(wide_newline); + eh.AddWriteBuf(text); + eh.AddWriteBuf(wide_newline); ServerInstance->stats->statsSent += text.length() + 2; this->bytes_out += text.length() + 2; @@ -1271,7 +1211,7 @@ void User::WriteCommonRaw(const std::string &line, bool include_self) if (this->registered != REG_ALL || quitting) return; - uniq_id_t uniq_id = ++already_sent; + LocalUser::already_sent_id++; UserChanList include_c(chans); std::map exceptions; @@ -1282,10 +1222,10 @@ void User::WriteCommonRaw(const std::string &line, bool include_self) for (std::map::iterator i = exceptions.begin(); i != exceptions.end(); ++i) { - User* u = i->first; - if (IS_LOCAL(u) && !u->quitting) + LocalUser* u = IS_LOCAL(i->first); + if (u && !u->quitting) { - already_sent[u->fd] = uniq_id; + u->already_sent = LocalUser::already_sent_id; if (i->second) u->Write(line); } @@ -1296,10 +1236,10 @@ void User::WriteCommonRaw(const std::string &line, bool include_self) const UserMembList* ulist = c->GetUsers(); for (UserMembList::const_iterator i = ulist->begin(); i != ulist->end(); i++) { - User* u = i->first; - if (IS_LOCAL(u) && !u->quitting && already_sent[u->fd] != uniq_id) + LocalUser* u = IS_LOCAL(i->first); + if (u && !u->quitting && u->already_sent != LocalUser::already_sent_id) { - already_sent[u->fd] = uniq_id; + u->already_sent = LocalUser::already_sent_id; u->Write(line); } } @@ -1314,7 +1254,7 @@ void User::WriteCommonQuit(const std::string &normal_text, const std::string &op if (this->registered != REG_ALL) return; - uniq_id_t uniq_id = ++already_sent; + already_sent_t uniq_id = ++LocalUser::already_sent_id; snprintf(tb1,MAXBUF,":%s QUIT :%s",this->GetFullHost().c_str(),normal_text.c_str()); snprintf(tb2,MAXBUF,":%s QUIT :%s",this->GetFullHost().c_str(),oper_text.c_str()); @@ -1328,10 +1268,10 @@ void User::WriteCommonQuit(const std::string &normal_text, const std::string &op for (std::map::iterator i = exceptions.begin(); i != exceptions.end(); ++i) { - User* u = i->first; - if (IS_LOCAL(u) && !u->quitting) + LocalUser* u = IS_LOCAL(i->first); + if (u && !u->quitting) { - already_sent[u->fd] = uniq_id; + u->already_sent = uniq_id; if (i->second) u->Write(IS_OPER(u) ? out2 : out1); } @@ -1341,10 +1281,10 @@ void User::WriteCommonQuit(const std::string &normal_text, const std::string &op const UserMembList* ulist = (*v)->GetUsers(); for (UserMembList::const_iterator i = ulist->begin(); i != ulist->end(); i++) { - User* u = i->first; - if (IS_LOCAL(u) && !u->quitting && (already_sent[u->fd] != uniq_id)) + LocalUser* u = IS_LOCAL(i->first); + if (u && !u->quitting && (u->already_sent != uniq_id)) { - already_sent[u->fd] = uniq_id; + u->already_sent = uniq_id; u->Write(IS_OPER(u) ? out2 : out1); } } @@ -1455,8 +1395,8 @@ void User::DoHostCycle(const std::string &quitline) if (!ServerInstance->Config->CycleHosts) return; - uniq_id_t silent_id = ++already_sent; - uniq_id_t seen_id = ++already_sent; + already_sent_t silent_id = ++LocalUser::already_sent_id; + already_sent_t seen_id = ++LocalUser::already_sent_id; UserChanList include_c(chans); std::map exceptions; @@ -1465,17 +1405,17 @@ void User::DoHostCycle(const std::string &quitline) for (std::map::iterator i = exceptions.begin(); i != exceptions.end(); ++i) { - User* u = i->first; - if (IS_LOCAL(u) && !u->quitting) + LocalUser* u = IS_LOCAL(i->first); + if (u && !u->quitting) { if (i->second) { - already_sent[u->fd] = seen_id; + u->already_sent = seen_id; u->Write(quitline); } else { - already_sent[u->fd] = silent_id; + u->already_sent = silent_id; } } } @@ -1484,26 +1424,31 @@ void User::DoHostCycle(const std::string &quitline) Channel* c = *v; snprintf(buffer, MAXBUF, ":%s JOIN %s", GetFullHost().c_str(), c->name.c_str()); std::string joinline(buffer); - std::string modeline = ServerInstance->Modes->ModeString(this, c); + Membership* memb = c->GetUser(this); + std::string modeline = memb->modes; if (modeline.length() > 0) { - snprintf(buffer, MAXBUF, ":%s MODE %s +%s", GetFullHost().c_str(), c->name.c_str(), modeline.c_str()); + for(unsigned int i=0; i < memb->modes.length(); i++) + modeline.append(" ").append(nick); + snprintf(buffer, MAXBUF, ":%s MODE %s +%s", + ServerInstance->Config->CycleHostsFromUser ? GetFullHost().c_str() : ServerInstance->Config->ServerName.c_str(), + c->name.c_str(), modeline.c_str()); modeline = buffer; } const UserMembList *ulist = c->GetUsers(); for (UserMembList::const_iterator i = ulist->begin(); i != ulist->end(); i++) { - User* u = i->first; - if (u == this || !IS_LOCAL(u)) + LocalUser* u = IS_LOCAL(i->first); + if (u == NULL || u == this) continue; - if (already_sent[u->fd] == silent_id) + if (u->already_sent == silent_id) continue; - if (already_sent[u->fd] != seen_id) + if (u->already_sent != seen_id) { u->Write(quitline); - already_sent[i->first->fd] = seen_id; + u->already_sent = seen_id; } u->Write(joinline); if (modeline.length() > 0) @@ -1575,7 +1520,8 @@ void User::SendAll(const char* command, const char* text, ...) for (std::vector::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); i++) { - (*i)->Write(fmt); + if ((*i)->registered == REG_ALL) + (*i)->Write(fmt); } } @@ -1628,7 +1574,7 @@ void User::SplitChanList(User* dest, const std::string &cl) } } - if (line.length()) + if (line.length() != prefix.str().length()) { ServerInstance->SendWhoisLine(this, dest, 319, "%s", line.c_str()); } @@ -1641,7 +1587,7 @@ void User::SplitChanList(User* dest, const std::string &cl) * then their ip will be taken as 'priority' anyway, so for example, * will match joe!bloggs@localhost */ -ConnectClass* LocalUser::SetClass(const std::string &explicit_name) +void LocalUser::SetClass(const std::string &explicit_name) { ConnectClass *found = NULL; @@ -1665,18 +1611,28 @@ ConnectClass* LocalUser::SetClass(const std::string &explicit_name) for (ClassVector::iterator i = ServerInstance->Config->Classes.begin(); i != ServerInstance->Config->Classes.end(); i++) { ConnectClass* c = *i; + ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Checking %s", c->GetName().c_str()); - if (c->type == CC_ALLOW) - { - ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "ALLOW %s %d %s", c->host.c_str(), c->GetPort(), c->GetName().c_str()); - } - else + ModResult MOD_RESULT; + FIRST_MOD_RESULT(OnSetConnectClass, MOD_RESULT, (this,c)); + if (MOD_RESULT == MOD_RES_DENY) + continue; + if (MOD_RESULT == MOD_RES_ALLOW) { - ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "DENY %s %d %s", c->GetHost().c_str(), c->GetPort(), c->GetName().c_str()); + ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Class forced by module to %s", c->GetName().c_str()); + found = c; + break; } + if (c->type == CC_NAMED) + continue; + + bool regdone = (registered != REG_NONE); + if (c->config->getBool("registered", regdone) != regdone) + continue; + /* check if host matches.. */ - if (c->GetHost().length() && !InspIRCd::MatchCIDR(this->GetIPString(), c->GetHost(), NULL) && + if (!InspIRCd::MatchCIDR(this->GetIPString(), c->GetHost(), NULL) && !InspIRCd::MatchCIDR(this->host, c->GetHost(), NULL)) { ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "No host match (for %s)", c->GetHost().c_str()); @@ -1694,14 +1650,21 @@ ConnectClass* LocalUser::SetClass(const std::string &explicit_name) } /* if it requires a port ... */ - if (c->GetPort()) + int port = c->config->getInt("port"); + if (port) { - ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Requires port (%d)", c->GetPort()); + ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Requires port (%d)", port); /* and our port doesn't match, fail. */ - if (this->GetServerPort() != c->GetPort()) + if (this->GetServerPort() != port) + continue; + } + + if (regdone && !c->config->getString("password").empty()) + { + if (ServerInstance->PassCompare(this, c->config->getString("password"), password, c->config->getString("hash"))) { - ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Port match failed (%d)", this->GetServerPort()); + ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Bad password, skipping"); continue; } } @@ -1719,8 +1682,6 @@ ConnectClass* LocalUser::SetClass(const std::string &explicit_name) { MyClass = found; } - - return this->MyClass; } /* looks up a users password for their connection class (/ tags) @@ -1728,9 +1689,14 @@ ConnectClass* LocalUser::SetClass(const std::string &explicit_name) * then their ip will be taken as 'priority' anyway, so for example, * will match joe!bloggs@localhost */ +ConnectClass* LocalUser::GetClass() +{ + return MyClass; +} + ConnectClass* User::GetClass() { - return this->MyClass; + return NULL; } void User::PurgeEmptyChannels() @@ -1745,93 +1711,54 @@ void User::PurgeEmptyChannels() this->UnOper(); } -void User::ShowMOTD() -{ - if (!ServerInstance->Config->MOTD.size()) - { - this->WriteNumeric(ERR_NOMOTD, "%s :Message of the day file is missing.",this->nick.c_str()); - return; - } - this->WriteNumeric(RPL_MOTDSTART, "%s :%s message of the day", this->nick.c_str(), ServerInstance->Config->ServerName.c_str()); - - for (file_cache::iterator i = ServerInstance->Config->MOTD.begin(); i != ServerInstance->Config->MOTD.end(); i++) - this->WriteNumeric(RPL_MOTD, "%s :- %s",this->nick.c_str(),i->c_str()); - - this->WriteNumeric(RPL_ENDOFMOTD, "%s :End of message of the day.", this->nick.c_str()); -} - -void User::ShowRULES() -{ - if (!ServerInstance->Config->RULES.size()) - { - this->WriteNumeric(ERR_NORULES, "%s :RULES File is missing",this->nick.c_str()); - return; - } - - this->WriteNumeric(RPL_RULESTART, "%s :- %s Server Rules -",this->nick.c_str(),ServerInstance->Config->ServerName.c_str()); - - for (file_cache::iterator i = ServerInstance->Config->RULES.begin(); i != ServerInstance->Config->RULES.end(); i++) - this->WriteNumeric(RPL_RULES, "%s :- %s",this->nick.c_str(),i->c_str()); - - this->WriteNumeric(RPL_RULESEND, "%s :End of RULES command.",this->nick.c_str()); -} - -void User::IncreasePenalty(int increase) -{ - this->Penalty += increase; -} - -void FakeUser::SetFakeServer(std::string name) -{ - this->nick = name; - this->server = name; -} - -const std::string FakeUser::GetFullHost() +const std::string& FakeUser::GetFullHost() { if (!ServerInstance->Config->HideWhoisServer.empty()) return ServerInstance->Config->HideWhoisServer; - return nick; + return server; } -const std::string FakeUser::GetFullRealHost() +const std::string& FakeUser::GetFullRealHost() { if (!ServerInstance->Config->HideWhoisServer.empty()) return ServerInstance->Config->HideWhoisServer; - return nick; + return server; } ConnectClass::ConnectClass(ConfigTag* tag, char t, const std::string& mask) - : config(tag), type(t), name("unnamed"), registration_timeout(0), host(mask), - pingtime(0), pass(""), hash(""), softsendqmax(0), hardsendqmax(0), - recvqmax(0), penaltythreshold(0), maxlocal(0), maxglobal(0), maxchans(0), port(0), limit(0) + : config(tag), type(t), fakelag(true), name("unnamed"), registration_timeout(0), host(mask), + pingtime(0), softsendqmax(0), hardsendqmax(0), recvqmax(0), + penaltythreshold(0), commandrate(0), maxlocal(0), maxglobal(0), maxconnwarn(true), maxchans(0), limit(0) { } ConnectClass::ConnectClass(ConfigTag* tag, char t, const std::string& mask, const ConnectClass& parent) - : config(tag), type(t), name("unnamed"), - registration_timeout(parent.registration_timeout), host(mask), - pingtime(parent.pingtime), pass(parent.pass), hash(parent.hash), - softsendqmax(parent.softsendqmax), hardsendqmax(parent.hardsendqmax), - recvqmax(parent.recvqmax), penaltythreshold(parent.penaltythreshold), maxlocal(parent.maxlocal), - maxglobal(parent.maxglobal), maxchans(parent.maxchans), - port(parent.port), limit(parent.limit) + : config(tag), type(t), fakelag(parent.fakelag), name("unnamed"), + registration_timeout(parent.registration_timeout), host(mask), pingtime(parent.pingtime), + softsendqmax(parent.softsendqmax), hardsendqmax(parent.hardsendqmax), recvqmax(parent.recvqmax), + penaltythreshold(parent.penaltythreshold), commandrate(parent.commandrate), + maxlocal(parent.maxlocal), maxglobal(parent.maxglobal), maxconnwarn(parent.maxconnwarn), maxchans(parent.maxchans), + limit(parent.limit) { } void ConnectClass::Update(const ConnectClass* src) { + config = src->config; + type = src->type; + fakelag = src->fakelag; name = src->name; registration_timeout = src->registration_timeout; host = src->host; pingtime = src->pingtime; - pass = src->pass; - hash = src->hash; softsendqmax = src->softsendqmax; hardsendqmax = src->hardsendqmax; recvqmax = src->recvqmax; penaltythreshold = src->penaltythreshold; + commandrate = src->commandrate; maxlocal = src->maxlocal; maxglobal = src->maxglobal; + maxconnwarn = src->maxconnwarn; + maxchans = src->maxchans; limit = src->limit; }