X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_connectban.cpp;h=81b0fcfa79f3aff3d02eeff65781896ddbcf8d13;hb=fd8faa7e21994dee0a6d3d09abebb3004311408e;hp=98fa3b847bcc9ec4f7f556128e5432fe233c3919;hpb=cd712c40e1b352c05e7ae0f72e0a5e84cdf64323;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_connectban.cpp b/src/modules/m_connectban.cpp index 98fa3b847..81b0fcfa7 100644 --- a/src/modules/m_connectban.cpp +++ b/src/modules/m_connectban.cpp @@ -1,88 +1,115 @@ -/* +------------------------------------+ - * | 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) 2019 Matt Schatz + * Copyright (C) 2014 Googolplexed + * Copyright (C) 2013, 2017-2020 Sadie Powell + * Copyright (C) 2012-2014 Attila Molnar + * Copyright (C) 2012, 2019 Robby + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2008, 2010 Craig Edwards + * Copyright (C) 2008 Robin Burchell * - * 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 . */ + #include "inspircd.h" #include "xline.h" +#include "modules/webirc.h" -/* $ModDesc: Throttles the connections of any users who try connect flood */ - -class ModuleConnectBan : public Module +class ModuleConnectBan + : public Module + , public WebIRC::EventListener { - private: - clonemap connects; + typedef std::map ConnectMap; + ConnectMap connects; unsigned int threshold; unsigned int banduration; unsigned int ipv4_cidr; unsigned int ipv6_cidr; - public: - ModuleConnectBan() { - Implementation eventlist[] = { I_OnUserConnect, I_OnGarbageCollect, I_OnRehash }; - ServerInstance->Modules->Attach(eventlist, this, 3); - OnRehash(NULL); - } + std::string banmessage; - virtual ~ModuleConnectBan() + unsigned char GetRange(LocalUser* user) { + int family = user->client_sa.family(); + switch (family) + { + case AF_INET: + return ipv4_cidr; + + case AF_INET6: + return ipv6_cidr; + + case AF_UNIX: + // Ranges for UNIX sockets are ignored entirely. + return 0; + } + + // If we have reached this point then we have encountered a bug. + ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "BUG: ModuleConnectBan::GetRange(): socket type %d is unknown!", family); + return 0; } - virtual Version GetVersion() + public: + ModuleConnectBan() + : WebIRC::EventListener(this) { - return Version("Throttles the connections of any users who try connect flood", VF_VENDOR); } - virtual void OnRehash(User* user) + void Prioritize() CXX11_OVERRIDE { - ConfigReader Conf; - std::string duration; - - ipv4_cidr = Conf.ReadInteger("connectban", "ipv4cidr", 0, true); - if (ipv4_cidr == 0) - ipv4_cidr = 32; - - ipv6_cidr = Conf.ReadInteger("connectban", "ipv6cidr", 0, true); - if (ipv6_cidr == 0) - ipv6_cidr = 128; - - threshold = Conf.ReadInteger("connectban", "threshold", 0, true); - - if (threshold == 0) - threshold = 10; + Module* corexline = ServerInstance->Modules->Find("core_xline"); + ServerInstance->Modules->SetPriority(this, I_OnSetUserIP, PRIORITY_AFTER, corexline); + } - duration = Conf.ReadValue("connectban", "duration", 0, true); + Version GetVersion() CXX11_OVERRIDE + { + return Version("Z-lines IP addresses which make excessive connections to the server.", VF_VENDOR); + } - if (duration.empty()) - duration = "10m"; + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + { + ConfigTag* tag = ServerInstance->Config->ConfValue("connectban"); - banduration = ServerInstance->Duration(duration); + ipv4_cidr = tag->getUInt("ipv4cidr", 32, 1, 32); + ipv6_cidr = tag->getUInt("ipv6cidr", 128, 1, 128); + threshold = tag->getUInt("threshold", 10, 1); + banduration = tag->getDuration("duration", 10*60, 1); + banmessage = tag->getString("banmessage", "Your IP range has been attempting to connect too many times in too short a duration. Wait a while, and you will be able to connect."); } - virtual void OnUserConnect(LocalUser *u) + void OnWebIRCAuth(LocalUser* user, const WebIRC::FlagMap* flags) CXX11_OVERRIDE { - int range = 32; - clonemap::iterator i; + if (user->exempt) + return; + + // HACK: Lower the connection attempts for the gateway IP address. The user + // will be rechecked for connect spamming shortly after when their IP address + // is changed and OnSetUserIP is called. + irc::sockets::cidr_mask mask(user->client_sa, GetRange(user)); + ConnectMap::iterator iter = connects.find(mask); + if (iter != connects.end() && iter->second) + iter->second--; + } - switch (u->client_sa.sa.sa_family) - { - case AF_INET6: - range = ipv6_cidr; - break; - case AF_INET: - range = ipv4_cidr; - break; - } + void OnSetUserIP(LocalUser* u) CXX11_OVERRIDE + { + if (u->exempt || u->quitting) + return; - irc::sockets::cidr_mask mask(u->client_sa, range); - i = connects.find(mask); + irc::sockets::cidr_mask mask(u->client_sa, GetRange(u)); + ConnectMap::iterator i = connects.find(mask); if (i != connects.end()) { @@ -90,16 +117,18 @@ class ModuleConnectBan : public Module if (i->second >= threshold) { - // Create zline for set duration. - ZLine* zl = new ZLine(ServerInstance->Time(), banduration, ServerInstance->Config->ServerName.c_str(), "Connect flooding", mask.str().c_str()); - if (ServerInstance->XLines->AddLine(zl,NULL)) - ServerInstance->XLines->ApplyLines(); - else + // Create Z-line for set duration. + ZLine* zl = new ZLine(ServerInstance->Time(), banduration, ServerInstance->Config->ServerName, banmessage, mask.str()); + if (!ServerInstance->XLines->AddLine(zl, NULL)) + { delete zl; - - ServerInstance->SNO->WriteGlobalSno('x',"Module m_connectban added Z:line on *@%s to expire on %s: Connect flooding", - mask.str().c_str(), ServerInstance->TimeString(zl->expiry).c_str()); - ServerInstance->SNO->WriteGlobalSno('a', "Connect flooding from IP range %s (%d)", mask.str().c_str(), threshold); + return; + } + ServerInstance->XLines->ApplyLines(); + std::string maskstr = mask.str(); + ServerInstance->SNO->WriteGlobalSno('x', "Z-line added by module m_connectban on %s to expire in %s (on %s): Connect flooding", + maskstr.c_str(), InspIRCd::DurationString(zl->duration).c_str(), InspIRCd::TimeString(zl->expiry).c_str()); + ServerInstance->SNO->WriteGlobalSno('a', "Connect flooding from IP range %s (%d)", maskstr.c_str(), threshold); connects.erase(i); } } @@ -109,9 +138,9 @@ class ModuleConnectBan : public Module } } - virtual void OnGarbageCollect() + void OnGarbageCollect() CXX11_OVERRIDE { - ServerInstance->Logs->Log("m_connectban",DEBUG, "Clearing map."); + ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Clearing map."); connects.clear(); } };