X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_services.cpp;h=f27e74a4d9da2d9b0f0ab0237b31b8cd3cd6b744;hb=3a7023f2c595d14778b3f1f7e53d3914698dd500;hp=7eed797e93aae06d97de5438242eec6f418a6d3c;hpb=cfdb1b9f7ccc21fce1c06b53385126da8526c301;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_services.cpp b/src/modules/m_services.cpp index 7eed797e9..f27e74a4d 100644 --- a/src/modules/m_services.cpp +++ b/src/modules/m_services.cpp @@ -24,144 +24,214 @@ using namespace std; #include "helperfuncs.h" #include "hashcomp.h" +static bool kludgeme = false; + /* $ModDesc: Povides support for services +r user/chan modes and more */ -class ModuleServices : public Module +class Channel_r : public ModeHandler { - Server *Srv; + Server* Srv; public: - ModuleServices(Server* Me) - : Module::Module(Me) + Channel_r(Server* srv) : ModeHandler('r', 0, 0, false, MODETYPE_CHANNEL, false), Srv(srv) { } + + ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) { - Srv = Me; + // only a u-lined server may add or remove the +r mode. + if ((Srv->IsUlined(source->nick)) || (Srv->IsUlined(source->server)) || (!*source->server || (strchr(source->nick,'.')))) + { + log(DEBUG,"Allowing cmode +r, server and nick are: '%s','%s'",source->nick,source->server); + channel->SetMode('r',adding); + return MODEACTION_ALLOW; + } + else + { + log(DEBUG,"Only a server can set chanmode +r, server and nick are: '%s','%s'",source->nick,source->server); + Srv->SendServ(source->fd,"500 "+std::string(source->nick)+" :Only a server may modify the +r channel mode"); + return MODEACTION_DENY; + } + } +}; - Srv->AddExtendedMode('r',MT_CHANNEL,false,0,0); - Srv->AddExtendedMode('r',MT_CLIENT,false,0,0); - Srv->AddExtendedMode('R',MT_CHANNEL,false,0,0); - Srv->AddExtendedMode('R',MT_CLIENT,false,0,0); - Srv->AddExtendedMode('M',MT_CHANNEL,false,0,0); - } - - virtual void On005Numeric(std::string &output) - { - std::stringstream line(output); - std::string temp1, temp2; - while (!line.eof()) - { - line >> temp1; - if (temp1.substr(0,10) == "CHANMODES=") - { - // append the chanmode to the end - temp1 = temp1.substr(10,temp1.length()); - temp1 = "CHANMODES=" + temp1 + "rRM"; - } - temp2 = temp2 + temp1 + " "; - } - if (temp2.length()) - output = temp2.substr(0,temp2.length()-1); - } +class User_r : public ModeHandler +{ + Server* Srv; + public: + User_r(Server* srv) : ModeHandler('r', 0, 0, false, MODETYPE_USER, false), Srv(srv) { } - void Implements(char* List) + ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) { - List[I_OnUserPreMessage] = List[I_OnExtendedMode] = List[I_On005Numeric] = List[I_OnUserPreNotice] = List[I_OnUserPreJoin] = 1; + if ((kludgeme) || (Srv->IsUlined(source->nick)) || (Srv->IsUlined(source->server)) || (!*source->server || (strchr(source->nick,'.')))) + { + log(DEBUG,"Allowing umode +r, server and nick are: '%s','%s'",source->nick,source->server); + dest->SetMode('r',adding); + return MODEACTION_ALLOW; + } + else + { + log(DEBUG,"Only a server can set umode +r, server and nick are: '%s','%s'",source->nick, source->server); + Srv->SendServ(source->fd,"500 "+std::string(source->nick)+" :Only a server may modify the +r user mode"); + return MODEACTION_DENY; + } } - - virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list ¶ms) +}; + +class Channel_R : public ModeHandler +{ + public: + Channel_R() : ModeHandler('R', 0, 0, false, MODETYPE_CHANNEL, false) { } + + ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) { - - if (modechar == 'r') - { - if (type == MT_CHANNEL) + if (adding) + { + if (!channel->IsModeSet('R')) { - // only a u-lined server may add or remove the +r mode. - if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)) || (!strcmp(user->server,"") || (strchr(user->nick,'.')))) - { - log(DEBUG,"Allowing umode +r, server and nick are: '%s','%s'",user->nick,user->server); - return 1; - } - else - { - log(DEBUG,"Only a server can set chanmode +r, server and nick are: '%s','%s'",user->nick,user->server); - Srv->SendServ(user->fd,"500 "+std::string(user->nick)+" :Only a server may modify the +r channel mode"); - } + channel->SetMode('R',true); + return MODEACTION_ALLOW; } - else + } + else + { + if (channel->IsModeSet('R')) { - if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)) || (!strcmp(user->server,"") || (strchr(user->nick,'.')))) - { - log(DEBUG,"Allowing umode +r, server and nick are: '%s','%s'",user->nick,user->server); - return 1; - } - else - { - log(DEBUG,"Only a server can set umode +r, server and nick are: '%s','%s'",user->nick,user->server); - Srv->SendServ(user->fd,"500 "+std::string(user->nick)+" :Only a server may modify the +r user mode"); - } + channel->SetMode('R',false); + return MODEACTION_ALLOW; } } - else if (modechar == 'R') + + return MODEACTION_DENY; + } +}; + +class User_R : public ModeHandler +{ + public: + User_R() : ModeHandler('R', 0, 0, false, MODETYPE_USER, false) { } + + ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) + { + if (adding) { - return 1; + if (!dest->IsModeSet('R')) + { + dest->SetMode('R',true); + return MODEACTION_ALLOW; + } } - else if (modechar == 'M') + else { - if (type == MT_CHANNEL) + if (dest->IsModeSet('R')) { - return 1; + dest->SetMode('R',false); + return MODEACTION_ALLOW; } } - return 0; + return MODEACTION_DENY; } +}; - virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text) +class Channel_M : public ModeHandler +{ + public: + Channel_M() : ModeHandler('M', 0, 0, false, MODETYPE_CHANNEL, false) { } + + ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) { - if (target_type == TYPE_CHANNEL) + if (adding) { - chanrec* c = (chanrec*)dest; - if ((c->IsCustomModeSet('M')) && (!strchr(user->modes,'r'))) + if (!channel->IsModeSet('M')) { - if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)) || (!strcmp(user->server,""))) - { - // user is ulined, can speak regardless - return 0; - } - // user messaging a +M channel and is not registered - Srv->SendServ(user->fd,"477 "+std::string(user->nick)+" "+std::string(c->name)+" :You need a registered nickname to speak on this channel"); - return 1; + channel->SetMode('M',true); + return MODEACTION_ALLOW; } } - if (target_type == TYPE_USER) + else { - userrec* u = (userrec*)dest; - if ((strchr(u->modes,'R')) && (!strchr(user->modes,'r'))) + if (channel->IsModeSet('M')) { - if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server))) - { - // user is ulined, can speak regardless - return 0; - } - // user messaging a +R user and is not registered - Srv->SendServ(user->fd,"477 "+std::string(user->nick)+" "+std::string(u->nick)+" :You need a registered nickname to message this user"); - return 1; + channel->SetMode('M',true); + return MODEACTION_ALLOW; } } - return 0; + + return MODEACTION_DENY; } - - virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text) +}; + +class ModuleServices : public Module +{ + Server *Srv; + Channel_r* m1; + Channel_R* m2; + Channel_M* m3; + User_r* m4; + User_R* m5; + public: + ModuleServices(Server* Me) + : Module::Module(Me) + { + Srv = Me; + m1 = new Channel_r(Me); + m2 = new Channel_R(); + m3 = new Channel_M(); + m4 = new User_r(Me); + m5 = new User_R(); + Srv->AddMode(m1, 'r'); + Srv->AddMode(m2, 'R'); + Srv->AddMode(m3, 'M'); + Srv->AddMode(m4, 'r'); + Srv->AddMode(m5, 'R'); + kludgeme = false; + } + + virtual void On005Numeric(std::string &output) + { + InsertMode(output, "rRM", 4); + } + + /* <- :stitch.chatspike.net 307 w00t w00t :is a registered nick */ + virtual void OnWhois(userrec* source, userrec* dest) + { + if (dest->IsModeSet('r')) + { + /* user is registered */ + WriteServ(source->fd, "307 %s %s :is a registered nick", source->nick, dest->nick); + } + } + + void Implements(char* List) + { + List[I_OnWhois] = List[I_OnUserPostNick] = List[I_OnUserPreMessage] = List[I_On005Numeric] = List[I_OnUserPreNotice] = List[I_OnUserPreJoin] = 1; + } + + virtual void OnUserPostNick(userrec* user, const std::string &oldnick) + { + /* On nickchange, if they have +r, remove it */ + if (user->IsModeSet('r')) + { + const char* modechange[2]; + modechange[0] = user->nick; + modechange[1] = "-r"; + kludgeme = true; + Srv->SendMode(modechange,2,user); + kludgeme = false; + } + } + + virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status) { if (target_type == TYPE_CHANNEL) { chanrec* c = (chanrec*)dest; - if ((c->IsCustomModeSet('M')) && (!strchr(user->modes,'r'))) + if ((c->IsModeSet('M')) && (!user->IsModeSet('r'))) { - if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server))) + if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)) || (!strcmp(user->server,""))) { // user is ulined, can speak regardless return 0; } - // user noticing a +M channel and is not registered + // user messaging a +M channel and is not registered Srv->SendServ(user->fd,"477 "+std::string(user->nick)+" "+std::string(c->name)+" :You need a registered nickname to speak on this channel"); return 1; } @@ -169,14 +239,14 @@ class ModuleServices : public Module if (target_type == TYPE_USER) { userrec* u = (userrec*)dest; - if ((strchr(u->modes,'R')) && (!strchr(user->modes,'r'))) + if ((u->IsModeSet('R')) && (user->IsModeSet('r'))) { if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server))) { // user is ulined, can speak regardless return 0; } - // user noticing a +R user and is not registered + // user messaging a +R user and is not registered Srv->SendServ(user->fd,"477 "+std::string(user->nick)+" "+std::string(u->nick)+" :You need a registered nickname to message this user"); return 1; } @@ -184,13 +254,18 @@ class ModuleServices : public Module return 0; } + virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status) + { + return OnUserPreMessage(user,dest,target_type,text,status); + } + virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname) { if (chan) { - if (chan->IsCustomModeSet('R')) + if (chan->IsModeSet('R')) { - if (!strchr(user->modes,'r')) + if (user->IsModeSet('r')) { if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server))) { @@ -208,6 +283,11 @@ class ModuleServices : public Module virtual ~ModuleServices() { + DELETE(m1); + DELETE(m2); + DELETE(m3); + DELETE(m4); + DELETE(m5); } virtual Version GetVersion()