X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmode.cpp;h=965619eea490dad84b951d91cbf7bf23145a6e2c;hb=d7ee3683a4d6d76113161be9754c007dee37d288;hp=c760df3f5c93f9940cce104feb9cba81c0c0b863;hpb=b4be0c94ab5fb7e5a7a799a195c78de072a5e315;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/mode.cpp b/src/mode.cpp index c760df3f5..965619eea 100644 --- a/src/mode.cpp +++ b/src/mode.cpp @@ -49,8 +49,9 @@ /* +s (server notice masks) */ #include "modes/umode_s.h" -ModeHandler::ModeHandler(InspIRCd* Instance, Module* Creator, char modeletter, int parameters_on, int parameters_off, bool listmode, ModeType type, bool operonly, char mprefix, char prefixrequired, TranslateType translate) - : ServerInstance(Instance), mode(modeletter), n_params_on(parameters_on), n_params_off(parameters_off), list(listmode), m_type(type), m_paramtype(translate), oper(operonly), prefix(mprefix), count(0), prefixneeded(prefixrequired), creator(Creator) +ModeHandler::ModeHandler(Module* Creator, char modeletter, ParamSpec Params, ModeType type) + : mode(modeletter), parameters_taken(Params), list(false), m_type(type), m_paramtype(TR_TEXT), + oper(false), prefix(0), count(0), levelrequired(HALFOP_VALUE), creator(Creator) { } @@ -63,18 +64,6 @@ bool ModeHandler::IsListMode() return list; } -char ModeHandler::GetNeededPrefix() -{ - if (prefixneeded == '%' && !ServerInstance->Config->AllowHalfop) - return '@'; - return prefixneeded; -} - -void ModeHandler::SetNeededPrefix(char needsprefix) -{ - prefixneeded = needsprefix; -} - unsigned int ModeHandler::GetPrefixRank() { return 0; @@ -91,29 +80,18 @@ void ModeHandler::ChangeCount(int modifier) ServerInstance->Logs->Log("MODE", DEBUG,"Change count for mode %c is now %d", mode, count); } -ModeType ModeHandler::GetModeType() -{ - return m_type; -} - -TranslateType ModeHandler::GetTranslateType() -{ - return m_paramtype; -} - -bool ModeHandler::NeedsOper() -{ - return oper; -} - -char ModeHandler::GetPrefix() -{ - return prefix; -} - int ModeHandler::GetNumParams(bool adding) { - return adding ? n_params_on : n_params_off; + switch (parameters_taken) + { + case PARAM_ALWAYS: + return 1; + case PARAM_SETONLY: + return adding ? 1 : 0; + case PARAM_NONE: + break; + } + return 0; } char ModeHandler::GetModeChar() @@ -126,6 +104,11 @@ std::string ModeHandler::GetUserParameter(User* user) return ""; } +ModResult ModeHandler::AccessCheck(User*, Channel*, std::string &, bool) +{ + return MOD_RES_PASSTHRU; +} + ModeAction ModeHandler::OnModeChange(User*, User*, Channel*, std::string&, bool) { return MODEACTION_DENY; @@ -155,7 +138,7 @@ void ModeHandler::OnParameterMissing(User* user, User* dest, Channel* channel) { } -bool ModeHandler::CheckTimeStamp(std::string& theirs, const std::string& ours, Channel*) +bool ModeHandler::ResolveModeConflict(std::string& theirs, const std::string& ours, Channel*) { return (theirs < ours); } @@ -205,7 +188,7 @@ ModeAction SimpleChannelModeHandler::OnModeChange(User* source, User* dest, Chan return MODEACTION_DENY; } -ModeWatcher::ModeWatcher(InspIRCd* Instance, char modeletter, ModeType type) : ServerInstance(Instance), mode(modeletter), m_type(type) +ModeWatcher::ModeWatcher(char modeletter, ModeType type) : mode(modeletter), m_type(type) { } @@ -285,30 +268,20 @@ ModeAction ModeParser::TryMode(User* user, User* targetuser, Channel* chan, bool int pcnt = mh->GetNumParams(adding); ModResult MOD_RESULT; - FIRST_MOD_RESULT(ServerInstance, OnRawMode, MOD_RESULT, (user, chan, modechar, parameter, adding, pcnt)); + FIRST_MOD_RESULT(OnRawMode, MOD_RESULT, (user, chan, modechar, parameter, adding, pcnt)); if (IS_LOCAL(user) && (MOD_RESULT == MOD_RES_DENY)) return MODEACTION_DENY; if (chan && !SkipACL && (MOD_RESULT != MOD_RES_ALLOW)) { - char needed = mh->GetNeededPrefix(); - ModeHandler* prefixmode = FindPrefix(needed); + MOD_RESULT = mh->AccessCheck(user, chan, parameter, adding); - /* 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) - { - needed = ServerInstance->Config->AllowHalfop ? '%' : '@'; - prefixmode = FindPrefix(needed); - } - - if (needed) + if (MOD_RESULT == MOD_RES_DENY) + return MODEACTION_DENY; + if (MOD_RESULT == MOD_RES_PASSTHRU) { - unsigned int neededrank = prefixmode->GetPrefixRank(); + 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 @@ -318,6 +291,8 @@ ModeAction ModeParser::TryMode(User* user, User* targetuser, Channel* chan, bool if (ourrank < neededrank) { /* Bog off */ + // TODO replace with a real search for the proper prefix + char needed = neededrank > HALFOP_VALUE ? '@' : '%'; user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :You must have channel privilege %c or above to %sset channel mode %c", user->nick.c_str(), chan->name.c_str(), needed, adding ? "" : "un", modechar); return MODEACTION_DENY; @@ -353,7 +328,7 @@ ModeAction ModeParser::TryMode(User* user, User* targetuser, Channel* chan, bool if (IS_OPER(user)) { user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Permission Denied - Oper type %s does not have access to set %s mode %c", - user->nick.c_str(), user->oper.c_str(), type == MODETYPE_CHANNEL ? "channel" : "user", modechar); + user->nick.c_str(), irc::Spacify(user->oper.c_str()), type == MODETYPE_CHANNEL ? "channel" : "user", modechar); } else { @@ -378,7 +353,7 @@ ModeAction ModeParser::TryMode(User* user, User* targetuser, Channel* chan, bool { User* user_to_prefix = ServerInstance->FindNick(parameter); if (user_to_prefix) - chan->SetPrefix(user_to_prefix, modechar, mh->GetPrefixRank(), adding); + chan->SetPrefix(user_to_prefix, modechar, adding); } for (ModeWatchIter watchers = modewatchers[handler_id].begin(); watchers != modewatchers[handler_id].end(); watchers++) @@ -419,13 +394,8 @@ void ModeParser::Process(const std::vector& parameters, User *user, } else { - /* Overall access control hook for mode change */ - int hook = targetchannel ? AC_GENERAL_MODE : AC_GENERAL_UMODE; - - LastParse = mode_sequence; ModResult MOD_RESULT; - FIRST_MOD_RESULT(ServerInstance, OnAccessCheck, MOD_RESULT, (user, targetuser, targetchannel, hook)); - LastParse.clear(); + FIRST_MOD_RESULT(OnPreMode, MOD_RESULT, (user, targetuser, targetchannel, parameters)); if (MOD_RESULT == MOD_RES_DENY) return; SkipAccessChecks = (MOD_RESULT == MOD_RES_ALLOW); @@ -480,7 +450,7 @@ void ModeParser::Process(const std::vector& parameters, User *user, if (merge && targetchannel && targetchannel->IsModeSet(modechar) && !mh->IsListMode()) { std::string ours = targetchannel->GetModeParameter(modechar); - if (!mh->CheckTimeStamp(parameter, ours, targetchannel)) + if (!mh->ResolveModeConflict(parameter, ours, targetchannel)) /* we won the mode merge, don't apply this mode */ continue; } @@ -501,9 +471,16 @@ void ModeParser::Process(const std::vector& parameters, User *user, if (pcnt) { + TranslateType tt = mh->GetTranslateType(); + if (tt == TR_NICK) + { + User* u = ServerInstance->FindNick(parameter); + if (u) + parameter = u->nick; + } output_parameters << " " << parameter; LastParseParams.push_back(parameter); - LastParseTranslate.push_back(mh->GetTranslateType()); + LastParseTranslate.push_back(tt); } if ( (output_mode.length() + output_parameters.str().length() > 450) @@ -568,7 +545,7 @@ void ModeParser::DisplayListModes(User* user, Channel* chan, std::string &mode_s return; ModResult MOD_RESULT; - FIRST_MOD_RESULT(ServerInstance, OnRawMode, MOD_RESULT, (user, chan, mletter, "", true, 0)); + FIRST_MOD_RESULT(OnRawMode, MOD_RESULT, (user, chan, mletter, "", true, 0)); if (MOD_RESULT == MOD_RES_DENY) continue; @@ -981,29 +958,29 @@ void ModeHandler::RemoveMode(Channel* channel, irc::modestacker* stack) } } -ModeParser::ModeParser(InspIRCd* Instance) : ServerInstance(Instance) +ModeParser::ModeParser() { ModeHandler* modes[] = { - 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 ModeUserWallops(Instance), - new ModeUserInvisible(Instance), - new ModeUserOperator(Instance), - new ModeUserServerNoticeMask(Instance), + new ModeChannelSecret, + new ModeChannelPrivate, + new ModeChannelModerated, + new ModeChannelTopicOps, + + new ModeChannelNoExternal, + new ModeChannelInviteOnly, + new ModeChannelKey, + new ModeChannelLimit, + + new ModeChannelBan, + new ModeChannelOp, + new ModeChannelHalfOp, + new ModeChannelVoice, + + new ModeUserWallops, + new ModeUserInvisible, + new ModeUserOperator, + new ModeUserServerNoticeMask, #define BUILTIN_MODE_COUNT 16 };