Update copyright headers.

[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 b619ee4487392beb8d6da39fb5f0e4721db55ad3..ae10915166e65b2e8ebe9ed0c296544964e2dc43 100644 (file)
--- a/src/modules/m_restrictchans.cpp
+++ b/src/modules/m_restrictchans.cpp
@@ -1,10 +1,13 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2018-2019 linuxdaemon <linuxdaemon.irc@gmail.com>
+ *   Copyright (C) 2013 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, 2010 Craig Edwards <brain@inspircd.org>
  *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
- *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2005-2006 Craig Edwards <craigedwards@brainbox.cc>
  *
  * 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
@@ -21,42 +24,70 @@
 
 
 #include "inspircd.h"
+#include "modules/account.h"
+
+typedef insp::flat_set<std::string, irc::insensitive_swo> AllowChans;
 
 class ModuleRestrictChans : public Module
 {
-       std::set<std::string, irc::insensitive_swo> allowchans;
+       AllowChans allowchans;
+       bool allowregistered;
+
+       bool CanCreateChannel(LocalUser* user, const std::string& name)
+       {
+               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)
+               {
+                       if (InspIRCd::Match(name, *it))
+                               return true;
+               }
+
+               return false;
+       }
 
  public:
+       ModuleRestrictChans()
+               : allowregistered(false)
+       {
+       }
+
        void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
-               allowchans.clear();
+               AllowChans newallows;
                ConfigTagList tags = ServerInstance->Config->ConfTags("allowchannel");
-               for(ConfigIter i = tags.first; i != tags.second; ++i)
+               for (ConfigIter i = tags.first; i != tags.second; ++i)
                {
-                       ConfigTag* tag = i->second;
-                       std::string txt = tag->getString("name");
-                       allowchans.insert(txt);
+                       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);
+
+               // 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)
-               {
-                       // user is not an oper and its not in the allow list
-                       if ((!user->IsOper()) && (allowchans.find(cname) == allowchans.end()))
-                       {
-                               user->WriteNumeric(ERR_BANNEDFROMCHAN, "%s :Only IRC operators may create new channels", cname.c_str());
-                               return MOD_RES_DENY;
-                       }
-               }
+               if (!chan && !CanCreateChannel(user, cname))
+                       return MOD_RES_DENY;
+
                return MOD_RES_PASSTHRU;
        }
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Only opers may create new channels if this module is loaded",VF_VENDOR);
+               return Version("Allows restricting who can create channels", VF_VENDOR);
        }
 };