X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_messageflood.cpp;h=329d77aac69ffc594c81a038faac2188ae294ff1;hb=80e81e3b81b779901fd9d67f8ae030ee30c0bcec;hp=3021b1771e65940e52cdb1b57a09ab431047132c;hpb=e59cb85871f75b7603c63c6cd274d57536cf6794;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp
index 3021b1771..329d77aac 100644
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -1,13 +1,14 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2013, 2017-2019 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012-2014, 2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2008 Pippijn van Steenhoven <pip88nl@gmail.com>
- *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2007 John Brooks <john.brooks@dereferenced.net>
+ *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 John Brooks <special@inspircd.org>
  *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
- *   Copyright (C) 2006 Craig Edwards <craigedwards@brainbox.cc>
- *   Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
+ *   Copyright (C) 2006, 2008, 2010 Craig Edwards <brain@inspircd.org>
  *
  * 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
@@ -36,7 +37,7 @@ class floodsettings
 	unsigned int secs;
 	unsigned int lines;
 	time_t reset;
-	insp::flat_map<User*, unsigned int> counters;
+	insp::flat_map<User*, double> counters;
 
 	floodsettings(bool a, unsigned int b, unsigned int c)
 		: ban(a)
@@ -46,7 +47,7 @@ class floodsettings
 		reset = ServerInstance->Time() + secs;
 	}
 
-	bool addmessage(User* who)
+	bool addmessage(User* who, double weight)
 	{
 		if (ServerInstance->Time() > reset)
 		{
@@ -54,7 +55,8 @@ class floodsettings
 			reset = ServerInstance->Time() + secs;
 		}
 
-		return (++counters[who] >= this->lines);
+		counters[who] += weight;
+		return (counters[who] >= this->lines);
 	}
 
 	void clear(User* who)
@@ -71,6 +73,7 @@ class MsgFlood : public ParamMode<MsgFlood, SimpleExtItem<floodsettings> >
 	MsgFlood(Module* Creator)
 		: ParamMode<MsgFlood, SimpleExtItem<floodsettings> >(Creator, "flood", 'f')
 	{
+		syntax = "[*]<messages>:<seconds>";
 	}
 
 	ModeAction OnSet(User* source, Channel* channel, std::string& parameter) CXX11_OVERRIDE
@@ -113,6 +116,9 @@ class ModuleMsgFlood
 private:
 	CheckExemption::EventProvider exemptionprov;
 	MsgFlood mf;
+	double notice;
+	double privmsg;
+	double tagmsg;
 
  public:
 	ModuleMsgFlood()
@@ -122,7 +128,15 @@ private:
 	{
 	}
 
-	ModResult HandleMessage(User* user, const MessageTarget& target)
+	void ReadConfig(ConfigStatus&) CXX11_OVERRIDE
+	{
+		ConfigTag* tag = ServerInstance->Config->ConfValue("messageflood");
+		notice = tag->getFloat("notice", 1.0);
+		privmsg = tag->getFloat("privmsg", 1.0);
+		tagmsg = tag->getFloat("tagmsg", 0.2);
+	}
+
+	ModResult HandleMessage(User* user, const MessageTarget& target, double weight)
 	{
 		if (target.type != MessageTarget::TYPE_CHANNEL)
 			return MOD_RES_PASSTHRU;
@@ -138,7 +152,7 @@ private:
 		floodsettings *f = mf.ext.get(dest);
 		if (f)
 		{
-			if (f->addmessage(user))
+			if (f->addmessage(user, weight))
 			{
 				/* Youre outttta here! */
 				f->clear(user);
@@ -163,12 +177,12 @@ private:
 
 	ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE
 	{
-		return HandleMessage(user, target);
+		return HandleMessage(user, target, (details.type == MSG_PRIVMSG ? privmsg : notice));
 	}
 
 	ModResult OnUserPreTagMessage(User* user, const MessageTarget& target, CTCTags::TagMessageDetails& details) CXX11_OVERRIDE
 	{
-		return HandleMessage(user, target);
+		return HandleMessage(user, target, tagmsg);
 	}
 
 	void Prioritize() CXX11_OVERRIDE
@@ -179,7 +193,7 @@ private:
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides channel mode +f, message flood protection", VF_VENDOR);
+		return Version("Adds channel mode f (flood) which helps protect against spammers which mass-message channels.", VF_VENDOR);
 	}
 };