-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
- * E-mail:
- * <brain@chatspike.net>
- * <Craig@chatspike.net>
- *
- * Written by Craig Edwards, Craig McLure, and others.
- * This program is free but copyrighted software; see
- * the file COPYING for details.
+ * Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2005-2009 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2004-2008 Craig Edwards <craigedwards@brainbox.cc>
+ * Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ * Copyright (C) 2007 John Brooks <john.brooks@dereferenced.net>
*
- * ---------------------------------------------------
+ * 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 "inspircd_io.h"
-#include "inspircd_util.h"
-#include "inspircd_config.h"
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/errno.h>
-#include <sys/ioctl.h>
-#include <sys/utsname.h>
-#include <cstdio>
-#include <time.h>
-#include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
-#include <map>
-#include <sstream>
-#include <vector>
-#include <errno.h>
-#include <deque>
-#include <errno.h>
-#include <unistd.h>
-#include <sched.h>
-#include "connection.h"
-#include "users.h"
-#include "servers.h"
-#include "ctables.h"
-#include "globals.h"
-#include "modules.h"
-#include "dynamic.h"
-#include "wildcard.h"
-#include "message.h"
-#include "commands.h"
#include "xline.h"
-#include "inspstring.h"
-
-#ifdef GCC3
-#define nspace __gnu_cxx
-#else
-#define nspace std
-#endif
-
-
-using namespace std;
-
-extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-
-extern int LogLevel;
-extern char ServerName[MAXBUF];
-extern char Network[MAXBUF];
-extern char ServerDesc[MAXBUF];
-extern char AdminName[MAXBUF];
-extern char AdminEmail[MAXBUF];
-extern char AdminNick[MAXBUF];
-extern char diepass[MAXBUF];
-extern char restartpass[MAXBUF];
-extern char motd[MAXBUF];
-extern char rules[MAXBUF];
-extern char list[MAXBUF];
-extern char PrefixQuit[MAXBUF];
-extern char DieValue[MAXBUF];
-
-extern int debugging;
-extern int WHOWAS_STALE;
-extern int WHOWAS_MAX;
-extern int DieDelay;
-extern time_t startup_time;
-extern int NetBufferSize;
-extern time_t nb_start;
-
-extern std::vector<int> fd_reap;
-extern std::vector<std::string> module_names;
-
-extern int boundPortCount;
-extern int portCount;
-extern int SERVERportCount;
-extern int ports[MAXSOCKS];
-extern int defaultRoute;
-
-extern std::vector<long> auth_cookies;
-extern std::stringstream config_f;
-
-extern serverrec* me[32];
-
-extern FILE *log_file;
-
-namespace nspace
-{
-#ifdef GCC34
- template<> struct hash<in_addr>
-#else
- template<> struct nspace::hash<in_addr>
-#endif
- {
- size_t operator()(const struct in_addr &a) const
- {
- size_t q;
- memcpy(&q,&a,sizeof(size_t));
- return q;
- }
- };
-#ifdef GCC34
- template<> struct hash<string>
-#else
- template<> struct nspace::hash<string>
-#endif
- {
- size_t operator()(const string &s) const
- {
- char a[MAXBUF];
- static struct hash<const char *> strhash;
- strlcpy(a,s.c_str(),MAXBUF);
- strlower(a);
- return strhash(a);
- }
- };
-}
-
+#include "bancache.h"
-struct StrHashComp
+/** An XLineFactory specialized to generate GLine* pointers
+ */
+class GLineFactory : public XLineFactory
{
+ public:
+ GLineFactory() : XLineFactory("G") { }
- bool operator()(const string& s1, const string& s2) const
+ /** Generate a GLine
+ */
+ XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask)
{
- char a[MAXBUF],b[MAXBUF];
- strlcpy(a,s1.c_str(),MAXBUF);
- strlcpy(b,s2.c_str(),MAXBUF);
- strlower(a);
- strlower(b);
- return (strcasecmp(a,b) == 0);
+ IdentHostPair ih = ServerInstance->XLines->IdentSplit(xline_specific_mask);
+ return new GLine(set_time, duration, source, reason, ih.first, ih.second);
}
-
};
-struct InAddr_HashComp
+/** An XLineFactory specialized to generate ELine* pointers
+ */
+class ELineFactory : public XLineFactory
{
+ public:
+ ELineFactory() : XLineFactory("E") { }
- bool operator()(const in_addr &s1, const in_addr &s2) const
+ /** Generate an ELine
+ */
+ XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask)
{
- size_t q;
- size_t p;
-
- memcpy(&q,&s1,sizeof(size_t));
- memcpy(&p,&s2,sizeof(size_t));
-
- return (q == p);
+ IdentHostPair ih = ServerInstance->XLines->IdentSplit(xline_specific_mask);
+ return new ELine(set_time, duration, source, reason, ih.first, ih.second);
}
+};
+/** An XLineFactory specialized to generate KLine* pointers
+ */
+class KLineFactory : public XLineFactory
+{
+ public:
+ KLineFactory() : XLineFactory("K") { }
+
+ /** Generate a KLine
+ */
+ XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask)
+ {
+ IdentHostPair ih = ServerInstance->XLines->IdentSplit(xline_specific_mask);
+ return new KLine(set_time, duration, source, reason, ih.first, ih.second);
+ }
};
+/** An XLineFactory specialized to generate QLine* pointers
+ */
+class QLineFactory : public XLineFactory
+{
+ public:
+ QLineFactory() : XLineFactory("Q") { }
-typedef nspace::hash_map<std::string, userrec*, nspace::hash<string>, StrHashComp> user_hash;
-typedef nspace::hash_map<std::string, chanrec*, nspace::hash<string>, StrHashComp> chan_hash;
-typedef nspace::hash_map<in_addr,string*, nspace::hash<in_addr>, InAddr_HashComp> address_cache;
-typedef nspace::hash_map<std::string, WhoWasUser*, nspace::hash<string>, StrHashComp> whowas_hash;
-typedef std::deque<command_t> command_table;
+ /** Generate a QLine
+ */
+ XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask)
+ {
+ return new QLine(set_time, duration, source, reason, xline_specific_mask);
+ }
+};
+/** An XLineFactory specialized to generate ZLine* pointers
+ */
+class ZLineFactory : public XLineFactory
+{
+ public:
+ ZLineFactory() : XLineFactory("Z") { }
-extern user_hash clientlist;
-extern chan_hash chanlist;
-extern whowas_hash whowas;
-extern command_table cmdlist;
-extern file_cache MOTD;
-extern file_cache RULES;
-extern address_cache IP;
+ /** Generate a ZLine
+ */
+ XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask)
+ {
+ return new ZLine(set_time, duration, source, reason, xline_specific_mask);
+ }
+};
-extern time_t TIME;
-std::vector<KLine> klines;
-std::vector<GLine> glines;
-std::vector<ZLine> zlines;
-std::vector<QLine> qlines;
-std::vector<ELine> elines;
+/*
+ * This is now version 3 of the XLine subsystem, let's see if we can get it as nice and
+ * efficient as we can this time so we can close this file and never ever touch it again ..
+ *
+ * Background:
+ * Version 1 stored all line types in one list (one for g, one for z, etc). This was fine,
+ * but both version 1 and 2 suck at applying lines efficiently. That is, every time a new line
+ * was added, it iterated every existing line for every existing user. Ow. Expiry was also
+ * expensive, as the lists were NOT sorted.
+ *
+ * Version 2 moved permanent lines into a seperate list from non-permanent to help optimize
+ * matching speed, but matched in the same way.
+ * Expiry was also sped up by sorting the list by expiry (meaning just remove the items at the
+ * head of the list that are outdated.)
+ *
+ * This was fine and good, but it looked less than ideal in code, and matching was still slower
+ * than it could have been, something which we address here.
+ *
+ * VERSION 3:
+ * All lines are (as in v1) stored together -- no seperation of perm and non-perm. They are stored in
+ * a map of maps (first map is line type, second map is for quick lookup on add/delete/etc).
+ *
+ * Expiry is *no longer* performed on a timer, and no longer uses a sorted list of any variety. This
+ * is now done by only checking for expiry when a line is accessed, meaning that expiry is no longer
+ * a resource intensive problem.
+ *
+ * Application no longer tries to apply every single line on every single user - instead, now only lines
+ * added since the previous application are applied. This keeps S2S ADDLINE during burst nice and fast,
+ * while at the same time not slowing things the fuck down when we try adding a ban with lots of preexisting
+ * bans. :)
+ */
-// Reads the default bans from the config file.
-// only a very small number of bans are defined
-// this way these days, such as qlines against
-// services nicks, etc.
+bool XLine::Matches(User *u)
+{
+ return false;
+}
-void read_xline_defaults()
+/*
+ * Checks what users match a given vector of ELines and sets their ban exempt flag accordingly.
+ */
+void XLineManager::CheckELines()
{
- char ipmask[MAXBUF];
- char nick[MAXBUF];
- char host[MAXBUF];
- char reason[MAXBUF];
+ ContainerIter n = lookup_lines.find("E");
- for (int i = 0; i < ConfValueEnum("badip",&config_f); i++)
- {
- ConfValue("badip","ipmask",i,ipmask,&config_f);
- ConfValue("badip","reason",i,reason,&config_f);
- add_zline(0,"<Config>",reason,ipmask);
- log(DEBUG,"Read Z line (badip tag): ipmask=%s reason=%s",ipmask,reason);
- }
-
- for (int i = 0; i < ConfValueEnum("badnick",&config_f); i++)
+ if (n == lookup_lines.end())
+ return;
+
+ XLineLookup& ELines = n->second;
+
+ if (ELines.empty())
+ return;
+
+ for (LocalUserList::const_iterator u2 = ServerInstance->Users->local_users.begin(); u2 != ServerInstance->Users->local_users.end(); u2++)
{
- ConfValue("badnick","nick",i,nick,&config_f);
- ConfValue("badnick","reason",i,reason,&config_f);
- add_qline(0,"<Config>",reason,nick);
- log(DEBUG,"Read Q line (badnick tag): nick=%s reason=%s",nick,reason);
+ User* u = (User*)(*u2);
+
+ /* This uses safe iteration to ensure that if a line expires here, it doenst trash the iterator */
+ LookupIter safei;
+
+ for (LookupIter i = ELines.begin(); i != ELines.end(); )
+ {
+ safei = i;
+ safei++;
+
+ XLine *e = i->second;
+ u->exempt = e->Matches(u);
+
+ i = safei;
+ }
}
-
- for (int i = 0; i < ConfValueEnum("badhost",&config_f); i++)
+}
+
+
+XLineLookup* XLineManager::GetAll(const std::string &type)
+{
+ ContainerIter n = lookup_lines.find(type);
+
+ if (n == lookup_lines.end())
+ return NULL;
+
+ LookupIter safei;
+ const time_t current = ServerInstance->Time();
+
+ /* Expire any dead ones, before sending */
+ for (LookupIter x = n->second.begin(); x != n->second.end(); )
{
- ConfValue("badhost","host",i,host,&config_f);
- ConfValue("badhost","reason",i,reason,&config_f);
- add_kline(0,"<Config>",reason,host);
- log(DEBUG,"Read K line (badhost tag): host=%s reason=%s",host,reason);
+ safei = x;
+ safei++;
+ if (x->second->duration && current > x->second->expiry)
+ {
+ ExpireLine(n, x);
+ }
+ x = safei;
}
- for (int i = 0; i < ConfValueEnum("exception",&config_f); i++)
+
+ return &(n->second);
+}
+
+void XLineManager::DelAll(const std::string &type)
+{
+ ContainerIter n = lookup_lines.find(type);
+
+ if (n == lookup_lines.end())
+ return;
+
+ LookupIter x;
+
+ /* Delete all of a given type (this should probably use DelLine, but oh well) */
+ while ((x = n->second.begin()) != n->second.end())
{
- ConfValue("exception","host",i,host,&config_f);
- ConfValue("exception","reason",i,reason,&config_f);
- add_eline(0,"<Config>",reason,host);
- log(DEBUG,"Read E line (exception tag): host=%s reason=%s",host,reason);
+ ExpireLine(n, x);
}
}
-// adds a g:line
+std::vector<std::string> XLineManager::GetAllTypes()
+{
+ std::vector<std::string> items;
+ for (ContainerIter x = lookup_lines.begin(); x != lookup_lines.end(); ++x)
+ items.push_back(x->first);
+ return items;
+}
-void add_gline(long duration, const char* source,const char* reason,const char* hostmask)
+IdentHostPair XLineManager::IdentSplit(const std::string &ident_and_host)
{
- del_gline(hostmask);
- GLine item;
- item.duration = duration;
- strlcpy(item.hostmask,hostmask,199);
- strlcpy(item.reason,reason,MAXBUF);
- strlcpy(item.source,source,255);
- item.n_matches = 0;
- item.set_time = TIME;
- glines.push_back(item);
+ IdentHostPair n = std::make_pair<std::string,std::string>("*","*");
+ std::string::size_type x = ident_and_host.find('@');
+ if (x != std::string::npos)
+ {
+ n.second = ident_and_host.substr(x + 1,ident_and_host.length());
+ n.first = ident_and_host.substr(0, x);
+ if (!n.first.length())
+ n.first.assign("*");
+ if (!n.second.length())
+ n.second.assign("*");
+ }
+ else
+ {
+ n.first.clear();
+ n.second = ident_and_host;
+ }
+
+ return n;
}
-// adds an e:line (exception to bans)
+// adds a line
-void add_eline(long duration, const char* source, const char* reason, const char* hostmask)
+bool XLineManager::AddLine(XLine* line, User* user)
{
- del_eline(hostmask);
- ELine item;
- item.duration = duration;
- strlcpy(item.hostmask,hostmask,199);
- strlcpy(item.reason,reason,MAXBUF);
- strlcpy(item.source,source,255);
- item.n_matches = 0;
- item.set_time = TIME;
- elines.push_back(item);
+ if (line->duration && ServerInstance->Time() > line->expiry)
+ return false; // Don't apply expired XLines.
+
+ /* Don't apply duplicate xlines */
+ ContainerIter x = lookup_lines.find(line->type);
+ if (x != lookup_lines.end())
+ {
+ LookupIter i = x->second.find(line->Displayable());
+ if (i != x->second.end())
+ {
+ // XLine propagation bug was here, if the line to be added already exists and
+ // it's expired then expire it and add the new one instead of returning false
+ if ((!i->second->duration) || (ServerInstance->Time() < i->second->expiry))
+ return false;
+
+ ExpireLine(x, i);
+ }
+ }
+
+ /*ELine* item = new ELine(ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str());*/
+ XLineFactory* xlf = GetFactory(line->type);
+ if (!xlf)
+ return false;
+
+ ServerInstance->BanCache->RemoveEntries(line->type, false); // XXX perhaps remove ELines here?
+
+ if (xlf->AutoApplyToUserList(line))
+ pending_lines.push_back(line);
+
+ lookup_lines[line->type][line->Displayable()] = line;
+ line->OnAdd();
+
+ FOREACH_MOD(I_OnAddLine,OnAddLine(user, line));
+
+ return true;
}
-// adds a q:line
+// deletes a line, returns true if the line existed and was removed
-void add_qline(long duration, const char* source, const char* reason, const char* nickname)
+bool XLineManager::DelLine(const char* hostmask, const std::string &type, User* user, bool simulate)
{
- del_qline(nickname);
- QLine item;
- item.duration = duration;
- strlcpy(item.nick,nickname,63);
- strlcpy(item.reason,reason,MAXBUF);
- strlcpy(item.source,source,255);
- item.n_matches = 0;
- item.is_global = false;
- item.set_time = TIME;
- qlines.push_back(item);
+ ContainerIter x = lookup_lines.find(type);
+
+ if (x == lookup_lines.end())
+ return false;
+
+ LookupIter y = x->second.find(hostmask);
+
+ if (y == x->second.end())
+ return false;
+
+ if (simulate)
+ return true;
+
+ ServerInstance->BanCache->RemoveEntries(y->second->type, true);
+
+ FOREACH_MOD(I_OnDelLine,OnDelLine(user, y->second));
+
+ y->second->Unset();
+
+ std::vector<XLine*>::iterator pptr = std::find(pending_lines.begin(), pending_lines.end(), y->second);
+ if (pptr != pending_lines.end())
+ pending_lines.erase(pptr);
+
+ delete y->second;
+ x->second.erase(y);
+
+ return true;
}
-// adds a z:line
-void add_zline(long duration, const char* source, const char* reason, const char* ipaddr)
+void ELine::Unset()
{
- del_zline(ipaddr);
- ZLine item;
- item.duration = duration;
- if (strchr(ipaddr,'@'))
+ /* remove exempt from everyone and force recheck after deleting eline */
+ for (LocalUserList::const_iterator u2 = ServerInstance->Users->local_users.begin(); u2 != ServerInstance->Users->local_users.end(); u2++)
{
- while (*ipaddr != '@')
- ipaddr++;
- ipaddr++;
+ User* u = (User*)(*u2);
+ u->exempt = false;
}
- strlcpy(item.ipaddr,ipaddr,39);
- strlcpy(item.reason,reason,MAXBUF);
- strlcpy(item.source,source,255);
- item.n_matches = 0;
- item.is_global = false;
- item.set_time = TIME;
- zlines.push_back(item);
+
+ ServerInstance->XLines->CheckELines();
}
-// adds a k:line
+// returns a pointer to the reason if a nickname matches a qline, NULL if it didnt match
-void add_kline(long duration, const char* source, const char* reason, const char* hostmask)
+XLine* XLineManager::MatchesLine(const std::string &type, User* user)
{
- del_kline(hostmask);
- KLine item;
- item.duration = duration;
- strlcpy(item.hostmask,hostmask,200);
- strlcpy(item.reason,reason,MAXBUF);
- strlcpy(item.source,source,255);
- item.n_matches = 0;
- item.set_time = TIME;
- klines.push_back(item);
-}
+ ContainerIter x = lookup_lines.find(type);
-// deletes a g:line, returns true if the line existed and was removed
+ if (x == lookup_lines.end())
+ return NULL;
-bool del_gline(const char* hostmask)
-{
- for (std::vector<GLine>::iterator i = glines.begin(); i != glines.end(); i++)
+ const time_t current = ServerInstance->Time();
+
+ LookupIter safei;
+
+ for (LookupIter i = x->second.begin(); i != x->second.end(); )
{
- if (!strcasecmp(hostmask,i->hostmask))
+ safei = i;
+ safei++;
+
+ if (i->second->duration && current > i->second->expiry)
{
- glines.erase(i);
- return true;
+ /* Expire the line, proceed to next one */
+ ExpireLine(x, i);
+ i = safei;
+ continue;
}
+
+ if (i->second->Matches(user))
+ {
+ return i->second;
+ }
+
+ i = safei;
}
- return false;
+ return NULL;
}
-// deletes a e:line, returns true if the line existed and was removed
-
-bool del_eline(const char* hostmask)
+XLine* XLineManager::MatchesLine(const std::string &type, const std::string &pattern)
{
- for (std::vector<ELine>::iterator i = elines.begin(); i != elines.end(); i++)
- {
- if (!strcasecmp(hostmask,i->hostmask))
- {
- elines.erase(i);
- return true;
- }
- }
- return false;
-}
+ ContainerIter x = lookup_lines.find(type);
+
+ if (x == lookup_lines.end())
+ return NULL;
-// deletes a q:line, returns true if the line existed and was removed
+ const time_t current = ServerInstance->Time();
-bool del_qline(const char* nickname)
-{
- for (std::vector<QLine>::iterator i = qlines.begin(); i != qlines.end(); i++)
+ LookupIter safei;
+
+ for (LookupIter i = x->second.begin(); i != x->second.end(); )
{
- if (!strcasecmp(nickname,i->nick))
+ safei = i;
+ safei++;
+
+ if (i->second->Matches(pattern))
{
- qlines.erase(i);
- return true;
+ if (i->second->duration && current > i->second->expiry)
+ {
+ /* Expire the line, return nothing */
+ ExpireLine(x, i);
+ /* See above */
+ i = safei;
+ continue;
+ }
+ else
+ return i->second;
}
+
+ i = safei;
}
- return false;
+ return NULL;
}
-bool qline_make_global(const char* nickname)
+// removes lines that have expired
+void XLineManager::ExpireLine(ContainerIter container, LookupIter item)
+{
+ FOREACH_MOD(I_OnExpireLine, OnExpireLine(item->second));
+
+ item->second->DisplayExpiry();
+ item->second->Unset();
+
+ /* TODO: Can we skip this loop by having a 'pending' field in the XLine class, which is set when a line
+ * is pending, cleared when it is no longer pending, so we skip over this loop if its not pending?
+ * -- Brain
+ */
+ std::vector<XLine*>::iterator pptr = std::find(pending_lines.begin(), pending_lines.end(), item->second);
+ if (pptr != pending_lines.end())
+ pending_lines.erase(pptr);
+
+ delete item->second;
+ container->second.erase(item);
+}
+
+
+// applies lines, removing clients and changing nicks etc as applicable
+void XLineManager::ApplyLines()
{
- for (std::vector<QLine>::iterator i = qlines.begin(); i != qlines.end(); i++)
+ LocalUserList::reverse_iterator u2 = ServerInstance->Users->local_users.rbegin();
+ while (u2 != ServerInstance->Users->local_users.rend())
{
- if (!strcasecmp(nickname,i->nick))
+ User* u = *u2++;
+
+ // Don't ban people who are exempt.
+ if (u->exempt)
+ continue;
+
+ for (std::vector<XLine *>::iterator i = pending_lines.begin(); i != pending_lines.end(); i++)
{
- i->is_global = true;
- return true;
+ XLine *x = *i;
+ if (x->Matches(u))
+ x->Apply(u);
}
}
- return false;
+
+ pending_lines.clear();
}
-bool zline_make_global(const char* ipaddr)
+void XLineManager::InvokeStats(const std::string &type, int numeric, User* user, string_list &results)
{
- for (std::vector<ZLine>::iterator i = zlines.begin(); i != zlines.end(); i++)
+ ContainerIter n = lookup_lines.find(type);
+
+ time_t current = ServerInstance->Time();
+
+ LookupIter safei;
+
+ if (n != lookup_lines.end())
{
- if (!strcasecmp(ipaddr,i->ipaddr))
+ XLineLookup& list = n->second;
+ for (LookupIter i = list.begin(); i != list.end(); )
{
- i->is_global = true;
- return true;
+ safei = i;
+ safei++;
+
+ if (i->second->duration && current > i->second->expiry)
+ {
+ ExpireLine(n, i);
+ }
+ else
+ results.push_back(ServerInstance->Config->ServerName+" "+ConvToStr(numeric)+" "+user->nick+" :"+i->second->Displayable()+" "+
+ ConvToStr(i->second->set_time)+" "+ConvToStr(i->second->duration)+" "+i->second->source+" :"+i->second->reason);
+ i = safei;
}
}
- return false;
}
-void sync_xlines(serverrec* serv, char* tcp_host)
+
+XLineManager::XLineManager()
{
- char data[MAXBUF];
-
- // for zlines and qlines, we should first check if theyre global...
- for (std::vector<ZLine>::iterator i = zlines.begin(); i != zlines.end(); i++)
+ GLineFactory* GFact;
+ ELineFactory* EFact;
+ KLineFactory* KFact;
+ QLineFactory* QFact;
+ ZLineFactory* ZFact;
+
+
+ GFact = new GLineFactory;
+ EFact = new ELineFactory;
+ KFact = new KLineFactory;
+ QFact = new QLineFactory;
+ ZFact = new ZLineFactory;
+
+ RegisterFactory(GFact);
+ RegisterFactory(EFact);
+ RegisterFactory(KFact);
+ RegisterFactory(QFact);
+ RegisterFactory(ZFact);
+}
+
+XLineManager::~XLineManager()
+{
+ const char gekqz[] = "GEKQZ";
+ for(unsigned int i=0; i < sizeof(gekqz); i++)
{
- if (i->is_global)
- {
- snprintf(data,MAXBUF,"%s } %s %s %lu %lu :%s",CreateSum().c_str(),i->ipaddr,i->source,(unsigned long)i->set_time,(unsigned long)i->duration,i->reason);
- serv->SendPacket(data,tcp_host);
- }
+ XLineFactory* xlf = GetFactory(std::string(1, gekqz[i]));
+ delete xlf;
}
- for (std::vector<QLine>::iterator i = qlines.begin(); i != qlines.end(); i++)
+
+ // Delete all existing XLines
+ for (XLineContainer::iterator i = lookup_lines.begin(); i != lookup_lines.end(); i++)
{
- if (i->is_global)
+ for (XLineLookup::iterator j = i->second.begin(); j != i->second.end(); j++)
{
- snprintf(data,MAXBUF,"%s { %s %s %lu %lu :%s",CreateSum().c_str(),i->nick,i->source,(unsigned long)i->set_time,(unsigned long)i->duration,i->reason);
- serv->SendPacket(data,tcp_host);
+ delete j->second;
}
}
- // glines are always global, so no need to check
- for (std::vector<GLine>::iterator i = glines.begin(); i != glines.end(); i++)
- {
- snprintf(data,MAXBUF,"%s # %s %s %lu %lu :%s",CreateSum().c_str(),i->hostmask,i->source,(unsigned long)i->set_time,(unsigned long)i->duration,i->reason);
- serv->SendPacket(data,tcp_host);
- }
}
+void XLine::Apply(User* u)
+{
+}
-// deletes a z:line, returns true if the line existed and was removed
+bool XLine::IsBurstable()
+{
+ return true;
+}
-bool del_zline(const char* ipaddr)
+void XLine::DefaultApply(User* u, const std::string &line, bool bancache)
{
- for (std::vector<ZLine>::iterator i = zlines.begin(); i != zlines.end(); i++)
+ char sreason[MAXBUF];
+ snprintf(sreason, MAXBUF, "%s-Lined: %s", line.c_str(), this->reason.c_str());
+ if (!ServerInstance->Config->MoronBanner.empty())
+ u->WriteServ("NOTICE %s :*** %s", u->nick.c_str(), ServerInstance->Config->MoronBanner.c_str());
+
+ if (ServerInstance->Config->HideBans)
+ ServerInstance->Users->QuitUser(u, line + "-Lined", sreason);
+ else
+ ServerInstance->Users->QuitUser(u, sreason);
+
+
+ if (bancache)
{
- if (!strcasecmp(ipaddr,i->ipaddr))
- {
- zlines.erase(i);
- return true;
- }
+ ServerInstance->Logs->Log("BANCACHE", DEBUG, "BanCache: Adding positive hit (" + line + ") for " + u->GetIPString());
+ if (this->duration > 0)
+ ServerInstance->BanCache->AddHit(u->GetIPString(), this->type, line + "-Lined: " + this->reason, this->duration);
+ else
+ ServerInstance->BanCache->AddHit(u->GetIPString(), this->type, line + "-Lined: " + this->reason);
}
- return false;
}
-// deletes a k:line, returns true if the line existed and was removed
-
-bool del_kline(const char* hostmask)
+bool KLine::Matches(User *u)
{
- for (std::vector<KLine>::iterator i = klines.begin(); i != klines.end(); i++)
+ if (u->exempt)
+ return false;
+
+ if (InspIRCd::Match(u->ident, this->identmask, ascii_case_insensitive_map))
{
- if (!strcasecmp(hostmask,i->hostmask))
+ if (InspIRCd::MatchCIDR(u->host, this->hostmask, ascii_case_insensitive_map) ||
+ InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, ascii_case_insensitive_map))
{
- klines.erase(i);
return true;
}
}
+
return false;
}
-// returns a pointer to the reason if a nickname matches a qline, NULL if it didnt match
+void KLine::Apply(User* u)
+{
+ DefaultApply(u, "K", (this->identmask == "*") ? true : false);
+}
-char* matches_qline(const char* nick)
+bool GLine::Matches(User *u)
{
- if (qlines.empty())
- return NULL;
- for (std::vector<QLine>::iterator i = qlines.begin(); i != qlines.end(); i++)
+ if (u->exempt)
+ return false;
+
+ if (InspIRCd::Match(u->ident, this->identmask, ascii_case_insensitive_map))
{
- if (match(nick,i->nick))
+ if (InspIRCd::MatchCIDR(u->host, this->hostmask, ascii_case_insensitive_map) ||
+ InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, ascii_case_insensitive_map))
{
- return i->reason;
+ return true;
}
}
- return NULL;
+
+ return false;
}
-// returns a pointer to the reason if a host matches a gline, NULL if it didnt match
+void GLine::Apply(User* u)
+{
+ DefaultApply(u, "G", (this->identmask == "*") ? true : false);
+}
-char* matches_gline(const char* host)
+bool ELine::Matches(User *u)
{
- if (glines.empty())
- return NULL;
- for (std::vector<GLine>::iterator i = glines.begin(); i != glines.end(); i++)
+ if (u->exempt)
+ return false;
+
+ if (InspIRCd::Match(u->ident, this->identmask, ascii_case_insensitive_map))
{
- if (match(host,i->hostmask))
+ if (InspIRCd::MatchCIDR(u->host, this->hostmask, ascii_case_insensitive_map) ||
+ InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, ascii_case_insensitive_map))
{
- return i->reason;
+ return true;
}
}
- return NULL;
+
+ return false;
}
-char* matches_exception(const char* host)
+bool ZLine::Matches(User *u)
{
- if (elines.empty())
- return NULL;
- char host2[MAXBUF];
- snprintf(host2,MAXBUF,"*@%s",host);
- for (std::vector<ELine>::iterator i = elines.begin(); i != elines.end(); i++)
- {
- if ((match(host,i->hostmask)) || (match(host2,i->hostmask)))
- {
- return i->reason;
- }
- }
- return NULL;
+ if (u->exempt)
+ return false;
+
+ if (InspIRCd::MatchCIDR(u->GetIPString(), this->ipaddr))
+ return true;
+ else
+ return false;
}
+void ZLine::Apply(User* u)
+{
+ DefaultApply(u, "Z", true);
+}
-void gline_set_creation_time(char* host, time_t create_time)
+
+bool QLine::Matches(User *u)
{
- for (std::vector<GLine>::iterator i = glines.begin(); i != glines.end(); i++)
- {
- if (!strcasecmp(host,i->hostmask))
- {
- i->set_time = create_time;
- return;
- }
- }
- return ;
+ if (InspIRCd::Match(u->nick, this->nick))
+ return true;
+
+ return false;
}
-void qline_set_creation_time(char* nick, time_t create_time)
+void QLine::Apply(User* u)
{
- for (std::vector<QLine>::iterator i = qlines.begin(); i != qlines.end(); i++)
- {
- if (!strcasecmp(nick,i->nick))
- {
- i->set_time = create_time;
- return;
- }
- }
- return ;
+ /* Force to uuid on apply of qline, no need to disconnect any more :) */
+ u->ForceNickChange(u->uuid.c_str());
}
-void zline_set_creation_time(char* ip, time_t create_time)
+
+bool ZLine::Matches(const std::string &str)
{
- for (std::vector<ZLine>::iterator i = zlines.begin(); i != zlines.end(); i++)
- {
- if (!strcasecmp(ip,i->ipaddr))
- {
- i->set_time = create_time;
- return;
- }
- }
- return ;
+ if (InspIRCd::MatchCIDR(str, this->ipaddr))
+ return true;
+ else
+ return false;
}
-// returns a pointer to the reason if an ip address matches a zline, NULL if it didnt match
+bool QLine::Matches(const std::string &str)
+{
+ if (InspIRCd::Match(str, this->nick))
+ return true;
-char* matches_zline(const char* ipaddr)
+ return false;
+}
+
+bool ELine::Matches(const std::string &str)
{
- if (zlines.empty())
- return NULL;
- for (std::vector<ZLine>::iterator i = zlines.begin(); i != zlines.end(); i++)
- {
- if (match(ipaddr,i->ipaddr))
- {
- return i->reason;
- }
- }
- return NULL;
+ return (InspIRCd::MatchCIDR(str, matchtext));
+}
+
+bool KLine::Matches(const std::string &str)
+{
+ return (InspIRCd::MatchCIDR(str.c_str(), matchtext));
}
-// returns a pointer to the reason if a host matches a kline, NULL if it didnt match
+bool GLine::Matches(const std::string &str)
+{
+ return (InspIRCd::MatchCIDR(str, matchtext));
+}
-char* matches_kline(const char* host)
+void ELine::OnAdd()
{
- if (klines.empty())
- return NULL;
- for (std::vector<KLine>::iterator i = klines.begin(); i != klines.end(); i++)
+ /* When adding one eline, only check the one eline */
+ for (LocalUserList::const_iterator u2 = ServerInstance->Users->local_users.begin(); u2 != ServerInstance->Users->local_users.end(); u2++)
{
- if (match(host,i->hostmask))
- {
- return i->reason;
- }
+ User* u = (User*)(*u2);
+ if (this->Matches(u))
+ u->exempt = true;
}
- return NULL;
}
-// removes lines that have expired
+void ELine::DisplayExpiry()
+{
+ ServerInstance->SNO->WriteToSnoMask('x',"Removing expired E-Line %s@%s (set by %s %ld seconds ago)",
+ identmask.c_str(),hostmask.c_str(),source.c_str(),(long)(ServerInstance->Time() - this->set_time));
+}
-void expire_lines()
+void QLine::DisplayExpiry()
{
- bool go_again = true;
- time_t current = TIME;
-
- // because we mess up an iterator when we remove from the vector, we must bail from
- // the loop early if we delete an item, therefore this outer while loop is required.
- while (go_again)
- {
- go_again = false;
+ ServerInstance->SNO->WriteToSnoMask('x',"Removing expired Q-Line %s (set by %s %ld seconds ago)",
+ nick.c_str(),source.c_str(),(long)(ServerInstance->Time() - this->set_time));
+}
- for (std::vector<KLine>::iterator i = klines.begin(); i != klines.end(); i++)
- {
- if ((current > (i->duration + i->set_time)) && (i->duration > 0))
- {
- WriteOpers("Expiring timed K-Line %s (set by %s %d seconds ago)",i->hostmask,i->source,i->duration);
- klines.erase(i);
- go_again = true;
- break;
- }
- }
+void ZLine::DisplayExpiry()
+{
+ ServerInstance->SNO->WriteToSnoMask('x',"Removing expired Z-Line %s (set by %s %ld seconds ago)",
+ ipaddr.c_str(),source.c_str(),(long)(ServerInstance->Time() - this->set_time));
+}
- for (std::vector<ELine>::iterator i = elines.begin(); i != elines.end(); i++)
- {
- if ((current > (i->duration + i->set_time)) && (i->duration > 0))
- {
- WriteOpers("Expiring timed E-Line %s (set by %s %d seconds ago)",i->hostmask,i->source,i->duration);
- elines.erase(i);
- go_again = true;
- break;
- }
- }
-
- for (std::vector<GLine>::iterator i = glines.begin(); i != glines.end(); i++)
- {
- if ((current > (i->duration + i->set_time)) && (i->duration > 0))
- {
- WriteOpers("Expiring timed G-Line %s (set by %s %d seconds ago)",i->hostmask,i->source,i->duration);
- glines.erase(i);
- go_again = true;
- break;
- }
- }
+void KLine::DisplayExpiry()
+{
+ ServerInstance->SNO->WriteToSnoMask('x',"Removing expired K-Line %s@%s (set by %s %ld seconds ago)",
+ identmask.c_str(),hostmask.c_str(),source.c_str(),(long)(ServerInstance->Time() - this->set_time));
+}
- for (std::vector<ZLine>::iterator i = zlines.begin(); i != zlines.end(); i++)
- {
- if ((current > (i->duration + i->set_time)) && (i->duration > 0))
- {
- WriteOpers("Expiring timed Z-Line %s (set by %s %d seconds ago)",i->ipaddr,i->source,i->duration);
- zlines.erase(i);
- go_again = true;
- break;
- }
- }
+void GLine::DisplayExpiry()
+{
+ ServerInstance->SNO->WriteToSnoMask('x',"Removing expired G-Line %s@%s (set by %s %ld seconds ago)",
+ identmask.c_str(),hostmask.c_str(),source.c_str(),(long)(ServerInstance->Time() - this->set_time));
+}
- for (std::vector<QLine>::iterator i = qlines.begin(); i != qlines.end(); i++)
- {
- if ((current > (i->duration + i->set_time)) && (i->duration > 0))
- {
- WriteOpers("Expiring timed Q-Line %s (set by %s %d seconds ago)",i->nick,i->source,i->duration);
- qlines.erase(i);
- go_again = true;
- break;
- }
- }
- }
+const char* ELine::Displayable()
+{
+ return matchtext.c_str();
}
-// applies lines, removing clients and changing nicks etc as applicable
+const char* KLine::Displayable()
+{
+ return matchtext.c_str();
+}
-void apply_lines()
+const char* GLine::Displayable()
{
- bool go_again = true;
- char reason[MAXBUF];
- char host[MAXBUF];
-
- if ((!glines.size()) && (!klines.size()) && (!zlines.size()) && (!qlines.size()))
- return;
-
- while (go_again)
- {
- go_again = false;
- for (user_hash::const_iterator u = clientlist.begin(); u != clientlist.end(); u++)
- {
- if (!strcasecmp(u->second->server,ServerName))
- {
- snprintf(host,MAXBUF,"%s@%s",u->second->ident,u->second->host);
- if (elines.size())
- {
- // ignore people matching exempts
- if (matches_exception(host))
- continue;
- }
- if (glines.size())
- {
- char* check = matches_gline(host);
- if (check)
- {
- WriteOpers("*** User %s matches G-Line: %s",u->second->registered == 7 ? u->second->nick:"<unknown>",check);
- snprintf(reason,MAXBUF,"G-Lined: %s",check);
- kill_link(u->second,reason);
- go_again = true;
- break;
- }
- }
- if (klines.size())
- {
- char* check = matches_kline(host);
- if (check)
- {
- WriteOpers("*** User %s matches K-Line: %s",u->second->registered == 7 ? u->second->nick:"<unknown>",check);
- snprintf(reason,MAXBUF,"K-Lined: %s",check);
- kill_link(u->second,reason);
- go_again = true;
- break;
- }
- }
- if (qlines.size())
- {
- char* check = matches_qline(u->second->nick);
- if (check)
- {
- snprintf(reason,MAXBUF,"Matched Q-Lined nick: %s",check);
- WriteOpers("*** Q-Lined nickname %s from %s: %s",u->second->registered == 7 ? u->second->nick:"<unknown>",u->second->host,check);
- kill_link(u->second,reason);
- go_again = true;
- break;
- }
- }
- if (zlines.size())
- {
- char* check = matches_zline(u->second->ip);
- if (check)
- {
- snprintf(reason,MAXBUF,"Z-Lined: %s",check);
- WriteOpers("*** User %s matches Z-Line: %s",u->second->registered == 7 ? u->second->nick:"<unknown>",u->second->host,check);
- kill_link(u->second,reason);
- go_again = true;
- break;
- }
- }
- }
- }
- }
+ return matchtext.c_str();
}
-void stats_k(userrec* user)
+const char* ZLine::Displayable()
{
- for (std::vector<KLine>::iterator i = klines.begin(); i != klines.end(); i++)
- {
- WriteServ(user->fd,"216 %s :%s %d %d %s %s",user->nick,i->hostmask,i->set_time,i->duration,i->source,i->reason);
- }
+ return ipaddr.c_str();
}
-void stats_g(userrec* user)
+const char* QLine::Displayable()
{
- for (std::vector<GLine>::iterator i = glines.begin(); i != glines.end(); i++)
- {
- WriteServ(user->fd,"223 %s :%s %d %d %s %s",user->nick,i->hostmask,i->set_time,i->duration,i->source,i->reason);
- }
+ return nick.c_str();
}
-void stats_q(userrec* user)
+bool KLine::IsBurstable()
{
- for (std::vector<QLine>::iterator i = qlines.begin(); i != qlines.end(); i++)
- {
- WriteServ(user->fd,"217 %s :%s %d %d %s %s",user->nick,i->nick,i->set_time,i->duration,i->source,i->reason);
- }
+ return false;
}
-void stats_z(userrec* user)
+bool XLineManager::RegisterFactory(XLineFactory* xlf)
{
- for (std::vector<ZLine>::iterator i = zlines.begin(); i != zlines.end(); i++)
- {
- WriteServ(user->fd,"223 %s :%s %d %d %s %s",user->nick,i->ipaddr,i->set_time,i->duration,i->source,i->reason);
- }
+ XLineFactMap::iterator n = line_factory.find(xlf->GetType());
+
+ if (n != line_factory.end())
+ return false;
+
+ line_factory[xlf->GetType()] = xlf;
+
+ return true;
}
-void stats_e(userrec* user)
+bool XLineManager::UnregisterFactory(XLineFactory* xlf)
{
- for (std::vector<ELine>::iterator i = elines.begin(); i != elines.end(); i++)
- {
- WriteServ(user->fd,"223 %s :%s %d %d %s %s",user->nick,i->hostmask,i->set_time,i->duration,i->source,i->reason);
- }
+ XLineFactMap::iterator n = line_factory.find(xlf->GetType());
+
+ if (n == line_factory.end())
+ return false;
+
+ line_factory.erase(n);
+
+ return true;
+}
+
+XLineFactory* XLineManager::GetFactory(const std::string &type)
+{
+ XLineFactMap::iterator n = line_factory.find(type);
+
+ if (n == line_factory.end())
+ return NULL;
+
+ return n->second;
}
projects / user / henk / code / inspircd.git / blobdiff