X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmode.cpp;h=86b0024c0432df2fd2ebf999b6c50a54487192ee;hb=221934729eba613b1a845771a0a6aabf3eb6390c;hp=596233cfdea5e3286c73dcb208a03f6ce7196676;hpb=2fd5ed7aa9e5ac8a8d8e19c07f320306e594a47a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/mode.cpp b/src/mode.cpp index 596233cfd..86b0024c0 100644 --- a/src/mode.cpp +++ b/src/mode.cpp @@ -20,26 +20,14 @@ using namespace std; #include "inspircd.h" #include "configreader.h" #include -#include -#include -#include #include "hash_map.h" -#include -#include -#include -#include #include "connection.h" #include "users.h" -#include "ctables.h" -#include "globals.h" #include "modules.h" -#include "dynamic.h" -#include "wildcard.h" #include "message.h" -#include "commands.h" -#include "xline.h" #include "inspstring.h" #include "helperfuncs.h" +#include "commands.h" #include "mode.h" /* +s (secret) */ @@ -50,6 +38,33 @@ using namespace std; #include "modes/cmode_b.h" /* +m (moderated) */ #include "modes/cmode_m.h" +/* +t (only (half) ops can change topic) */ +#include "modes/cmode_t.h" +/* +n (no external messages) */ +#include "modes/cmode_n.h" +/* +i (invite only) */ +#include "modes/cmode_i.h" +/* +k (keyed channel) */ +#include "modes/cmode_k.h" +/* +l (channel user limit) */ +#include "modes/cmode_l.h" +/* +o (channel op) */ +#include "modes/cmode_o.h" +/* +h (channel halfop) */ +#include "modes/cmode_h.h" +/* +v (channel voice) */ +#include "modes/cmode_v.h" + +/* +s (server notices) */ +#include "modes/umode_s.h" +/* +w (see wallops) */ +#include "modes/umode_w.h" +/* +i (invisible) */ +#include "modes/umode_i.h" +/* +o (operator) */ +#include "modes/umode_o.h" +/* +n (notice mask - our implementation of snomasks) */ +#include "modes/umode_n.h" extern int MODCOUNT; extern std::vector modules; @@ -134,7 +149,7 @@ void ModeWatcher::AfterMode(userrec* source, userrec* dest, chanrec* channel, co { } -userrec* ModeParser::SanityChecks(userrec *user,char *dest,chanrec *chan,int status) +userrec* ModeParser::SanityChecks(userrec *user,const char *dest,chanrec *chan,int status) { userrec *d; if ((!user) || (!dest) || (!chan) || (!*dest)) @@ -150,242 +165,97 @@ userrec* ModeParser::SanityChecks(userrec *user,char *dest,chanrec *chan,int sta return d; } -char* ModeParser::Grant(userrec *d,chanrec *chan,int MASK) +const char* ModeParser::Grant(userrec *d,chanrec *chan,int MASK) { if (!chan) - return NULL; + return ""; for (std::vector::const_iterator i = d->chans.begin(); i != d->chans.end(); i++) { - if (((ucrec*)(*i))->channel == chan) + ucrec* n = (ucrec*)(*i); + if (n->channel == chan) { - if (((ucrec*)(*i))->uc_modes & MASK) + if (n->uc_modes & MASK) { - return NULL; + return ""; } - ((ucrec*)(*i))->uc_modes = ((ucrec*)(*i))->uc_modes | MASK; + n->uc_modes = n->uc_modes | MASK; switch (MASK) { case UCMODE_OP: - ((ucrec*)(*i))->channel->AddOppedUser(d); + n->channel->AddOppedUser(d); break; case UCMODE_HOP: - ((ucrec*)(*i))->channel->AddHalfoppedUser(d); + n->channel->AddHalfoppedUser(d); break; case UCMODE_VOICE: - ((ucrec*)(*i))->channel->AddVoicedUser(d); + n->channel->AddVoicedUser(d); break; } - log(DEBUG,"grant: %s %s",((ucrec*)(*i))->channel->name,d->nick); + log(DEBUG,"grant: %s %s",n->channel->name,d->nick); return d->nick; } } - return NULL; + return ""; } -char* ModeParser::Revoke(userrec *d,chanrec *chan,int MASK) +const char* ModeParser::Revoke(userrec *d,chanrec *chan,int MASK) { if (!chan) - return NULL; + return ""; for (std::vector::const_iterator i = d->chans.begin(); i != d->chans.end(); i++) { - if (((ucrec*)(*i))->channel == chan) + ucrec* n = (ucrec*)(*i); + if (n->channel == chan) { - if ((((ucrec*)(*i))->uc_modes & MASK) == 0) + if ((n->uc_modes & MASK) == 0) { - return NULL; + return ""; } - ((ucrec*)(*i))->uc_modes ^= MASK; + n->uc_modes ^= MASK; switch (MASK) { case UCMODE_OP: - ((ucrec*)(*i))->channel->DelOppedUser(d); + n->channel->DelOppedUser(d); break; case UCMODE_HOP: - ((ucrec*)(*i))->channel->DelHalfoppedUser(d); + n->channel->DelHalfoppedUser(d); break; case UCMODE_VOICE: - ((ucrec*)(*i))->channel->DelVoicedUser(d); + n->channel->DelVoicedUser(d); break; } - log(DEBUG,"revoke: %s %s",((ucrec*)(*i))->channel->name,d->nick); + log(DEBUG,"revoke: %s %s",n->channel->name,d->nick); return d->nick; } } - return NULL; -} - -char* ModeParser::GiveOps(userrec *user,char *dest,chanrec *chan,int status) -{ - userrec *d = this->SanityChecks(user,dest,chan,status); - - if (d) - { - if (IS_LOCAL(user)) - { - int MOD_RESULT = 0; - FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_OP)); - - if (MOD_RESULT == ACR_DENY) - return NULL; - if (MOD_RESULT == ACR_DEFAULT) - { - if ((status < STATUS_OP) && (!is_uline(user->server))) - { - WriteServ(user->fd,"482 %s %s :You're not a channel operator",user->nick, chan->name); - return NULL; - } - } - } - - return this->Grant(d,chan,UCMODE_OP); - } - return NULL; -} - -char* ModeParser::GiveHops(userrec *user,char *dest,chanrec *chan,int status) -{ - userrec *d = this->SanityChecks(user,dest,chan,status); - - if (d) - { - if (IS_LOCAL(user)) - { - int MOD_RESULT = 0; - FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_HALFOP)); - - if (MOD_RESULT == ACR_DENY) - return NULL; - if (MOD_RESULT == ACR_DEFAULT) - { - if ((status < STATUS_OP) && (!is_uline(user->server))) - { - WriteServ(user->fd,"482 %s %s :You're not a channel operator",user->nick, chan->name); - return NULL; - } - } - } - - return this->Grant(d,chan,UCMODE_HOP); - } - return NULL; -} - -char* ModeParser::GiveVoice(userrec *user,char *dest,chanrec *chan,int status) -{ - userrec *d = this->SanityChecks(user,dest,chan,status); - - if (d) - { - if (IS_LOCAL(user)) - { - int MOD_RESULT = 0; - FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_VOICE)); - - if (MOD_RESULT == ACR_DENY) - return NULL; - if (MOD_RESULT == ACR_DEFAULT) - { - if ((status < STATUS_HOP) && (!is_uline(user->server))) - { - WriteServ(user->fd,"482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, chan->name); - return NULL; - } - } - } - - return this->Grant(d,chan,UCMODE_VOICE); - } - return NULL; + return ""; } -char* ModeParser::TakeOps(userrec *user,char *dest,chanrec *chan,int status) +void ModeParser::DisplayCurrentModes(userrec *user, userrec* targetuser, chanrec* targetchannel, const char* text) { - userrec *d = this->SanityChecks(user,dest,chan,status); - - if (d) + if (targetchannel) { - if (IS_LOCAL(user)) - { - int MOD_RESULT = 0; - FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_DEOP)); - - if (MOD_RESULT == ACR_DENY) - return NULL; - if (MOD_RESULT == ACR_DEFAULT) - { - if ((status < STATUS_OP) && (!is_uline(user->server)) && (IS_LOCAL(user))) - { - WriteServ(user->fd,"482 %s %s :You are not a channel operator",user->nick, chan->name); - return NULL; - } - } - } - - return this->Revoke(d,chan,UCMODE_OP); + /* Display channel's current mode string */ + WriteServ(user->fd,"324 %s %s +%s",user->nick, targetchannel->name, chanmodes(targetchannel, targetchannel->HasUser(user))); + WriteServ(user->fd,"329 %s %s %d", user->nick, targetchannel->name, targetchannel->created); + return; } - return NULL; -} - -char* ModeParser::TakeHops(userrec *user,char *dest,chanrec *chan,int status) -{ - userrec *d = this->SanityChecks(user,dest,chan,status); - - if (d) + else if (targetuser) { - if (IS_LOCAL(user)) - { - int MOD_RESULT = 0; - FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_DEHALFOP)); - - if (MOD_RESULT == ACR_DENY) - return NULL; - if (MOD_RESULT == ACR_DEFAULT) - { - /* Tweak by Brain suggested by w00t, allow a halfop to dehalfop themselves */ - if ((user != d) && ((status < STATUS_OP) && (!is_uline(user->server)))) - { - WriteServ(user->fd,"482 %s %s :You are not a channel operator",user->nick, chan->name); - return NULL; - } - } - } - - return this->Revoke(d,chan,UCMODE_HOP); + /* Display user's current mode string */ + WriteServ(user->fd,"221 %s :+%s",targetuser->nick,targetuser->FormatModes()); + WriteServ(user->fd, "008 %s :+%s", targetuser->nick, targetuser->FormatNoticeMasks()); + return; } - return NULL; -} -char* ModeParser::TakeVoice(userrec *user,char *dest,chanrec *chan,int status) -{ - userrec *d = this->SanityChecks(user,dest,chan,status); - - if (d) - { - if (IS_LOCAL(user)) - { - int MOD_RESULT = 0; - FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_DEVOICE)); - - if (MOD_RESULT == ACR_DENY) - return NULL; - if (MOD_RESULT == ACR_DEFAULT) - { - if ((status < STATUS_HOP) && (!is_uline(user->server))) - { - WriteServ(user->fd,"482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, chan->name); - return NULL; - } - } - } - - return this->Revoke(d,chan,UCMODE_VOICE); - } - return NULL; + /* No such nick/channel */ + WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, text); + return; } -void ModeParser::Process(char **parameters, int pcnt, userrec *user, bool servermode) +void ModeParser::Process(const char** parameters, int pcnt, userrec *user, bool servermode) { std::string target = parameters[0]; ModeType type = MODETYPE_USER; @@ -395,41 +265,82 @@ void ModeParser::Process(char **parameters, int pcnt, userrec *user, bool server log(DEBUG,"ModeParser::Process start"); - if (pcnt > 1) + if (pcnt == 1) + { + this->DisplayCurrentModes(user, targetuser, targetchannel, parameters[0]); + } + else if (pcnt > 1) { if (targetchannel) { - log(DEBUG,"Target type is CHANNEL"); type = MODETYPE_CHANNEL; mask = MASK_CHANNEL; + + /* Extra security checks on channel modes + * (e.g. are they a (half)op? + */ + + if (cstatus(user, targetchannel) < STATUS_HOP) + { + /* We don't have halfop */ + log(DEBUG,"The user is not a halfop or above, checking other reasons for being able to set the modes"); + + /* Are we a uline or is it a servermode? */ + if ((!is_uline(user->server)) && (!servermode)) + { + /* Not enough permission: + * NOT a uline and NOT a servermode, + * OR, NOT halfop or above. + */ + WriteServ(user->fd,"482 %s %s :You're not a channel (half)operator",user->nick, targetchannel->name); + return; + } + } } else if (targetuser) { - log(DEBUG,"Target type is USER"); type = MODETYPE_USER; mask = MASK_USER; } else { /* No such nick/channel */ - log(DEBUG,"Target type is UNKNOWN, bailing"); + WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]); return; } + + /* Special case for displaying the list for listmodes, + * e.g. MODE #chan b, or MODE #chan +b without a parameter + */ + if ((type== MODETYPE_CHANNEL) && (pcnt == 2)) + { + const char* mode = parameters[1]; + if (*mode == '+') + mode++; + + unsigned char handler_id = ((*mode) - 65) | mask; + ModeHandler* mh = modehandlers[handler_id]; + + if ((mh) && (mh->IsListMode())) + { + mh->DisplayList(user, targetchannel); + } + } + std::string mode_sequence = parameters[1]; std::string parameter = ""; std::ostringstream parameter_list; std::string output_sequence = ""; bool adding = true, state_change = false; - int handler_id = 0; + unsigned char handler_id = 0; int parameter_counter = 2; /* Index of first parameter */ - for (std::string::const_iterator modeletter = mode_sequence.begin(); modeletter != mode_sequence.end(); modeletter++) + for (std::string::const_iterator letter = mode_sequence.begin(); letter != mode_sequence.end(); letter++) { - switch (*modeletter) - { - - log(DEBUG,"Iterate mode letter %c",*modeletter); + unsigned char modechar = *letter; + switch (modechar) + { /* NB: * For + and - mode characters, we don't just stick the character into the output sequence. * This is because the user may do something dumb, like: +-+ooo or +oo-+. To prevent this @@ -463,28 +374,22 @@ void ModeParser::Process(char **parameters, int pcnt, userrec *user, bool server * a user mode. This is a little stranger, but a lot * faster, than using a map of pairs. */ - handler_id = (*modeletter - 65) | mask; + handler_id = (modechar - 65) | mask; if (modehandlers[handler_id]) { bool abort = false; - log(DEBUG,"Found a ModeHandler* for mode %c",*modeletter); - for (ModeWatchIter watchers = modewatchers[handler_id].begin(); watchers != modewatchers[handler_id].end(); watchers++) { - log(DEBUG,"Call a ModeWatcher*"); if ((*watchers)->BeforeMode(user, targetuser, targetchannel, parameter, adding, type) == MODEACTION_DENY) abort = true; } if ((modehandlers[handler_id]->GetModeType() == type) && (!abort)) { - log(DEBUG,"Modetype match, calling handler"); - if (modehandlers[handler_id]->GetNumParams(adding)) { - log(DEBUG,"ModeHandler* for this mode says it has parameters. pcnt=%d parameter_counter=%d",pcnt,parameter_counter); - + /* This mode expects a parameter, do we have any parameters left in our list to use? */ if (parameter_counter < pcnt) { parameter = parameters[parameter_counter++]; @@ -495,41 +400,52 @@ void ModeParser::Process(char **parameters, int pcnt, userrec *user, bool server continue; } } + + /* It's an oper only mode, check if theyre an oper. If they arent, + * eat any parameter that came with the mode, and continue to next + */ + if ((IS_LOCAL(user)) && (modehandlers[handler_id]->NeedsOper()) && (!*user->oper)) + continue; + + /* Call the handler for the mode */ ModeAction ma = modehandlers[handler_id]->OnModeChange(user, targetuser, targetchannel, parameter, adding); - if (ma == MODEACTION_ALLOW) + + if ((modehandlers[handler_id]->GetNumParams(adding)) && (parameter == "")) { - log(DEBUG,"ModeAction was allow"); + /* The handler nuked the parameter and they are supposed to have one. + * We CANT continue now, even if they actually returned MODEACTION_ALLOW, + * so we bail to the next mode character. + */ + continue; + } + if (ma == MODEACTION_ALLOW) + { /* We're about to output a valid mode letter - was there previously a pending state-change? */ if (state_change) - { - log(DEBUG,"Appending state change"); output_sequence.append(adding ? "+" : "-"); - } /* Add the mode letter */ - output_sequence = output_sequence + *modeletter; - log(DEBUG,"Added mode letter to output sequence, sequence now: '%s'",output_sequence.c_str()); + output_sequence.push_back(modechar); /* Is there a valid parameter for this mode? If so add it to the parameter list */ if ((modehandlers[handler_id]->GetNumParams(adding)) && (parameter != "")) - { - log(DEBUG,"Added parameter to parameter_list, list now: '%s'",parameter_list.str().c_str()); parameter_list << " " << parameter; - } /* Call all the AfterMode events in the mode watchers for this mode */ for (ModeWatchIter watchers = modewatchers[handler_id].begin(); watchers != modewatchers[handler_id].end(); watchers++) - { - log(DEBUG,"Called a ModeWatcher* after event"); (*watchers)->AfterMode(user, targetuser, targetchannel, parameter, adding, type); - } /* Reset the state change flag */ state_change = false; } } } + else + { + /* No mode handler? Unknown mode character then. */ + WriteServ(user->fd,"472 %s %c :is unknown mode char to me",user->nick, modechar); + } break; } } @@ -542,6 +458,10 @@ void ModeParser::Process(char **parameters, int pcnt, userrec *user, bool server { WriteChannelWithServ(Config->ServerName,targetchannel,"MODE %s %s%s",targetchannel->name,output_sequence.c_str(),parameter_list.str().c_str()); } + else + { + WriteServ(targetuser->fd,"MODE %s %s",targetuser->nick,output_sequence.c_str()); + } } else { @@ -551,13 +471,18 @@ void ModeParser::Process(char **parameters, int pcnt, userrec *user, bool server WriteChannel(targetchannel,user,"MODE %s %s%s",targetchannel->name,output_sequence.c_str(),parameter_list.str().c_str()); FOREACH_MOD(I_OnMode,OnMode(user, targetchannel, TYPE_CHANNEL, output_sequence + parameter_list.str())); } + else + { + WriteTo(user,targetuser,"MODE %s %s",targetuser->nick,output_sequence.c_str()); + FOREACH_MOD(I_OnMode,OnMode(user, targetuser, TYPE_USER, output_sequence)); + } } } } } -void cmd_mode::Handle (char **parameters, int pcnt, userrec *user) +void cmd_mode::Handle (const char** parameters, int pcnt, userrec *user) { if (!user) return; @@ -571,6 +496,33 @@ void ModeParser::CleanMask(std::string &mask) { std::string::size_type pos_of_pling = mask.find_first_of('!'); std::string::size_type pos_of_at = mask.find_first_of('@'); + std::string::size_type pos_of_dot = mask.find_first_of('.'); + std::string::size_type pos_of_colon = mask.find_first_of(':'); /* Because ipv6 addresses are colon delimited */ + + if ((pos_of_pling == std::string::npos) && (pos_of_at == std::string::npos)) + { + /* Just a nick, or just a host */ + if ((pos_of_dot == std::string::npos) && (pos_of_colon == std::string::npos)) + { + /* It has no '.' in it, it must be a nick. */ + mask.append("!*@*"); + } + else + { + /* Got a dot in it? Has to be a host */ + mask = "*!*@" + mask; + } + } + else if ((pos_of_pling == std::string::npos) && (pos_of_at != std::string::npos)) + { + /* Has an @ but no !, its a user@host */ + mask = "*!" + mask; + } + else if ((pos_of_pling != std::string::npos) && (pos_of_at == std::string::npos)) + { + /* Has a ! but no @, it must be a nick!ident */ + mask.append("@*"); + } } bool ModeParser::AddMode(ModeHandler* mh, unsigned const char modeletter) @@ -582,17 +534,62 @@ bool ModeParser::AddMode(ModeHandler* mh, unsigned const char modeletter) * If they do that, thats their problem, and if i ever EVER see an * official InspIRCd developer do that, i'll beat them with a paddle! */ - if ((modeletter < 'A') || (modeletter > 'z')) + if ((mh->GetModeChar() < 'A') || (mh->GetModeChar() > 'z')) return false; mh->GetModeType() == MODETYPE_USER ? mask = MASK_USER : mask = MASK_CHANNEL; - pos = (modeletter-65) | mask; + pos = (mh->GetModeChar()-65) | mask; if (modehandlers[pos]) return false; modehandlers[pos] = mh; - log(DEBUG,"ModeParser::AddMode: added mode %c",modeletter); + log(DEBUG,"ModeParser::AddMode: added mode %c",mh->GetModeChar()); + return true; +} + +bool ModeParser::AddModeWatcher(ModeWatcher* mw) +{ + unsigned char mask = 0; + unsigned char pos = 0; + + if (!mw) + return false; + + if ((mw->GetModeChar() < 'A') || (mw->GetModeChar() > 'z')) + return false; + + mw->GetModeType() == MODETYPE_USER ? mask = MASK_USER : mask = MASK_CHANNEL; + pos = (mw->GetModeChar()-65) | mask; + + modewatchers[pos].push_back(mw); + log(DEBUG,"ModeParser::AddModeWatcher: watching mode %c",mw->GetModeChar()); + + return true; +} + +bool ModeParser::DelModeWatcher(ModeWatcher* mw) +{ + unsigned char mask = 0; + unsigned char pos = 0; + + if (!mw) + return false; + + if ((mw->GetModeType() < 'A') || (mw->GetModeType() > 'z')) + return false; + + mw->GetModeType() == MODETYPE_USER ? mask = MASK_USER : mask = MASK_CHANNEL; + pos = (mw->GetModeChar()-65) | mask; + + ModeWatchIter a = find(modewatchers[pos].begin(),modewatchers[pos].end(),mw); + + if (a == modewatchers[pos].end()) + return false; + + modewatchers[pos].erase(a); + log(DEBUG,"ModeParser::DelModeWatcher: stopped watching mode %c",mw->GetModeChar()); + return true; } @@ -603,9 +600,30 @@ ModeParser::ModeParser() memset(modewatchers, 0, sizeof(modewatchers)); /* Initialise the RFC mode letters */ + + /* Start with channel simple modes, no params */ this->AddMode(new ModeChannelSecret, 's'); this->AddMode(new ModeChannelPrivate, 'p'); - this->AddMode(new ModeChannelBan, 'b'); this->AddMode(new ModeChannelModerated, 'm'); + this->AddMode(new ModeChannelTopicOps, 't'); + this->AddMode(new ModeChannelNoExternal, 'n'); + this->AddMode(new ModeChannelInviteOnly, 'i'); + + /* Cannel modes with params */ + this->AddMode(new ModeChannelKey, 'k'); + this->AddMode(new ModeChannelLimit, 'l'); + + /* Channel listmodes */ + this->AddMode(new ModeChannelBan, 'b'); + this->AddMode(new ModeChannelOp, 'o'); + this->AddMode(new ModeChannelHalfOp, 'h'); + this->AddMode(new ModeChannelVoice, 'v'); + + /* Now for usermodes */ + this->AddMode(new ModeUserServerNotice, 's'); + this->AddMode(new ModeUserWallops, 'w'); + this->AddMode(new ModeUserInvisible, 'i'); + this->AddMode(new ModeUserOperator, 'o'); + this->AddMode(new ModeUserServerNoticeMask, 'n'); }