Move <security:announceinvites> to core_channel.

[user/henk/code/inspircd.git] / src / coremods / core_channel / core_channel.cpp

diff --git a/src/coremods/core_channel/core_channel.cpp b/src/coremods/core_channel/core_channel.cpp
index 66630fbc3838107ee1ff040900653b3ab5e065e6..b69483166574be80b5752d4a3086fe7cffd58e3a 100644 (file)
--- a/src/coremods/core_channel/core_channel.cpp
+++ b/src/coremods/core_channel/core_channel.cpp
@@ -105,6 +105,19 @@ class CoreModChannel : public Module, public CheckExemption::EventListener
                }
                exemptions.swap(exempts);
 
+               ConfigTag* securitytag = ServerInstance->Config->ConfValue("security");
+               const std::string announceinvites = securitytag->getString("announceinvites", "dynamic");
+               if (stdalgo::string::equalsci(announceinvites, "none"))
+                       cmdinvite.announceinvites = Invite::ANNOUNCE_NONE;
+               else if (stdalgo::string::equalsci(announceinvites, "all"))
+                       cmdinvite.announceinvites = Invite::ANNOUNCE_ALL;
+               else if (stdalgo::string::equalsci(announceinvites, "ops"))
+                       cmdinvite.announceinvites = Invite::ANNOUNCE_OPS;
+               else if (stdalgo::string::equalsci(announceinvites, "dynamic"))
+                       cmdinvite.announceinvites = Invite::ANNOUNCE_DYNAMIC;
+               else
+                       throw ModuleException(announceinvites + " is an invalid <security:announceinvites> value, at " + securitytag->getTagLocation());
+
                // In 2.0 we allowed limits of 0 to be set. This is non-standard behaviour
                // and will be removed in the next major release.
                limitmode.minlimit = optionstag->getBool("allowzerolimit", true) ? 0 : 1;
@@ -138,6 +151,53 @@ class CoreModChannel : public Module, public CheckExemption::EventListener
                }
        }
 
+       ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string&, std::string&, const std::string& keygiven) CXX11_OVERRIDE
+       {
+               if (!chan)
+                       return MOD_RES_PASSTHRU;
+
+               // Check whether the channel key is correct.
+               const std::string ckey = chan->GetModeParameter(&keymode);
+               if (!ckey.empty())
+               {
+                       ModResult MOD_RESULT;
+                       FIRST_MOD_RESULT(OnCheckKey, MOD_RESULT, (user, chan, keygiven));
+                       if (!MOD_RESULT.check(InspIRCd::TimingSafeCompare(ckey, keygiven)))
+                       {
+                               // If no key provided, or key is not the right one, and can't bypass +k (not invited or option not enabled)
+                               user->WriteNumeric(ERR_BADCHANNELKEY, chan->name, "Cannot join channel (Incorrect channel key)");
+                               return MOD_RES_DENY;
+                       }
+               }
+
+               // Check whether the invite only mode is set.
+               if (chan->IsModeSet(inviteonlymode))
+               {
+                       ModResult MOD_RESULT;
+                       FIRST_MOD_RESULT(OnCheckInvite, MOD_RESULT, (user, chan));
+                       if (MOD_RESULT != MOD_RES_ALLOW)
+                       {
+                               user->WriteNumeric(ERR_INVITEONLYCHAN, chan->name, "Cannot join channel (Invite only)");
+                               return MOD_RES_DENY;
+                       }
+               }
+
+               // Check whether the limit would be exceeded by this user joining.
+               if (chan->IsModeSet(limitmode))
+               {
+                       ModResult MOD_RESULT;
+                       FIRST_MOD_RESULT(OnCheckLimit, MOD_RESULT, (user, chan));
+                       if (!MOD_RESULT.check(chan->GetUserCounter() < static_cast<size_t>(limitmode.ext.get(chan))))
+                       {
+                               user->WriteNumeric(ERR_CHANNELISFULL, chan->name, "Cannot join channel (Channel is full)");
+                               return MOD_RES_DENY;
+                       }
+               }
+
+               // Everything looks okay.
+               return MOD_RES_PASSTHRU;
+       }
+
        void OnPostJoin(Membership* memb) CXX11_OVERRIDE
        {
                Channel* const chan = memb->chan;