X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmode.cpp;h=1ac2b9e64902737e0a7d3589ca84beb923d4a2fb;hb=b9006ce3cba742ca2a22d601ba1a63a47b0402c9;hp=34234586997320085ec5bf9362e6f0c2203695bf;hpb=a85a9b8c115762ce691e9cfb3c1175725a920c87;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/mode.cpp b/src/mode.cpp index 342345869..8081188f5 100644 --- a/src/mode.cpp +++ b/src/mode.cpp @@ -1,165 +1,141 @@ -/* +------------------------------------+ - * | 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) 2012 Shawn Smith + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2007, 2009 Dennis Friis + * Copyright (C) 2006-2008 Robin Burchell + * Copyright (C) 2008 Thomas Stagner + * Copyright (C) 2004-2008 Craig Edwards + * Copyright (C) 2006 Oliver Lupton * - * 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 . */ -/* $Core: libIRCDmode */ -/* $ExtraDeps: $(RELCPPFILES) */ -/* $ExtraObjects: modes/modeclasses.a */ -/* $ExtraBuild: @${MAKE} -C "modes" DIRNAME="src/modes" CC="$(CC)" $(MAKEARGS) CPPFILES="$(CPPFILES)" */ #include "inspircd.h" -#include "inspstring.h" - -/* +s (secret) */ -#include "modes/cmode_s.h" -/* +p (private) */ -#include "modes/cmode_p.h" -/* +b (bans) */ -#include "modes/cmode_b.h" -/* +m (moderated) */ -#include "modes/cmode_m.h" -/* +t (only (half) ops can change topic) */ -#include "modes/cmode_t.h" -/* +n (no external messages) */ -#include "modes/cmode_n.h" -/* +i (invite only) */ -#include "modes/cmode_i.h" -/* +k (keyed channel) */ -#include "modes/cmode_k.h" -/* +l (channel user limit) */ -#include "modes/cmode_l.h" -/* +o (channel op) */ -#include "modes/cmode_o.h" -/* +h (channel halfop) */ -#include "modes/cmode_h.h" -/* +v (channel voice) */ -#include "modes/cmode_v.h" -/* +s (server notices) */ -#include "modes/umode_s.h" -/* +w (see wallops) */ -#include "modes/umode_w.h" -/* +i (invisible) */ -#include "modes/umode_i.h" -/* +o (operator) */ -#include "modes/umode_o.h" -/* +n (notice mask - our implementation of snomasks) */ -#include "modes/umode_n.h" - -ModeHandler::ModeHandler(InspIRCd* Instance, char modeletter, int parameters_on, int parameters_off, bool listmode, ModeType type, bool operonly, char mprefix, char prefixrequired) - : ServerInstance(Instance), mode(modeletter), n_params_on(parameters_on), n_params_off(parameters_off), list(listmode), m_type(type), oper(operonly), prefix(mprefix), count(0), prefixneeded(prefixrequired) -{ -} - -ModeHandler::~ModeHandler() -{ -} +#include "builtinmodes.h" -bool ModeHandler::IsListMode() +ModeHandler::ModeHandler(Module* Creator, const std::string& Name, char modeletter, ParamSpec Params, ModeType type, Class mclass) + : ServiceProvider(Creator, Name, SERVICE_MODE), modeid(ModeParser::MODEID_MAX), m_paramtype(TR_TEXT), + parameters_taken(Params), mode(modeletter), oper(false), + list(false), m_type(type), type_id(mclass), levelrequired(HALFOP_VALUE) { - return list; } -char ModeHandler::GetNeededPrefix() +CullResult ModeHandler::cull() { - return prefixneeded; + if (ServerInstance) + ServerInstance->Modes->DelMode(this); + return classbase::cull(); } -void ModeHandler::SetNeededPrefix(char needsprefix) +ModeHandler::~ModeHandler() { - prefixneeded = needsprefix; } -unsigned int ModeHandler::GetPrefixRank() +int ModeHandler::GetNumParams(bool adding) { + switch (parameters_taken) + { + case PARAM_ALWAYS: + return 1; + case PARAM_SETONLY: + return adding ? 1 : 0; + case PARAM_NONE: + break; + } return 0; } -unsigned int ModeHandler::GetCount() +std::string ModeHandler::GetUserParameter(User* user) { - return 0; + return ""; } -void ModeHandler::ChangeCount(int modifier) +ModResult ModeHandler::AccessCheck(User*, Channel*, std::string &, bool) { - count += modifier; - ServerInstance->Logs->Log("MODE", DEBUG,"Change count for mode %c is now %d", mode, count); + return MOD_RES_PASSTHRU; } -ModeType ModeHandler::GetModeType() +ModeAction ModeHandler::OnModeChange(User*, User*, Channel*, std::string&, bool) { - return m_type; + return MODEACTION_DENY; } -bool ModeHandler::NeedsOper() +void ModeHandler::DisplayList(User*, Channel*) { - return oper; } -char ModeHandler::GetPrefix() +void ModeHandler::DisplayEmptyList(User*, Channel*) { - return prefix; } -int ModeHandler::GetNumParams(bool adding) +void ModeHandler::OnParameterMissing(User* user, User* dest, Channel* channel) { - return adding ? n_params_on : n_params_off; } -char ModeHandler::GetModeChar() +bool ModeHandler::ResolveModeConflict(std::string& theirs, const std::string& ours, Channel*) { - return mode; + return (theirs < ours); } -ModeAction ModeHandler::OnModeChange(User*, User*, Channel*, std::string&, bool, bool) +ModeAction SimpleUserModeHandler::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { - return MODEACTION_DENY; -} + /* We're either trying to add a mode we already have or + remove a mode we don't have, deny. */ + if (dest->IsModeSet(this) == adding) + return MODEACTION_DENY; -ModePair ModeHandler::ModeSet(User*, User* dest, Channel* channel, const std::string&) -{ - if (dest) - { - return std::make_pair(dest->IsModeSet(this->mode), ""); - } - else - { - return std::make_pair(channel->IsModeSet(this->mode), ""); - } -} + /* adding will be either true or false, depending on if we + are adding or removing the mode, since we already checked + to make sure we aren't adding a mode we have or that we + aren't removing a mode we don't have, we don't have to do any + other checks here to see if it's true or false, just add or + remove the mode */ + dest->SetMode(this, adding); -void ModeHandler::DisplayList(User*, Channel*) -{ + return MODEACTION_ALLOW; } -void ModeHandler::DisplayEmptyList(User*, Channel*) -{ -} -bool ModeHandler::CheckTimeStamp(time_t theirs, time_t ours, const std::string&, const std::string&, Channel*) +ModeAction SimpleChannelModeHandler::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { - return (ours < theirs); -} + /* We're either trying to add a mode we already have or + remove a mode we don't have, deny. */ + if (channel->IsModeSet(this) == adding) + return MODEACTION_DENY; -ModeWatcher::ModeWatcher(InspIRCd* Instance, char modeletter, ModeType type) : ServerInstance(Instance), mode(modeletter), m_type(type) -{ + /* adding will be either true or false, depending on if we + are adding or removing the mode, since we already checked + to make sure we aren't adding a mode we have or that we + aren't removing a mode we don't have, we don't have to do any + other checks here to see if it's true or false, just add or + remove the mode */ + channel->SetMode(this, adding); + + return MODEACTION_ALLOW; } -ModeWatcher::~ModeWatcher() +ModeWatcher::ModeWatcher(Module* Creator, const std::string& modename, ModeType type) + : mode(modename), m_type(type), creator(Creator) { + ServerInstance->Modes->AddModeWatcher(this); } -char ModeWatcher::GetModeChar() +ModeWatcher::~ModeWatcher() { - return mode; + ServerInstance->Modes->DelModeWatcher(this); } ModeType ModeWatcher::GetModeType() @@ -167,548 +143,433 @@ ModeType ModeWatcher::GetModeType() return m_type; } -bool ModeWatcher::BeforeMode(User*, User*, Channel*, std::string&, bool, ModeType, bool) +bool ModeWatcher::BeforeMode(User*, User*, Channel*, std::string&, bool) { return true; } -void ModeWatcher::AfterMode(User*, User*, Channel*, const std::string&, bool, ModeType, bool) +void ModeWatcher::AfterMode(User*, User*, Channel*, const std::string&, bool) { } -User* ModeParser::SanityChecks(User *user, const char *dest, Channel *chan, int) +void ModeParser::DisplayCurrentModes(User *user, User* targetuser, Channel* targetchannel, const char* text) { - User *d; - if ((!user) || (!dest) || (!chan) || (!*dest)) + if (targetchannel) { - return NULL; + /* Display channel's current mode string */ + user->WriteNumeric(RPL_CHANNELMODEIS, "%s +%s", targetchannel->name.c_str(), targetchannel->ChanModes(targetchannel->HasUser(user))); + user->WriteNumeric(RPL_CHANNELCREATED, "%s %lu", targetchannel->name.c_str(), (unsigned long)targetchannel->age); + return; } - d = ServerInstance->FindNick(dest); - if (!d) + else { - user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick, dest); - return NULL; + if (targetuser == user || user->HasPrivPermission("users/auspex")) + { + /* Display user's current mode string */ + user->WriteNumeric(RPL_UMODEIS, ":+%s", targetuser->FormatModes()); + if ((targetuser->IsOper())) + { + ModeHandler* snomask = FindMode('s', MODETYPE_USER); + user->WriteNumeric(RPL_SNOMASKIS, "%s :Server notice mask", snomask->GetUserParameter(user).c_str()); + } + return; + } + else + { + user->WriteNumeric(ERR_USERSDONTMATCH, ":Can't view modes for other users"); + return; + } } - return d; } -const char* ModeParser::Grant(User *d,Channel *chan,int MASK) +PrefixMode::PrefixMode(Module* Creator, const std::string& Name, char ModeLetter, unsigned int Rank, char PrefixChar) + : ModeHandler(Creator, Name, ModeLetter, PARAM_ALWAYS, MODETYPE_CHANNEL, MC_PREFIX) + , prefix(PrefixChar), prefixrank(Rank) { - if (!chan) - return ""; + list = true; + m_paramtype = TR_NICK; +} + +ModeAction PrefixMode::OnModeChange(User* source, User*, Channel* chan, std::string& parameter, bool adding) +{ + User* target; + if (IS_LOCAL(source)) + target = ServerInstance->FindNickOnly(parameter); + else + target = ServerInstance->FindNick(parameter); - UCListIter n = d->chans.find(chan); - if (n != d->chans.end()) + if (!target) { - if (n->second & MASK) - { - return ""; - } - n->second = n->second | MASK; - switch (MASK) - { - case UCMODE_OP: - n->first->AddOppedUser(d); - break; - case UCMODE_HOP: - n->first->AddHalfoppedUser(d); - break; - case UCMODE_VOICE: - n->first->AddVoicedUser(d); - break; - } - return d->nick; + source->WriteNumeric(ERR_NOSUCHNICK, "%s :No such nick/channel", parameter.c_str()); + return MODEACTION_DENY; } - return ""; + + Membership* memb = chan->GetUser(target); + if (!memb) + return MODEACTION_DENY; + + parameter = target->nick; + return (memb->SetPrefix(this, adding) ? MODEACTION_ALLOW : MODEACTION_DENY); } -const char* ModeParser::Revoke(User *d,Channel *chan,int MASK) +ModeAction ParamModeBase::OnModeChange(User* source, User*, Channel* chan, std::string& parameter, bool adding) { - if (!chan) - return ""; + if (adding) + { + if (chan->GetModeParameter(this) == parameter) + return MODEACTION_DENY; - UCListIter n = d->chans.find(chan); - if (n != d->chans.end()) + if (OnSet(source, chan, parameter) != MODEACTION_ALLOW) + return MODEACTION_DENY; + + chan->SetMode(this, true); + + // Handler might have changed the parameter internally + parameter.clear(); + this->GetParameter(chan, parameter); + } + else { - if ((n->second & MASK) == 0) - { - return ""; - } - n->second ^= MASK; - switch (MASK) - { - case UCMODE_OP: - n->first->DelOppedUser(d); - break; - case UCMODE_HOP: - n->first->DelHalfoppedUser(d); - break; - case UCMODE_VOICE: - n->first->DelVoicedUser(d); - break; - } - return d->nick; + if (!chan->IsModeSet(this)) + return MODEACTION_DENY; + this->OnUnsetInternal(source, chan); + chan->SetMode(this, false); } - return ""; + return MODEACTION_ALLOW; } -void ModeParser::DisplayCurrentModes(User *user, User* targetuser, Channel* targetchannel, const char* text) +ModeAction ModeParser::TryMode(User* user, User* targetuser, Channel* chan, bool adding, const unsigned char modechar, + std::string ¶meter, bool SkipACL) { - if (targetchannel) + ModeType type = chan ? MODETYPE_CHANNEL : MODETYPE_USER; + + ModeHandler *mh = FindMode(modechar, type); + int pcnt = mh->GetNumParams(adding); + + // crop mode parameter size to 250 characters + if (parameter.length() > 250 && adding) + parameter = parameter.substr(0, 250); + + ModResult MOD_RESULT; + FIRST_MOD_RESULT(OnRawMode, MOD_RESULT, (user, chan, mh, parameter, adding)); + + if (IS_LOCAL(user) && (MOD_RESULT == MOD_RES_DENY)) + return MODEACTION_DENY; + + if (chan && !SkipACL && (MOD_RESULT != MOD_RES_ALLOW)) { - /* Display channel's current mode string */ - user->WriteNumeric(324, "%s %s +%s",user->nick, targetchannel->name, targetchannel->ChanModes(targetchannel->HasUser(user))); - user->WriteNumeric(329, "%s %s %lu", user->nick, targetchannel->name, (unsigned long)targetchannel->age); - return; + MOD_RESULT = mh->AccessCheck(user, chan, parameter, adding); + + if (MOD_RESULT == MOD_RES_DENY) + return MODEACTION_DENY; + if (MOD_RESULT == MOD_RES_PASSTHRU) + { + unsigned int neededrank = mh->GetLevelRequired(); + /* Compare our rank on the channel against the rank of the required prefix, + * allow if >= ours. Because mIRC and xchat throw a tizz if the modes shown + * in NAMES(X) are not in rank order, we know the most powerful mode is listed + * first, so we don't need to iterate, we just look up the first instead. + */ + unsigned int ourrank = chan->GetPrefixValue(user); + if (ourrank < neededrank) + { + PrefixMode* neededmh = NULL; + for(char c='A'; c <= 'z'; c++) + { + PrefixMode* privmh = FindPrefixMode(c); + if (privmh && privmh->GetPrefixRank() >= neededrank) + { + // this mode is sufficient to allow this action + if (!neededmh || privmh->GetPrefixRank() < neededmh->GetPrefixRank()) + neededmh = privmh; + } + } + if (neededmh) + user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s :You must have channel %s access or above to %sset channel mode %c", + chan->name.c_str(), neededmh->name.c_str(), adding ? "" : "un", modechar); + else + user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s :You cannot %sset channel mode %c", + chan->name.c_str(), adding ? "" : "un", modechar); + return MODEACTION_DENY; + } + } } - else if (targetuser) + + // Ask mode watchers whether this mode change is OK + std::pair itpair = modewatchermap.equal_range(mh->name); + for (ModeWatchIter i = itpair.first; i != itpair.second; ++i) { - if (targetuser->Visibility && !targetuser->Visibility->VisibleTo(user)) + ModeWatcher* mw = i->second; + if (mw->GetModeType() == type) { - user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick, text); - return; + if (!mw->BeforeMode(user, targetuser, chan, parameter, adding)) + return MODEACTION_DENY; + + // A module whacked the parameter completely, and there was one. Abort. + if (pcnt && parameter.empty()) + return MODEACTION_DENY; } + } - if ((targetuser == user) || (IS_OPER(user))) + if (IS_LOCAL(user) && !user->IsOper()) + { + char* disabled = (type == MODETYPE_CHANNEL) ? ServerInstance->Config->DisabledCModes : ServerInstance->Config->DisabledUModes; + if (disabled[modechar - 'A']) { - /* Display user's current mode string */ - user->WriteNumeric(221, "%s :+%s",targetuser->nick,targetuser->FormatModes()); - if (IS_OPER(targetuser)) - user->WriteNumeric(8, "%s +%s :Server notice mask", targetuser->nick, targetuser->FormatNoticeMasks()); - return; + user->WriteNumeric(ERR_NOPRIVILEGES, ":Permission Denied - %s mode %c has been locked by the administrator", + type == MODETYPE_CHANNEL ? "channel" : "user", modechar); + return MODEACTION_DENY; + } + } + + if (adding && IS_LOCAL(user) && mh->NeedsOper() && !user->HasModePermission(modechar, type)) + { + /* It's an oper only mode, and they don't have access to it. */ + if (user->IsOper()) + { + user->WriteNumeric(ERR_NOPRIVILEGES, ":Permission Denied - Oper type %s does not have access to set %s mode %c", + user->oper->name.c_str(), type == MODETYPE_CHANNEL ? "channel" : "user", modechar); } else { - user->WriteNumeric(502, "%s :Can't change mode for other users", user->nick); - return; + user->WriteNumeric(ERR_NOPRIVILEGES, ":Permission Denied - Only operators may set %s mode %c", + type == MODETYPE_CHANNEL ? "channel" : "user", modechar); } + return MODEACTION_DENY; + } + + /* Call the handler for the mode */ + ModeAction ma = mh->OnModeChange(user, targetuser, chan, parameter, adding); + + if (pcnt && parameter.empty()) + return MODEACTION_DENY; + + if (ma != MODEACTION_ALLOW) + return ma; + + itpair = modewatchermap.equal_range(mh->name); + for (ModeWatchIter i = itpair.first; i != itpair.second; ++i) + { + ModeWatcher* mw = i->second; + if (mw->GetModeType() == type) + mw->AfterMode(user, targetuser, chan, parameter, adding); } - /* No such nick/channel */ - user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick, text); - return; + return MODEACTION_ALLOW; } -void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bool servermode) +void ModeParser::Process(const std::vector& parameters, User* user, ModeProcessFlag flags) { - std::string target = parameters[0]; - ModeType type = MODETYPE_USER; - unsigned char mask = 0; - Channel* targetchannel = ServerInstance->FindChan(parameters[0]); - User* targetuser = ServerInstance->FindNick(parameters[0]); + const std::string& target = parameters[0]; + Channel* targetchannel = ServerInstance->FindChan(target); + User* targetuser = NULL; + if (!targetchannel) + { + if (IS_LOCAL(user)) + targetuser = ServerInstance->FindNickOnly(target); + else + targetuser = ServerInstance->FindNick(target); + } + ModeType type = targetchannel ? MODETYPE_CHANNEL : MODETYPE_USER; LastParse.clear(); + LastParseParams.clear(); + LastParseTranslate.clear(); + LastChangeList.clear(); - /* Special case for displaying the list for listmodes, - * e.g. MODE #chan b, or MODE #chan +b without a parameter - */ - if ((targetchannel) && (pcnt == 2)) + if ((!targetchannel) && ((!targetuser) || (IS_SERVER(targetuser)))) + { + user->WriteNumeric(ERR_NOSUCHNICK, "%s :No such nick/channel", target.c_str()); + return; + } + if (parameters.size() == 1) + { + this->DisplayCurrentModes(user, targetuser, targetchannel, target.c_str()); + return; + } + + ModResult MOD_RESULT; + FIRST_MOD_RESULT(OnPreMode, MOD_RESULT, (user, targetuser, targetchannel, parameters)); + + bool SkipAccessChecks = false; + + if (!IS_LOCAL(user) || MOD_RESULT == MOD_RES_ALLOW) + SkipAccessChecks = true; + else if (MOD_RESULT == MOD_RES_DENY) + return; + + if (targetuser && !SkipAccessChecks && user != targetuser) { - const char* mode = parameters[1]; - int nonlistmodes_found = 0; - bool sent[256]; + user->WriteNumeric(ERR_USERSDONTMATCH, ":Can't change mode for other users"); + return; + } + + const std::string& mode_sequence = parameters[1]; - mask = MASK_CHANNEL; + std::string output_mode; + std::string output_parameters; + LastParseParams.push_back(output_mode); + LastParseTranslate.push_back(TR_TEXT); - memset(&sent, 0, 256); - - while (mode && *mode) + bool adding = true; + char output_pm = '\0'; // current output state, '+' or '-' + unsigned int param_at = 2; + + for (std::string::const_iterator letter = mode_sequence.begin(); letter != mode_sequence.end(); letter++) + { + unsigned char modechar = *letter; + if (modechar == '+' || modechar == '-') { - unsigned char mletter = *mode; + adding = (modechar == '+'); + continue; + } - if (*mode == '+') - { - mode++; + ModeHandler *mh = this->FindMode(modechar, type); + if (!mh) + { + /* No mode handler? Unknown mode character then. */ + user->WriteNumeric(type == MODETYPE_CHANNEL ? ERR_UNKNOWNMODE : ERR_UNKNOWNSNOMASK, "%c :is unknown mode char to me", modechar); + continue; + } + + std::string parameter; + int pcnt = mh->GetNumParams(adding); + if (pcnt && param_at == parameters.size()) + { + /* No parameter, continue to the next mode */ + mh->OnParameterMissing(user, targetuser, targetchannel); + continue; + } + else if (pcnt) + { + parameter = parameters[param_at++]; + /* Make sure the user isn't trying to slip in an invalid parameter */ + if ((parameter.find(':') == 0) || (parameter.rfind(' ') != std::string::npos)) continue; - } - - /* Ensure the user doesnt request the same mode twice, - * so they cant flood themselves off out of idiocy. - */ - if (!sent[mletter]) - { - sent[mletter] = true; - } - else + if ((flags & MODE_MERGE) && targetchannel && targetchannel->IsModeSet(mh) && !mh->IsListMode()) { - mode++; - continue; + std::string ours = targetchannel->GetModeParameter(mh); + if (!mh->ResolveModeConflict(parameter, ours, targetchannel)) + /* we won the mode merge, don't apply this mode */ + continue; } + } - ModeHandler *mh = this->FindMode(*mode, MODETYPE_CHANNEL); - bool display = true; + ModeAction ma = TryMode(user, targetuser, targetchannel, adding, modechar, parameter, SkipAccessChecks); - if ((mh) && (mh->IsListMode())) - { - int MOD_RESULT = 0; - FOREACH_RESULT(I_OnRawMode, OnRawMode(user, targetchannel, *mode, "", true, 0)); - if (MOD_RESULT == ACR_DENY) - { - mode++; - continue; - } + if (ma != MODEACTION_ALLOW) + continue; - if (ServerInstance->Config->HideModeLists[mletter] && (targetchannel->GetStatus(user) < STATUS_HOP)) - { - user->WriteNumeric(482, "%s %s :Only half-operators and above may view the +%c list",user->nick, targetchannel->name, *mode++); - mh->DisplayEmptyList(user, targetchannel); - continue; - } + char needed_pm = adding ? '+' : '-'; + if (needed_pm != output_pm) + { + output_pm = needed_pm; + output_mode.append(1, output_pm); + } + output_mode.append(1, modechar); - /** See below for a description of what craq this is :D - */ - unsigned char handler_id = (*mode - 65) | mask; + if (pcnt) + { + output_parameters.push_back(' '); + output_parameters.append(parameter); + LastParseParams.push_back(parameter); + LastParseTranslate.push_back(mh->GetTranslateType()); + } + LastChangeList.push(mh, adding, parameter); - for(ModeWatchIter watchers = modewatchers[handler_id].begin(); watchers != modewatchers[handler_id].end(); watchers++) - { - std::string dummyparam; - - if (!((*watchers)->BeforeMode(user, NULL, targetchannel, dummyparam, true, MODETYPE_CHANNEL))) - display = false; - } + if ((output_mode.length() + output_parameters.length() > 450) + || (output_mode.length() > 100) + || (LastParseParams.size() > ServerInstance->Config->Limits.MaxModes)) + { + /* mode sequence is getting too long */ + break; + } + } - if (display) - mh->DisplayList(user, targetchannel); - } - else - nonlistmodes_found++; + LastParseParams[0] = output_mode; - mode++; - } + if (!output_mode.empty()) + { + LastParse = targetchannel ? targetchannel->name : targetuser->nick; + LastParse.append(" "); + LastParse.append(output_mode); + LastParse.append(output_parameters); - /* We didnt have any modes that were non-list, we can return here */ - if (!nonlistmodes_found) - return; - } + if (targetchannel) + targetchannel->WriteChannel(user, "MODE " + LastParse); + else + targetuser->WriteFrom(user, "MODE " + LastParse); - if (pcnt == 1) + FOREACH_MOD(OnMode, (user, targetuser, targetchannel, LastChangeList, flags, output_mode)); + } + else if (targetchannel && parameters.size() == 2) { - this->DisplayCurrentModes(user, targetuser, targetchannel, parameters[0]); + /* Special case for displaying the list for listmodes, + * e.g. MODE #chan b, or MODE #chan +b without a parameter + */ + this->DisplayListModes(user, targetchannel, mode_sequence); } - else if (pcnt > 1) +} + +void ModeParser::DisplayListModes(User* user, Channel* chan, const std::string& mode_sequence) +{ + seq++; + + for (std::string::const_iterator letter = mode_sequence.begin(); letter != mode_sequence.end(); letter++) { - bool SkipAccessChecks = false; + unsigned char mletter = *letter; + if (mletter == '+') + continue; - if (targetchannel) - { - type = MODETYPE_CHANNEL; - mask = MASK_CHANNEL; + /* Ensure the user doesnt request the same mode twice, + * so they cant flood themselves off out of idiocy. + */ + if (sent[mletter] == seq) + continue; - /* Extra security checks on channel modes - * (e.g. are they a (half)op? - */ + sent[mletter] = seq; - if ((IS_LOCAL(user)) && (!ServerInstance->ULine(user->server)) && (!servermode)) - { - /* We don't have halfop */ - int MOD_RESULT = 0; - FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user, NULL, targetchannel, AC_GENERAL_MODE)); - if (MOD_RESULT == ACR_DENY) - return; - SkipAccessChecks = (MOD_RESULT == ACR_ALLOW); - } - } - else if (targetuser) - { - type = MODETYPE_USER; - mask = MASK_USER; - if ((user != targetuser) && (!ServerInstance->ULine(user->server))) - { - user->WriteNumeric(502, "%s :Can't change mode for other users", user->nick); - return; - } - } - else - { - /* No such nick/channel */ - user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick, parameters[0]); - return; - } + ModeHandler *mh = this->FindMode(mletter, MODETYPE_CHANNEL); - std::string mode_sequence = parameters[1]; - std::string parameter; - std::ostringstream parameter_list; - std::string output_sequence; - bool adding = true, state_change = false; - unsigned char handler_id = 0; - int parameter_counter = 2; /* Index of first parameter */ - int parameter_count = 0; - bool last_successful_state_change = false; - - /* A mode sequence that doesnt start with + or -. Assume +. - Thanks for the suggestion spike (bug#132) */ - if ((*mode_sequence.begin() != '+') && (*mode_sequence.begin() != '-')) - mode_sequence.insert(0, "+"); - - for (std::string::const_iterator letter = mode_sequence.begin(); letter != mode_sequence.end(); letter++) - { - unsigned char modechar = *letter; + if (!mh || !mh->IsListMode()) + return; - switch (modechar) - { - /* NB: - * For + and - mode characters, we don't just stick the character into the output sequence. - * This is because the user may do something dumb, like: +-+ooo or +oo-+. To prevent this - * appearing in the output sequence, we store a flag which says there was a state change, - * which is set on any + or -, however, the + or - that we finish on is only appended to - * the output stream in the event it is followed by a non "+ or -" character, such as o or v. - */ - case '+': - /* The following expression prevents: +o+o nick nick, compressing it to +oo nick nick, - * however, will allow the + if it is the first item in the sequence, regardless. - */ - if ((!adding) || (!output_sequence.length())) - state_change = true; - adding = true; - if (!output_sequence.length()) - last_successful_state_change = false; - continue; - break; - case '-': - if ((adding) || (!output_sequence.length())) - state_change = true; - adding = false; - if (!output_sequence.length()) - last_successful_state_change = true; - continue; - break; - default: - - /** - * Watch carefully for the sleight of hand trick. - * 65 is the ascii value of 'A'. We take this from - * the char we're looking at to get a number between - * 1 and 127. We then logic-or it to get the hashed - * position, dependent on wether its a channel or - * a user mode. This is a little stranger, but a lot - * faster, than using a map of pairs. - */ - handler_id = (modechar - 65) | mask; - - if (modehandlers[handler_id]) - { - bool abort = false; + ModResult MOD_RESULT; + FIRST_MOD_RESULT(OnRawMode, MOD_RESULT, (user, chan, mh, "", true)); + if (MOD_RESULT == MOD_RES_DENY) + continue; - if (modehandlers[handler_id]->GetModeType() == type) - { - int MOD_RESULT = 0; - - if (modehandlers[handler_id]->GetNumParams(adding)) - { - /* This mode expects a parameter, do we have any parameters left in our list to use? */ - if (parameter_counter < pcnt) - { - parameter = parameters[parameter_counter++]; - - /* Yerk, invalid! */ - if ((parameter.find(':') == 0) || (parameter.rfind(' ') != std::string::npos)) - parameter.clear(); - } - else - { - /* No parameter, continue to the next mode */ - continue; - } - - FOREACH_RESULT(I_OnRawMode, OnRawMode(user, targetchannel, modechar, parameter, adding, 1, servermode)); - } - else - { - FOREACH_RESULT(I_OnRawMode, OnRawMode(user, targetchannel, modechar, "", adding, 0, servermode)); - } - - if (IS_LOCAL(user) && (MOD_RESULT == ACR_DENY)) - continue; - - if (!SkipAccessChecks && IS_LOCAL(user) && (MOD_RESULT != ACR_ALLOW)) - { - /* Check access to this mode character */ - if ((type == MODETYPE_CHANNEL) && (modehandlers[handler_id]->GetNeededPrefix())) - { - char needed = modehandlers[handler_id]->GetNeededPrefix(); - ModeHandler* prefixmode = FindPrefix(needed); - - /* If the mode defined by the handler is not '\0', but the handler for it - * cannot be found, they probably dont have the right module loaded to implement - * the prefix they want to compare the mode against, e.g. '&' for m_chanprotect. - * Revert to checking against the minimum core prefix, '%'. - */ - if (needed && !prefixmode) - prefixmode = FindPrefix('%'); - - unsigned int neededrank = prefixmode->GetPrefixRank(); - /* Compare our rank on the channel against the rank of the required prefix, - * allow if >= ours. Because mIRC and xchat throw a tizz if the modes shown - * in NAMES(X) are not in rank order, we know the most powerful mode is listed - * first, so we don't need to iterate, we just look up the first instead. - */ - std::string modestring = targetchannel->GetAllPrefixChars(user); - char ml = (modestring.empty() ? '\0' : modestring[0]); - ModeHandler* ourmode = FindPrefix(ml); - if (!ourmode || ourmode->GetPrefixRank() < neededrank) - { - /* Bog off */ - user->WriteNumeric(482, "%s %s :You must have channel privilege %c or above to %sset channel mode %c", - user->nick, targetchannel->name, needed, adding ? "" : "un", modechar); - continue; - } - } - } - - bool had_parameter = !parameter.empty(); - - for (ModeWatchIter watchers = modewatchers[handler_id].begin(); watchers != modewatchers[handler_id].end(); watchers++) - { - if ((*watchers)->BeforeMode(user, targetuser, targetchannel, parameter, adding, type, servermode) == false) - { - abort = true; - break; - } - /* A module whacked the parameter completely, and there was one. abort. */ - if ((had_parameter) && (parameter.empty())) - { - abort = true; - break; - } - } - - if (abort) - continue; - - /* It's an oper only mode, check if theyre an oper. If they arent, - * eat any parameter that came with the mode, and continue to next - */ - if ((IS_LOCAL(user)) && (modehandlers[handler_id]->NeedsOper()) && (!user->HasModePermission(modehandlers[handler_id]->GetModeChar(), type))) - { - if (IS_OPER(user)) - { - user->WriteNumeric(481, "%s :Permission Denied - Oper type %s does not have access to %sset %s mode %c", - user->nick, - user->oper, - adding ? "" : "un", - type == MODETYPE_CHANNEL ? "channel" : "user", - modehandlers[handler_id]->GetModeChar()); - } - else - { - user->WriteNumeric(481, "%s :Permission Denied - Only operators may %sset %s mode %c", - user->nick, - adding ? "" : "un", - type == MODETYPE_CHANNEL ? "channel" : "user", - modehandlers[handler_id]->GetModeChar()); - } - continue; - } - - /* Call the handler for the mode */ - ModeAction ma = modehandlers[handler_id]->OnModeChange(user, targetuser, targetchannel, parameter, adding, servermode); - - if ((modehandlers[handler_id]->GetNumParams(adding)) && (parameter.empty())) - { - /* The handler nuked the parameter and they are supposed to have one. - * We CANT continue now, even if they actually returned MODEACTION_ALLOW, - * so we bail to the next mode character. - */ - continue; - } - - if (ma == MODEACTION_ALLOW) - { - /* We're about to output a valid mode letter - was there previously a pending state-change? */ - if (state_change) - { - if (adding != last_successful_state_change) - output_sequence.append(adding ? "+" : "-"); - last_successful_state_change = adding; - } - - /* Add the mode letter */ - output_sequence.push_back(modechar); - - modehandlers[handler_id]->ChangeCount(adding ? 1 : -1); - - /* Is there a valid parameter for this mode? If so add it to the parameter list */ - if ((modehandlers[handler_id]->GetNumParams(adding)) && (!parameter.empty())) - { - parameter_list << " " << parameter; - parameter_count++; - /* Does this mode have a prefix? */ - if (modehandlers[handler_id]->GetPrefix() && targetchannel) - { - User* user_to_prefix = ServerInstance->FindNick(parameter); - if (user_to_prefix) - targetchannel->SetPrefix(user_to_prefix, modehandlers[handler_id]->GetPrefix(), - modehandlers[handler_id]->GetPrefixRank(), adding); - } - } - - /* Call all the AfterMode events in the mode watchers for this mode */ - for (ModeWatchIter watchers = modewatchers[handler_id].begin(); watchers != modewatchers[handler_id].end(); watchers++) - (*watchers)->AfterMode(user, targetuser, targetchannel, parameter, adding, type, servermode); - - /* Reset the state change flag */ - state_change = false; - - if ((output_sequence.length() + parameter_list.str().length() > 450) || (output_sequence.length() > 100) - || (parameter_count > MAXMODES)) - { - /* We cant have a mode sequence this long */ - letter = mode_sequence.end() - 1; - continue; - } - } - } - } - else - { - /* No mode handler? Unknown mode character then. */ - user->WriteServ("%d %s %c :is unknown mode char to me", type == MODETYPE_CHANNEL ? 472 : 501, user->nick, modechar); - } - break; - } + bool display = true; + if (!user->HasPrivPermission("channels/auspex") && ServerInstance->Config->HideModeLists[mletter] && (chan->GetPrefixValue(user) < HALFOP_VALUE)) + { + user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s :You do not have access to view the +%c list", + chan->name.c_str(), mletter); + display = false; } - /* Was there at least one valid mode in the sequence? */ - if (!output_sequence.empty()) + // Ask mode watchers whether it's OK to show the list + std::pair itpair = modewatchermap.equal_range(mh->name); + for (ModeWatchIter i = itpair.first; i != itpair.second; ++i) { - if (servermode) - { - if (type == MODETYPE_CHANNEL) - { - targetchannel->WriteChannelWithServ(ServerInstance->Config->ServerName, "MODE %s %s%s", targetchannel->name, output_sequence.c_str(), parameter_list.str().c_str()); - this->LastParse = targetchannel->name; - } - else - { - targetuser->WriteServ("MODE %s %s%s",targetuser->nick,output_sequence.c_str(), parameter_list.str().c_str()); - this->LastParse = targetuser->nick; - } - } - else + ModeWatcher* mw = i->second; + if (mw->GetModeType() == MODETYPE_CHANNEL) { - if (type == MODETYPE_CHANNEL) - { - targetchannel->WriteChannel(user,"MODE %s %s%s",targetchannel->name,output_sequence.c_str(),parameter_list.str().c_str()); - FOREACH_MOD(I_OnMode,OnMode(user, targetchannel, TYPE_CHANNEL, output_sequence + parameter_list.str())); - this->LastParse = targetchannel->name; - } - else + std::string dummyparam; + + if (!mw->BeforeMode(user, NULL, chan, dummyparam, true)) { - user->WriteTo(targetuser,"MODE %s %s%s",targetuser->nick,output_sequence.c_str(), parameter_list.str().c_str()); - FOREACH_MOD(I_OnMode,OnMode(user, targetuser, TYPE_USER, output_sequence + parameter_list.str())); - this->LastParse = targetuser->nick; + // A mode watcher doesn't want us to show the list + display = false; + break; } } - - LastParse.append(" "); - LastParse.append(output_sequence); - LastParse.append(parameter_list.str()); } - } -} -const std::string& ModeParser::GetLastParse() -{ - return LastParse; + if (display) + mh->DisplayList(user, chan); + else + mh->DisplayEmptyList(user, chan); + } } void ModeParser::CleanMask(std::string &mask) @@ -718,6 +579,9 @@ void ModeParser::CleanMask(std::string &mask) std::string::size_type pos_of_dot = mask.find_first_of('.'); std::string::size_type pos_of_colons = mask.find("::"); /* Because ipv6 addresses are colon delimited -- double so it treats extban as nick */ + if (mask.length() >= 2 && mask[1] == ':') + return; // if it's an extban, don't even try guess how it needs to be formed. + if ((pos_of_pling == std::string::npos) && (pos_of_at == std::string::npos)) { /* Just a nick, or just a host - or clearly ipv6 (starting with :) */ @@ -744,47 +608,83 @@ void ModeParser::CleanMask(std::string &mask) } } -bool ModeParser::AddMode(ModeHandler* mh) +ModeHandler::Id ModeParser::AllocateModeId(ModeType mt) { - unsigned char mask = 0; - unsigned char pos = 0; + for (ModeHandler::Id i = 0; i != MODEID_MAX; ++i) + { + if (!modehandlersbyid[mt][i]) + return i; + } + + throw ModuleException("Out of ModeIds"); +} +void ModeParser::AddMode(ModeHandler* mh) +{ /* Yes, i know, this might let people declare modes like '_' or '^'. * If they do that, thats their problem, and if i ever EVER see an * official InspIRCd developer do that, i'll beat them with a paddle! */ - if ((mh->GetModeChar() < 'A') || (mh->GetModeChar() > 'z') || (mh->GetPrefix() > 126)) - return false; + if ((mh->GetModeChar() < 'A') || (mh->GetModeChar() > 'z')) + throw ModuleException("Invalid letter for mode " + mh->name); /* A mode prefix of ',' is not acceptable, it would fuck up server to server. * A mode prefix of ':' will fuck up both server to server, and client to server. * A mode prefix of '#' will mess up /whois and /privmsg */ - if ((mh->GetPrefix() == ',') || (mh->GetPrefix() == ':') || (mh->GetPrefix() == '#')) - return false; + PrefixMode* pm = mh->IsPrefixMode(); + if (pm) + { + if ((pm->GetPrefix() > 126) || (pm->GetPrefix() == ',') || (pm->GetPrefix() == ':') || (pm->GetPrefix() == '#')) + throw ModuleException("Invalid prefix for mode " + mh->name); + + if (FindPrefix(pm->GetPrefix())) + throw ModuleException("Prefix already exists for mode " + mh->name); + } - mh->GetModeType() == MODETYPE_USER ? mask = MASK_USER : mask = MASK_CHANNEL; - pos = (mh->GetModeChar()-65) | mask; + ModeHandler*& slot = modehandlers[mh->GetModeType()][mh->GetModeChar()-65]; + if (slot) + throw ModuleException("Letter is already in use for mode " + mh->name); - if (modehandlers[pos]) - return false; + // The mode needs an id if it is either a user mode, a simple mode (flag) or a parameter mode. + // Otherwise (for listmodes and prefix modes) the id remains MODEID_MAX, which is invalid. + ModeHandler::Id modeid = MODEID_MAX; + if ((mh->GetModeType() == MODETYPE_USER) || (mh->IsParameterMode()) || (!mh->IsListMode())) + modeid = AllocateModeId(mh->GetModeType()); - modehandlers[pos] = mh; - return true; + if (!modehandlersbyname[mh->GetModeType()].insert(std::make_pair(mh->name, mh)).second) + throw ModuleException("Mode name already in use: " + mh->name); + + // Everything is fine, add the mode + + // If we allocated an id for this mode then save it and put the mode handler into the slot + if (modeid != MODEID_MAX) + { + mh->modeid = modeid; + modehandlersbyid[mh->GetModeType()][modeid] = mh; + } + + slot = mh; + if (pm) + mhlist.prefix.push_back(pm); + else if (mh->IsListModeBase()) + mhlist.list.push_back(mh->IsListModeBase()); + + RecreateModeListFor004Numeric(); } bool ModeParser::DelMode(ModeHandler* mh) { - unsigned char mask = 0; - unsigned char pos = 0; - if ((mh->GetModeChar() < 'A') || (mh->GetModeChar() > 'z')) return false; - mh->GetModeType() == MODETYPE_USER ? mask = MASK_USER : mask = MASK_CHANNEL; - pos = (mh->GetModeChar()-65) | mask; + ModeHandlerMap& mhmap = modehandlersbyname[mh->GetModeType()]; + ModeHandlerMap::iterator mhmapit = mhmap.find(mh->name); + if ((mhmapit == mhmap.end()) || (mhmapit->second != mh)) + return false; - if (!modehandlers[pos]) + ModeHandler*& slot = modehandlers[mh->GetModeType()][mh->GetModeChar()-65]; + if (slot != mh) return false; /* Note: We can't stack here, as we have modes potentially being removed across many different channels. @@ -793,141 +693,111 @@ bool ModeParser::DelMode(ModeHandler* mh) switch (mh->GetModeType()) { case MODETYPE_USER: - for (user_hash::iterator i = ServerInstance->Users->clientlist->begin(); i != ServerInstance->Users->clientlist->end(); i++) + { + const user_hash& users = ServerInstance->Users->GetUsers(); + for (user_hash::const_iterator i = users.begin(); i != users.end(); ) { - mh->RemoveMode(i->second); + User* user = i->second; + ++i; + mh->RemoveMode(user); } + } break; case MODETYPE_CHANNEL: - for (chan_hash::iterator i = ServerInstance->chanlist->begin(); i != ServerInstance->chanlist->end(); i++) + { + const chan_hash& chans = ServerInstance->GetChans(); + for (chan_hash::const_iterator i = chans.begin(); i != chans.end(); ) { - mh->RemoveMode(i->second); + // The channel may not be in the hash after RemoveMode(), see m_permchannels + Channel* chan = i->second; + ++i; + + irc::modestacker stack(false); + mh->RemoveMode(chan, stack); + + std::vector stackresult; + stackresult.push_back(chan->name); + while (stack.GetStackedLine(stackresult)) + { + this->Process(stackresult, ServerInstance->FakeClient, MODE_LOCALONLY); + stackresult.erase(stackresult.begin() + 1, stackresult.end()); + } } + } break; } - modehandlers[pos] = NULL; + mhmap.erase(mhmapit); + if (mh->GetId() != MODEID_MAX) + modehandlersbyid[mh->GetModeType()][mh->GetId()] = NULL; + slot = NULL; + if (mh->IsPrefixMode()) + mhlist.prefix.erase(std::find(mhlist.prefix.begin(), mhlist.prefix.end(), mh->IsPrefixMode())); + else if (mh->IsListModeBase()) + mhlist.list.erase(std::find(mhlist.list.begin(), mhlist.list.end(), mh->IsListModeBase())); + RecreateModeListFor004Numeric(); return true; } -ModeHandler* ModeParser::FindMode(unsigned const char modeletter, ModeType mt) +ModeHandler* ModeParser::FindMode(const std::string& modename, ModeType mt) { - unsigned char mask = 0; - unsigned char pos = 0; - - if ((modeletter < 'A') || (modeletter > 'z')) - return NULL; - - mt == MODETYPE_USER ? mask = MASK_USER : mask = MASK_CHANNEL; - pos = (modeletter-65) | mask; + ModeHandlerMap& mhmap = modehandlersbyname[mt]; + ModeHandlerMap::const_iterator it = mhmap.find(modename); + if (it != mhmap.end()) + return it->second; - return modehandlers[pos]; + return NULL; } -std::string ModeParser::UserModeList() +ModeHandler* ModeParser::FindMode(unsigned const char modeletter, ModeType mt) { - char modestr[256]; - int pointer = 0; - - for (unsigned char mode = 'A'; mode <= 'z'; mode++) - { - unsigned char pos = (mode-65) | MASK_USER; + if ((modeletter < 'A') || (modeletter > 'z')) + return NULL; - if (modehandlers[pos]) - modestr[pointer++] = mode; - } - modestr[pointer++] = 0; - return modestr; + return modehandlers[mt][modeletter-65]; } -std::string ModeParser::ChannelModeList() +PrefixMode* ModeParser::FindPrefixMode(unsigned char modeletter) { - char modestr[256]; - int pointer = 0; - - for (unsigned char mode = 'A'; mode <= 'z'; mode++) - { - if ((!ServerInstance->Config->AllowHalfop) && (mode == 'h')) - continue; - - unsigned char pos = (mode-65) | MASK_CHANNEL; - - if (modehandlers[pos]) - modestr[pointer++] = mode; - } - modestr[pointer++] = 0; - return modestr; + ModeHandler* mh = FindMode(modeletter, MODETYPE_CHANNEL); + if (!mh) + return NULL; + return mh->IsPrefixMode(); } -std::string ModeParser::ParaModeList() +std::string ModeParser::CreateModeList(ModeType mt, bool needparam) { - char modestr[256]; - int pointer = 0; + std::string modestr; for (unsigned char mode = 'A'; mode <= 'z'; mode++) { - if ((!ServerInstance->Config->AllowHalfop) && (mode == 'h')) - continue; - - unsigned char pos = (mode-65) | MASK_CHANNEL; - - if ((modehandlers[pos]) && (modehandlers[pos]->GetNumParams(true))) - modestr[pointer++] = mode; + ModeHandler* mh = modehandlers[mt][mode-65]; + if ((mh) && ((!needparam) || (mh->GetNumParams(true)))) + modestr.push_back(mode); } - modestr[pointer++] = 0; + return modestr; } -ModeHandler* ModeParser::FindPrefix(unsigned const char pfxletter) +void ModeParser::RecreateModeListFor004Numeric() { - for (unsigned char mode = 'A'; mode <= 'z'; mode++) - { - unsigned char pos = (mode-65) | MASK_CHANNEL; - - if ((modehandlers[pos]) && (modehandlers[pos]->GetPrefix() == pfxletter)) - { - return modehandlers[pos]; - } - } - return NULL; + Cached004ModeList = CreateModeList(MODETYPE_USER) + " " + CreateModeList(MODETYPE_CHANNEL) + " " + CreateModeList(MODETYPE_CHANNEL, true); } -std::string ModeParser::ModeString(User* user, Channel* channel, bool nick_suffix) +PrefixMode* ModeParser::FindPrefix(unsigned const char pfxletter) { - std::string types; - std::string pars; - - if (!channel || !user) - return ""; - - for (unsigned char mode = 'A'; mode <= 'z'; mode++) + const PrefixModeList& list = GetPrefixModes(); + for (PrefixModeList::const_iterator i = list.begin(); i != list.end(); ++i) { - unsigned char pos = (mode-65) | MASK_CHANNEL; - ModeHandler* mh = modehandlers[pos]; - if ((mh) && (mh->GetNumParams(true)) && (mh->GetNumParams(false))) - { - ModePair ret; - ret = mh->ModeSet(NULL, user, channel, user->nick); - if ((ret.first) && (ret.second == user->nick)) - { - if (nick_suffix) - { - pars.append(" "); - pars.append(user->nick); - } - types.push_back(mh->GetModeChar()); - } - } + PrefixMode* pm = *i; + if (pm->GetPrefix() == pfxletter) + return pm; } - - if (nick_suffix) - return types+pars; - else - return types; + return NULL; } -std::string ModeParser::ChanModes() +std::string ModeParser::GiveModeList(ModeType mt) { std::string type1; /* Listmodes EXCEPT those with a prefix */ std::string type2; /* Modes that take a param when adding or removing */ @@ -936,205 +806,180 @@ std::string ModeParser::ChanModes() for (unsigned char mode = 'A'; mode <= 'z'; mode++) { - if ((!ServerInstance->Config->AllowHalfop) && (mode == 'h')) - continue; - - unsigned char pos = (mode-65) | MASK_CHANNEL; + ModeHandler* mh = modehandlers[mt][mode-65]; /* One parameter when adding */ - if (modehandlers[pos]) - { - if (modehandlers[pos]->GetNumParams(true)) + if (mh) + { + if (mh->GetNumParams(true)) { - if ((modehandlers[pos]->IsListMode()) && (!modehandlers[pos]->GetPrefix())) + PrefixMode* pm = mh->IsPrefixMode(); + if ((mh->IsListMode()) && ((!pm) || (pm->GetPrefix() == 0))) { - type1 += modehandlers[pos]->GetModeChar(); + type1 += mh->GetModeChar(); } else { /* ... and one parameter when removing */ - if (modehandlers[pos]->GetNumParams(false)) + if (mh->GetNumParams(false)) { /* But not a list mode */ - if (!modehandlers[pos]->GetPrefix()) + if (!pm) { - type2 += modehandlers[pos]->GetModeChar(); + type2 += mh->GetModeChar(); } } else { /* No parameters when removing */ - type3 += modehandlers[pos]->GetModeChar(); + type3 += mh->GetModeChar(); } } } else { - type4 += modehandlers[pos]->GetModeChar(); + type4 += mh->GetModeChar(); } } - } return type1 + "," + type2 + "," + type3 + "," + type4; } -bool ModeParser::PrefixComparison(prefixtype one, prefixtype two) -{ - return one.second > two.second; -} - -std::string ModeParser::BuildPrefixes() +std::string ModeParser::BuildPrefixes(bool lettersAndModes) { std::string mletters; std::string mprefixes; - pfxcontainer pfx; - std::map prefix_to_mode; + std::map > prefixes; - for (unsigned char mode = 'A'; mode <= 'z'; mode++) + const PrefixModeList& list = GetPrefixModes(); + for (PrefixModeList::const_iterator i = list.begin(); i != list.end(); ++i) { - if ((!ServerInstance->Config->AllowHalfop) && (mode == 'h')) - continue; - - unsigned char pos = (mode-65) | MASK_CHANNEL; - - if ((modehandlers[pos]) && (modehandlers[pos]->GetPrefix())) - { - pfx.push_back(std::make_pair(modehandlers[pos]->GetPrefix(), modehandlers[pos]->GetPrefixRank())); - prefix_to_mode[modehandlers[pos]->GetPrefix()] = modehandlers[pos]->GetModeChar(); - } + PrefixMode* pm = *i; + if (pm->GetPrefix()) + prefixes[pm->GetPrefixRank()] = std::make_pair(pm->GetPrefix(), pm->GetModeChar()); } - sort(pfx.begin(), pfx.end(), ModeParser::PrefixComparison); - - for (pfxcontainer::iterator n = pfx.begin(); n != pfx.end(); n++) + for(std::map >::reverse_iterator n = prefixes.rbegin(); n != prefixes.rend(); n++) { - mletters = mletters + n->first; - mprefixes = mprefixes + prefix_to_mode.find(n->first)->second; + mletters = mletters + n->second.first; + mprefixes = mprefixes + n->second.second; } - return "(" + mprefixes + ")" + mletters; + return lettersAndModes ? "(" + mprefixes + ")" + mletters : mletters; } -bool ModeParser::AddModeWatcher(ModeWatcher* mw) +void ModeParser::AddModeWatcher(ModeWatcher* mw) { - unsigned char mask = 0; - unsigned char pos = 0; - - if (!mw) - return false; - - if ((mw->GetModeChar() < 'A') || (mw->GetModeChar() > 'z')) - return false; - - mw->GetModeType() == MODETYPE_USER ? mask = MASK_USER : mask = MASK_CHANNEL; - pos = (mw->GetModeChar()-65) | mask; - - modewatchers[pos].push_back(mw); - - return true; + modewatchermap.insert(std::make_pair(mw->GetModeName(), mw)); } bool ModeParser::DelModeWatcher(ModeWatcher* mw) { - unsigned char mask = 0; - unsigned char pos = 0; - - if (!mw) - return false; - - if ((mw->GetModeChar() < 'A') || (mw->GetModeChar() > 'z')) - return false; - - mw->GetModeType() == MODETYPE_USER ? mask = MASK_USER : mask = MASK_CHANNEL; - pos = (mw->GetModeChar()-65) | mask; - - ModeWatchIter a = find(modewatchers[pos].begin(),modewatchers[pos].end(),mw); - - if (a == modewatchers[pos].end()) + std::pair itpair = modewatchermap.equal_range(mw->GetModeName()); + for (ModeWatchIter i = itpair.first; i != itpair.second; ++i) { - return false; + if (i->second == mw) + { + modewatchermap.erase(i); + return true; + } } - modewatchers[pos].erase(a); - - return true; + return false; } -/** This default implementation can remove simple user modes - */ -void ModeHandler::RemoveMode(User* user, irc::modestacker* stack) +void ModeHandler::RemoveMode(User* user) { - char moderemove[MAXBUF]; - const char* parameters[] = { user->nick, moderemove }; - + // Remove the mode if it's set on the user if (user->IsModeSet(this->GetModeChar())) { - if (stack) - { - stack->Push(this->GetModeChar()); - } - else - { - sprintf(moderemove,"-%c",this->GetModeChar()); - ServerInstance->Parser->CallHandler("MODE", parameters, 2, user); - } + std::vector parameters; + parameters.push_back(user->nick); + parameters.push_back("-"); + parameters[1].push_back(this->GetModeChar()); + ServerInstance->Modes->Process(parameters, ServerInstance->FakeClient, ModeParser::MODE_LOCALONLY); } } -/** This default implementation can remove simple channel modes - * (no parameters) - */ -void ModeHandler::RemoveMode(Channel* channel, irc::modestacker* stack) +void ModeHandler::RemoveMode(Channel* channel, irc::modestacker& stack) { - char moderemove[MAXBUF]; - const char* parameters[] = { channel->name, moderemove }; - - if (channel->IsModeSet(this->GetModeChar())) + if (channel->IsModeSet(this)) { - if (stack) - { - stack->Push(this->GetModeChar()); - } + if (this->GetNumParams(false)) + // Removing this mode requires a parameter + stack.Push(this->GetModeChar(), channel->GetModeParameter(this)); else - { - sprintf(moderemove,"-%c",this->GetModeChar()); - ServerInstance->SendMode(parameters, 2, ServerInstance->FakeClient); - } + stack.Push(this->GetModeChar()); + } +} + +void PrefixMode::RemoveMode(Channel* chan, irc::modestacker& stack) +{ + const Channel::MemberMap& userlist = chan->GetUsers(); + for (Channel::MemberMap::const_iterator i = userlist.begin(); i != userlist.end(); ++i) + { + if (i->second->hasMode(this->GetModeChar())) + stack.Push(this->GetModeChar(), i->first->nick); } } -ModeParser::ModeParser(InspIRCd* Instance) : ServerInstance(Instance) +struct builtin_modes { - ModeHandler* modes[] = + SimpleChannelModeHandler s; + SimpleChannelModeHandler p; + SimpleChannelModeHandler m; + SimpleChannelModeHandler t; + + SimpleChannelModeHandler n; + SimpleChannelModeHandler i; + ModeChannelKey k; + ModeChannelLimit l; + + ModeChannelBan b; + ModeChannelOp o; + ModeChannelVoice v; + + SimpleUserModeHandler ui; + ModeUserOperator uo; + ModeUserServerNoticeMask us; + + builtin_modes() + : s(NULL, "secret", 's') + , p(NULL, "private", 'p') + , m(NULL, "moderated", 'm') + , t(NULL, "topiclock", 't') + , n(NULL, "noextmsg", 'n') + , i(NULL, "inviteonly", 'i') + , ui(NULL, "invisible", 'i') + { + } + + void init() { - new ModeChannelSecret(Instance), - new ModeChannelPrivate(Instance), - new ModeChannelModerated(Instance), - new ModeChannelTopicOps(Instance), - new ModeChannelNoExternal(Instance), - new ModeChannelInviteOnly(Instance), - new ModeChannelKey(Instance), - new ModeChannelLimit(Instance), - new ModeChannelBan(Instance), - new ModeChannelOp(Instance), - new ModeChannelHalfOp(Instance), - new ModeChannelVoice(Instance), - new ModeUserServerNotice(Instance), - new ModeUserWallops(Instance), - new ModeUserInvisible(Instance), - new ModeUserOperator(Instance), - new ModeUserServerNoticeMask(Instance), - NULL - }; - - /* Clear mode list */ + ServiceProvider* modes[] = { &s, &p, &m, &t, &n, &i, &k, &l, &b, &o, &v, + &ui, &uo, &us }; + ServerInstance->Modules->AddServices(modes, sizeof(modes)/sizeof(ServiceProvider*)); + } +}; + +static builtin_modes static_modes; + +void ModeParser::InitBuiltinModes() +{ + static_modes.init(); + static_modes.b.DoRehash(); +} + +ModeParser::ModeParser() +{ + /* Clear mode handler list */ memset(modehandlers, 0, sizeof(modehandlers)); - memset(modewatchers, 0, sizeof(modewatchers)); + memset(modehandlersbyid, 0, sizeof(modehandlersbyid)); - /* Last parse string */ - LastParse.clear(); + seq = 0; + memset(&sent, 0, sizeof(sent)); +} - /* Initialise the RFC mode letters */ - for (int index = 0; modes[index]; index++) - this->AddMode(modes[index]); +ModeParser::~ModeParser() +{ }