X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmode.cpp;h=3842b01e6ea02301b5d3b86e2221d89948dd1409;hb=84a19a9ab6129deb71cdc24b216b74dd8eb80978;hp=1f808099c76e741c6ef6cf2e308e4048a760034c;hpb=102cea3ab2947da96dfa13c1938d7e44a3e4fea1;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/mode.cpp b/src/mode.cpp index 1f808099c..3842b01e6 100644 --- a/src/mode.cpp +++ b/src/mode.cpp @@ -3,7 +3,7 @@ * +------------------------------------+ * * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: + * E-mail: * * * @@ -18,7 +18,7 @@ using namespace std; #include "inspircd_config.h" #include "inspircd.h" -#include "inspircd_io.h" +#include "configreader.h" #include #include #include @@ -54,92 +54,178 @@ extern ServerConfig* Config; extern time_t TIME; -char* ModeParser::GiveOps(userrec *user,char *dest,chanrec *chan,int status) +ModeHandler::ModeHandler(char modeletter, int parameters_on, int parameters_off, bool listmode, ModeType type, bool operonly) : mode(modeletter), n_params_on(parameters_on), n_params_off(parameters_off), list(listmode), m_type(type), oper(operonly) +{ +} + +ModeHandler::~ModeHandler() +{ +} + +bool ModeHandler::IsListMode() +{ + return list; +} + +ModeType ModeHandler::GetModeType() +{ + return m_type; +} + +bool ModeHandler::NeedsOper() +{ + return oper; +} + +int ModeHandler::GetNumParams(bool adding) +{ + return adding ? n_params_on : n_params_off; +} + +char ModeHandler::GetModeChar() +{ + return mode; +} + +ModeAction ModeHandler::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) +{ + return MODEACTION_DENY; +} + +void ModeHandler::DisplayList(userrec* user, chanrec* channel) +{ +} + +bool ModeHandler::CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel) +{ + return (ours < theirs); +} + +ModeWatcher::ModeWatcher(char modeletter, ModeType type) : mode(modeletter), m_type(type) +{ +} + +ModeWatcher::~ModeWatcher() +{ +} + +char ModeWatcher::GetModeChar() +{ + return mode; +} + +ModeType ModeWatcher::GetModeType() +{ + return m_type; +} + +bool ModeWatcher::BeforeMode(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding, ModeType type) +{ + return true; +} + +void ModeWatcher::AfterMode(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter, bool adding, ModeType type) +{ +} + +userrec* ModeParser::SanityChecks(userrec *user,char *dest,chanrec *chan,int status) { userrec *d; - if ((!user) || (!dest) || (!chan) || (!*dest)) { - log(DEFAULT,"*** BUG *** GiveOps was given an invalid parameter"); return NULL; } d = Find(dest); if (!d) { - log(DEFAULT,"the target nickname given to GiveOps couldnt be found"); WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest); return NULL; } - else + return d; +} + +char* ModeParser::Grant(userrec *d,chanrec *chan,int MASK) +{ + if (!chan) + return NULL; + + for (std::vector::const_iterator i = d->chans.begin(); i != d->chans.end(); i++) { - if (user->server == d->server) + if (((ucrec*)(*i))->channel == chan) { - int MOD_RESULT = 0; - FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_OP)); - - if (MOD_RESULT == ACR_DENY) + if (((ucrec*)(*i))->uc_modes & MASK) + { return NULL; - if (MOD_RESULT == ACR_DEFAULT) + } + ((ucrec*)(*i))->uc_modes = ((ucrec*)(*i))->uc_modes | MASK; + switch (MASK) { - if ((status < STATUS_OP) && (!is_uline(user->server)) && (IS_LOCAL(user))) - { - log(DEBUG,"%s cant give ops to %s because they nave status %d and needs %d",user->nick,dest,status,STATUS_OP); - WriteServ(user->fd,"482 %s %s :You're not a channel operator",user->nick, chan->name); - return NULL; - } + case UCMODE_OP: + ((ucrec*)(*i))->channel->AddOppedUser(d); + break; + case UCMODE_HOP: + ((ucrec*)(*i))->channel->AddHalfoppedUser(d); + break; + case UCMODE_VOICE: + ((ucrec*)(*i))->channel->AddVoicedUser(d); + break; } + log(DEBUG,"grant: %s %s",((ucrec*)(*i))->channel->name,d->nick); + return d->nick; } + } + return NULL; +} +char* ModeParser::Revoke(userrec *d,chanrec *chan,int MASK) +{ + if (!chan) + return NULL; - for (unsigned int i = 0; i < d->chans.size(); i++) + for (std::vector::const_iterator i = d->chans.begin(); i != d->chans.end(); i++) + { + if (((ucrec*)(*i))->channel == chan) { - if ((d->chans[i].channel != NULL) && (chan != NULL)) - if (!strcasecmp(d->chans[i].channel->name,chan->name)) + if ((((ucrec*)(*i))->uc_modes & MASK) == 0) { - if (d->chans[i].uc_modes & UCMODE_OP) - { - /* mode already set on user, dont allow multiple */ - return NULL; - } - d->chans[i].uc_modes = d->chans[i].uc_modes | UCMODE_OP; - d->chans[i].channel->AddOppedUser((char*)d); - log(DEBUG,"gave ops: %s %s",d->chans[i].channel->name,d->nick); - return d->nick; + return NULL; } + ((ucrec*)(*i))->uc_modes ^= MASK; + switch (MASK) + { + case UCMODE_OP: + ((ucrec*)(*i))->channel->DelOppedUser(d); + break; + case UCMODE_HOP: + ((ucrec*)(*i))->channel->DelHalfoppedUser(d); + break; + case UCMODE_VOICE: + ((ucrec*)(*i))->channel->DelVoicedUser(d); + break; + } + log(DEBUG,"revoke: %s %s",((ucrec*)(*i))->channel->name,d->nick); + return d->nick; } - log(DEFAULT,"The target channel given to GiveOps was not in the users mode list"); } return NULL; } -char* ModeParser::GiveHops(userrec *user,char *dest,chanrec *chan,int status) +char* ModeParser::GiveOps(userrec *user,char *dest,chanrec *chan,int status) { - userrec *d; + userrec *d = this->SanityChecks(user,dest,chan,status); - if ((!user) || (!dest) || (!chan) || (!*dest)) + if (d) { - log(DEFAULT,"*** BUG *** GiveHops was given an invalid parameter"); - return NULL; - } - - d = Find(dest); - if (!d) - { - WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest); - return NULL; - } - else - { - if (user->server == d->server) + if (IS_LOCAL(user)) { int MOD_RESULT = 0; - FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_HALFOP)); - + 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)) && (IS_LOCAL(user))) + 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; @@ -147,45 +233,46 @@ char* ModeParser::GiveHops(userrec *user,char *dest,chanrec *chan,int status) } } - for (unsigned int i = 0; i < d->chans.size(); i++) + 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)) { - if ((d->chans[i].channel != NULL) && (chan != NULL)) - if (!strcasecmp(d->chans[i].channel->name,chan->name)) + 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 (d->chans[i].uc_modes & UCMODE_HOP) + if ((status < STATUS_OP) && (!is_uline(user->server))) { - /* mode already set on user, dont allow multiple */ + WriteServ(user->fd,"482 %s %s :You're not a channel operator",user->nick, chan->name); return NULL; } - d->chans[i].uc_modes = d->chans[i].uc_modes | UCMODE_HOP; - d->chans[i].channel->AddHalfoppedUser((char*)d); - log(DEBUG,"gave h-ops: %s %s",d->chans[i].channel->name,d->nick); - return d->nick; } } + + return this->Grant(d,chan,UCMODE_HOP); } return NULL; } char* ModeParser::GiveVoice(userrec *user,char *dest,chanrec *chan,int status) { - userrec *d; + userrec *d = this->SanityChecks(user,dest,chan,status); - if ((!user) || (!dest) || (!chan) || (!*dest)) - { - log(DEFAULT,"*** BUG *** GiveVoice was given an invalid parameter"); - return NULL; - } - - d = Find(dest); - if (!d) - { - WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest); - return NULL; - } - else + if (d) { - if (user->server == d->server) + if (IS_LOCAL(user)) { int MOD_RESULT = 0; FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_VOICE)); @@ -194,7 +281,7 @@ char* ModeParser::GiveVoice(userrec *user,char *dest,chanrec *chan,int status) return NULL; if (MOD_RESULT == ACR_DEFAULT) { - if ((status < STATUS_HOP) && (!is_uline(user->server)) && (IS_LOCAL(user))) + 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; @@ -202,46 +289,18 @@ char* ModeParser::GiveVoice(userrec *user,char *dest,chanrec *chan,int status) } } - for (unsigned int i = 0; i < d->chans.size(); i++) - { - if ((d->chans[i].channel != NULL) && (chan != NULL)) - if (!strcasecmp(d->chans[i].channel->name,chan->name)) - { - if (d->chans[i].uc_modes & UCMODE_VOICE) - { - /* mode already set on user, dont allow multiple */ - return NULL; - } - d->chans[i].uc_modes = d->chans[i].uc_modes | UCMODE_VOICE; - d->chans[i].channel->AddVoicedUser((char*)d); - log(DEBUG,"gave voice: %s %s",d->chans[i].channel->name,d->nick); - return d->nick; - } - } + return this->Grant(d,chan,UCMODE_VOICE); } return NULL; } char* ModeParser::TakeOps(userrec *user,char *dest,chanrec *chan,int status) { - userrec *d; + userrec *d = this->SanityChecks(user,dest,chan,status); - if ((!user) || (!dest) || (!chan) || (!*dest)) + if (d) { - log(DEFAULT,"*** BUG *** TakeOps was given an invalid parameter"); - return NULL; - } - - d = Find(dest); - if (!d) - { - log(DEBUG,"TakeOps couldnt resolve the target nickname: %s",dest); - WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest); - return NULL; - } - else - { - if (user->server == d->server) + if (IS_LOCAL(user)) { int MOD_RESULT = 0; FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_DEOP)); @@ -250,7 +309,7 @@ char* ModeParser::TakeOps(userrec *user,char *dest,chanrec *chan,int status) return NULL; if (MOD_RESULT == ACR_DEFAULT) { - if ((status < STATUS_OP) && (!is_uline(user->server)) && (IS_LOCAL(user)) && (IS_LOCAL(user))) + 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; @@ -258,46 +317,18 @@ char* ModeParser::TakeOps(userrec *user,char *dest,chanrec *chan,int status) } } - for (unsigned int i = 0; i < d->chans.size(); i++) - { - if ((d->chans[i].channel != NULL) && (chan != NULL)) - if (!strcasecmp(d->chans[i].channel->name,chan->name)) - { - if ((d->chans[i].uc_modes & UCMODE_OP) == 0) - { - /* mode already set on user, dont allow multiple */ - return NULL; - } - d->chans[i].uc_modes ^= UCMODE_OP; - d->chans[i].channel->DelOppedUser((char*)d); - log(DEBUG,"took ops: %s %s",d->chans[i].channel->name,d->nick); - return d->nick; - } - } - log(DEBUG,"TakeOps couldnt locate the target channel in the target users list"); + return this->Revoke(d,chan,UCMODE_OP); } return NULL; } char* ModeParser::TakeHops(userrec *user,char *dest,chanrec *chan,int status) { - userrec *d; + userrec *d = this->SanityChecks(user,dest,chan,status); - if ((!user) || (!dest) || (!chan) || (!*dest)) - { - log(DEFAULT,"*** BUG *** TakeHops was given an invalid parameter"); - return NULL; - } - - d = Find(dest); - if (!d) - { - WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest); - return NULL; - } - else + if (d) { - if (user->server == d->server) + if (IS_LOCAL(user)) { int MOD_RESULT = 0; FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_DEHALFOP)); @@ -307,7 +338,7 @@ char* ModeParser::TakeHops(userrec *user,char *dest,chanrec *chan,int status) 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))) && (IS_LOCAL(user))) + 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; @@ -315,45 +346,18 @@ char* ModeParser::TakeHops(userrec *user,char *dest,chanrec *chan,int status) } } - for (unsigned int i = 0; i < d->chans.size(); i++) - { - if ((d->chans[i].channel != NULL) && (chan != NULL)) - if (!strcasecmp(d->chans[i].channel->name,chan->name)) - { - if ((d->chans[i].uc_modes & UCMODE_HOP) == 0) - { - /* mode already set on user, dont allow multiple */ - return NULL; - } - d->chans[i].uc_modes ^= UCMODE_HOP; - d->chans[i].channel->DelHalfoppedUser((char*)d); - log(DEBUG,"took h-ops: %s %s",d->chans[i].channel->name,d->nick); - return d->nick; - } - } + return this->Revoke(d,chan,UCMODE_HOP); } return NULL; } char* ModeParser::TakeVoice(userrec *user,char *dest,chanrec *chan,int status) { - userrec *d; - - if ((!user) || (!dest) || (!chan) || (!*dest)) - { - log(DEFAULT,"*** BUG *** TakeVoice was given an invalid parameter"); - return NULL; - } + userrec *d = this->SanityChecks(user,dest,chan,status); - d = Find(dest); - if (!d) - { - WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest); - return NULL; - } - else + if (d) { - if (user->server == d->server) + if (IS_LOCAL(user)) { int MOD_RESULT = 0; FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_DEVOICE)); @@ -362,7 +366,7 @@ char* ModeParser::TakeVoice(userrec *user,char *dest,chanrec *chan,int status) return NULL; if (MOD_RESULT == ACR_DEFAULT) { - if ((status < STATUS_HOP) && (!is_uline(user->server)) && (IS_LOCAL(user))) + 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; @@ -370,22 +374,7 @@ char* ModeParser::TakeVoice(userrec *user,char *dest,chanrec *chan,int status) } } - for (unsigned int i = 0; i < d->chans.size(); i++) - { - if ((d->chans[i].channel != NULL) && (chan != NULL)) - if (!strcasecmp(d->chans[i].channel->name,chan->name)) - { - if ((d->chans[i].uc_modes & UCMODE_VOICE) == 0) - { - /* mode already set on user, dont allow multiple */ - return NULL; - } - d->chans[i].uc_modes ^= UCMODE_VOICE; - d->chans[i].channel->DelVoicedUser((char*)d); - log(DEBUG,"took voice: %s %s",d->chans[i].channel->name,d->nick); - return d->nick; - } - } + return this->Revoke(d,chan,UCMODE_VOICE); } return NULL; } @@ -475,10 +464,10 @@ char* ModeParser::TakeBan(userrec *user,char *dest,chanrec *chan,int status) { if (!strcasecmp(i->data,dest)) { - int MOD_RESULT = 0; - FOREACH_RESULT(I_OnDelBan,OnDelBan(user,chan,dest)); - if (MOD_RESULT) - return NULL; + int MOD_RESULT = 0; + FOREACH_RESULT(I_OnDelBan,OnDelBan(user,chan,dest)); + if (MOD_RESULT) + return NULL; chan->bans.erase(i); return dest; } @@ -486,66 +475,154 @@ char* ModeParser::TakeBan(userrec *user,char *dest,chanrec *chan,int status) return NULL; } -// tidies up redundant modes, e.g. +nt-nt+i becomes +-+i, -// a section further down the chain tidies up the +-+- crap. -std::string ModeParser::CompressModes(std::string modes,bool channelmodes) +void ModeParser::Process(char **parameters, int pcnt, userrec *user, bool servermode) { - int counts[127]; - bool active[127]; - memset(counts,0,sizeof(counts)); - memset(active,0,sizeof(active)); - for (unsigned int i = 0; i < modes.length(); i++) + std::string target = parameters[0]; + ModeType type = MODETYPE_USER; + chanrec* targetchannel = FindChan(parameters[0]); + userrec* targetuser = Find(parameters[0]); + + if (pcnt > 1) { - if ((modes[i] == '+') || (modes[i] == '-')) - continue; - if (channelmodes) + if (targetchannel) { - if ((strchr("itnmsp",modes[i])) || ((ModeDefined(modes[i],MT_CHANNEL)) && (ModeDefinedOn(modes[i],MT_CHANNEL)==0) && (ModeDefinedOff(modes[i],MT_CHANNEL)==0))) - { - log(DEBUG,"Tidy mode %c",modes[i]); - counts[(unsigned int)modes[i]]++; - active[(unsigned int)modes[i]] = true; - } + type = MODETYPE_CHANNEL; + } + else if (targetuser) + { + type = MODETYPE_USER; } else { - log(DEBUG,"Tidy mode %c",modes[i]); - counts[(unsigned int)modes[i]]++; - active[(unsigned int)modes[i]] = true; + /* No such nick/channel */ + return; } - } - for (int j = 65; j < 127; j++) - { - if ((counts[j] > 1) && (active[j] == true)) + 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; + int parameter_counter = 2; /* Index of first parameter */ + + for (std::string::const_iterator modeletter = mode_sequence.begin(); modeletter != mode_sequence.end(); modeletter++) + { + switch (*modeletter) + { + /* 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 + * appearing in the output sequence, we store a flag which says there was a state change, + * which is set on any + or -, however, the + or - that we finish on is only appended to + * the output stream in the event it is followed by a non "+ or -" character, such as o or v. + */ + case '+': + /* The following expression prevents: +o+o nick nick, compressing it to +oo nick nick, + * however, will allow the + if it is the first item in the sequence, regardless. + */ + if ((!adding) || (!output_sequence.length())) + state_change = true; + adding = true; + continue; + break; + case '-': + if ((adding) || (!output_sequence.length())) + state_change = true; + adding = false; + continue; + break; + default: + + /* 65 is the ascii value of 'A' */ + handler_id = *modeletter - 65; + + if (modehandlers[handler_id]) + { + bool abort = false; + for (ModeWatchIter watchers = modewatchers[handler_id].begin(); watchers != modewatchers[handler_id].end(); watchers++) + { + if ((*watchers)->BeforeMode(user, targetuser, targetchannel, parameter, adding, type) == MODEACTION_DENY) + abort = true; + } + if ((modehandlers[handler_id]->GetModeType() == type) && (!abort)) + { + if (modehandlers[handler_id]->GetNumParams(adding)) + { + if (pcnt < parameter_counter) + { + parameter = parameters[parameter_counter++]; + } + else + { + parameter = ""; + } + } + ModeAction ma = modehandlers[handler_id]->OnModeChange(user, targetuser, targetchannel, parameter, adding); + if (ma == MODEACTION_ALLOW) + { + /* We're about to output a valid mode letter - was there previously a pending state-change? */ + if (state_change) + output_sequence.append(adding ? "+" : "-"); + + /* Add the mode letter */ + output_sequence = output_sequence + *modeletter; + + /* Is there a valid parameter for this mode? If so add it to the parameter list */ + if ((modehandlers[handler_id]->GetNumParams(adding)) && (parameter != "")) + { + 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++) + { + (*watchers)->AfterMode(user, targetuser, targetchannel, parameter, adding, type); + } + + /* Reset the state change flag */ + state_change = false; + } + } + } + break; + } + } + /* Was there at least one valid mode in the sequence? */ + if (output_sequence != "") { - static char v[2]; - v[0] = (unsigned char)j; - v[1] = '\0'; - std::string mode_str = v; - std::string::size_type pos = modes.find(mode_str); - if (pos != std::string::npos) + if (servermode) + { + if (type == MODETYPE_CHANNEL) + { + WriteChannelWithServ(Config->ServerName,targetchannel,"MODE %s %s%s",targetchannel->name,output_sequence.c_str(),parameter_list.str().c_str()); + } + } + else { - log(DEBUG,"all occurances of mode %c to be deleted...",(unsigned char)j); - while (modes.find(mode_str) != std::string::npos) - modes.erase(modes.find(mode_str),1); - log(DEBUG,"New mode line: %s",modes.c_str()); + if (type == MODETYPE_CHANNEL) + { + 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())); + } } } } - return modes; +} + +std::string ModeParser::CompressModes(std::string modes,bool channelmodes) +{ + return ""; } void ModeParser::ProcessModes(char **parameters,userrec* user,chanrec *chan,int status, int pcnt, bool servermode, bool silent, bool local) { - if (!parameters) { - log(DEFAULT,"*** BUG *** process_modes was given an invalid parameter"); + if ((!parameters) || (pcnt < 2)) { return; } - char modelist[MAXBUF]; char outlist[MAXBUF]; - char outstr[MAXBUF]; - char outpars[32][MAXBUF]; + char mlist[MAXBUF]; + char *outpars[32]; int param = 2; int pc = 0; int ptr = 0; @@ -553,11 +630,6 @@ void ModeParser::ProcessModes(char **parameters,userrec* user,chanrec *chan,int char* r = NULL; bool k_set = false, l_set = false, previously_set_l = false, previously_unset_l = false, previously_set_k = false, previously_unset_k = false; - if (pcnt < 2) - { - return; - } - int MOD_RESULT = 0; if (IS_LOCAL(user)) @@ -567,11 +639,10 @@ void ModeParser::ProcessModes(char **parameters,userrec* user,chanrec *chan,int return; } - log(DEBUG,"process_modes: start: parameters=%d",pcnt); + std::string tidied = this->CompressModes(parameters[1],true); + strlcpy(mlist,tidied.c_str(),MAXBUF); + char* modelist = mlist; - strlcpy(modelist,parameters[1],MAXBUF); /* mode list, e.g. +oo-o * - * parameters[2] onwards are parameters for - * modes that require them :) */ *outlist = *modelist; char* outl = outlist+1; @@ -579,17 +650,11 @@ void ModeParser::ProcessModes(char **parameters,userrec* user,chanrec *chan,int log(DEBUG,"process_modes: modelist: %s",modelist); - std::string tidied = this->CompressModes(modelist,true); - strlcpy(modelist,tidied.c_str(),MAXBUF); - int len = tidied.length(); while (modelist[len-1] == ' ') modelist[--len] = '\0'; - bool next_cant_be_modifier = false; - char* modechar; - - for (modechar = (modelist + 1); *modechar; ptr++, modechar++) + for (char* modechar = (modelist + 1); *modechar; ptr++, modechar++) { r = NULL; @@ -599,108 +664,102 @@ void ModeParser::ProcessModes(char **parameters,userrec* user,chanrec *chan,int if (pc > MAXMODES-1) break; - log(DEBUG,"Mode %c",*modechar); + + switch (*modechar) { - switch (*modechar) - { - case '-': - *outl++ = '-'; - mdir = 0; - next_cant_be_modifier = true; - - break; - - case '+': - *outl++ = '+'; - mdir = 1; - next_cant_be_modifier = true; - break; + case '-': + *outl++ = '-'; + mdir = 0; + break; + + case '+': + *outl++ = '+'; + mdir = 1; + break; - case 'o': - log(DEBUG,"Ops"); - if ((param >= pcnt)) break; - log(DEBUG,"Enough parameters left"); - r = NULL; - if (mdir == 1) + case 'o': + log(DEBUG,"Ops"); + if ((param >= pcnt)) break; + log(DEBUG,"Enough parameters left"); + r = NULL; + if (mdir == 1) + { + MOD_RESULT = 0; + FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'o', parameters[param], true, 1)); + if (!MOD_RESULT) { - MOD_RESULT = 0; - FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'o', parameters[param], true, 1)); - if (!MOD_RESULT) - { - log(DEBUG,"calling GiveOps"); - r = GiveOps(user,parameters[param++],chan,status); - } - else param++; + r = GiveOps(user,parameters[param++],chan,status); } - else - { - MOD_RESULT = 0; - FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'o', parameters[param], false, 1)); - if (!MOD_RESULT) - { - log(DEBUG,"calling TakeOps"); - r = TakeOps(user,parameters[param++],chan,status); - } - else param++; - } - if (r) + else param++; + } + else + { + MOD_RESULT = 0; + FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'o', parameters[param], false, 1)); + if (!MOD_RESULT) { - *outl++ = 'o'; - strlcpy(outpars[pc++],r,MAXBUF); + r = TakeOps(user,parameters[param++],chan,status); } - break; + else param++; + } + if (r) + { + *outl++ = 'o'; + outpars[pc++] = r; + } + break; - case 'h': - if (((param >= pcnt)) || (!Config->AllowHalfop)) break; - r = NULL; - if (mdir == 1) - { - MOD_RESULT = 0; - FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'h', parameters[param], true, 1)); - if (!MOD_RESULT) - { - r = GiveHops(user,parameters[param++],chan,status); - } - else param++; - } - else + case 'h': + if (((param >= pcnt)) || (!Config->AllowHalfop)) break; + r = NULL; + if (mdir == 1) + { + MOD_RESULT = 0; + FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'h', parameters[param], true, 1)); + if (!MOD_RESULT) { - MOD_RESULT = 0; - FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'h', parameters[param], false, 1)); - if (!MOD_RESULT) - { - r = TakeHops(user,parameters[param++],chan,status); - } - else param++; + r = GiveHops(user,parameters[param++],chan,status); } - if (r) + else param++; + } + else + { + MOD_RESULT = 0; + FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'h', parameters[param], false, 1)); + if (!MOD_RESULT) { - *outl++ = 'h'; - strlcpy(outpars[pc++],r,MAXBUF); + r = TakeHops(user,parameters[param++],chan,status); } - break; + else param++; + } + if (r) + { + *outl++ = 'h'; + outpars[pc++] = r; + } + break; - case 'v': + case 'v': if ((param >= pcnt)) break; r = NULL; if (mdir == 1) { - MOD_RESULT = 0; - FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'v', parameters[param], true, 1)); - if (!MOD_RESULT) - { + MOD_RESULT = 0; + FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'v', parameters[param], true, 1)); + if (!MOD_RESULT) + { r = GiveVoice(user,parameters[param++],chan,status); } else param++; } else { - MOD_RESULT = 0; - FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'v', parameters[param], false, 1)); - if (!MOD_RESULT) - { + MOD_RESULT = 0; + FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'v', parameters[param], false, 1)); + if (!MOD_RESULT) + { r = TakeVoice(user,parameters[param++],chan,status); } else param++; @@ -708,422 +767,428 @@ void ModeParser::ProcessModes(char **parameters,userrec* user,chanrec *chan,int if (r) { *outl++ = 'v'; - strlcpy(outpars[pc++],r,MAXBUF); + outpars[pc++] = r; } - break; + break; - case 'b': - if ((param >= pcnt)) break; - r = NULL; - if (mdir == 1) - { - MOD_RESULT = 0; - FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'b', parameters[param], true, 1)); - if (!MOD_RESULT) - { - r = AddBan(user,parameters[param++],chan,status); - } - else param++; - } - else + case 'b': + if ((param >= pcnt)) break; + r = NULL; + if (mdir == 1) + { + MOD_RESULT = 0; + FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'b', parameters[param], true, 1)); + if (!MOD_RESULT) { - MOD_RESULT = 0; - FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'b', parameters[param], false, 1)); - if (!MOD_RESULT) - { - r = TakeBan(user,parameters[param++],chan,status); - } - else param++; + r = AddBan(user,parameters[param++],chan,status); } - if (r) + else param++; + } + else + { + MOD_RESULT = 0; + FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'b', parameters[param], false, 1)); + if (!MOD_RESULT) { - *outl++ = 'b'; - strlcpy(outpars[pc++],parameters[param-1],MAXBUF); + r = TakeBan(user,parameters[param++],chan,status); } - break; + else param++; + } + if (r) + { + *outl++ = 'b'; + outpars[pc++] = parameters[param-1]; + } + break; - case 'k': - if ((param >= pcnt)) - break; + case 'k': + if ((param >= pcnt)) + break; - if (mdir == 1) - { - if (k_set) - break; + if (mdir == 1) + { + if (k_set) + break; - if (previously_unset_k) - break; - previously_set_k = true; + if (previously_unset_k) + break; + previously_set_k = true; - if (!*chan->key) - { - MOD_RESULT = 0; - FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'k', parameters[param], true, 1)); - if (!MOD_RESULT) - { - *outl++ = 'k'; - char key[MAXBUF]; - strlcpy(key,parameters[param++],32); - strlcpy(outpars[pc++],key,MAXBUF); - strlcpy(chan->key,key,MAXBUF); - k_set = true; - } - else param++; - } - } - else + if (!chan->modes[CM_KEY]) { - /* checks on -k are case sensitive and only accurate to the - first 32 characters */ - if (previously_set_k) - break; - previously_unset_k = true; - - char key[MAXBUF]; MOD_RESULT = 0; - FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'k', parameters[param], false, 1)); + FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'k', parameters[param], true, 1)); if (!MOD_RESULT) { + *outl++ = 'k'; + char key[MAXBUF]; strlcpy(key,parameters[param++],32); - /* only allow -k if correct key given */ - if (!strcmp(chan->key,key)) - { - *outl++ = 'k'; - *chan->key = 0; - strlcpy(outpars[pc++],key,MAXBUF); - } + outpars[pc++] = key; + strlcpy(chan->key,key,MAXBUF); + chan->modes[CM_KEY] = 1; + k_set = true; } else param++; } - break; - - case 'l': - if (mdir == 0) + } + else + { + /* checks on -k are case sensitive and only accurate to the + first 32 characters */ + if (previously_set_k) + break; + previously_unset_k = true; + + char key[MAXBUF]; + MOD_RESULT = 0; + FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'k', parameters[param], false, 1)); + if (!MOD_RESULT) { - if (previously_set_l) - break; - previously_unset_l = true; - MOD_RESULT = 0; - FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'l', "", false, 0)); - if (!MOD_RESULT) - { - if (chan->limit) - { - *outl++ = 'l'; - chan->limit = 0; - } + strlcpy(key,parameters[param++],32); + /* only allow -k if correct key given */ + if (!strcmp(chan->key,key)) + { + *outl++ = 'k'; + *chan->key = 0; + chan->modes[CM_KEY] = 0; + outpars[pc++] = key; } } - - if ((param >= pcnt)) break; - if (mdir == 1) + else param++; + } + break; + + case 'l': + if (mdir == 0) + { + if (previously_set_l) + break; + previously_unset_l = true; + MOD_RESULT = 0; + FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'l', "", false, 0)); + if (!MOD_RESULT) { - if (l_set) - break; - if (previously_unset_l) - break; - previously_set_l = true; - bool invalid = false; - for (char* f = parameters[param]; *f; f++) + if (chan->modes[CM_LIMIT]) { - if ((*f < '0') || (*f > '9')) - { - invalid = true; - } + *outl++ = 'l'; + chan->limit = 0; + chan->modes[CM_LIMIT] = 0; } - /* If the limit is < 1, or the new limit is the current limit, dont allow */ - if ((atoi(parameters[param]) < 1) || ((chan->limit > 0) && (atoi(parameters[param]) == chan->limit))) + } + } + + if ((param >= pcnt)) break; + if (mdir == 1) + { + if (l_set) + break; + if (previously_unset_l) + break; + previously_set_l = true; + bool invalid = false; + for (char* f = parameters[param]; *f; f++) + { + if ((*f < '0') || (*f > '9')) { invalid = true; } + } + /* If the limit is < 1, or the new limit is the current limit, dont allow */ + if ((atoi(parameters[param]) < 1) || ((chan->limit > 0) && (atoi(parameters[param]) == chan->limit))) + { + invalid = true; + } - if (invalid) - break; + if (invalid) + break; - MOD_RESULT = 0; - FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'l', parameters[param], true, 1)); - if (!MOD_RESULT) - { + MOD_RESULT = 0; + FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'l', parameters[param], true, 1)); + if (!MOD_RESULT) + { - chan->limit = atoi(parameters[param]); - - // reported by mech: large values cause underflow - if (chan->limit < 0) - chan->limit = 0x7FFF; - } + chan->limit = atoi(parameters[param]); - if (chan->limit) - { - *outl++ = 'l'; - strlcpy(outpars[pc++],parameters[param++],MAXBUF); - l_set = true; - } + // reported by mech: large values cause underflow + if (chan->limit < 0) + chan->limit = 0x7FFF; + } + + if (chan->limit) + { + *outl++ = 'l'; + chan->modes[CM_LIMIT] = 1; + outpars[pc++] = parameters[param++]; + l_set = true; + } + } + break; + + case 'i': + MOD_RESULT = 0; + FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'i', "", mdir, 0)); + if (!MOD_RESULT) + { + if (mdir) + { + if (!(chan->modes[CM_INVITEONLY])) *outl++ = 'i'; + chan->modes[CM_INVITEONLY] = 1; + } + else + { + if (chan->modes[CM_INVITEONLY]) *outl++ = 'i'; + chan->modes[CM_INVITEONLY] = 0; + } + } + break; + + case 't': + MOD_RESULT = 0; + FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 't', "", mdir, 0)); + if (!MOD_RESULT) + { + if (mdir) + { + if (!(chan->modes[CM_TOPICLOCK])) *outl++ = 't'; + chan->modes[CM_TOPICLOCK] = 1; + } + else + { + if (chan->modes[CM_TOPICLOCK]) *outl++ = 't'; + chan->modes[CM_TOPICLOCK] = 0; + } + } + break; + + case 'n': + MOD_RESULT = 0; + FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'n', "", mdir, 0)); + if (!MOD_RESULT) + { + if (mdir) + { + if (!(chan->modes[CM_NOEXTERNAL])) *outl++ = 'n'; + chan->modes[CM_NOEXTERNAL] = 1; + } + else + { + if (chan->modes[CM_NOEXTERNAL]) *outl++ = 'n'; + chan->modes[CM_NOEXTERNAL] = 0; + } + } + break; + + case 'm': + MOD_RESULT = 0; + FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'm', "", mdir, 0)); + if (!MOD_RESULT) + { + if (mdir) + { + if (!(chan->modes[CM_MODERATED])) *outl++ = 'm'; + chan->modes[CM_MODERATED] = 1; + } + else + { + if (chan->modes[CM_MODERATED]) *outl++ = 'm'; + chan->modes[CM_MODERATED] = 0; } - break; + } + break; - case 'i': - MOD_RESULT = 0; - FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'i', "", mdir, 0)); - if (!MOD_RESULT) - { - if (mdir) - { - if (!(chan->binarymodes & CM_INVITEONLY)) *outl++ = 'i'; - chan->binarymodes |= CM_INVITEONLY; - } - else + case 's': + MOD_RESULT = 0; + FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 's', "", mdir, 0)); + if (!MOD_RESULT) + { + if (mdir) + { + if (!(chan->modes[CM_SECRET])) *outl++ = 's'; + chan->modes[CM_SECRET] = 1; + if (chan->modes[CM_PRIVATE]) { - if (chan->binarymodes & CM_INVITEONLY) *outl++ = 'i'; - chan->binarymodes &= ~CM_INVITEONLY; + chan->modes[CM_PRIVATE] = 0; + if (mdir) + { + *outl++ = '-'; *outl++ = 'p'; *outl++ = '+'; + } } } - break; - - case 't': - MOD_RESULT = 0; - FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 't', "", mdir, 0)); - if (!MOD_RESULT) - { - if (mdir) - { - if (!(chan->binarymodes & CM_TOPICLOCK)) *outl++ = 't'; - chan->binarymodes |= CM_TOPICLOCK; - } - else - { - if (chan->binarymodes & CM_TOPICLOCK) *outl++ = 't'; - chan->binarymodes &= ~CM_TOPICLOCK; - } + else + { + if (chan->modes[CM_SECRET]) *outl++ = 's'; + chan->modes[CM_SECRET] = 0; } - break; + } + break; - case 'n': - MOD_RESULT = 0; - FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'n', "", mdir, 0)); - if (!MOD_RESULT) - { - if (mdir) - { - if (!(chan->binarymodes & CM_NOEXTERNAL)) *outl++ = 'n'; - chan->binarymodes |= CM_NOEXTERNAL; - } - else - { - if (chan->binarymodes & CM_NOEXTERNAL) *outl++ = 'n'; - chan->binarymodes &= ~CM_NOEXTERNAL; - } + case 'p': + MOD_RESULT = 0; + FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'p', "", mdir, 0)); + if(!MOD_RESULT) + { + if(mdir) + { + if(!(chan->modes[CM_PRIVATE])) + *outl++ = 'p'; + + chan->modes[CM_PRIVATE] = 1; + + if(chan->modes[CM_SECRET]) + { + chan->modes[CM_SECRET] = 0; + + *outl++ = '-'; + *outl++ = 's'; + *outl++ = '+'; + } } - break; - - case 'm': - MOD_RESULT = 0; - FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'm', "", mdir, 0)); - if (!MOD_RESULT) - { - if (mdir) - { - if (!(chan->binarymodes & CM_MODERATED)) *outl++ = 'm'; - chan->binarymodes |= CM_MODERATED; - } - else - { - if (chan->binarymodes & CM_MODERATED) *outl++ = 'm'; - chan->binarymodes &= ~CM_MODERATED; - } + else + { + if(chan->modes[CM_PRIVATE]) + *outl++ = 'p'; + + chan->modes[CM_PRIVATE] = 0; } + } break; - case 's': - MOD_RESULT = 0; - FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 's', "", mdir, 0)); - if (!MOD_RESULT) - { - if (mdir) - { - if (!(chan->binarymodes & CM_SECRET)) *outl++ = 's'; - chan->binarymodes |= CM_SECRET; - if (chan->binarymodes & CM_PRIVATE) - { - chan->binarymodes &= ~CM_PRIVATE; - if (mdir) - { - *outl++ = '-'; *outl++ = 'p'; *outl++ = '+'; - } - } - } - else - { - if (chan->binarymodes & CM_SECRET) *outl++ = 's'; - chan->binarymodes &= ~CM_SECRET; - } + default: + string_list p; + p.clear(); + bool x = chan->modes[*modechar-65]; + if ((!x && !mdir) || (x && mdir)) + { + if (!ModeIsListMode(*modechar,MT_CHANNEL)) + { + log(DEBUG,"Mode %c isnt set on %s but trying to remove!",*modechar,chan->name); + break; } - break; - - case 'p': - MOD_RESULT = 0; - FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'p', "", mdir, 0)); - if (!MOD_RESULT) - { - if (mdir) - { - if (!(chan->binarymodes & CM_PRIVATE)) *outl++ = 'p'; - chan->binarymodes |= CM_PRIVATE; - if (chan->binarymodes & CM_SECRET) - { - chan->binarymodes &= ~CM_SECRET; - if (mdir) - { - *outl++ = '-'; *outl++ = 's'; *outl++ = '+'; - } - } - } - else - { - if (chan->binarymodes & CM_PRIVATE) *outl++ = 'p'; - chan->binarymodes &= ~CM_PRIVATE; - } + } + if (ModeDefined(*modechar,MT_CHANNEL)) + { + /* A module has claimed this mode */ + if (param0) && (mdir)) + { + p.push_back(parameters[param]); + } + if ((ModeDefinedOff(*modechar,MT_CHANNEL)>0) && (!mdir)) + { + p.push_back(parameters[param]); + } } - break; - - default: - log(DEBUG,"Preprocessing custom mode %c: modelist: %s",*modechar,chan->custom_modes); - string_list p; - p.clear(); - if (((!strchr(chan->custom_modes,*modechar)) && (!mdir)) || ((strchr(chan->custom_modes,*modechar)) && (mdir))) + bool handled = false; + if (param>=pcnt) { - if (!ModeIsListMode(*modechar,MT_CHANNEL)) + // we're supposed to have a parameter, but none was given... so dont handle the mode. + if (((ModeDefinedOn(*modechar,MT_CHANNEL)>0) && (mdir)) || ((ModeDefinedOff(*modechar,MT_CHANNEL)>0) && (!mdir))) { - log(DEBUG,"Mode %c isnt set on %s but trying to remove!",*modechar,chan->name); - break; + log(DEBUG,"Not enough parameters for module-mode %c",*modechar); + handled = true; + param++; } } - if (ModeDefined(*modechar,MT_CHANNEL)) + // BIG ASS IDIOTIC CODER WARNING! + // Using OnRawMode on another modules mode's behavour + // will confuse the crap out of admins! just because you CAN + // do it, doesnt mean you SHOULD! + MOD_RESULT = 0; + std::string para = ""; + if (p.size()) + para = p[0]; + + FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, *modechar, para, mdir, pcnt)); + if(!MOD_RESULT) { - log(DEBUG,"A module has claimed this mode"); - if (param0) && (mdir)) + if (!handled) { - p.push_back(parameters[param]); - } - if ((ModeDefinedOff(*modechar,MT_CHANNEL)>0) && (!mdir)) - { - p.push_back(parameters[param]); - } - } - bool handled = false; - if (param>=pcnt) - { - // we're supposed to have a parameter, but none was given... so dont handle the mode. - if (((ModeDefinedOn(*modechar,MT_CHANNEL)>0) && (mdir)) || ((ModeDefinedOff(*modechar,MT_CHANNEL)>0) && (!mdir))) - { - log(DEBUG,"Not enough parameters for module-mode %c",*modechar); - handled = true; - param++; - } - } - - // BIG ASS IDIOTIC CODER WARNING! - // Using OnRawMode on another modules mode's behavour - // will confuse the crap out of admins! just because you CAN - // do it, doesnt mean you SHOULD! - MOD_RESULT = 0; - std::string para = ""; - if (p.size()) - para = p[0]; - FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, *modechar, para, mdir, pcnt)); - if (!MOD_RESULT) - { - for (int i = 0; i <= MODCOUNT; i++) - { - if (!handled) + int t = modules[i]->OnExtendedMode(user,chan,*modechar,MT_CHANNEL,mdir,p); + if (t != 0) { - int t = modules[i]->OnExtendedMode(user,chan,*modechar,MT_CHANNEL,mdir,p); - if (t != 0) + log(DEBUG,"OnExtendedMode returned nonzero for a module"); + if (ModeIsListMode(*modechar,MT_CHANNEL)) { - log(DEBUG,"OnExtendedMode returned nonzero for a module"); - if (ModeIsListMode(*modechar,MT_CHANNEL)) + if (t == -1) { - if (t == -1) - { - //pc++; - param++; - } - else - { - if (param < pcnt) - { - *outl++ = *modechar; - } - strlcpy(outpars[pc++],parameters[param++],MAXBUF); - } + //pc++; + param++; } else { if (param < pcnt) { - /* Null terminate it early for the 'else' below - * so it can use strchr (ugh) - */ *outl++ = *modechar; - chan->SetCustomMode(*modechar,mdir); - // include parameters in output if mode has them - if ((ModeDefinedOn(*modechar,MT_CHANNEL)>0) && (mdir)) - { - chan->SetCustomModeParam(modelist[ptr],parameters[param],mdir); - strlcpy(outpars[pc++],parameters[param++],MAXBUF); - } + } + outpars[pc++] = parameters[param++]; + } + } + else + { + *outl++ = *modechar; + chan->SetCustomMode(*modechar,mdir); + // include parameters in output if mode has them + if ((ModeDefinedOn(*modechar,MT_CHANNEL)>0) && (mdir)) + { + if (param < pcnt) + { + chan->SetCustomModeParam(*modechar,parameters[param],mdir); + outpars[pc++] = parameters[param++]; } } - // break, because only one module can handle the mode. - handled = true; - } - } - } + } + // break, because only one module can handle the mode. + handled = true; + } + } } - } - else - { - WriteServ(user->fd,"472 %s %c :is unknown mode char to me",user->nick,*modechar); } - break; - - } + } + else + { + WriteServ(user->fd,"472 %s %c :is unknown mode char to me",user->nick,*modechar); + } + break; } } /* Null terminate it now we're done */ *outl = 0; + + /************ Fast, but confusing string tidying ************/ outl = outlist; while (*outl && (*outl < 'A')) outl++; /* outl now points to the first mode character after +'s and -'s */ outl--; /* Now points at first mode-modifier + or - symbol */ - char* trim = outl; /* Now we tidy off any trailing -'s etc */ while (*trim++); trim--; while ((*--trim == '+') || (*trim == '-')) *trim = 0; - + /************ Done wih the string tidy functions ************/ + + /* The mode change must be at least two characters long (+ or - and at least one mode) */ if (((*outl == '+') || (*outl == '-')) && *(outl+1)) { - strlcpy(outstr,outl,MAXBUF); for (ptr = 0; ptr < pc; ptr++) { - charlcat(outstr,' ',MAXBUF); - strlcat(outstr,outpars[ptr],MAXBUF); + charlcat(outl,' ',MAXBUF); + strlcat(outl,outpars[ptr],MAXBUF-1); } if (local) { log(DEBUG,"Local mode change"); - WriteChannelLocal(chan, user, "MODE %s %s",chan->name,outstr); - FOREACH_MOD(I_OnMode,OnMode(user, chan, TYPE_CHANNEL, outstr)); + WriteChannelLocal(chan, user, "MODE %s %s",chan->name,outl); + FOREACH_MOD(I_OnMode,OnMode(user, chan, TYPE_CHANNEL, outl)); } else { @@ -1131,7 +1196,7 @@ void ModeParser::ProcessModes(char **parameters,userrec* user,chanrec *chan,int { if (!silent) { - WriteChannelWithServ(Config->ServerName,chan,"MODE %s %s",chan->name,outstr); + WriteChannelWithServ(Config->ServerName,chan,"MODE %s %s",chan->name,outl); } } @@ -1139,8 +1204,8 @@ void ModeParser::ProcessModes(char **parameters,userrec* user,chanrec *chan,int { if (!silent) { - WriteChannel(chan,user,"MODE %s %s",chan->name,outstr); - FOREACH_MOD(I_OnMode,OnMode(user, chan, TYPE_CHANNEL, outstr)); + WriteChannel(chan,user,"MODE %s %s",chan->name,outl); + FOREACH_MOD(I_OnMode,OnMode(user, chan, TYPE_CHANNEL, outl)); } } } @@ -1151,6 +1216,7 @@ void ModeParser::ProcessModes(char **parameters,userrec* user,chanrec *chan,int bool ModeParser::AllowedUmode(char umode, char* sourcemodes,bool adding,bool serveroverride) { + bool sourceoper = (strchr(sourcemodes,'o') != NULL); log(DEBUG,"Allowed_umode: %c %s",umode,sourcemodes); // Servers can +o and -o arbitrarily if ((serveroverride == true) && (umode == 'o')) @@ -1160,34 +1226,32 @@ bool ModeParser::AllowedUmode(char umode, char* sourcemodes,bool adding,bool ser // RFC1459 specified modes if ((umode == 'w') || (umode == 's') || (umode == 'i')) { - log(DEBUG,"umode %c allowed by RFC1459 scemantics",umode); + /* umode allowed by RFC1459 scemantics */ return true; } - // user may not +o themselves or others, but an oper may de-oper other opers or themselves - if ((strchr(sourcemodes,'o')) && (!adding)) + /* user may not +o themselves or others, but an oper may de-oper other opers or themselves */ + if (sourceoper && !adding) { - log(DEBUG,"umode %c allowed by RFC1459 scemantics",umode); return true; } else if (umode == 'o') { - log(DEBUG,"umode %c allowed by RFC1459 scemantics",umode); + /* Bad oper, bad bad! */ return false; } - // process any module-defined modes that need oper - if ((ModeDefinedOper(umode,MT_CLIENT)) && (strchr(sourcemodes,'o'))) + /* process any module-defined modes that need oper */ + if ((ModeDefinedOper(umode,MT_CLIENT)) && (sourceoper)) { log(DEBUG,"umode %c allowed by module handler (oper only mode)",umode); return true; } - else - if (ModeDefined(umode,MT_CLIENT)) + else if (ModeDefined(umode,MT_CLIENT)) { // process any module-defined modes that don't need oper log(DEBUG,"umode %c allowed by module handler (non-oper mode)",umode); - if ((ModeDefinedOper(umode,MT_CLIENT)) && (!strchr(sourcemodes,'o'))) + if ((ModeDefinedOper(umode,MT_CLIENT)) && (!sourceoper)) { // no, this mode needs oper, and this user 'aint got what it takes! return false; @@ -1247,27 +1311,23 @@ bool ModeParser::ProcessModuleUmode(char umode, userrec* source, void* dest, boo void cmd_mode::Handle (char **parameters, int pcnt, userrec *user) { - chanrec* Ptr; - userrec* dest; + chanrec* chan; + userrec* dest = Find(parameters[0]); + int MOD_RESULT; int can_change; int direction = 1; char outpars[MAXBUF]; bool next_ok = true; - dest = Find(parameters[0]); - if (!user) - { return; - } if ((dest) && (pcnt == 1)) { WriteServ(user->fd,"221 %s :+%s",dest->nick,dest->modes); return; } - - if ((dest) && (pcnt > 1)) + else if ((dest) && (pcnt > 1)) { std::string tidied = ServerInstance->ModeGrok->CompressModes(parameters[1],false); parameters[1] = (char*)tidied.c_str(); @@ -1279,7 +1339,7 @@ void cmd_mode::Handle (char **parameters, int pcnt, userrec *user) can_change = 0; if (user != dest) { - if ((strchr(user->modes,'o')) || (is_uline(user->server))) + if ((*user->oper) || (is_uline(user->server))) { can_change = 1; } @@ -1303,79 +1363,106 @@ void cmd_mode::Handle (char **parameters, int pcnt, userrec *user) for (char* i = parameters[1]; *i; i++) { - if (*i == ' ') - continue; - if ((i != parameters[1]) && (*i != '+') && (*i != '-')) next_ok = true; - if (*i == '+') - { - if ((direction != 1) && (next_ok)) - { - charlcat(outpars,'+',MAXBUF); - next_ok = false; - } - direction = 1; - } - else - if (*i == '-') - { - if ((direction != 0) && (next_ok)) - { - charlcat(outpars,'-',MAXBUF); - next_ok = false; - } - direction = 0; - } - else + switch (*i) { - can_change = 0; - if (strchr(user->modes,'o')) - { - can_change = 1; - } - else - { - if ((*i == 'i') || (*i == 'w') || (*i == 's') || (ServerInstance->ModeGrok->AllowedUmode(*i,user->modes,direction,false))) + case ' ': + continue; + + case '+': + if ((direction != 1) && (next_ok)) + { + charlcat(outpars,'+',MAXBUF); + next_ok = false; + } + direction = 1; + break; + + case '-': + if ((direction != 0) && (next_ok)) + { + charlcat(outpars,'-',MAXBUF); + next_ok = false; + } + direction = 0; + break; + + default: + can_change = 0; + if (*user->oper) { can_change = 1; } - } - if (can_change) - { - if (direction == 1) + else + { + if ((*i == 'i') || (*i == 'w') || (*i == 's') || (ServerInstance->ModeGrok->AllowedUmode(*i,user->modes,direction,false))) + { + can_change = 1; + } + } + if (can_change) { - if ((!strchr(dmodes,*i)) && (ServerInstance->ModeGrok->AllowedUmode(*i,user->modes,true,false))) + if (direction == 1) { - if ((ServerInstance->ModeGrok->ProcessModuleUmode(*i, user, dest, direction)) || (*i == 'i') || (*i == 's') || (*i == 'w') || (*i == 'o')) + if ((!strchr(dmodes,*i)) && (ServerInstance->ModeGrok->AllowedUmode(*i,user->modes,true,false))) { - charlcat(dmodes,*i,MAXMODES); - charlcat(outpars,*i,MAXMODES); - if (*i == 'o') + if ((ServerInstance->ModeGrok->ProcessModuleUmode(*i, user, dest, direction)) || (*i == 'i') || (*i == 's') || (*i == 'w') || (*i == 'o')) { - FOREACH_MOD(I_OnGlobalOper,OnGlobalOper(dest)); + charlcat(dmodes,*i,53); + charlcat(outpars,*i,MAXMODES); + switch (*i) + { + case 'o': + FOREACH_MOD(I_OnGlobalOper,OnGlobalOper(dest)); + break; + case 'i': + dest->modebits |= UM_INVISIBLE; + break; + case 's': + dest->modebits |= UM_SERVERNOTICE; + break; + case 'w': + dest->modebits |= UM_WALLOPS; + break; + default: + break; + } } } } - } - else - { - if ((ServerInstance->ModeGrok->AllowedUmode(*i,user->modes,false,false)) && (strchr(dmodes,*i))) + else { - if ((ServerInstance->ModeGrok->ProcessModuleUmode(*i, user, dest, direction)) || (*i == 'i') || (*i == 's') || (*i == 'w') || (*i == 'o')) + if ((ServerInstance->ModeGrok->AllowedUmode(*i,user->modes,false,false)) && (strchr(dmodes,*i))) { - charlcat(outpars,*i,MAXMODES); - charremove(dmodes,*i); - if (*i == 'o') + if ((ServerInstance->ModeGrok->ProcessModuleUmode(*i, user, dest, direction)) || (*i == 'i') || (*i == 's') || (*i == 'w') || (*i == 'o')) { - *dest->oper = 0; - DeleteOper(dest); + charlcat(outpars,*i,MAXMODES); + charremove(dmodes,*i); + switch (*i) + { + case 'o': + *dest->oper = 0; + DeleteOper(dest); + break; + case 'i': + dest->modebits &= ~UM_INVISIBLE; + break; + case 's': + dest->modebits &= ~UM_SERVERNOTICE; + break; + case 'w': + dest->modebits &= ~UM_WALLOPS; + break; + default: + break; + } } } } } - } + break; } } if (*outpars) @@ -1418,75 +1505,77 @@ void cmd_mode::Handle (char **parameters, int pcnt, userrec *user) return; } - - Ptr = FindChan(parameters[0]); - if (Ptr) + else { - if (pcnt == 1) - { - /* just /modes #channel */ - WriteServ(user->fd,"324 %s %s +%s",user->nick, Ptr->name, chanmodes(Ptr,has_channel(user,Ptr))); - WriteServ(user->fd,"329 %s %s %d", user->nick, Ptr->name, Ptr->created); - return; - } - else - if (pcnt == 2) + chan = FindChan(parameters[0]); + if(chan) { - char* mode = parameters[1]; - if (*mode == '+') - mode++; - int MOD_RESULT = 0; - FOREACH_RESULT(I_OnRawMode,OnRawMode(user, Ptr, *mode, "", false, 0)); - if (!MOD_RESULT) - { - if (*mode == 'b') - { + if (pcnt == 1) + { + /* just /modes #channel */ + WriteServ(user->fd,"324 %s %s +%s",user->nick, chan->name, chanmodes(chan, chan->HasUser(user))); + WriteServ(user->fd,"329 %s %s %d", user->nick, chan->name, chan->created); + return; + } + else if (pcnt == 2) + { + char* mode = parameters[1]; + + MOD_RESULT = 0; + + if (*mode == '+') + mode++; - for (BanList::iterator i = Ptr->bans.begin(); i != Ptr->bans.end(); i++) + FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, *mode, "", false, 0)); + if(!MOD_RESULT) + { + if (*mode == 'b') { - WriteServ(user->fd,"367 %s %s %s %s %d",user->nick, Ptr->name, i->data, i->set_by, i->set_time); + for (BanList::iterator i = chan->bans.begin(); i != chan->bans.end(); i++) + { + WriteServ(user->fd,"367 %s %s %s %s %d",user->nick, chan->name, i->data, i->set_by, i->set_time); + } + WriteServ(user->fd,"368 %s %s :End of channel ban list",user->nick, chan->name); + return; + } + + if ((ModeDefined(*mode,MT_CHANNEL)) && (ModeIsListMode(*mode,MT_CHANNEL))) + { + // list of items for an extmode + log(DEBUG,"Calling OnSendList for all modules, list output for mode %c",*mode); + FOREACH_MOD(I_OnSendList,OnSendList(user,chan,*mode)); + return; } - WriteServ(user->fd,"368 %s %s :End of channel ban list",user->nick, Ptr->name); - return; - } - if ((ModeDefined(*mode,MT_CHANNEL)) && (ModeIsListMode(*mode,MT_CHANNEL))) - { - // list of items for an extmode - log(DEBUG,"Calling OnSendList for all modules, list output for mode %c",*mode); - FOREACH_MOD(I_OnSendList,OnSendList(user,Ptr,*mode)); - return; } } - } - - if (((Ptr) && (!has_channel(user,Ptr))) && (!is_uline(user->server)) && (IS_LOCAL(user))) - { - WriteServ(user->fd,"442 %s %s :You're not on that channel!",user->nick, Ptr->name); - return; - } - if (Ptr) - { - int MOD_RESULT = 0; - FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,NULL,Ptr,AC_GENERAL_MODE)); - - if (MOD_RESULT == ACR_DENY) + if ((IS_LOCAL(user)) && (!is_uline(user->server)) && (!chan->HasUser(user))) + { + WriteServ(user->fd,"442 %s %s :You're not on that channel!",user->nick, chan->name); return; - if (MOD_RESULT == ACR_DEFAULT) + } + + MOD_RESULT = 0; + FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user, NULL, chan, AC_GENERAL_MODE)); + + if(MOD_RESULT == ACR_DENY) + return; + + if(MOD_RESULT == ACR_DEFAULT) { - if ((cstatus(user,Ptr) < STATUS_HOP) && (IS_LOCAL(user))) + if ((IS_LOCAL(user)) && (cstatus(user,chan) < STATUS_HOP)) { - WriteServ(user->fd,"482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, Ptr->name); + 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; } } - - ServerInstance->ModeGrok->ProcessModes(parameters,user,Ptr,cstatus(user,Ptr),pcnt,false,false,false); + + ServerInstance->ModeGrok->ProcessModes(parameters,user,chan,cstatus(user,chan),pcnt,false,false,false); + } + else + { + WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]); } - } - else - { - WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]); } } @@ -1496,24 +1585,16 @@ void cmd_mode::Handle (char **parameters, int pcnt, userrec *user) void ModeParser::ServerMode(char **parameters, int pcnt, userrec *user) { chanrec* Ptr; - userrec* dest; + userrec* dest = Find(parameters[0]); int can_change; int direction = 1; char outpars[MAXBUF]; bool next_ok = true; - dest = Find(parameters[0]); - - // fix: ChroNiCk found this - we cant use this as debug if its null! - if (dest) - { - log(DEBUG,"server_mode on %s",dest->nick); - } - if ((dest) && (pcnt > 1)) { - std::string tidied = ServerInstance->ModeGrok->CompressModes(parameters[1],false); - parameters[1] = (char*)tidied.c_str(); + std::string tidied = ServerInstance->ModeGrok->CompressModes(parameters[1],false); + parameters[1] = (char*)tidied.c_str(); char dmodes[MAXBUF]; strlcpy(dmodes,dest->modes,MAXBUF); @@ -1527,104 +1608,133 @@ void ModeParser::ServerMode(char **parameters, int pcnt, userrec *user) for (char* i = parameters[1]; *i; i++) { - if (*i == ' ') - continue; - if ((i != parameters[1]) && (*i != '+') && (*i != '-')) next_ok = true; - if (*i == '+') - { - if ((direction != 1) && (next_ok)) - { - next_ok = false; - charlcat(outpars,'+',MAXBUF); - } - direction = 1; - } - else - if (*i == '-') - { - if ((direction != 0) && (next_ok)) - { - next_ok = false; - charlcat(outpars,'-',MAXBUF); - } - direction = 0; - } - else + switch (*i) { - log(DEBUG,"begin mode processing entry"); - can_change = 1; - if (can_change) - { - if (direction == 1) + case ' ': + continue; + + case '+': + if ((direction != 1) && (next_ok)) + { + next_ok = false; + charlcat(outpars,'+',MAXBUF); + } + direction = 1; + break; + + case '-': + if ((direction != 0) && (next_ok)) + { + next_ok = false; + charlcat(outpars,'-',MAXBUF); + } + direction = 0; + break; + + default: + log(DEBUG,"begin mode processing entry"); + can_change = 1; + if (can_change) { - log(DEBUG,"umode %c being added",*i); - if ((!strchr(dmodes,*i)) && (ServerInstance->ModeGrok->AllowedUmode(*i,user->modes,true,true))) + if (direction == 1) { - log(DEBUG,"umode %c is an allowed umode",*i); - if ((ServerInstance->ModeGrok->ProcessModuleUmode(*i, user, dest, direction)) || (*i == 'i') || (*i == 's') || (*i == 'w') || (*i == 'o')) + log(DEBUG,"umode %c being added",*i); + if ((!strchr(dmodes,*i)) && (ServerInstance->ModeGrok->AllowedUmode(*i,user->modes,true,true))) { - charlcat(dmodes,*i,MAXMODES); - charlcat(outpars,*i,MAXMODES); + log(DEBUG,"umode %c is an allowed umode",*i); + if ((*i == 'i') || (*i == 's') || (*i == 'w') || (*i == 'o') || (ServerInstance->ModeGrok->ProcessModuleUmode(*i, user, dest, direction))) + { + charlcat(dmodes,*i,MAXBUF); + charlcat(outpars,*i,53); + switch (*i) + { + case 'i': + dest->modebits |= UM_INVISIBLE; + break; + case 's': + dest->modebits |= UM_SERVERNOTICE; + break; + case 'w': + dest->modebits |= UM_WALLOPS; + break; + default: + break; + } + } } } - } - else - { - // can only remove a mode they already have - log(DEBUG,"umode %c being removed",*i); - if ((ServerInstance->ModeGrok->AllowedUmode(*i,user->modes,false,true)) && (strchr(dmodes,*i))) + else { - log(DEBUG,"umode %c is an allowed umode",*i); - if ((ServerInstance->ModeGrok->ProcessModuleUmode(*i, user, dest, direction)) || (*i == 'i') || (*i == 's') || (*i == 'w') || (*i == 'o')) + // can only remove a mode they already have + log(DEBUG,"umode %c being removed",*i); + if ((ServerInstance->ModeGrok->AllowedUmode(*i,user->modes,false,true)) && (strchr(dmodes,*i))) { - charlcat(outpars,*i,MAXMODES); - charremove(dmodes,*i); + log(DEBUG,"umode %c is an allowed umode",*i); + if ((*i == 'i') || (*i == 's') || (*i == 'w') || (*i == 'o') || (ServerInstance->ModeGrok->ProcessModuleUmode(*i, user, dest, direction))) + { + charlcat(outpars,*i,MAXBUF); + charremove(dmodes,*i); + switch (*i) + { + case 'i': + dest->modebits &= ~UM_INVISIBLE; + break; + case 's': + dest->modebits &= ~UM_SERVERNOTICE; + break; + case 'w': + dest->modebits &= ~UM_WALLOPS; + break; + default: + break; + } + } } } } + break; + } + } + if (*outpars) + { + char b[MAXBUF]; + char* z = b; + + for (char* i = outpars; *i;) + { + *z++ = *i++; + if (((*i == '-') || (*i == '+')) && ((*(i+1) == '-') || (*(i+1) == '+'))) + { + // someones playing silly buggers and trying + // to put a +- or -+ into the line... + i++; + } + if (!*(i+1)) + { + // Someone's trying to make the last character in + // the line be a + or - symbol. + if ((*i == '-') || (*i == '+')) + { + i++; + } } } + *z = 0; + + if ((*b) && (!IS_SINGLE(b,'+')) && (!IS_SINGLE(b,'-'))) + { + WriteTo(user, dest, "MODE %s :%s", dest->nick, b); + FOREACH_MOD(I_OnMode,OnMode(user, dest, TYPE_USER, b)); + } + + log(DEBUG,"Stripped mode line"); + log(DEBUG,"Line dest is now %s",dmodes); + strlcpy(dest->modes,dmodes,MAXMODES-1); + } - if (*outpars) - { - char b[MAXBUF]; - char* z = b; - - for (char* i = outpars; *i;) - { - *z++ = *i++; - if (((*i == '-') || (*i == '+')) && ((*(i+1) == '-') || (*(i+1) == '+'))) - { - // someones playing silly buggers and trying - // to put a +- or -+ into the line... - i++; - } - if (!*(i+1)) - { - // Someone's trying to make the last character in - // the line be a + or - symbol. - if ((*i == '-') || (*i == '+')) - { - i++; - } - } - } - *z = 0; - - if ((*b) && (!IS_SINGLE(b,'+')) && (!IS_SINGLE(b,'-'))) - { - WriteTo(user, dest, "MODE %s :%s", dest->nick, b); - FOREACH_MOD(I_OnMode,OnMode(user, dest, TYPE_USER, b)); - } - - log(DEBUG,"Stripped mode line"); - log(DEBUG,"Line dest is now %s",dmodes); - strlcpy(dest->modes,dmodes,MAXMODES-1); - - } return; }