X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmode.cpp;h=e58dd67628888b63a79a17771f3fe0e4d4ea3035;hb=32a26fa539242d009ffab01e09cafdaba9270dac;hp=6ee841301d1dd61baa574227e5a6a932490af8a0;hpb=76ebc88ccd6fef0bf2d97b607829fb3466e273af;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/mode.cpp b/src/mode.cpp index 6ee841301..e58dd6762 100644 --- a/src/mode.cpp +++ b/src/mode.cpp @@ -2,32 +2,22 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. + * InspIRCd: (C) 2002-2008 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits + * * This program is free but copyrighted software; see - * the file COPYING for details. + * the file COPYING for details. * * --------------------------------------------------- */ -using namespace std; +/* $Core: libIRCDmode */ +/* $ExtraDeps: $(RELCPPFILES) */ +/* $ExtraObjects: modes/modeclasses.a */ +/* $ExtraBuild: @${MAKE} -C "modes" DIRNAME="src/modes" CC="$(CC)" $(MAKEARGS) CPPFILES="$(CPPFILES)" */ -#include "inspircd_config.h" #include "inspircd.h" -#include "configreader.h" -#include -#include "hash_map.h" -#include "connection.h" -#include "users.h" -#include "modules.h" #include "inspstring.h" -#include "helperfuncs.h" -#include "commands.h" -#include "mode.h" /* +s (secret) */ #include "modes/cmode_s.h" @@ -53,7 +43,6 @@ using namespace std; #include "modes/cmode_h.h" /* +v (channel voice) */ #include "modes/cmode_v.h" - /* +s (server notices) */ #include "modes/umode_s.h" /* +w (see wallops) */ @@ -65,8 +54,8 @@ using namespace std; /* +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) - : ServerInstance(Instance), mode(modeletter), n_params_on(parameters_on), n_params_off(parameters_off), list(listmode), m_type(type), oper(operonly) +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) { } @@ -79,6 +68,32 @@ bool ModeHandler::IsListMode() return list; } +char ModeHandler::GetNeededPrefix() +{ + return prefixneeded; +} + +void ModeHandler::SetNeededPrefix(char needsprefix) +{ + prefixneeded = needsprefix; +} + +unsigned int ModeHandler::GetPrefixRank() +{ + return 0; +} + +unsigned int ModeHandler::GetCount() +{ + return 0; +} + +void ModeHandler::ChangeCount(int modifier) +{ + count += modifier; + ServerInstance->Log(DEBUG,"Change count for mode %c is now %d", mode, count); +} + ModeType ModeHandler::GetModeType() { return m_type; @@ -89,6 +104,11 @@ bool ModeHandler::NeedsOper() return oper; } +char ModeHandler::GetPrefix() +{ + return prefix; +} + int ModeHandler::GetNumParams(bool adding) { return adding ? n_params_on : n_params_off; @@ -99,12 +119,12 @@ char ModeHandler::GetModeChar() return mode; } -ModeAction ModeHandler::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) +ModeAction ModeHandler::OnModeChange(User*, User*, Channel*, std::string&, bool, bool) { return MODEACTION_DENY; } -ModePair ModeHandler::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter) +ModePair ModeHandler::ModeSet(User*, User* dest, Channel* channel, const std::string&) { if (dest) { @@ -116,11 +136,15 @@ ModePair ModeHandler::ModeSet(userrec* source, userrec* dest, chanrec* channel, } } -void ModeHandler::DisplayList(userrec* user, chanrec* channel) +void ModeHandler::DisplayList(User*, Channel*) +{ +} + +void ModeHandler::DisplayEmptyList(User*, Channel*) { } -bool ModeHandler::CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel) +bool ModeHandler::CheckTimeStamp(time_t theirs, time_t ours, const std::string&, const std::string&, Channel*) { return (ours < theirs); } @@ -143,18 +167,18 @@ ModeType ModeWatcher::GetModeType() return m_type; } -bool ModeWatcher::BeforeMode(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding, ModeType type) +bool ModeWatcher::BeforeMode(User*, User*, Channel*, std::string&, bool, ModeType, bool) { return true; } -void ModeWatcher::AfterMode(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter, bool adding, ModeType type) +void ModeWatcher::AfterMode(User*, User*, Channel*, const std::string&, bool, ModeType, bool) { } -userrec* ModeParser::SanityChecks(userrec *user,const char *dest,chanrec *chan,int status) +User* ModeParser::SanityChecks(User *user, const char *dest, Channel *chan, int) { - userrec *d; + User *d; if ((!user) || (!dest) || (!chan) || (!*dest)) { return NULL; @@ -168,89 +192,96 @@ userrec* ModeParser::SanityChecks(userrec *user,const char *dest,chanrec *chan,i return d; } -const char* ModeParser::Grant(userrec *d,chanrec *chan,int MASK) +const char* ModeParser::Grant(User *d,Channel *chan,int MASK) { if (!chan) return ""; - for (std::vector::const_iterator i = d->chans.begin(); i != d->chans.end(); i++) + UCListIter n = d->chans.find(chan); + if (n != d->chans.end()) { - ucrec* n = (ucrec*)(*i); - if (n->channel == chan) + if (n->second & MASK) { - if (n->uc_modes & MASK) - { - return ""; - } - n->uc_modes = n->uc_modes | MASK; - switch (MASK) - { - case UCMODE_OP: - n->channel->AddOppedUser(d); - break; - case UCMODE_HOP: - n->channel->AddHalfoppedUser(d); - break; - case UCMODE_VOICE: - n->channel->AddVoicedUser(d); - break; - } - log(DEBUG,"grant: %s %s",n->channel->name,d->nick); - return d->nick; + 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; } return ""; } -const char* ModeParser::Revoke(userrec *d,chanrec *chan,int MASK) +const char* ModeParser::Revoke(User *d,Channel *chan,int MASK) { if (!chan) return ""; - for (std::vector::const_iterator i = d->chans.begin(); i != d->chans.end(); i++) + UCListIter n = d->chans.find(chan); + if (n != d->chans.end()) { - ucrec* n = (ucrec*)(*i); - if (n->channel == chan) + if ((n->second & MASK) == 0) { - if ((n->uc_modes & MASK) == 0) - { - return ""; - } - n->uc_modes ^= MASK; - switch (MASK) - { - case UCMODE_OP: - n->channel->DelOppedUser(d); - break; - case UCMODE_HOP: - n->channel->DelHalfoppedUser(d); - break; - case UCMODE_VOICE: - n->channel->DelVoicedUser(d); - break; - } - log(DEBUG,"revoke: %s %s",n->channel->name,d->nick); - return d->nick; + 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; } return ""; } -void ModeParser::DisplayCurrentModes(userrec *user, userrec* targetuser, chanrec* targetchannel, const char* text) +void ModeParser::DisplayCurrentModes(User *user, User* targetuser, Channel* targetchannel, const char* text) { if (targetchannel) { /* Display channel's current mode string */ user->WriteServ("324 %s %s +%s",user->nick, targetchannel->name, targetchannel->ChanModes(targetchannel->HasUser(user))); - user->WriteServ("329 %s %s %d", user->nick, targetchannel->name, targetchannel->created); + user->WriteServ("329 %s %s %lu", user->nick, targetchannel->name, (unsigned long)targetchannel->age); return; } else if (targetuser) { - /* Display user's current mode string */ - user->WriteServ("221 %s :+%s",targetuser->nick,targetuser->FormatModes()); - user->WriteServ("008 %s :+%s", targetuser->nick, targetuser->FormatNoticeMasks()); - return; + if (targetuser->Visibility && !targetuser->Visibility->VisibleTo(user)) + { + user->WriteServ("401 %s %s :No such nick/channel",user->nick, text); + return; + } + + if ((targetuser == user) || (IS_OPER(user))) + { + /* Display user's current mode string */ + user->WriteServ("221 %s :+%s",targetuser->nick,targetuser->FormatModes()); + if (IS_OPER(targetuser)) + user->WriteServ("008 %s +%s :Server notice mask", targetuser->nick, targetuser->FormatNoticeMasks()); + return; + } + else + { + user->WriteServ("502 %s :Can't change mode for other users", user->nick); + return; + } } /* No such nick/channel */ @@ -258,15 +289,15 @@ void ModeParser::DisplayCurrentModes(userrec *user, userrec* targetuser, chanrec return; } -void ModeParser::Process(const char** parameters, int pcnt, userrec *user, bool servermode) +void ModeParser::Process(const char** parameters, int pcnt, User *user, bool servermode) { std::string target = parameters[0]; ModeType type = MODETYPE_USER; unsigned char mask = 0; - chanrec* targetchannel = ServerInstance->FindChan(parameters[0]); - userrec* targetuser = ServerInstance->FindNick(parameters[0]); + Channel* targetchannel = ServerInstance->FindChan(parameters[0]); + User* targetuser = ServerInstance->FindNick(parameters[0]); - log(DEBUG,"ModeParser::Process start"); + LastParse.clear(); /* Special case for displaying the list for listmodes, * e.g. MODE #chan b, or MODE #chan +b without a parameter @@ -274,15 +305,80 @@ void ModeParser::Process(const char** parameters, int pcnt, userrec *user, bool if ((targetchannel) && (pcnt == 2)) { const char* mode = parameters[1]; - if (*mode == '+') - mode++; - unsigned char handler_id = ((*mode) - 65) | MASK_CHANNEL; - ModeHandler* mh = modehandlers[handler_id]; - if ((mh) && (mh->IsListMode())) + int nonlistmodes_found = 0; + bool sent[256]; + + mask = MASK_CHANNEL; + + memset(&sent, 0, 256); + + while (mode && *mode) { - mh->DisplayList(user, targetchannel); - return; + unsigned char mletter = *mode; + + if (*mode == '+') + { + mode++; + 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 + { + mode++; + continue; + } + + ModeHandler *mh = this->FindMode(*mode, MODETYPE_CHANNEL); + bool display = true; + + 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 (ServerInstance->Config->HideModeLists[mletter] && (targetchannel->GetStatus(user) < STATUS_HOP)) + { + user->WriteServ("482 %s %s :Only half-operators and above may view the +%c list",user->nick, targetchannel->name, *mode++); + mh->DisplayEmptyList(user, targetchannel); + continue; + } + + /** See below for a description of what craq this is :D + */ + unsigned char handler_id = (*mode - 65) | mask; + + 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 (display) + mh->DisplayList(user, targetchannel); + } + else + nonlistmodes_found++; + + mode++; } + + /* We didnt have any modes that were non-list, we can return here */ + if (!nonlistmodes_found) + return; } if (pcnt == 1) @@ -291,6 +387,8 @@ void ModeParser::Process(const char** parameters, int pcnt, userrec *user, bool } else if (pcnt > 1) { + bool SkipAccessChecks = false; + if (targetchannel) { type = MODETYPE_CHANNEL; @@ -300,27 +398,25 @@ void ModeParser::Process(const char** parameters, int pcnt, userrec *user, bool * (e.g. are they a (half)op? */ - if ((IS_LOCAL(user)) && (targetchannel->GetStatus(user) < STATUS_HOP)) + if ((IS_LOCAL(user)) && (!ServerInstance->ULine(user->server)) && (!servermode)) { /* We don't have halfop */ - log(DEBUG,"The user is not a halfop or above, checking other reasons for being able to set the modes"); - - /* Are we a uline or is it a servermode? */ - if ((!is_uline(user->server)) && (!servermode)) - { - /* Not enough permission: - * NOT a uline and NOT a servermode, - * OR, NOT halfop or above. - */ - user->WriteServ("482 %s %s :You're not a channel (half)operator",user->nick, targetchannel->name); + 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->WriteServ("502 %s :Can't change mode for other users", user->nick); + return; + } } else { @@ -330,12 +426,18 @@ void ModeParser::Process(const char** parameters, int pcnt, userrec *user, bool } std::string mode_sequence = parameters[1]; - std::string parameter = ""; + std::string parameter; std::ostringstream parameter_list; - std::string output_sequence = ""; + 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++) { @@ -357,12 +459,16 @@ void ModeParser::Process(const char** parameters, int pcnt, userrec *user, bool 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: @@ -382,37 +488,109 @@ void ModeParser::Process(const char** parameters, int pcnt, userrec *user, bool { bool abort = false; - for (ModeWatchIter watchers = modewatchers[handler_id].begin(); watchers != modewatchers[handler_id].end(); watchers++) - { - if ((*watchers)->BeforeMode(user, targetuser, targetchannel, parameter, adding, type) == MODEACTION_DENY) - abort = true; - } - if ((modehandlers[handler_id]->GetModeType() == type) && (!abort)) + 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)) + { + ServerInstance->Log(DEBUG,"Enter minimum prefix check"); + /* Check access to this mode character */ + if ((type == MODETYPE_CHANNEL) && (modehandlers[handler_id]->GetNeededPrefix())) + { + char needed = modehandlers[handler_id]->GetNeededPrefix(); + ModeHandler* prefixmode = FindPrefix(needed); + ServerInstance->Log(DEBUG,"Needed prefix: %c", 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->WriteServ("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->oper)) + if ((IS_LOCAL(user)) && (modehandlers[handler_id]->NeedsOper()) && (!IS_OPER(user))) + { + user->WriteServ("481 %s :Permission Denied - Only IRC 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); + ModeAction ma = modehandlers[handler_id]->OnModeChange(user, targetuser, targetchannel, parameter, adding, servermode); - if ((modehandlers[handler_id]->GetNumParams(adding)) && (parameter == "")) + 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, @@ -425,73 +603,100 @@ void ModeParser::Process(const char** parameters, int pcnt, userrec *user, bool { /* We're about to output a valid mode letter - was there previously a pending state-change? */ if (state_change) - output_sequence.append(adding ? "+" : "-"); + { + 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 != "")) + 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); + (*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("472 %s %c :is unknown mode char to me",user->nick, modechar); + user->WriteServ("%d %s %c :is unknown mode char to me", type == MODETYPE_CHANNEL ? 472 : 501, user->nick, modechar); } break; } } + /* Was there at least one valid mode in the sequence? */ - if (output_sequence != "") + if (!output_sequence.empty()) { 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",targetuser->nick,output_sequence.c_str()); + targetuser->WriteServ("MODE %s %s%s",targetuser->nick,output_sequence.c_str(), parameter_list.str().c_str()); + this->LastParse = targetuser->nick; } } else { if (type == MODETYPE_CHANNEL) { - log(DEBUG,"Write output sequence and parameters to channel: %s %s%s",targetchannel->name,output_sequence.c_str(),parameter_list.str().c_str()); 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 { - user->WriteTo(targetuser,"MODE %s %s",targetuser->nick,output_sequence.c_str()); - FOREACH_MOD(I_OnMode,OnMode(user, targetuser, TYPE_USER, output_sequence)); + 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; } } + + LastParse.append(" "); + LastParse.append(output_sequence); + LastParse.append(parameter_list.str()); } } } - -void cmd_mode::Handle (const char** parameters, int pcnt, userrec *user) +const std::string& ModeParser::GetLastParse() { - if (!user) - return; - - ServerInstance->ModeGrok->Process(parameters, pcnt, user, false); - - return; + return LastParse; } void ModeParser::CleanMask(std::string &mask) @@ -527,7 +732,7 @@ void ModeParser::CleanMask(std::string &mask) } } -bool ModeParser::AddMode(ModeHandler* mh, unsigned const char modeletter) +bool ModeParser::AddMode(ModeHandler* mh) { unsigned char mask = 0; unsigned char pos = 0; @@ -536,7 +741,14 @@ bool ModeParser::AddMode(ModeHandler* mh, unsigned const char modeletter) * 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')) + if ((mh->GetModeChar() < 'A') || (mh->GetModeChar() > 'z') || (mh->GetPrefix() > 126)) + return false; + + /* 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; mh->GetModeType() == MODETYPE_USER ? mask = MASK_USER : mask = MASK_CHANNEL; @@ -546,7 +758,41 @@ bool ModeParser::AddMode(ModeHandler* mh, unsigned const char modeletter) return false; modehandlers[pos] = mh; - log(DEBUG,"ModeParser::AddMode: added mode %c",mh->GetModeChar()); + return true; +} + +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; + + if (!modehandlers[pos]) + return false; + + switch (mh->GetModeType()) + { + case MODETYPE_USER: + for (user_hash::iterator i = ServerInstance->Users->clientlist->begin(); i != ServerInstance->Users->clientlist->end(); i++) + { + mh->RemoveMode(i->second); + } + break; + case MODETYPE_CHANNEL: + for (chan_hash::iterator i = ServerInstance->chanlist->begin(); i != ServerInstance->chanlist->end(); i++) + { + mh->RemoveMode(i->second); + } + break; + } + + modehandlers[pos] = NULL; + return true; } @@ -587,6 +833,9 @@ std::string ModeParser::ChannelModeList() 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]) @@ -603,6 +852,9 @@ std::string ModeParser::ParaModeList() 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))) @@ -612,6 +864,136 @@ std::string ModeParser::ParaModeList() return modestr; } +ModeHandler* ModeParser::FindPrefix(unsigned const char pfxletter) +{ + 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; +} + +std::string ModeParser::ModeString(User* user, Channel* channel) +{ + std::string types; + std::string pars; + + if (!channel || !user) + return ""; + + for (unsigned char mode = 'A'; mode <= 'z'; mode++) + { + 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)) + { + pars.append(" "); + pars.append(user->nick); + types.push_back(mh->GetModeChar()); + } + } + } + + return types+pars; +} + +std::string ModeParser::ChanModes() +{ + std::string type1; /* Listmodes EXCEPT those with a prefix */ + std::string type2; /* Modes that take a param when adding or removing */ + std::string type3; /* Modes that only take a param when adding */ + std::string type4; /* Modes that dont take a param */ + + for (unsigned char mode = 'A'; mode <= 'z'; mode++) + { + if ((!ServerInstance->Config->AllowHalfop) && (mode == 'h')) + continue; + + unsigned char pos = (mode-65) | MASK_CHANNEL; + /* One parameter when adding */ + if (modehandlers[pos]) + { + if (modehandlers[pos]->GetNumParams(true)) + { + if ((modehandlers[pos]->IsListMode()) && (!modehandlers[pos]->GetPrefix())) + { + type1 += modehandlers[pos]->GetModeChar(); + } + else + { + /* ... and one parameter when removing */ + if (modehandlers[pos]->GetNumParams(false)) + { + /* But not a list mode */ + if (!modehandlers[pos]->GetPrefix()) + { + type2 += modehandlers[pos]->GetModeChar(); + } + } + else + { + /* No parameters when removing */ + type3 += modehandlers[pos]->GetModeChar(); + } + } + } + else + { + type4 += modehandlers[pos]->GetModeChar(); + } + } + + } + + return type1 + "," + type2 + "," + type3 + "," + type4; +} + +bool ModeParser::PrefixComparison(prefixtype one, prefixtype two) +{ + return one.second > two.second; +} + +std::string ModeParser::BuildPrefixes() +{ + std::string mletters; + std::string mprefixes; + pfxcontainer pfx; + std::map prefix_to_mode; + + 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]->GetPrefix())) + { + pfx.push_back(std::make_pair(modehandlers[pos]->GetPrefix(), modehandlers[pos]->GetPrefixRank())); + prefix_to_mode[modehandlers[pos]->GetPrefix()] = modehandlers[pos]->GetModeChar(); + } + } + + sort(pfx.begin(), pfx.end(), ModeParser::PrefixComparison); + + for (pfxcontainer::iterator n = pfx.begin(); n != pfx.end(); n++) + { + mletters = mletters + n->first; + mprefixes = mprefixes + prefix_to_mode.find(n->first)->second; + } + + return "(" + mprefixes + ")" + mletters; +} + bool ModeParser::AddModeWatcher(ModeWatcher* mw) { unsigned char mask = 0; @@ -627,7 +1009,6 @@ bool ModeParser::AddModeWatcher(ModeWatcher* mw) pos = (mw->GetModeChar()-65) | mask; modewatchers[pos].push_back(mw); - log(DEBUG,"ModeParser::AddModeWatcher: watching mode %c",mw->GetModeChar()); return true; } @@ -640,7 +1021,7 @@ bool ModeParser::DelModeWatcher(ModeWatcher* mw) if (!mw) return false; - if ((mw->GetModeType() < 'A') || (mw->GetModeType() > 'z')) + if ((mw->GetModeChar() < 'A') || (mw->GetModeChar() > 'z')) return false; mw->GetModeType() == MODETYPE_USER ? mask = MASK_USER : mask = MASK_CHANNEL; @@ -649,69 +1030,76 @@ bool ModeParser::DelModeWatcher(ModeWatcher* mw) ModeWatchIter a = find(modewatchers[pos].begin(),modewatchers[pos].end(),mw); if (a == modewatchers[pos].end()) + { return false; + } modewatchers[pos].erase(a); - log(DEBUG,"ModeParser::DelModeWatcher: stopped watching mode %c",mw->GetModeChar()); return true; } -ModeParser::ModeParser(InspIRCd* Instance) : ServerInstance(Instance) +/** This default implementation can remove simple user modes + */ +void ModeHandler::RemoveMode(User* user) { - /* Clear mode list */ - memset(modehandlers, 0, sizeof(modehandlers)); - memset(modewatchers, 0, sizeof(modewatchers)); - - /* Initialise the RFC mode letters */ - - /* Start with channel simple modes, no params */ - this->AddMode(new ModeChannelSecret(Instance), 's'); - this->AddMode(new ModeChannelPrivate(Instance), 'p'); - this->AddMode(new ModeChannelModerated(Instance), 'm'); - this->AddMode(new ModeChannelTopicOps(Instance), 't'); - this->AddMode(new ModeChannelNoExternal(Instance), 'n'); - this->AddMode(new ModeChannelInviteOnly(Instance), 'i'); - - /* Cannel modes with params */ - this->AddMode(new ModeChannelKey(Instance), 'k'); - this->AddMode(new ModeChannelLimit(Instance), 'l'); + char moderemove[MAXBUF]; + const char* parameters[] = { user->nick, moderemove }; - /* Channel listmodes */ - this->AddMode(new ModeChannelBan(Instance), 'b'); - this->AddMode(new ModeChannelOp(Instance), 'o'); - this->AddMode(new ModeChannelHalfOp(Instance), 'h'); - this->AddMode(new ModeChannelVoice(Instance), 'v'); - - /* Now for usermodes */ - this->AddMode(new ModeUserServerNotice(Instance), 's'); - this->AddMode(new ModeUserWallops(Instance), 'w'); - this->AddMode(new ModeUserInvisible(Instance), 'i'); - this->AddMode(new ModeUserOperator(Instance), 'o'); - this->AddMode(new ModeUserServerNoticeMask(Instance), 'n'); + if (user->IsModeSet(this->GetModeChar())) + { + sprintf(moderemove,"-%c",this->GetModeChar()); + ServerInstance->Parser->CallHandler("MODE", parameters, 2, user); + } } -bool ModeParser::InsertMode(std::string &output, const char* mode, unsigned short section) +/** This default implementation can remove simple channel modes + * (no parameters) + */ +void ModeHandler::RemoveMode(Channel* channel) { - unsigned short currsection = 1; - unsigned int pos = output.find("CHANMODES=", 0) + 10; // +10 for the length of "CHANMODES=" + char moderemove[MAXBUF]; + const char* parameters[] = { channel->name, moderemove }; - if(section > 4 || section == 0) + if (channel->IsModeSet(this->GetModeChar())) { - log(DEBUG, "InsertMode: CHANMODES doesn't have a section %dh :/", section); - return false; + sprintf(moderemove,"-%c",this->GetModeChar()); + ServerInstance->SendMode(parameters, 2, ServerInstance->FakeClient); } +} - for(; pos < output.size(); pos++) +ModeParser::ModeParser(InspIRCd* Instance) : ServerInstance(Instance) +{ + ModeHandler* modes[] = { - if(section == currsection) - break; + 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 + }; - if(output[pos] == ',') - currsection++; - } + /* Clear mode list */ + memset(modehandlers, 0, sizeof(modehandlers)); + memset(modewatchers, 0, sizeof(modewatchers)); - output.insert(pos, mode); - return true; -} + /* Last parse string */ + LastParse.clear(); + /* Initialise the RFC mode letters */ + for (int index = 0; modes[index]; index++) + this->AddMode(modes[index]); +}