X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmode.cpp;h=c37407223e06ac9e8d73acb52afe28a68c41d2ba;hb=060f4034303f798ee0a55a926c2c2a120b865df4;hp=9c608c37a4285de0c10c2d36a389404b384b7f32;hpb=d9e3bb8d4343643504ab7ee6ab943a000065cc8a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/mode.cpp b/src/mode.cpp index 9c608c37a..c37407223 100644 --- a/src/mode.cpp +++ b/src/mode.cpp @@ -49,9 +49,9 @@ /* +s (server notice masks) */ #include "modes/umode_s.h" -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) +ModeHandler::ModeHandler(Module* Creator, const std::string& Name, char modeletter, ParamSpec Params, ModeType type) + : m_paramtype(TR_TEXT), parameters_taken(Params), mode(modeletter), prefix(0), oper(false), + list(false), m_type(type), count(0), levelrequired(HALFOP_VALUE), creator(Creator), name(Name) { } @@ -104,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; @@ -133,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); } @@ -183,7 +188,8 @@ 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(Module* Creator, char modeletter, ModeType type) + : mode(modeletter), m_type(type), creator(Creator) { } @@ -263,28 +269,35 @@ 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)) { - 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) - { - /* 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); + 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) + { + /* 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; + } } } @@ -316,7 +329,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 { @@ -326,6 +339,12 @@ ModeAction ModeParser::TryMode(User* user, User* targetuser, Channel* chan, bool return MODEACTION_DENY; } + if (mh->GetTranslateType() == TR_NICK && !ServerInstance->FindNick(parameter)) + { + user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel", user->nick.c_str(), parameter.c_str()); + return MODEACTION_DENY; + } + /* Call the handler for the mode */ ModeAction ma = mh->OnModeChange(user, targetuser, chan, parameter, adding); @@ -383,7 +402,7 @@ void ModeParser::Process(const std::vector& parameters, User *user, else { ModResult MOD_RESULT; - FIRST_MOD_RESULT(ServerInstance, OnPreMode, MOD_RESULT, (user, targetuser, targetchannel, parameters)); + FIRST_MOD_RESULT(OnPreMode, MOD_RESULT, (user, targetuser, targetchannel, parameters)); if (MOD_RESULT == MOD_RES_DENY) return; SkipAccessChecks = (MOD_RESULT == MOD_RES_ALLOW); @@ -438,7 +457,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; } @@ -459,9 +478,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) @@ -526,7 +552,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; @@ -664,6 +690,22 @@ bool ModeParser::DelMode(ModeHandler* mh) return true; } +void ModeParser::RemoveModes(Module* mod) +{ + for(int i=0; i < 256; i++) + { + ModeHandler* mh = modehandlers[i]; + if (mh && mh->creator == mod) + DelMode(mh); + for(unsigned int j=0; j < modewatchers[i].size(); j++) + { + ModeWatcher* mw = modewatchers[i][j]; + if (mw && mw->creator == mod) + DelModeWatcher(mw); + } + } +} + ModeHandler* ModeParser::FindMode(unsigned const char modeletter, ModeType mt) { unsigned char mask = 0; @@ -939,58 +981,67 @@ void ModeHandler::RemoveMode(Channel* channel, irc::modestacker* stack) } } -ModeParser::ModeParser(InspIRCd* Instance) +struct builtin_modes { - ModeHandler* modes[] = + ModeChannelSecret s; + ModeChannelPrivate p; + ModeChannelModerated m; + ModeChannelTopicOps t; + + ModeChannelNoExternal n; + ModeChannelInviteOnly i; + ModeChannelKey k; + ModeChannelLimit l; + + ModeChannelBan b; + ModeChannelOp o; + // halfop is added by configreader + ModeChannelVoice v; + + ModeUserWallops uw; + ModeUserInvisible ui; + ModeUserOperator uo; + ModeUserServerNoticeMask us; + + void init(ModeParser* 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), + modes->AddMode(&s); + modes->AddMode(&p); + modes->AddMode(&m); + modes->AddMode(&t); + modes->AddMode(&n); + modes->AddMode(&i); + modes->AddMode(&k); + modes->AddMode(&l); + modes->AddMode(&b); + modes->AddMode(&o); + modes->AddMode(&v); + modes->AddMode(&uw); + modes->AddMode(&ui); + modes->AddMode(&uo); + modes->AddMode(&us); + } +}; - new ModeUserWallops(Instance), - new ModeUserInvisible(Instance), - new ModeUserOperator(Instance), - new ModeUserServerNoticeMask(Instance), -#define BUILTIN_MODE_COUNT 16 - }; +static builtin_modes static_modes; +ModeParser::ModeParser() +{ /* Clear mode handler list */ memset(modehandlers, 0, sizeof(modehandlers)); /* Last parse string */ LastParse.clear(); - /* Initialise the RFC mode letters */ - for (int index = 0; index < BUILTIN_MODE_COUNT; index++) - this->AddMode(modes[index]); - seq = 0; memset(&sent, 0, sizeof(sent)); + + static_modes.init(this); } ModeParser::~ModeParser() { - int count = 0; - for(int i=0; i < 256; i++) - { - ModeHandler* mh = modehandlers[i]; - if (mh) - { - count++; - delete mh; - } - } - if (count != BUILTIN_MODE_COUNT) - throw CoreException("Mode handler found non-core modes remaining at deallocation"); + ModeHandler* mh = ServerInstance->Modes->FindMode('h', MODETYPE_CHANNEL); + if (mh) + delete mh; }