diff options
| -rw-r--r-- | include/channels.h | 6 | ||||
| -rw-r--r-- | src/channels.cpp | 32 | ||||
| -rw-r--r-- | src/modules/m_override.cpp | 13 | ||||
| -rw-r--r-- | src/modules/m_timedbans.cpp | 9 |
4 files changed, 35 insertions, 25 deletions
diff --git a/include/channels.h b/include/channels.h index 14e06d40f..d0d221550 100644 --- a/include/channels.h +++ b/include/channels.h @@ -527,6 +527,12 @@ class chanrec : public Extensible */ void SetPrefix(userrec* user, char prefix, unsigned int prefix_rank, bool adding); + /** Check if a user is banned on this channel + * @param user A user to check against the banlist + * @returns True if the user given is banned + */ + bool IsBanned(userrec* user); + /** Destructor for chanrec */ virtual ~chanrec() { /* stub */ } diff --git a/src/channels.cpp b/src/channels.cpp index 5c3bb266f..dab518844 100644 --- a/src/channels.cpp +++ b/src/channels.cpp @@ -318,17 +318,10 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo sprintf(mask,"%s!%s@%s",user->nick, user->ident, user->GetIPString()); if (!MOD_RESULT) { - for (BanList::iterator i = Ptr->bans.begin(); i != Ptr->bans.end(); i++) + if (Ptr->IsBanned(user)) { - /* This allows CIDR ban matching - * - * Full masked host Full unmasked host IP with/without CIDR - */ - if ((match(user->GetFullHost(),i->data)) || (match(user->GetFullRealHost(),i->data)) || (match(mask, i->data, true))) - { - user->WriteServ("474 %s %s :Cannot join channel (You're banned)",user->nick, Ptr->name); - return NULL; - } + user->WriteServ("474 %s %s :Cannot join channel (You're banned)",user->nick, Ptr->name); + return NULL; } } } @@ -442,6 +435,25 @@ chanrec* chanrec::ForceChan(InspIRCd* Instance, chanrec* Ptr,ucrec *a,userrec* u return Ptr; } +bool chanrec::IsBanned(userrec* user) +{ + char mask[MAXBUF]; + sprintf(mask,"%s!%s@%s",user->nick, user->ident, user->GetIPString()); + for (BanList::iterator i = this->bans.begin(); i != this->bans.end(); i++) + { + /* This allows CIDR ban matching + * + * Full masked host Full unmasked host IP with/without CIDR + */ + if ((match(user->GetFullHost(),i->data)) || (match(user->GetFullRealHost(),i->data)) || (match(mask, i->data, true))) + { + return true; + } + + } + return false; +} + /* chanrec::PartUser * remove a channel from a users record, and remove the record from the hash * if the channel has become empty diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp index 342e42829..7dd58d8c2 100644 --- a/src/modules/m_override.cpp +++ b/src/modules/m_override.cpp @@ -231,17 +231,12 @@ class ModuleOverride : public Module if (CanOverride(user,"BANWALK")) { - for (BanList::iterator i = chan->bans.begin(); i != chan->bans.end(); i++) + if (chan->IsBanned(user)) { - char mask[MAXBUF]; - sprintf(mask,"%s!%s@%s",user->nick, user->ident, user->GetIPString()); - if ((match(user->GetFullHost(),i->data)) || (match(user->GetFullRealHost(),i->data)) || (match(mask, i->data, true))) + if (NoisyOverride) { - if (NoisyOverride) - { - chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper-override to bypass channel bans on %s", cname, user->nick,i->data); - ServerInstance->SNO->WriteToSnoMask('O',"%s used oper-override to bypass channel bans on %s", cname, user->nick, i->data); - } + chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper-override to bypass channel ban", cname, user->nick); + ServerInstance->SNO->WriteToSnoMask('O',"%s used oper-override to bypass channel ban", cname, user->nick); } } return -1; diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp index 8639aa7df..08da114a6 100644 --- a/src/modules/m_timedbans.cpp +++ b/src/modules/m_timedbans.cpp @@ -64,13 +64,10 @@ class cmd_tban : public command_t user->WriteServ("NOTICE "+std::string(user->nick)+" :Invalid ban mask"); return; } - for (BanList::iterator i = channel->bans.begin(); i != channel->bans.end(); i++) + if (channel->IsBanned(user)) { - if (!strcasecmp(i->data,parameters[2])) - { - user->WriteServ("NOTICE "+std::string(user->nick)+" :The ban "+std::string(parameters[2])+" is already on the banlist of "+std::string(parameters[0])); - return; - } + user->WriteServ("NOTICE "+std::string(user->nick)+" :The ban "+std::string(parameters[2])+" is already on the banlist of "+std::string(parameters[0])); + return; } TimedBan T; std::string channelname = parameters[0]; |