X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_messageflood.cpp;h=6079eb47b733c27b9ebdf421836ae57ddbf77163;hb=6ab1d0dffb8084bf6a2ad8a446a3836fa3760c8a;hp=61682c26f87ae95c8d6649b389436866e39d3466;hpb=ca63c99e8b662b0cfa5516028aa1cae3abc8186a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp index 61682c26f..6079eb47b 100644 --- a/src/modules/m_messageflood.cpp +++ b/src/modules/m_messageflood.cpp @@ -25,7 +25,7 @@ using namespace std; /* $ModDesc: Provides channel mode +f (message flood protection) */ -class floodsettings +class floodsettings : public classbase { public: bool ban; @@ -83,101 +83,125 @@ class floodsettings } }; -class ModuleMsgFlood : public Module +class MsgFlood : public ModeHandler { - Server *Srv; - public: - - ModuleMsgFlood(Server* Me) - : Module::Module(Me) + MsgFlood() : ModeHandler('f', 1, 0, false, MODETYPE_CHANNEL, false) { } + + ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter) + { + floodsettings* x; + if (channel->GetExt("flood",x)) + return std::make_pair(true, (x->ban ? "*" : "")+ConvToStr(x->lines)+":"+ConvToStr(x->secs)); + else + return std::make_pair(false, parameter); + } + + bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel) { - Srv = Me; - Srv->AddExtendedMode('f',MT_CHANNEL,false,1,0); + /* When TS is equal, the alphabetically later one wins */ + return (their_param < our_param); } - - virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list ¶ms) + + ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) { - if ((modechar == 'f') && (type == MT_CHANNEL)) + floodsettings *f; + + if (adding) { - if (mode_on) + char ndata[MAXBUF]; + char* data = ndata; + strlcpy(ndata,parameter.c_str(),MAXBUF); + char* lines = data; + char* secs = NULL; + bool ban = false; + if (*data == '*') { - std::string FloodParams = params[0]; - chanrec* c = (chanrec*)target; - char ndata[MAXBUF]; - char* data = ndata; - strlcpy(ndata,FloodParams.c_str(),MAXBUF); - char* lines = data; - char* secs = NULL; - bool ban = false; - if (*data == '*') - { - ban = true; - lines++; - } - else + ban = true; + lines++; + } + else + { + ban = false; + } + while (*data) + { + if (*data == ':') { - ban = false; + *data = 0; + data++; + secs = data; + break; } - while (*data) + else data++; + } + if (secs) + { + /* Set up the flood parameters for this channel */ + int nlines = atoi(lines); + int nsecs = atoi(secs); + if ((nlines<1) || (nsecs<1)) { - if (*data == ':') - { - *data = 0; - data++; - secs = data; - break; - } - else data++; + WriteServ(source->fd,"608 %s %s :Invalid flood parameter",source->nick,channel->name); + parameter = ""; + return MODEACTION_DENY; } - if (secs) + else { - /* Set up the flood parameters for this channel */ - int nlines = atoi(lines); - int nsecs = atoi(secs); - if ((nlines<1) || (nsecs<1)) + if (!channel->GetExt("flood", f)) { - WriteServ(user->fd,"608 %s %s :Invalid flood parameter",user->nick,c->name); - return 0; + parameter = ConvToStr(nlines) + ":" +ConvToStr(nsecs); + floodsettings *f = new floodsettings(ban,nsecs,nlines); + channel->Extend("flood",f); + channel->SetMode('f', true); + channel->SetModeParam('f', parameter.c_str(), true); + return MODEACTION_ALLOW; } - else - { - if (!c->GetExt("flood")) - { - floodsettings *f = new floodsettings(ban,nsecs,nlines); - c->Extend("flood",(char*)f); - } - } - return 1; } - else - { - WriteServ(user->fd,"608 %s %s :Invalid flood parameter",user->nick,c->name); - return 0; - } - } else { - chanrec* c = (chanrec*)target; - if (c->GetExt("flood")) - { - floodsettings *f = (floodsettings*)c->GetExt("flood"); - delete f; - c->Shrink("flood"); - } + WriteServ(source->fd,"608 %s %s :Invalid flood parameter",source->nick,channel->name); + parameter = ""; + return MODEACTION_DENY; } - return 1; } - return 0; + else + { + if (channel->GetExt("flood", f)) + { + DELETE(f); + channel->Shrink("flood"); + channel->SetMode('f', false); + return MODEACTION_ALLOW; + } + } + + return MODEACTION_DENY; } +}; +class ModuleMsgFlood : public Module +{ + Server *Srv; + MsgFlood* mf; + + public: + + ModuleMsgFlood(Server* Me) + : Module::Module(Me) + { + Srv = Me; + mf = new MsgFlood(); + Srv->AddMode(mf, 'f'); + } + void ProcessMessages(userrec* user,chanrec* dest, const std::string &text) { if (IS_LOCAL(user)) { - floodsettings *f = (floodsettings*)dest->GetExt("flood"); - if (f) + floodsettings *f; + if (dest->GetExt("flood", f)) { f->addmessage(user); if (f->shouldkick(user)) @@ -186,13 +210,25 @@ class ModuleMsgFlood : public Module f->clear(user); if (f->ban) { - char* parameters[3]; + const char* parameters[3]; parameters[0] = dest->name; parameters[1] = "+b"; parameters[2] = user->MakeWildHost(); Srv->SendMode(parameters,3,user); + std::deque n; + /* Propogate the ban to other servers. + * We dont know what protocol we may be using, + * so this event is picked up by our protocol + * module and formed into a ban command that + * suits the protocol in use. + */ + n.push_back(dest->name); + n.push_back("+b"); + n.push_back(user->MakeWildHost()); + Event rmode((char *)&n, NULL, "send_mode"); + rmode.Send(); } - Srv->KickUser(NULL, user, dest, "Channel flood triggered (mode +f)"); + dest->ServerKickUser(user, "Channel flood triggered (mode +f)", true); } } } @@ -216,17 +252,17 @@ class ModuleMsgFlood : public Module void OnChannelDelete(chanrec* chan) { - if (chan->GetExt("flood")) + floodsettings* f; + if (chan->GetExt("flood", f)) { - floodsettings *f = (floodsettings*)chan->GetExt("flood"); - delete f; + DELETE(f); chan->Shrink("flood"); } } void Implements(char* List) { - List[I_On005Numeric] = List[I_OnExtendedMode] = List[I_OnChannelDelete] = List[I_OnUserNotice] = List[I_OnUserMessage] = 1; + List[I_On005Numeric] = List[I_OnChannelDelete] = List[I_OnUserNotice] = List[I_OnUserMessage] = 1; } virtual void On005Numeric(std::string &output) @@ -236,6 +272,7 @@ class ModuleMsgFlood : public Module virtual ~ModuleMsgFlood() { + DELETE(mf); } virtual Version GetVersion()