X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chanprotect.cpp;h=85e8d4a78b23cb83a80a39efd9b840091ee560d0;hb=fea1a27cb96a114f698eedcf90401b78406108fb;hp=b6f277c0379030acd324e8bb7a63a79f6c5f6f8e;hpb=a7b0c26a4c56440e4bc5ddc6d3ecfeb36089dbb2;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_chanprotect.cpp b/src/modules/m_chanprotect.cpp index b6f277c03..85e8d4a78 100644 --- a/src/modules/m_chanprotect.cpp +++ b/src/modules/m_chanprotect.cpp @@ -14,9 +14,6 @@ * --------------------------------------------------- */ -using namespace std; - -#include #include "users.h" #include "channels.h" #include "modules.h" @@ -24,39 +21,253 @@ using namespace std; /* $ModDesc: Provides channel modes +a and +q */ -char fakevalue[] = "on"; +const char* fakevalue = "on"; + +class ChanFounder : public ModeHandler +{ + Server* Srv; + char* dummyptr; + + public: + ChanFounder(Server* s) : ModeHandler('q', 1, 1, true, MODETYPE_CHANNEL, false), Srv(s) { } + + ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter) + { + userrec* x = Find(parameter); + if (x) + { + if (!channel->HasUser(x)) + { + return std::make_pair(false, parameter); + } + else + { + std::string founder = "cm_founder_"+std::string(channel->name); + if (x->GetExt(founder,dummyptr)) + { + return std::make_pair(true, x->nick); + } + else + { + return std::make_pair(false, parameter); + } + } + } + return std::make_pair(false, parameter); + } + + + ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) + { + userrec* theuser = Srv->FindNick(parameter); + + log(DEBUG,"ChanFounder::OnModeChange"); + + // cant find the user given as the parameter, eat the mode change. + if (!theuser) + { + log(DEBUG,"No such user in ChanFounder"); + parameter = ""; + return MODEACTION_DENY; + } + + // given user isnt even on the channel, eat the mode change + if (!channel->HasUser(theuser)) + { + log(DEBUG,"Channel doesn't have user in ChanFounder"); + parameter = ""; + return MODEACTION_DENY; + } + + std::string protect = "cm_protect_"+std::string(channel->name); + std::string founder = "cm_founder_"+std::string(channel->name); + + // source is a server, or ulined, we'll let them +-q the user. + if ((Srv->IsUlined(source->nick)) || (Srv->IsUlined(source->server)) || (!*source->server) || (!IS_LOCAL(source))) + { + log(DEBUG,"Allowing remote mode change in ChanFounder"); + if (adding) + { + if (!theuser->GetExt(founder,dummyptr)) + { + log(DEBUG,"Does not have the ext item in ChanFounder"); + if (!theuser->Extend(founder,fakevalue)) + log(DEBUG,"COULD NOT EXTEND!!!"); + // Tidy the nickname (make case match etc) + parameter = theuser->nick; + if (theuser->GetExt(founder, dummyptr)) + log(DEBUG,"Extended!"); + else + log(DEBUG,"Not extended :("); + return MODEACTION_ALLOW; + } + } + else + { + if (theuser->GetExt(founder, dummyptr)) + { + theuser->Shrink(founder); + // Tidy the nickname (make case match etc) + parameter = theuser->nick; + return MODEACTION_ALLOW; + } + } + return MODEACTION_DENY; + } + else + { + // whoops, someones being naughty! + source->WriteServ("468 %s %s :Only servers may set channel mode +q",source->nick, channel->name); + parameter = ""; + return MODEACTION_DENY; + } + } + + void DisplayList(userrec* user, chanrec* channel) + { + chanuserlist cl = Srv->GetUsers(channel); + std::string founder = "cm_founder_"+std::string(channel->name); + for (unsigned int i = 0; i < cl.size(); i++) + { + if (cl[i]->GetExt(founder, dummyptr)) + { + user->WriteServ("386 %s %s %s",user->nick, channel->name,cl[i]->nick); + } + } + user->WriteServ("387 %s %s :End of channel founder list",user->nick, channel->name); + } + +}; + +class ChanProtect : public ModeHandler +{ + Server* Srv; + char* dummyptr; + public: + ChanProtect(Server* s) : ModeHandler('a', 1, 1, true, MODETYPE_CHANNEL, false), Srv(s) { } + + ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter) + { + userrec* x = Find(parameter); + if (x) + { + if (!channel->HasUser(x)) + { + return std::make_pair(false, parameter); + } + else + { + std::string founder = "cm_protect_"+std::string(channel->name); + if (x->GetExt(founder,dummyptr)) + { + return std::make_pair(true, x->nick); + } + else + { + return std::make_pair(false, parameter); + } + } + } + return std::make_pair(false, parameter); + } + + ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) + { + userrec* theuser = Srv->FindNick(parameter); + + // cant find the user given as the parameter, eat the mode change. + if (!theuser) + { + parameter = ""; + return MODEACTION_DENY; + } + + // given user isnt even on the channel, eat the mode change + if (!channel->HasUser(theuser)) + { + parameter = ""; + return MODEACTION_DENY; + } + + std::string protect = "cm_protect_"+std::string(channel->name); + std::string founder = "cm_founder_"+std::string(channel->name); + + // source has +q, is a server, or ulined, we'll let them +-a the user. + if ((Srv->IsUlined(source->nick)) || (Srv->IsUlined(source->server)) || (!*source->server) || (source->GetExt(founder,dummyptr)) || (!IS_LOCAL(source))) + { + if (adding) + { + if (!theuser->GetExt(protect,dummyptr)) + { + theuser->Extend(protect,fakevalue); + // Tidy the nickname (make case match etc) + parameter = theuser->nick; + return MODEACTION_ALLOW; + } + } + else + { + if (theuser->GetExt(protect,dummyptr)) + { + theuser->Shrink(protect); + // Tidy the nickname (make case match etc) + parameter = theuser->nick; + return MODEACTION_ALLOW; + } + } + return MODEACTION_DENY; + } + else + { + // bzzzt, wrong answer! + source->WriteServ("482 %s %s :You are not a channel founder",source->nick, channel->name); + return MODEACTION_DENY; + } + } + + virtual void DisplayList(userrec* user, chanrec* channel) + { + chanuserlist cl = Srv->GetUsers(channel); + std::string protect = "cm_protect_"+std::string(channel->name); + for (unsigned int i = 0; i < cl.size(); i++) + { + if (cl[i]->GetExt(protect,dummyptr)) + { + user->WriteServ("388 %s %s %s",user->nick, channel->name,cl[i]->nick); + } + } + user->WriteServ("389 %s %s :End of channel protected user list",user->nick, channel->name); + } + +}; class ModuleChanProtect : public Module { Server *Srv; bool FirstInGetsFounder; - ConfigReader *Conf; + ChanProtect* cp; + ChanFounder* cf; + char* dummyptr; public: - ModuleChanProtect(Server* Me) - : Module::Module(Me) - { - - // here we initialise our module. Use new to create new instances of the required - // classes. - - Srv = Me; - Conf = new ConfigReader; + ModuleChanProtect(Server* Me) : Module::Module(Me), Srv(Me) + { + /* Initialise module variables */ + + cp = new ChanProtect(Me); + cf = new ChanFounder(Me); - // set up our modes. We're using listmodes and not normal extmodes here. - // listmodes only need one parameter as everything else is assumed by the - // nature of the mode thats being created. - Srv->AddExtendedListMode('a'); - Srv->AddExtendedListMode('q'); + Srv->AddMode(cp, 'a'); + Srv->AddMode(cf, 'q'); - // read our config options (main config file) - FirstInGetsFounder = Conf->ReadFlag("options","noservices",0); + /* Load config stuff */ + OnRehash(""); } void Implements(char* List) { - List[I_On005Numeric] = List[I_OnUserKick] = List[I_OnUserPart] = List[I_OnRehash] = List[I_OnUserJoin] = List[I_OnAccessCheck] = List[I_OnExtendedMode] = List[I_OnSendList] = List[I_OnSyncChannel] = 1; + List[I_On005Numeric] = List[I_OnUserKick] = List[I_OnUserPart] = List[I_OnRehash] = List[I_OnUserJoin] = List[I_OnAccessCheck] = List[I_OnSyncChannel] = 1; } virtual void On005Numeric(std::string &output) @@ -80,11 +291,14 @@ class ModuleChanProtect : public Module virtual void OnRehash(const std::string ¶meter) { - // on a rehash we delete our classes for good measure and create them again. - delete Conf; - Conf = new ConfigReader; - // re-read our config options on a rehash - FirstInGetsFounder = Conf->ReadFlag("options","noservices",0); + /* Create a configreader class and read our flag, + * in old versions this was heap-allocated and the + * object was kept between rehashes...now we just + * stack-allocate it locally. + */ + ConfigReader Conf; + + FirstInGetsFounder = Conf.ReadFlag("options","noservices",0); } virtual void OnUserJoin(userrec* user, chanrec* channel) @@ -103,7 +317,7 @@ class ModuleChanProtect : public Module // Change requested by katsklaw... when the first in is set to get founder, // to make it clearer that +q has been given, send that one user the +q notice // so that their client's syncronization and their sanity are left intact. - WriteServ(user->fd,"MODE %s +q %s",channel->name,user->nick); + user->WriteServ("MODE %s +q %s",channel->name,user->nick); if (user->Extend("cm_founder_"+std::string(channel->name),fakevalue)) { Srv->Log(DEBUG,"Marked user "+std::string(user->nick)+" as founder for "+std::string(channel->name)); @@ -118,6 +332,7 @@ class ModuleChanProtect : public Module // etc of protected users. There are many types of access check, we're going to handle // a relatively small number of them relevent to our module using a switch statement. + log(DEBUG,"chanprotect OnAccessCheck %d",access_type); // don't allow action if: // (A) Theyre founder (no matter what) // (B) Theyre protected, and you're not @@ -132,60 +347,70 @@ class ModuleChanProtect : public Module return ACR_ALLOW; } + std::string founder = "cm_founder_"+std::string(channel->name); + std::string protect = "cm_protect_"+std::string(channel->name); + switch (access_type) { // a user has been deopped. Do we let them? hmmm... case AC_DEOP: - if (dest->GetExt("cm_founder_"+std::string(channel->name))) + log(DEBUG,"OnAccessCheck AC_DEOP"); + if (dest->GetExt(founder,dummyptr)) { - Srv->SendServ(source->fd,"484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't deop "+std::string(dest->nick)+" as they're a channel founder"); + log(DEBUG,"Has %s",founder.c_str()); + source->WriteServ("484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't deop "+std::string(dest->nick)+" as they're a channel founder"); return ACR_DENY; } - if ((dest->GetExt("cm_protect_"+std::string(channel->name))) && (!source->GetExt("cm_protect_"+std::string(channel->name)))) + else { - Srv->SendServ(source->fd,"484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't deop "+std::string(dest->nick)+" as they're protected (+a)"); + log(DEBUG,"Doesnt have %s",founder.c_str()); + } + if ((dest->GetExt(protect,dummyptr)) && (!source->GetExt(protect,dummyptr))) + { + source->WriteServ("484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't deop "+std::string(dest->nick)+" as they're protected (+a)"); return ACR_DENY; } break; // a user is being kicked. do we chop off the end of the army boot? case AC_KICK: - if (dest->GetExt("cm_founder_"+std::string(channel->name))) + log(DEBUG,"OnAccessCheck AC_KICK"); + if (dest->GetExt(founder,dummyptr)) { - Srv->SendServ(source->fd,"484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't kick "+std::string(dest->nick)+" as they're a channel founder"); + source->WriteServ("484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't kick "+std::string(dest->nick)+" as they're a channel founder"); return ACR_DENY; } - if ((dest->GetExt("cm_protect_"+std::string(channel->name))) && (!source->GetExt("cm_protect_"+std::string(channel->name)))) + if ((dest->GetExt(protect,dummyptr)) && (!source->GetExt(protect,dummyptr))) { - Srv->SendServ(source->fd,"484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't kick "+std::string(dest->nick)+" as they're protected (+a)"); + source->WriteServ("484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't kick "+std::string(dest->nick)+" as they're protected (+a)"); return ACR_DENY; } break; // a user is being dehalfopped. Yes, we do disallow -h of a +ha user case AC_DEHALFOP: - if (dest->GetExt("cm_founder_"+std::string(channel->name))) + if (dest->GetExt(founder,dummyptr)) { - Srv->SendServ(source->fd,"484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't de-halfop "+std::string(dest->nick)+" as they're a channel founder"); + source->WriteServ("484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't de-halfop "+std::string(dest->nick)+" as they're a channel founder"); return ACR_DENY; } - if ((dest->GetExt("cm_protect_"+std::string(channel->name))) && (!source->GetExt("cm_protect_"+std::string(channel->name)))) + if ((dest->GetExt(protect,dummyptr)) && (!source->GetExt(protect,dummyptr))) { - Srv->SendServ(source->fd,"484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't de-halfop "+std::string(dest->nick)+" as they're protected (+a)"); + source->WriteServ("484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't de-halfop "+std::string(dest->nick)+" as they're protected (+a)"); return ACR_DENY; } break; // same with devoice. case AC_DEVOICE: - if (dest->GetExt("cm_founder_"+std::string(channel->name))) + if (dest->GetExt(founder,dummyptr)) { - Srv->SendServ(source->fd,"484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't devoice "+std::string(dest->nick)+" as they're a channel founder"); + source->WriteServ("484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't devoice "+std::string(dest->nick)+" as they're a channel founder"); return ACR_DENY; } - if ((dest->GetExt("cm_protect_"+std::string(channel->name))) && (!source->GetExt("cm_protect_"+std::string(channel->name)))) + if ((dest->GetExt(protect,dummyptr)) && (!source->GetExt(protect,dummyptr))) { - Srv->SendServ(source->fd,"484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't devoice "+std::string(dest->nick)+" as they're protected (+a)"); + source->WriteServ("484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't devoice "+std::string(dest->nick)+" as they're protected (+a)"); return ACR_DENY; } break; @@ -195,130 +420,10 @@ class ModuleChanProtect : public Module return ACR_DEFAULT; } - virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list ¶ms) - { - // not out mode, bail - if ((modechar == 'q') && (type == MT_CHANNEL)) - { - // set up parameters - chanrec* chan = (chanrec*)target; - userrec* theuser = Srv->FindNick(params[0]); - - // cant find the user given as the parameter, eat the mode change. - if (!theuser) - return -1; - - // given user isnt even on the channel, eat the mode change - if (!chan->HasUser(theuser)) - return -1; - - // source is a server, or ulined, we'll let them +-q the user. - if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)) || (!strcmp(user->server,""))) - { - if (mode_on) - { - if (!theuser->GetExt("cm_founder_"+std::string(chan->name))) - { - theuser->Extend("cm_founder_"+std::string(chan->name),fakevalue); - return 1; - } - } - else - { - if (theuser->GetExt("cm_founder_"+std::string(chan->name))) - { - theuser->Shrink("cm_founder_"+std::string(chan->name)); - return 1; - } - } - - return -1; - } - else - { - // whoops, someones being naughty! - WriteServ(user->fd,"468 %s %s :Only servers may set channel mode +q",user->nick, chan->name); - return -1; - } - } - if ((modechar == 'a') && (type == MT_CHANNEL)) - { - // set up parameters - chanrec* chan = (chanrec*)target; - userrec* theuser = Srv->FindNick(params[0]); - - // cant find the user given as the parameter, eat the mode change. - if (!theuser) - return -1; - - // given user isnt even on the channel, eat the mode change - if (!chan->HasUser(theuser)) - return -1; - - // source has +q, is a server, or ulined, we'll let them +-a the user. - if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)) || (!strcmp(user->server,"")) || (user->GetExt("cm_founder_"+std::string(chan->name)))) - { - if (mode_on) - { - if (!theuser->GetExt("cm_protect_"+std::string(chan->name))) - { - theuser->Extend("cm_protect_"+std::string(chan->name),fakevalue); - return 1; - } - } - else - { - if (theuser->GetExt("cm_protect_"+std::string(chan->name))) - { - theuser->Shrink("cm_protect_"+std::string(chan->name)); - return 1; - } - } - - return -1; - } - else - { - // bzzzt, wrong answer! - WriteServ(user->fd,"482 %s %s :You are not a channel founder",user->nick, chan->name); - return -1; - } - } - return 0; - } - - virtual void OnSendList(userrec* user, chanrec* channel, char mode) - { - if (mode == 'q') - { - chanuserlist cl = Srv->GetUsers(channel); - for (unsigned int i = 0; i < cl.size(); i++) - { - if (cl[i]->GetExt("cm_founder_"+std::string(channel->name))) - { - WriteServ(user->fd,"386 %s %s %s",user->nick, channel->name,cl[i]->nick); - } - } - WriteServ(user->fd,"387 %s %s :End of channel founder list",user->nick, channel->name); - } - if (mode == 'a') - { - chanuserlist cl = Srv->GetUsers(channel); - for (unsigned int i = 0; i < cl.size(); i++) - { - if (cl[i]->GetExt("cm_protect_"+std::string(channel->name))) - { - WriteServ(user->fd,"388 %s %s %s",user->nick, channel->name,cl[i]->nick); - } - } - WriteServ(user->fd,"389 %s %s :End of channel protected user list",user->nick, channel->name); - } - - } - virtual ~ModuleChanProtect() { - delete Conf; + DELETE(cp); + DELETE(cf); } virtual Version GetVersion() @@ -333,13 +438,15 @@ class ModuleChanProtect : public Module // know whos +q/+a on the channel. chanuserlist cl = Srv->GetUsers(chan); string_list commands; + std::string founder = "cm_founder_"+std::string(chan->name); + std::string protect = "cm_protect_"+std::string(chan->name); for (unsigned int i = 0; i < cl.size(); i++) { - if (cl[i]->GetExt("cm_founder_"+std::string(chan->name))) + if (cl[i]->GetExt(founder,dummyptr)) { proto->ProtoSendMode(opaque,TYPE_CHANNEL,chan,"+q "+std::string(cl[i]->nick)); } - if (cl[i]->GetExt("cm_protect_"+std::string(chan->name))) + if (cl[i]->GetExt(protect,dummyptr)) { proto->ProtoSendMode(opaque,TYPE_CHANNEL,chan,"+a "+std::string(cl[i]->nick)); } @@ -372,4 +479,3 @@ extern "C" void * init_module( void ) { return new ModuleChanProtectFactory; } -