summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/inspircd.conf.example5
-rw-r--r--conf/modules.conf.example6
-rw-r--r--include/configreader.h5
-rw-r--r--src/commands/cmd_nick.cpp13
-rw-r--r--src/commands/cmd_privmsg.cpp16
-rw-r--r--src/configreader.cpp1
-rw-r--r--src/modules/m_restrictbanned.cpp97
7 files changed, 37 insertions, 106 deletions
diff --git a/conf/inspircd.conf.example b/conf/inspircd.conf.example
index db963890b..8bd853249 100644
--- a/conf/inspircd.conf.example
+++ b/conf/inspircd.conf.example
@@ -542,6 +542,11 @@
# NOT SUPPORTED/NEEDED UNDER WIINDOWS.
#runasgroup=""
+ # restrictbannedusers: If this is set, InspIRCd will not allow users
+ # banned on a channel to change nickname or message channels they are
+ # banned on.
+ restrictbannedusers="yes"
+
# userstats: /stats commands that users can run (oeprs can run all).
userstats="Pu">
diff --git a/conf/modules.conf.example b/conf/modules.conf.example
index 745d0c286..c2f641211 100644
--- a/conf/modules.conf.example
+++ b/conf/modules.conf.example
@@ -1196,12 +1196,6 @@
#<module name="m_remove.so">
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
-# Restrict banned users module:
-# Disallows banned users on a channel from messaging the channel,
-# changing nick, or changing the topic, if loaded.
-#<module name="m_restrictbanned.so">
-
-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
# Restricted channels module: Allows only opers to create channels
#<module name="m_restrictchans.so">
diff --git a/include/configreader.h b/include/configreader.h
index 859e5bddb..5e97bb09b 100644
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -565,6 +565,11 @@ class CoreExport ServerConfig : public Extensible
*/
bool writelog;
+ /** If this value is true, banned users (+b, not extbans) will not be able to change nick
+ * if banned on any channel, nor to message them.
+ */
+ bool RestrictBannedUsers;
+
/** If this value is true, halfops have been
* enabled in the configuration file.
*/
diff --git a/src/commands/cmd_nick.cpp b/src/commands/cmd_nick.cpp
index 25b2868ec..a48cf53a9 100644
--- a/src/commands/cmd_nick.cpp
+++ b/src/commands/cmd_nick.cpp
@@ -103,6 +103,19 @@ CmdResult CommandNick::Handle (const std::vector<std::string>& parameters, User
user->WriteNumeric(432, "%s %s :Invalid nickname: %s",user->nick.c_str(), parameters[0].c_str(), mq->reason);
return CMD_FAILURE;
}
+
+ if (ServerInstance->Config->RestrictBannedUsers)
+ {
+ for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++)
+ {
+ Channel *chan = i->first;
+ if (chan->GetStatus(user) < STATUS_VOICE && chan->IsBanned(user))
+ {
+ user->WriteNumeric(404, "%s %s :Cannot send to channel (you're banned)", user->nick.c_str(), chan->name.c_str());
+ return CMD_FAILURE;
+ }
+ }
+ }
}
/*
diff --git a/src/commands/cmd_privmsg.cpp b/src/commands/cmd_privmsg.cpp
index 7354307fe..a11e53dfb 100644
--- a/src/commands/cmd_privmsg.cpp
+++ b/src/commands/cmd_privmsg.cpp
@@ -68,18 +68,28 @@ CmdResult CommandPrivmsg::Handle (const std::vector<std::string>& parameters, Us
if (chan)
{
- if (IS_LOCAL(user))
+ if (IS_LOCAL(user) && chan->GetStatus(user) < STATUS_VOICE)
{
- if ((chan->IsModeSet('n')) && (!chan->HasUser(user)))
+ if (chan->IsModeSet('n') && !chan->HasUser(user))
{
user->WriteNumeric(404, "%s %s :Cannot send to channel (no external messages)", user->nick.c_str(), chan->name.c_str());
return CMD_FAILURE;
}
- if ((chan->IsModeSet('m')) && (chan->GetStatus(user) < STATUS_VOICE))
+
+ if (chan->IsModeSet('m'))
{
user->WriteNumeric(404, "%s %s :Cannot send to channel (+m)", user->nick.c_str(), chan->name.c_str());
return CMD_FAILURE;
}
+
+ if (ServerInstance->Config->RestrictBannedUsers)
+ {
+ if (chan->IsBanned(user))
+ {
+ user->WriteNumeric(404, "%s %s :Cannot send to channel (you're banned)", user->nick.c_str(), chan->name.c_str());
+ return CMD_FAILURE;
+ }
+ }
}
int MOD_RESULT = 0;
diff --git a/src/configreader.cpp b/src/configreader.cpp
index ca03056c5..7f211084c 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -816,6 +816,7 @@ void ServerConfig::Read(bool bail, const std::string &useruid)
{"security", "hidewhois", "", new ValueContainerChar (this->HideWhoisServer), DT_NOSPACES, NoValidation},
{"security", "hidekills", "", new ValueContainerChar (this->HideKillsServer), DT_NOSPACES, NoValidation},
{"security", "operspywhois", "0", new ValueContainerBool (&this->OperSpyWhois), DT_BOOLEAN, NoValidation},
+ {"security", "restrictbannedusers", "1", new ValueContainerBool (&this->RestrictBannedUsers), DT_BOOLEAN, NoValidation},
{"performance", "nouserdns", "0", new ValueContainerBool (&this->NoUserDns), DT_BOOLEAN, NoValidation},
{"options", "syntaxhints", "0", new ValueContainerBool (&this->SyntaxHints), DT_BOOLEAN, NoValidation},
{"options", "cyclehosts", "0", new ValueContainerBool (&this->CycleHosts), DT_BOOLEAN, NoValidation},
diff --git a/src/modules/m_restrictbanned.cpp b/src/modules/m_restrictbanned.cpp
deleted file mode 100644
index ca8c3a426..000000000
--- a/src/modules/m_restrictbanned.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
- *
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
- *
- * This program is free but copyrighted software; see
- * the file COPYING for details.
- *
- * ---------------------------------------------------
- */
-
-#include "inspircd.h"
-
-/* $ModDesc: Restricts banned users in a channel. May not speak, etc. */
-
-class ModuleRestrictBanned : public Module
-{
- private:
- public:
- ModuleRestrictBanned(InspIRCd* Me) : Module(Me)
- {
- Implementation eventlist[] = { I_OnLocalTopicChange, I_OnUserPreNick, I_OnUserPreNotice, I_OnUserPreMessage };
- ServerInstance->Modules->Attach(eventlist, this, 4);
- }
-
- virtual ~ModuleRestrictBanned()
- {
- }
-
- virtual Version GetVersion()
- {
- return Version("$Id$",VF_VENDOR,API_VERSION);
- }
-
-
- int CheckRestricted(User *user, Channel *channel, const std::string &action)
- {
- /* aren't local? we don't care. */
- if (!IS_LOCAL(user))
- return 0;
-
- if (channel->GetStatus(user) < STATUS_VOICE && channel->IsBanned(user))
- {
- /* banned, boned. drop the message. */
- user->WriteServ("NOTICE "+std::string(user->nick)+" :*** You may not " + action + ", as you are banned on channel " + channel->name);
- return 1;
- }
-
- return 0;
- }
-
- virtual int OnUserPreNick(User *user, const std::string &newnick)
- {
- /* if they aren't local, we don't care */
- if (!IS_LOCAL(user))
- return 0;
-
- /* Allow changes to UID */
- if (isdigit(newnick[0]))
- return 0;
-
- /* bit of a special case. */
- for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++)
- {
- if (CheckRestricted(user, i->first, "change your nickname") == 1)
- return 1;
- }
-
- return 0;
- }
-
- virtual int OnLocalTopicChange(User *user, Channel *channel, const std::string &topic)
- {
- return CheckRestricted(user, channel, "change the topic");
- }
-
- virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
- {
- return OnUserPreNotice(user,dest,target_type,text,status,exempt_list);
- }
-
- virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
- {
- if (target_type == TYPE_CHANNEL)
- {
- Channel *channel = (Channel *)dest;
-
- return CheckRestricted(user, channel, "message the channel");
- }
-
- return 0;
- }
-};
-
-MODULE_INIT(ModuleRestrictBanned)
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-27 06:06:42 +0000