Fix the cloaking module on C++98 compilers.

[user/henk/code/inspircd.git] / src / modules / m_restrictchans.cpp

diff --git a/src/modules/m_restrictchans.cpp b/src/modules/m_restrictchans.cpp
index 8fac7527bef64b1f56648aee151a374fe6c20231..6327ea48704f4deed4e91df6669fa669c16ab537 100644 (file)
--- a/src/modules/m_restrictchans.cpp
+++ b/src/modules/m_restrictchans.cpp
@@ -1,76 +1,96 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2018-2019 linuxdaemon <linuxdaemon.irc@gmail.com>
+ *   Copyright (C) 2013, 2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2005, 2007, 2010 Craig Edwards <brain@inspircd.org>
  *
- * This program is free but copyrighted software; see
- *         the file COPYING for details.
+ * 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 <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
+#include "modules/account.h"
 
-/* $ModDesc: Only opers may create new channels if this module is loaded */
+typedef insp::flat_set<std::string, irc::insensitive_swo> AllowChans;
 
 class ModuleRestrictChans : public Module
 {
-       std::set<irc::string> allowchans;
+       AllowChans allowchans;
+       bool allowregistered;
 
-       void ReadConfig()
+       bool CanCreateChannel(LocalUser* user, const std::string& name)
        {
-               allowchans.clear();
-               ConfigTagList tags = ServerInstance->Config->ConfTags("allowchannel");
-               for(ConfigIter i = tags.first; i != tags.second; ++i)
+               const AccountExtItem* accountext = GetAccountExtItem();
+               if (allowregistered && accountext && accountext->get(user))
+                       return true;
+
+               if (user->HasPrivPermission("channels/restricted-create"))
+                       return true;
+
+               for (AllowChans::const_iterator it = allowchans.begin(), it_end = allowchans.end(); it != it_end; ++it)
                {
-                       ConfigTag* tag = i->second;
-                       std::string txt = tag->getString("name");
-                       allowchans.insert(txt.c_str());
+                       if (InspIRCd::Match(name, *it))
+                               return true;
                }
+
+               return false;
        }
 
  public:
        ModuleRestrictChans()
+               : allowregistered(false)
        {
-               ReadConfig();
-               Implementation eventlist[] = { I_OnUserPreJoin, I_OnRehash };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
-       virtual void OnRehash(User* user)
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
-               ReadConfig();
-       }
+               AllowChans newallows;
+               ConfigTagList tags = ServerInstance->Config->ConfTags("allowchannel");
+               for (ConfigIter i = tags.first; i != tags.second; ++i)
+               {
+                       const std::string name = i->second->getString("name");
+                       if (name.empty())
+                               throw ModuleException("Empty <allowchannel:name> at " + i->second->getTagLocation());
 
+                       newallows.insert(name);
+               }
+               allowchans.swap(newallows);
 
-       virtual ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
-       {
-               irc::string x = cname;
-               if (!IS_LOCAL(user))
-                       return MOD_RES_PASSTHRU;
+               // Global config
+               ConfigTag* tag = ServerInstance->Config->ConfValue("restrictchans");
+               allowregistered = tag->getBool("allowregistered", false);
+       }
 
+       ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE
+       {
                // channel does not yet exist (record is null, about to be created IF we were to allow it)
-               if (!chan)
+               if (!chan && !CanCreateChannel(user, cname))
                {
-                       // user is not an oper and its not in the allow list
-                       if ((!IS_OPER(user)) && (allowchans.find(x) == allowchans.end()))
-                       {
-                               user->WriteNumeric(ERR_BANNEDFROMCHAN, "%s %s :Only IRC operators may create new channels",user->nick.c_str(),cname);
-                               return MOD_RES_DENY;
-                       }
+                       user->WriteNumeric(ERR_BANNEDFROMCHAN, cname, "You are not allowed to create new channels.");
+                       return MOD_RES_DENY;
                }
-               return MOD_RES_PASSTHRU;
-       }
 
-       virtual ~ModuleRestrictChans()
-       {
+               return MOD_RES_PASSTHRU;
        }
 
-       virtual Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Only opers may create new channels if this module is loaded",VF_VENDOR);
+               return Version("Prevents unprivileged users from creating new channels.", VF_VENDOR);
        }
 };