* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * InspIRCd: (C) 2002-2008 InspIRCd Development Team
* See: http://www.inspircd.org/wiki/index.php/Credits
*
* This program is free but copyrighted software; see
#include "inspircd.h"
#include "wildcard.h"
#include "xline.h"
+#include "bancache.h"
/*
* This is now version 3 of the XLine subsystem, let's see if we can get it as nice and
if (ELines.empty())
return;
- for (std::vector<User*>::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++)
+ for (std::vector<User*>::const_iterator u2 = ServerInstance->Users->local_users.begin(); u2 != ServerInstance->Users->local_users.end(); u2++)
{
User* u = (User*)(*u2);
- for (LookupIter i = ELines.begin(); i != ELines.end(); i++)
+ /* 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;
}
}
}
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(); )
+ {
+ safei = x;
+ safei++;
+ if (x->second->duration && current > x->second->expiry)
+ {
+ ExpireLine(n, x);
+ }
+ x = safei;
+ }
+
return &(n->second);
}
{
/*IdentHostPair ih = IdentSplit(hostmask);*/
+ ServerInstance->BanCache->RemoveEntries(line->type, false); // XXX perhaps remove ELines here?
+
if (DelLine(line->Displayable(), line->type, user, true))
return false;
if (simulate)
return true;
+ ServerInstance->BanCache->RemoveEntries(y->second->type, true);
+
FOREACH_MOD(I_OnDelLine,OnDelLine(user, y->second));
y->second->Unset();
void ELine::Unset()
{
/* remove exempt from everyone and force recheck after deleting eline */
- for (std::vector<User*>::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++)
+ for (std::vector<User*>::const_iterator u2 = ServerInstance->Users->local_users.begin(); u2 != ServerInstance->Users->local_users.end(); u2++)
{
User* u = (User*)(*u2);
u->exempt = false;
const time_t current = ServerInstance->Time();
- for (LookupIter i = x->second.begin(); i != x->second.end(); i++)
+ LookupIter safei;
+
+ for (LookupIter i = x->second.begin(); i != x->second.end(); )
{
+ safei = i;
+ safei++;
+
if (i->second->Matches(user))
{
- if (current > i->second->expiry)
+ if (i->second->duration && current > i->second->expiry)
{
/* Expire the line, return nothing */
ExpireLine(x, i);
- return NULL;
+ /* Continue, there may be another that matches
+ * (thanks aquanight)
+ */
+ i = safei;
+ continue;
}
else
return i->second;
}
+
+ i = safei;
}
return NULL;
}
const time_t current = ServerInstance->Time();
- for (LookupIter i = x->second.begin(); i != x->second.end(); i++)
+ LookupIter safei;
+
+ for (LookupIter i = x->second.begin(); i != x->second.end(); )
{
+ safei = i;
+ safei++;
+
if (i->second->Matches(pattern))
{
- if (current > i->second->expiry)
+ if (i->second->duration && current > i->second->expiry)
{
/* Expire the line, return nothing */
ExpireLine(x, i);
- return NULL;
+ /* See above */
+ i = safei;
+ continue;
}
else
return i->second;
}
+
+ i = safei;
}
return NULL;
}
// removes lines that have expired
void XLineManager::ExpireLine(ContainerIter container, LookupIter item)
{
- item->second->DisplayExpiry();
- item->second->Unset();
+ FOREACH_MOD(I_OnExpireLine, OnExpireLine(item->second));
- /* 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);
+ item->second->DisplayExpiry();
+ item->second->Unset();
- delete item->second;
- container->second.erase(item);
+ /* 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<User*>::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++)
+ for (std::vector<User*>::const_iterator u2 = ServerInstance->Users->local_users.begin(); u2 != ServerInstance->Users->local_users.end(); u2++)
{
User* u = (User*)(*u2);
pending_lines.clear();
}
-/* k: 216
- * g: 223
- * q: 217
- * z: 223
- * e: 223
- */
-
void XLineManager::InvokeStats(const std::string &type, int numeric, User* user, string_list &results)
{
std::string sn = ServerInstance->Config->ServerName;
ContainerIter n = lookup_lines.find(type);
+ time_t current = ServerInstance->Time();
+
+ LookupIter safei;
+
if (n != lookup_lines.end())
{
XLineLookup& list = n->second;
- for (LookupIter i = list.begin(); i != list.end(); i++)
- results.push_back(sn+" "+ConvToStr(numeric)+" "+user->nick+" :"+i->second->Displayable()+" "+
+ for (LookupIter i = list.begin(); i != list.end(); )
+ {
+ safei = i;
+ safei++;
+
+ if (i->second->duration && current > i->second->expiry)
+ {
+ ExpireLine(n, i);
+ }
+ else
+ results.push_back(sn+" "+ConvToStr(numeric)+" "+user->nick+" :"+i->second->Displayable()+" "+
ConvToStr(i->second->set_time)+" "+ConvToStr(i->second->duration)+" "+std::string(i->second->source)+" :"+(i->second->reason));
+ i = safei;
+ }
}
}
{
}
-void XLine::DefaultApply(User* u, const std::string &line)
+void XLine::DefaultApply(User* u, const std::string &line, bool bancache)
{
char reason[MAXBUF];
snprintf(reason, MAXBUF, "%s-Lined: %s", line.c_str(), this->reason);
User::QuitUser(ServerInstance, u, line + "-Lined", reason);
else
User::QuitUser(ServerInstance, u, reason);
+
+
+ if (bancache)
+ {
+ ServerInstance->Log(DEBUG, std::string("BanCache: Adding positive hit (") + line + ") for " + u->GetIPString());
+ ServerInstance->BanCache->AddHit(u->GetIPString(), this->type, line + "-Lined: " + this->reason);
+ }
}
bool KLine::Matches(User *u)
void KLine::Apply(User* u)
{
- DefaultApply(u, "K");
+ DefaultApply(u, "K", (strcmp(this->identmask, "*") == 0) ? true : false);
}
bool GLine::Matches(User *u)
void GLine::Apply(User* u)
{
- DefaultApply(u, "G");
+ DefaultApply(u, "G", (strcmp(this->identmask, "*") == 0) ? true : false);
}
bool ELine::Matches(User *u)
void ZLine::Apply(User* u)
{
- DefaultApply(u, "Z");
+ DefaultApply(u, "Z", true);
}
void QLine::Apply(User* u)
{
- /* Can we force the user to their uid here instead? */
- DefaultApply(u, "Q");
+ /* Force to uuid on apply of qline, no need to disconnect any more :) */
+ u->ForceNickChange(u->uuid);
}
void ELine::OnAdd()
{
/* When adding one eline, only check the one eline */
- for (std::vector<User*>::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++)
+ for (std::vector<User*>::const_iterator u2 = ServerInstance->Users->local_users.begin(); u2 != ServerInstance->Users->local_users.end(); u2++)
{
User* u = (User*)(*u2);
if (this->Matches(u))
{
XLineFactMap::iterator n = line_factory.find(type);
- if (n != line_factory.end())
+ if (n == line_factory.end())
return NULL;
return n->second;
projects / user / henk / code / inspircd.git / blobdiff