* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
* See: http://www.inspircd.org/wiki/index.php/Credits
*
* This program is free but copyrighted software; see
* ---------------------------------------------------
*/
-/* $Core: libIRCDxline */
+/* $Core */
#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
/*
* Checks what users match a given vector of ELines and sets their ban exempt flag accordingly.
*/
-void XLineManager::CheckELines(std::map<std::string, XLine *> &ELines)
+void XLineManager::CheckELines()
{
+ ContainerIter n = lookup_lines.find("E");
+
+ if (n == lookup_lines.end())
+ return;
+
+ XLineLookup& ELines = n->second;
+
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 (std::map<std::string, XLine *>::iterator 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;
}
}
}
-// this should probably be moved to configreader, but atm it relies on CheckELines above.
-bool DoneELine(ServerConfig* conf, const char* tag)
+
+XLineLookup* XLineManager::GetAll(const std::string &type)
{
- for (std::vector<User*>::const_iterator u2 = conf->GetInstance()->local_users.begin(); u2 != conf->GetInstance()->local_users.end(); u2++)
+ 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(); )
{
- User* u = (User*)(*u2);
- u->exempt = false;
+ safei = x;
+ safei++;
+ if (x->second->duration && current > x->second->expiry)
+ {
+ ExpireLine(n, x);
+ }
+ x = safei;
}
- conf->GetInstance()->XLines->CheckELines(conf->GetInstance()->XLines->lookup_lines['E']);
- return true;
+ 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())
+ {
+ ExpireLine(n, x);
+ }
+}
+
+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;
+}
IdentHostPair XLineManager::IdentSplit(const std::string &ident_and_host)
{
}
else
{
+ n.first = "";
n.second = ident_and_host;
}
return n;
}
-// adds a g:line
+// adds a line
-/*bool XLineManager::AddELine(long duration, const char* source, const char* reason, const char* hostmask)*/
bool XLineManager::AddLine(XLine* line, User* user)
{
- /*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 the line exists, check if its an expired line */
+ ContainerIter x = lookup_lines.find(line->type);
+ if (x != lookup_lines.end())
+ {
+ LookupIter i = x->second.find(line->Displayable());
+ if (i != x->second.end())
+ {
+ if (i->second->duration && ServerInstance->Time() > i->second->expiry)
+ ExpireLine(x, i);
+ else
+ return false;
+ }
+ }
/*ELine* item = new ELine(ServerInstance, ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str());*/
- pending_lines.push_back(line);
+ XLineFactory* xlf = GetFactory(line->type);
+ if (!xlf)
+ return false;
+
+ if (xlf->AutoApplyToUserList(line))
+ pending_lines.push_back(line);
+
lookup_lines[line->type][line->Displayable()] = line;
line->OnAdd();
// deletes a line, returns true if the line existed and was removed
-bool XLineManager::DelLine(const char* hostmask, char type, User* user, bool simulate)
+bool XLineManager::DelLine(const char* hostmask, const std::string &type, User* user, bool simulate)
{
- std::map<char, std::map<std::string, XLine*> >::iterator x = lookup_lines.find(type);
+ ContainerIter x = lookup_lines.find(type);
if (x == lookup_lines.end())
return false;
- std::map<std::string, XLine*>::iterator y = x->second.find(hostmask);
+ 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();
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;
}
- std::map<char, std::map<std::string, XLine*> >::iterator x = ServerInstance->XLines->lookup_lines.find('E');
- if (x != ServerInstance->XLines->lookup_lines.end())
- ServerInstance->XLines->CheckELines(x->second);
+ ServerInstance->XLines->CheckELines();
}
// returns a pointer to the reason if a nickname matches a qline, NULL if it didnt match
-XLine* XLineManager::MatchesLine(const char type, User* user)
+XLine* XLineManager::MatchesLine(const std::string &type, User* user)
{
- std::map<char, std::map<std::string, XLine*> >::iterator x = lookup_lines.find(type);
+ ContainerIter x = lookup_lines.find(type);
if (x == lookup_lines.end())
return NULL;
const time_t current = ServerInstance->Time();
- for (std::map<std::string, XLine*>::iterator 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;
}
-XLine* XLineManager::MatchesLine(const char type, const std::string &pattern)
+XLine* XLineManager::MatchesLine(const std::string &type, const std::string &pattern)
{
- std::map<char, std::map<std::string, XLine*> >::iterator x = lookup_lines.find(type);
+ ContainerIter x = lookup_lines.find(type);
if (x == lookup_lines.end())
return NULL;
const time_t current = ServerInstance->Time();
- for (std::map<std::string, XLine*>::iterator 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(std::map<char, std::map<std::string, XLine*> >::iterator container, std::map<std::string, XLine*>::iterator item)
+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();
+
+ /* 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);
+ 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 char type, int numeric, User* user, string_list &results)
+void XLineManager::InvokeStats(const std::string &type, int numeric, User* user, string_list &results)
{
std::string sn = ServerInstance->Config->ServerName;
- std::map<const char, std::map<std::string, XLine*> >::iterator n = lookup_lines.find(type);
+ ContainerIter n = lookup_lines.find(type);
+
+ time_t current = ServerInstance->Time();
+
+ LookupIter safei;
if (n != lookup_lines.end())
{
- std::map<std::string, XLine*>& list = n->second;
- for (std::map<std::string, XLine*>::iterator i = list.begin(); i != list.end(); i++)
- results.push_back(sn+" "+ConvToStr(numeric)+" "+user->nick+" :"+i->second->Displayable()+" "+
+ XLineLookup& list = n->second;
+ 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;
+ }
}
}
delete KFact;
delete QFact;
delete ZFact;
+
+ // Delete all existing XLines
+ for (XLineContainer::iterator i = lookup_lines.begin(); i != lookup_lines.end(); i++)
+ {
+ for (XLineLookup::iterator j = i->second.begin(); j != i->second.end(); j++)
+ {
+ delete j->second;
+ }
+ i->second.clear();
+ }
+ lookup_lines.clear();
+
}
void XLine::Apply(User* u)
{
}
-void XLine::DefaultApply(User* u, char line)
+bool XLine::IsBurstable()
+{
+ return true;
+}
+
+void XLine::DefaultApply(User* u, const std::string &line, bool bancache)
{
- char reason[MAXBUF];
- snprintf(reason, MAXBUF, "%c-Lined: %s", line, this->reason);
+ char sreason[MAXBUF];
+ snprintf(sreason, MAXBUF, "%s-Lined: %s", line.c_str(), this->reason);
if (*ServerInstance->Config->MoronBanner)
- u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
+ u->WriteServ("NOTICE %s :*** %s", u->nick.c_str(), ServerInstance->Config->MoronBanner);
+
if (ServerInstance->Config->HideBans)
- User::QuitUser(ServerInstance, u, line + std::string("-Lined"), reason);
+ ServerInstance->Users->QuitUser(u, line + "-Lined", sreason);
else
- User::QuitUser(ServerInstance, u, reason);
+ ServerInstance->Users->QuitUser(u, sreason);
+
+
+ if (bancache)
+ {
+ ServerInstance->Logs->Log("BANCACHE", DEBUG, std::string("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);
+ }
}
bool KLine::Matches(User *u)
if (u->exempt)
return false;
- if ((match(u->ident, this->identmask)))
+ if (InspIRCd::Match(u->ident, this->identmask, ascii_case_insensitive_map))
{
- if ((match(u->host, this->hostmask, true)) || (match(u->GetIPString(), this->hostmask, true)))
+ if (InspIRCd::MatchCIDR(u->host, this->hostmask, ascii_case_insensitive_map) ||
+ InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, ascii_case_insensitive_map))
{
return true;
}
void KLine::Apply(User* u)
{
- DefaultApply(u, 'K');
+ DefaultApply(u, "K", (strcmp(this->identmask, "*") == 0) ? true : false);
}
bool GLine::Matches(User *u)
if (u->exempt)
return false;
- if ((match(u->ident, this->identmask)))
+ if (InspIRCd::Match(u->ident, this->identmask, ascii_case_insensitive_map))
{
- if ((match(u->host, this->hostmask, true)) || (match(u->GetIPString(), this->hostmask, true)))
+ if (InspIRCd::MatchCIDR(u->host, this->hostmask, ascii_case_insensitive_map) ||
+ InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, ascii_case_insensitive_map))
{
return true;
}
void GLine::Apply(User* u)
{
- DefaultApply(u, 'G');
+ DefaultApply(u, "G", (strcmp(this->identmask, "*") == 0) ? true : false);
}
bool ELine::Matches(User *u)
if (u->exempt)
return false;
- if ((match(u->ident, this->identmask)))
+ if (InspIRCd::Match(u->ident, this->identmask, ascii_case_insensitive_map))
{
- if ((match(u->host, this->hostmask, true)) || (match(u->GetIPString(), this->hostmask, true)))
+ if (InspIRCd::MatchCIDR(u->host, this->hostmask, ascii_case_insensitive_map) ||
+ InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, ascii_case_insensitive_map))
{
return true;
}
if (u->exempt)
return false;
- if (match(u->GetIPString(), this->ipaddr, true))
+ if (InspIRCd::MatchCIDR(u->GetIPString(), this->ipaddr))
return true;
else
return false;
void ZLine::Apply(User* u)
{
- DefaultApply(u, 'Z');
+ DefaultApply(u, "Z", true);
}
bool QLine::Matches(User *u)
{
- if (u->exempt)
- return false;
-
- if (match(u->nick, this->nick))
+ if (InspIRCd::Match(u->nick, this->nick))
return true;
return false;
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.c_str());
}
bool ZLine::Matches(const std::string &str)
{
- if (match(str.c_str(), this->ipaddr, true))
+ if (InspIRCd::MatchCIDR(str, this->ipaddr))
return true;
else
return false;
bool QLine::Matches(const std::string &str)
{
- if (match(str.c_str(), this->nick))
+ if (InspIRCd::Match(str, this->nick))
return true;
return false;
bool ELine::Matches(const std::string &str)
{
- return ((match(str.c_str(), matchtext.c_str(), true)));
+ return (InspIRCd::MatchCIDR(str, matchtext));
}
bool KLine::Matches(const std::string &str)
{
- return ((match(str.c_str(), matchtext.c_str(), true)));
+ return (InspIRCd::MatchCIDR(str.c_str(), matchtext));
}
bool GLine::Matches(const std::string &str)
{
- return ((match(str.c_str(), matchtext.c_str(), true)));
-}
-
-bool ELine::MatchesLiteral(const std::string &str)
-{
- return (assign(str) == matchtext);
-}
-
-bool ZLine::MatchesLiteral(const std::string &str)
-{
- return (assign(str) == this->ipaddr);
-}
-
-bool GLine::MatchesLiteral(const std::string &str)
-{
- return (assign(str) == matchtext);
-}
-
-bool KLine::MatchesLiteral(const std::string &str)
-{
- return (assign(str) == matchtext);
-}
-
-bool QLine::MatchesLiteral(const std::string &str)
-{
- return (assign(str) == this->nick);
+ return (InspIRCd::MatchCIDR(str, matchtext));
}
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))
void ELine::DisplayExpiry()
{
- ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed E-Line %s@%s (set by %s %d seconds ago)",this->identmask,this->hostmask,this->source,this->duration);
+ ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed E-Line %s@%s (set by %s %ld seconds ago)",this->identmask,this->hostmask,this->source,this->duration);
}
void QLine::DisplayExpiry()
{
- ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed Q-Line %s (set by %s %d seconds ago)",this->nick,this->source,this->duration);
+ ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed Q-Line %s (set by %s %ld seconds ago)",this->nick,this->source,this->duration);
}
void ZLine::DisplayExpiry()
{
- ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed Z-Line %s (set by %s %d seconds ago)",this->ipaddr,this->source,this->duration);
+ ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed Z-Line %s (set by %s %ld seconds ago)",this->ipaddr,this->source,this->duration);
}
void KLine::DisplayExpiry()
{
- ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed K-Line %s@%s (set by %s %d seconds ago)",this->identmask,this->hostmask,this->source,this->duration);
+ ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed K-Line %s@%s (set by %s %ld seconds ago)",this->identmask,this->hostmask,this->source,this->duration);
}
void GLine::DisplayExpiry()
{
- ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed G-Line %s@%s (set by %s %d seconds ago)",this->identmask,this->hostmask,this->source,this->duration);
+ ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed G-Line %s@%s (set by %s %ld seconds ago)",this->identmask,this->hostmask,this->source,this->duration);
}
const char* ELine::Displayable()
return nick;
}
+bool KLine::IsBurstable()
+{
+ return false;
+}
+
bool XLineManager::RegisterFactory(XLineFactory* xlf)
{
- std::map<char, XLineFactory*>::iterator n = line_factory.find(xlf->GetType());
+ XLineFactMap::iterator n = line_factory.find(xlf->GetType());
if (n != line_factory.end())
return false;
bool XLineManager::UnregisterFactory(XLineFactory* xlf)
{
- std::map<char, XLineFactory*>::iterator n = line_factory.find(xlf->GetType());
+ XLineFactMap::iterator n = line_factory.find(xlf->GetType());
if (n == line_factory.end())
return false;
return true;
}
-XLineFactory* XLineManager::GetFactory(const char type)
+XLineFactory* XLineManager::GetFactory(const std::string &type)
{
- std::map<char, XLineFactory*>::iterator n = line_factory.find(type);
+ 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