From 19a3ffd76d3fb0fba5d32ac6fc528efef9a28cc7 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Fri, 4 May 2012 23:39:18 +0000 Subject: modules/m_mlock: new module implementing server-side MLOCK. --- src/modules/m_mlock.cpp | 68 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 src/modules/m_mlock.cpp (limited to 'src/modules/m_mlock.cpp') diff --git a/src/modules/m_mlock.cpp b/src/modules/m_mlock.cpp new file mode 100644 index 000000000..7e891f146 --- /dev/null +++ b/src/modules/m_mlock.cpp @@ -0,0 +1,68 @@ +/* + * InspIRCd -- Internet Relay Chat Daemon + * + * Copyright (C) 2012 William Pitcock + * + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "inspircd.h" + +class ModuleMLock : public Module { +private: + StringExtItem mlock; + +public: + ModuleMLock() : mlock("mlock", this) {}; + + void init() + { + Implementation eventlist[] = { I_OnPreMode }; + ServerInstance->Modules->Attach(eventlist, this, 1); + } + + Version GetVersion() + { + return Version("Implements the ability to have server-side MLOCK enforcement.", VF_VENDOR); + } + + void Prioritize() + { + ServerInstance->Modules->SetPriority(this, I_OnPreMode, PRIORITY_FIRST); + } + + ModResult OnPreMode(User* source, User* dest, Channel* channel, const std::vector& parameters) + { + if (!channel) + return MOD_RES_PASSTHRU; + + std::string *mlock_str = mlock.get(channel); + if (mlock_str->empty()) + return MOD_RES_PASSTHRU; + + for (const char *modes = parameters[1].c_str(); *modes; modes++) + { + if (mlock_str->find(*modes)) + { + source->WriteNumeric(742, "%s %c %s :MODE cannot be set due to channel having an active MLOCK restriction policy", + channel->name.c_str(), *modes, mlock_str->c_str()); + return MOD_RES_DENY; + } + } + + return MOD_RES_PASSTHRU; + } + +}; + +MODULE_INIT(ModuleMLock) -- cgit v1.2.3 From 663f0620bea4dc1e64ec640992f4d511ae1ef97b Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Tue, 15 May 2012 01:26:39 -0500 Subject: mlock: handle case where no mlock has been set on a channel yet --- src/modules/m_mlock.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/modules/m_mlock.cpp') diff --git a/src/modules/m_mlock.cpp b/src/modules/m_mlock.cpp index 7e891f146..45ad7453e 100644 --- a/src/modules/m_mlock.cpp +++ b/src/modules/m_mlock.cpp @@ -47,7 +47,7 @@ public: return MOD_RES_PASSTHRU; std::string *mlock_str = mlock.get(channel); - if (mlock_str->empty()) + if (!mlock_str || mlock_str->empty()) return MOD_RES_PASSTHRU; for (const char *modes = parameters[1].c_str(); *modes; modes++) -- cgit v1.2.3 From e4f9a63ecda239f4c53762d102360007751bcaed Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Tue, 15 May 2012 01:51:43 -0500 Subject: mlock: we should only enforce against modes set by our own clients --- src/modules/m_mlock.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/modules/m_mlock.cpp') diff --git a/src/modules/m_mlock.cpp b/src/modules/m_mlock.cpp index 45ad7453e..9e3c596cc 100644 --- a/src/modules/m_mlock.cpp +++ b/src/modules/m_mlock.cpp @@ -46,6 +46,9 @@ public: if (!channel) return MOD_RES_PASSTHRU; + if (!IS_LOCAL(source)) + return MOD_RES_PASSTHRU; + std::string *mlock_str = mlock.get(channel); if (!mlock_str || mlock_str->empty()) return MOD_RES_PASSTHRU; -- cgit v1.2.3 From 1b909065b0fc7789a4a33dce56219befa602b8ec Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Wed, 16 May 2012 12:34:23 -0500 Subject: mlock: fix style nitpicks --- src/modules/m_mlock.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/modules/m_mlock.cpp') diff --git a/src/modules/m_mlock.cpp b/src/modules/m_mlock.cpp index 9e3c596cc..17deb17bd 100644 --- a/src/modules/m_mlock.cpp +++ b/src/modules/m_mlock.cpp @@ -18,7 +18,8 @@ #include "inspircd.h" -class ModuleMLock : public Module { +class ModuleMLock : public Module +{ private: StringExtItem mlock; @@ -27,8 +28,7 @@ public: void init() { - Implementation eventlist[] = { I_OnPreMode }; - ServerInstance->Modules->Attach(eventlist, this, 1); + ServerInstance->Modules->Attach(I_OnPreMode, this); } Version GetVersion() -- cgit v1.2.3