* ---------------------------------------------------
*/
+/* $Core: libIRCDxline */
+
#include "inspircd.h"
-#include "users.h"
-#include "modules.h"
#include "wildcard.h"
#include "xline.h"
+/*
+ * 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. Expiry will
+ * still use a sorted list, and we'll just ignore anything permanent.
+ *
+ * Application will be by a list of lines 'pending' application, meaning only the newly added lines
+ * will be gone over. Much faster.
+ *
+ * More of course is to come.
+ */
+
/* Version two, now with optimized expiry!
*
* Because the old way was horrendously slow, the new way of expiring xlines is very
bool DoneZLine(ServerConfig* conf, const char* tag)
{
- conf->GetInstance()->XLines->apply_lines(APPLY_ZLINES|APPLY_PERM_ONLY);
+ // XXX we should really only call this once - after we've finished processing configuration all together
+ conf->GetInstance()->XLines->ApplyLines();
return true;
}
bool DoneQLine(ServerConfig* conf, const char* tag)
{
- conf->GetInstance()->XLines->apply_lines(APPLY_QLINES|APPLY_PERM_ONLY);
+ // XXX we should really only call this once - after we've finished processing configuration all together
+ conf->GetInstance()->XLines->ApplyLines();
return true;
}
bool DoneKLine(ServerConfig* conf, const char* tag)
{
- conf->GetInstance()->XLines->apply_lines(APPLY_KLINES|APPLY_PERM_ONLY);
+ // XXX we should really only call this once - after we've finished processing configuration all together
+ conf->GetInstance()->XLines->ApplyLines();
return true;
}
bool DoneELine(ServerConfig* conf, const char* tag)
{
- /* Yes, this is supposed to do nothing, we dont 'apply' these */
+ // XXX we should really only call this once - after we've finished processing configuration all together
+ conf->GetInstance()->XLines->ApplyLines();
return true;
}
const char* reason = values[0].GetString();
const char* ipmask = values[1].GetString();
- conf->GetInstance()->XLines->add_zline(0,"<Config>",reason,ipmask);
+ conf->GetInstance()->XLines->AddZLine(0,"<Config>",reason,ipmask);
return true;
}
const char* reason = values[0].GetString();
const char* nick = values[1].GetString();
- conf->GetInstance()->XLines->add_qline(0,"<Config>",reason,nick);
+ conf->GetInstance()->XLines->AddQLine(0,"<Config>",reason,nick);
return true;
}
const char* reason = values[0].GetString();
const char* host = values[1].GetString();
- conf->GetInstance()->XLines->add_kline(0,"<Config>",reason,host);
+ conf->GetInstance()->XLines->AddKLine(0,"<Config>",reason,host);
return true;
}
const char* reason = values[0].GetString();
const char* host = values[1].GetString();
- conf->GetInstance()->XLines->add_eline(0,"<Config>",reason,host);
+ conf->GetInstance()->XLines->AddELine(0,"<Config>",reason,host);
return true;
}
+bool XLine::Matches(User *u)
+{
+ return false;
+}
+
+//XXX perhaps move into xlinemanager
+void CheckELines(InspIRCd *ServerInstance, std::vector<ELine *> &ELines)
+{
+ for (std::vector<User*>::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++)
+ {
+ User* u = (User*)(*u2);
+
+ for (std::vector<ELine *>::iterator i = ELines.begin(); i != ELines.end(); i++)
+ {
+ ELine *e = (*i);
+
+ u->exempt = e->Matches(u);
+ }
+ }
+}
+
+
IdentHostPair XLineManager::IdentSplit(const std::string &ident_and_host)
{
IdentHostPair n = std::make_pair<std::string,std::string>("*","*");
// adds a g:line
-bool XLineManager::add_gline(long duration, const char* source,const char* reason,const char* hostmask)
+bool XLineManager::AddGLine(long duration, const char* source,const char* reason,const char* hostmask)
{
IdentHostPair ih = IdentSplit(hostmask);
- if (del_gline(hostmask, true))
+ if (DelGLine(hostmask, true))
return false;
- GLine* item = new GLine(ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str());
+ GLine* item = new GLine(ServerInstance, ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str());
- if (duration)
- {
- glines.push_back(item);
- sort(glines.begin(), glines.end(),XLineManager::GSortComparison);
- }
- else
- {
- pglines.push_back(item);
- }
+ glines.push_back(item);
+ sort(glines.begin(), glines.end(),XLineManager::XSortComparison);
+ pending_lines.push_back(item);
return true;
}
// adds an e:line (exception to bans)
-bool XLineManager::add_eline(long duration, const char* source, const char* reason, const char* hostmask)
+bool XLineManager::AddELine(long duration, const char* source, const char* reason, const char* hostmask)
{
IdentHostPair ih = IdentSplit(hostmask);
- if (del_eline(hostmask, true))
+ if (DelELine(hostmask, true))
return false;
- ELine* item = new ELine(ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str());
+ ELine* item = new ELine(ServerInstance, ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str());
+
+ elines.push_back(item);
+ sort(elines.begin(), elines.end(),XLineManager::XSortComparison);
+
+ // XXX we really only need to check one line (the new one) - this is a bit wasteful!
+ CheckELines(ServerInstance, elines);
- if (duration)
- {
- elines.push_back(item);
- sort(elines.begin(), elines.end(),XLineManager::ESortComparison);
- }
- else
- {
- pelines.push_back(item);
- }
return true;
}
// adds a q:line
-bool XLineManager::add_qline(long duration, const char* source, const char* reason, const char* nickname)
+bool XLineManager::AddQLine(long duration, const char* source, const char* reason, const char* nickname)
{
- if (del_qline(nickname, true))
+ if (DelQLine(nickname, true))
return false;
- QLine* item = new QLine(ServerInstance->Time(), duration, source, reason, nickname);
+ QLine* item = new QLine(ServerInstance, ServerInstance->Time(), duration, source, reason, nickname);
+
+ qlines.push_back(item);
+ sort(qlines.begin(), qlines.end(),XLineManager::XSortComparison);
+ pending_lines.push_back(item);
- if (duration)
- {
- qlines.push_back(item);
- sort(qlines.begin(), qlines.end(),XLineManager::QSortComparison);
- }
- else
- {
- pqlines.push_back(item);
- }
return true;
}
// adds a z:line
-bool XLineManager::add_zline(long duration, const char* source, const char* reason, const char* ipaddr)
+bool XLineManager::AddZLine(long duration, const char* source, const char* reason, const char* ipaddr)
{
if (strchr(ipaddr,'@'))
{
ipaddr++;
}
- if (del_zline(ipaddr, true))
+ if (DelZLine(ipaddr, true))
return false;
- ZLine* item = new ZLine(ServerInstance->Time(), duration, source, reason, ipaddr);
+ ZLine* item = new ZLine(ServerInstance, ServerInstance->Time(), duration, source, reason, ipaddr);
+
+ zlines.push_back(item);
+ sort(zlines.begin(), zlines.end(),XLineManager::XSortComparison);
+ pending_lines.push_back(item);
- if (duration)
- {
- zlines.push_back(item);
- sort(zlines.begin(), zlines.end(),XLineManager::ZSortComparison);
- }
- else
- {
- pzlines.push_back(item);
- }
return true;
}
// adds a k:line
-bool XLineManager::add_kline(long duration, const char* source, const char* reason, const char* hostmask)
+bool XLineManager::AddKLine(long duration, const char* source, const char* reason, const char* hostmask)
{
IdentHostPair ih = IdentSplit(hostmask);
- if (del_kline(hostmask, true))
+ if (DelKLine(hostmask, true))
return false;
- KLine* item = new KLine(ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str());
+ KLine* item = new KLine(ServerInstance, ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str());
+
+ klines.push_back(item);
+ sort(klines.begin(), klines.end(),XLineManager::XSortComparison);
+ pending_lines.push_back(item);
- if (duration)
- {
- klines.push_back(item);
- sort(klines.begin(), klines.end(),XLineManager::KSortComparison);
- }
- else
- {
- pklines.push_back(item);
- }
return true;
}
// deletes a g:line, returns true if the line existed and was removed
-bool XLineManager::del_gline(const char* hostmask, bool simulate)
+bool XLineManager::DelGLine(const char* hostmask, bool simulate)
{
IdentHostPair ih = IdentSplit(hostmask);
for (std::vector<GLine*>::iterator i = glines.begin(); i != glines.end(); i++)
return true;
}
}
- for (std::vector<GLine*>::iterator i = pglines.begin(); i != pglines.end(); i++)
- {
- if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask))
- {
- if (!simulate)
- {
- delete *i;
- pglines.erase(i);
- }
- return true;
- }
- }
+
return false;
}
// deletes a e:line, returns true if the line existed and was removed
-bool XLineManager::del_eline(const char* hostmask, bool simulate)
+bool XLineManager::DelELine(const char* hostmask, bool simulate)
{
IdentHostPair ih = IdentSplit(hostmask);
for (std::vector<ELine*>::iterator i = elines.begin(); i != elines.end(); i++)
{
if (!simulate)
{
+ /* 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++)
+ {
+ User* u = (User*)(*u2);
+ u->exempt = false;
+ }
+
delete *i;
elines.erase(i);
+ CheckELines(ServerInstance, elines);
}
return true;
}
}
- for (std::vector<ELine*>::iterator i = pelines.begin(); i != pelines.end(); i++)
- {
- if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask))
- {
- if (!simulate)
- {
- delete *i;
- pelines.erase(i);
- }
- return true;
- }
- }
+
return false;
}
// deletes a q:line, returns true if the line existed and was removed
-bool XLineManager::del_qline(const char* nickname, bool simulate)
+bool XLineManager::DelQLine(const char* nickname, bool simulate)
{
for (std::vector<QLine*>::iterator i = qlines.begin(); i != qlines.end(); i++)
{
return true;
}
}
- for (std::vector<QLine*>::iterator i = pqlines.begin(); i != pqlines.end(); i++)
- {
- if (!strcasecmp(nickname,(*i)->nick))
- {
- if (!simulate)
- {
- delete *i;
- pqlines.erase(i);
- }
- return true;
- }
- }
+
return false;
}
// deletes a z:line, returns true if the line existed and was removed
-bool XLineManager::del_zline(const char* ipaddr, bool simulate)
+bool XLineManager::DelZLine(const char* ipaddr, bool simulate)
{
for (std::vector<ZLine*>::iterator i = zlines.begin(); i != zlines.end(); i++)
{
return true;
}
}
- for (std::vector<ZLine*>::iterator i = pzlines.begin(); i != pzlines.end(); i++)
- {
- if (!strcasecmp(ipaddr,(*i)->ipaddr))
- {
- if (!simulate)
- {
- delete *i;
- pzlines.erase(i);
- }
- return true;
- }
- }
+
return false;
}
// deletes a k:line, returns true if the line existed and was removed
-bool XLineManager::del_kline(const char* hostmask, bool simulate)
+bool XLineManager::DelKLine(const char* hostmask, bool simulate)
{
IdentHostPair ih = IdentSplit(hostmask);
for (std::vector<KLine*>::iterator i = klines.begin(); i != klines.end(); i++)
return true;
}
}
- for (std::vector<KLine*>::iterator i = pklines.begin(); i != pklines.end(); i++)
- {
- if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask))
- {
- if (!simulate)
- {
- delete *i;
- pklines.erase(i);
- }
- return true;
- }
- }
+
return false;
}
// returns a pointer to the reason if a nickname matches a qline, NULL if it didnt match
-QLine* XLineManager::matches_qline(const char* nick, bool permonly)
+QLine* XLineManager::matches_qline(const char* nick)
{
- if ((qlines.empty()) && (pqlines.empty()))
+ if (qlines.empty())
return NULL;
- if (!permonly)
- {
- for (std::vector<QLine*>::iterator i = qlines.begin(); i != qlines.end(); i++)
- if (match(nick,(*i)->nick))
- return (*i);
- }
- for (std::vector<QLine*>::iterator i = pqlines.begin(); i != pqlines.end(); i++)
- if (match(nick,(*i)->nick))
+
+ for (std::vector<QLine*>::iterator i = qlines.begin(); i != qlines.end(); i++)
+ if ((*i)->Matches(nick))
return (*i);
return NULL;
}
// returns a pointer to the reason if a host matches a gline, NULL if it didnt match
-GLine* XLineManager::matches_gline(userrec* user, bool permonly)
+GLine* XLineManager::matches_gline(User* user)
{
- if ((glines.empty()) && (pglines.empty()))
+ if (glines.empty())
return NULL;
- if (!permonly)
- {
- for (std::vector<GLine*>::iterator i = glines.begin(); i != glines.end(); i++)
- {
- if ((match(user->ident,(*i)->identmask)))
- {
- if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true)))
- {
- return (*i);
- }
- }
- }
- }
- for (std::vector<GLine*>::iterator i = pglines.begin(); i != pglines.end(); i++)
+
+ for (std::vector<GLine*>::iterator i = glines.begin(); i != glines.end(); i++)
{
- if ((match(user->ident,(*i)->identmask)))
- {
- if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true)))
- {
- return (*i);
- }
- }
+ if ((*i)->Matches(user))
+ return (*i);
}
+
return NULL;
}
-ELine* XLineManager::matches_exception(userrec* user, bool permonly)
+ELine* XLineManager::matches_exception(User* user)
{
- if ((elines.empty()) && (pelines.empty()))
+ if (elines.empty())
return NULL;
- char host2[MAXBUF];
- snprintf(host2,MAXBUF,"*@%s",user->host);
- if (!permonly)
- {
- for (std::vector<ELine*>::iterator i = elines.begin(); i != elines.end(); i++)
- {
- if ((match(user->ident,(*i)->identmask)))
- {
- if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true)))
- {
- return (*i);
- }
- }
- }
- }
- for (std::vector<ELine*>::iterator i = pelines.begin(); i != pelines.end(); i++)
+
+ for (std::vector<ELine*>::iterator i = elines.begin(); i != elines.end(); i++)
{
- if ((match(user->ident,(*i)->identmask)))
- {
- if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true)))
- {
- return (*i);
- }
- }
+ if ((*i)->Matches(user))
+ return (*i);
}
return NULL;
}
return;
}
}
- for (std::vector<GLine*>::iterator i = pglines.begin(); i != pglines.end(); i++)
- {
- if (!strcasecmp(host,(*i)->hostmask))
- {
- (*i)->set_time = create_time;
- return;
- }
- }
+
return ;
}
return;
}
}
- for (std::vector<ELine*>::iterator i = pelines.begin(); i != pelines.end(); i++)
- {
- if (!strcasecmp(host,(*i)->hostmask))
- {
- (*i)->set_time = create_time;
- return;
- }
- }
+
return;
}
return;
}
}
- for (std::vector<QLine*>::iterator i = pqlines.begin(); i != pqlines.end(); i++)
- {
- if (!strcasecmp(nick,(*i)->nick))
- {
- (*i)->set_time = create_time;
- return;
- }
- }
+
return;
}
return;
}
}
- for (std::vector<ZLine*>::iterator i = pzlines.begin(); i != pzlines.end(); i++)
- {
- if (!strcasecmp(ip,(*i)->ipaddr))
- {
- (*i)->set_time = create_time;
- return;
- }
- }
+
return;
}
// returns a pointer to the reason if an ip address matches a zline, NULL if it didnt match
-ZLine* XLineManager::matches_zline(const char* ipaddr, bool permonly)
+ZLine* XLineManager::matches_zline(User *u)
{
- if ((zlines.empty()) && (pzlines.empty()))
+ if (zlines.empty())
return NULL;
- if (!permonly)
- {
- for (std::vector<ZLine*>::iterator i = zlines.begin(); i != zlines.end(); i++)
- if (match(ipaddr,(*i)->ipaddr, true))
- return (*i);
- }
- for (std::vector<ZLine*>::iterator i = pzlines.begin(); i != pzlines.end(); i++)
- if (match(ipaddr,(*i)->ipaddr, true))
+
+ for (std::vector<ZLine*>::iterator i = zlines.begin(); i != zlines.end(); i++)
+ if ((*i)->Matches(u))
return (*i);
return NULL;
}
// returns a pointer to the reason if a host matches a kline, NULL if it didnt match
-KLine* XLineManager::matches_kline(userrec* user, bool permonly)
+KLine* XLineManager::matches_kline(User* user)
{
- if ((klines.empty()) && (pklines.empty()))
+ if (klines.empty())
return NULL;
- if (!permonly)
- {
- for (std::vector<KLine*>::iterator i = klines.begin(); i != klines.end(); i++)
- {
- if ((match(user->ident,(*i)->identmask)))
- {
- if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true)))
- {
- return (*i);
- }
- }
- }
- }
- for (std::vector<KLine*>::iterator i = pklines.begin(); i != pklines.end(); i++)
+
+ for (std::vector<KLine*>::iterator i = klines.begin(); i != klines.end(); i++)
{
- if ((match(user->ident,(*i)->identmask)))
- {
- if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true)))
- {
- return (*i);
- }
- }
+ if ((*i)->Matches(user))
+ return (*i);
}
- return NULL;
-}
-bool XLineManager::GSortComparison ( const GLine* one, const GLine* two )
-{
- return (one->expiry) < (two->expiry);
-}
-
-bool XLineManager::ESortComparison ( const ELine* one, const ELine* two )
-{
- return (one->expiry) < (two->expiry);
-}
-
-bool XLineManager::ZSortComparison ( const ZLine* one, const ZLine* two )
-{
- return (one->expiry) < (two->expiry);
-}
-
-bool XLineManager::KSortComparison ( const KLine* one, const KLine* two )
-{
- return (one->expiry) < (two->expiry);
+ return NULL;
}
-bool XLineManager::QSortComparison ( const QLine* one, const QLine* two )
+bool XLineManager::XSortComparison(const XLine *one, const XLine *two)
{
+ // account for permanent lines
+ if (one->expiry == 0)
+ {
+ return false;
+ }
return (one->expiry) < (two->expiry);
}
// removes lines that have expired
-
void XLineManager::expire_lines()
{
time_t current = ServerInstance->Time();
* none left at the head of the queue that are after the current time.
*/
- while ((glines.size()) && (current > (*glines.begin())->expiry))
+ while ((glines.size()) && (current > (*glines.begin())->expiry) && ((*glines.begin())->duration != 0))
{
std::vector<GLine*>::iterator i = glines.begin();
ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed G-Line %s@%s (set by %s %d seconds ago)",(*i)->identmask,(*i)->hostmask,(*i)->source,(*i)->duration);
glines.erase(i);
}
- while ((elines.size()) && (current > (*elines.begin())->expiry))
+ while ((elines.size()) && (current > (*elines.begin())->expiry) && ((*elines.begin())->duration != 0))
{
std::vector<ELine*>::iterator i = elines.begin();
ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed E-Line %s@%s (set by %s %d seconds ago)",(*i)->identmask,(*i)->hostmask,(*i)->source,(*i)->duration);
elines.erase(i);
}
- while ((zlines.size()) && (current > (*zlines.begin())->expiry))
+ while ((zlines.size()) && (current > (*zlines.begin())->expiry) && ((*zlines.begin())->duration != 0))
{
std::vector<ZLine*>::iterator i = zlines.begin();
ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed Z-Line %s (set by %s %d seconds ago)",(*i)->ipaddr,(*i)->source,(*i)->duration);
zlines.erase(i);
}
- while ((klines.size()) && (current > (*klines.begin())->expiry))
+ while ((klines.size()) && (current > (*klines.begin())->expiry) && ((*klines.begin())->duration != 0))
{
std::vector<KLine*>::iterator i = klines.begin();
ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed K-Line %s@%s (set by %s %d seconds ago)",(*i)->identmask,(*i)->hostmask,(*i)->source,(*i)->duration);
klines.erase(i);
}
- while ((qlines.size()) && (current > (*qlines.begin())->expiry))
+ while ((qlines.size()) && (current > (*qlines.begin())->expiry) && ((*qlines.begin())->duration != 0))
{
std::vector<QLine*>::iterator i = qlines.begin();
ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed Q-Line %s (set by %s %d seconds ago)",(*i)->nick,(*i)->source,(*i)->duration);
}
// applies lines, removing clients and changing nicks etc as applicable
-
-void XLineManager::apply_lines(const int What)
+void XLineManager::ApplyLines()
{
- if (!What)
- return;
-
- if (What & APPLY_PERM_ONLY)
+ for (std::vector<User*>::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++)
{
- char reason[MAXBUF];
-
- if ((!pglines.size()) && (!pklines.size()) && (!pzlines.size()) && (!pqlines.size()))
- return;
+ User* u = (User*)(*u2);
- XLine* check = NULL;
- for (std::vector<userrec*>::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++)
+ for (std::vector<XLine *>::iterator i = pending_lines.begin(); i != pending_lines.end(); i++)
{
- userrec* u = (userrec*)(*u2);
-
- if (elines.size() || pelines.size())
- if (matches_exception(u))
- continue;
-
- if ((What & APPLY_GLINES) && pglines.size())
- {
- if ((check = matches_gline(u,true)))
- {
- snprintf(reason,MAXBUF,"G-Lined: %s",check->reason);
- if (*ServerInstance->Config->MoronBanner)
- u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
- if (ServerInstance->Config->HideBans)
- ServerInstance->GlobalCulls.AddItem(u, "G-Lined", reason);
- else
- ServerInstance->GlobalCulls.AddItem(u, reason);
- }
- }
-
- if ((What & APPLY_KLINES) && pklines.size())
- {
- if ((check = matches_kline(u,true)))
- {
- snprintf(reason,MAXBUF,"K-Lined: %s",check->reason);
- if (*ServerInstance->Config->MoronBanner)
- u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
- if (ServerInstance->Config->HideBans)
- ServerInstance->GlobalCulls.AddItem(u, "K-Lined", reason);
- else
- ServerInstance->GlobalCulls.AddItem(u, reason);
- }
- }
-
- if ((What & APPLY_QLINES) && pqlines.size())
- {
- if ((check = matches_qline(u->nick,true)))
- {
- snprintf(reason,MAXBUF,"Q-Lined: %s",check->reason);
- if (*ServerInstance->Config->MoronBanner)
- u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
- if (ServerInstance->Config->HideBans)
- ServerInstance->GlobalCulls.AddItem(u, "Q-Lined", reason);
- else
- ServerInstance->GlobalCulls.AddItem(u, reason);
- }
- }
-
- if ((What & APPLY_ZLINES) && pzlines.size())
- {
- if ((check = matches_zline(u->GetIPString(),true)))
- {
- snprintf(reason,MAXBUF,"Z-Lined: %s",check->reason);
- if (*ServerInstance->Config->MoronBanner)
- u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
- if (ServerInstance->Config->HideBans)
- ServerInstance->GlobalCulls.AddItem(u, "Z-Lined", reason);
- else
- ServerInstance->GlobalCulls.AddItem(u, reason);
- }
- }
+ XLine *x = *i;
+ if (x->Matches(u))
+ x->Apply(u);
}
}
- else
- {
- char reason[MAXBUF];
-
- if ((!glines.size()) && (!klines.size()) && (!zlines.size()) && (!qlines.size()) &&
- (!pglines.size()) && (!pklines.size()) && (!pzlines.size()) && (!pqlines.size()))
- return;
-
- XLine* check = NULL;
- for (std::vector<userrec*>::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++)
- {
- userrec* u = (userrec*)(*u2);
- if (elines.size() || pelines.size())
- {
- // ignore people matching exempts
- if (matches_exception(u))
- continue;
- }
- if ((What & APPLY_GLINES) && (glines.size() || pglines.size()))
- {
- if ((check = matches_gline(u)))
- {
- snprintf(reason,MAXBUF,"G-Lined: %s",check->reason);
- if (*ServerInstance->Config->MoronBanner)
- u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
- if (ServerInstance->Config->HideBans)
- ServerInstance->GlobalCulls.AddItem(u, "G-Lined", reason);
- else
- ServerInstance->GlobalCulls.AddItem(u, reason);
- }
- }
- if ((What & APPLY_KLINES) && (klines.size() || pklines.size()))
- {
- if ((check = matches_kline(u)))
- {
- snprintf(reason,MAXBUF,"K-Lined: %s",check->reason);
- if (*ServerInstance->Config->MoronBanner)
- u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
- if (ServerInstance->Config->HideBans)
- ServerInstance->GlobalCulls.AddItem(u, "K-Lined", reason);
- else
- ServerInstance->GlobalCulls.AddItem(u, reason);
- }
- }
- if ((What & APPLY_QLINES) && (qlines.size() || pqlines.size()))
- {
- if ((check = matches_qline(u->nick)))
- {
- snprintf(reason,MAXBUF,"Q-Lined: %s",check->reason);
- if (*ServerInstance->Config->MoronBanner)
- u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
- if (ServerInstance->Config->HideBans)
- ServerInstance->GlobalCulls.AddItem(u, "Q-Lined", reason);
- else
- ServerInstance->GlobalCulls.AddItem(u, reason);
- }
- }
- if ((What & APPLY_ZLINES) && (zlines.size() || pzlines.size()))
- {
- if ((check = matches_zline(u->GetIPString())))
- {
- snprintf(reason,MAXBUF,"Z-Lined: %s", check->reason);
- if (*ServerInstance->Config->MoronBanner)
- u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
- if (ServerInstance->Config->HideBans)
- ServerInstance->GlobalCulls.AddItem(u, "Z-Lined", reason);
- else
- ServerInstance->GlobalCulls.AddItem(u, reason);
- }
- }
- }
- }
+ pending_lines.clear();
}
-void XLineManager::stats_k(userrec* user, string_list &results)
+void XLineManager::stats_k(User* user, string_list &results)
{
std::string sn = ServerInstance->Config->ServerName;
for (std::vector<KLine*>::iterator i = klines.begin(); i != klines.end(); i++)
results.push_back(sn+" 216 "+user->nick+" :"+(*i)->identmask+"@"+(*i)->hostmask+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason);
- for (std::vector<KLine*>::iterator i = pklines.begin(); i != pklines.end(); i++)
- results.push_back(sn+" 216 "+user->nick+" :"+(*i)->identmask+"@"+(*i)->hostmask+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason);
}
-void XLineManager::stats_g(userrec* user, string_list &results)
+void XLineManager::stats_g(User* user, string_list &results)
{
std::string sn = ServerInstance->Config->ServerName;
for (std::vector<GLine*>::iterator i = glines.begin(); i != glines.end(); i++)
results.push_back(sn+" 223 "+user->nick+" :"+(*i)->identmask+"@"+(*i)->hostmask+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason);
- for (std::vector<GLine*>::iterator i = pglines.begin(); i != pglines.end(); i++)
- results.push_back(sn+" 223 "+user->nick+" :"+(*i)->identmask+"@"+(*i)->hostmask+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason);
}
-void XLineManager::stats_q(userrec* user, string_list &results)
+void XLineManager::stats_q(User* user, string_list &results)
{
std::string sn = ServerInstance->Config->ServerName;
for (std::vector<QLine*>::iterator i = qlines.begin(); i != qlines.end(); i++)
results.push_back(sn+" 217 "+user->nick+" :"+(*i)->nick+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason);
- for (std::vector<QLine*>::iterator i = pqlines.begin(); i != pqlines.end(); i++)
- results.push_back(sn+" 217 "+user->nick+" :"+(*i)->nick+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason);
}
-void XLineManager::stats_z(userrec* user, string_list &results)
+void XLineManager::stats_z(User* user, string_list &results)
{
std::string sn = ServerInstance->Config->ServerName;
for (std::vector<ZLine*>::iterator i = zlines.begin(); i != zlines.end(); i++)
results.push_back(sn+" 223 "+user->nick+" :"+(*i)->ipaddr+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason);
- for (std::vector<ZLine*>::iterator i = pzlines.begin(); i != pzlines.end(); i++)
- results.push_back(sn+" 223 "+user->nick+" :"+(*i)->ipaddr+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason);
}
-void XLineManager::stats_e(userrec* user, string_list &results)
+void XLineManager::stats_e(User* user, string_list &results)
{
std::string sn = ServerInstance->Config->ServerName;
for (std::vector<ELine*>::iterator i = elines.begin(); i != elines.end(); i++)
results.push_back(sn+" 223 "+user->nick+" :"+(*i)->identmask+"@"+(*i)->hostmask+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason);
- for (std::vector<ELine*>::iterator i = pelines.begin(); i != pelines.end(); i++)
- results.push_back(sn+" 223 "+user->nick+" :"+(*i)->identmask+"@"+(*i)->hostmask+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason);
}
XLineManager::XLineManager(InspIRCd* Instance) : ServerInstance(Instance)
{
}
+
+bool XLine::Matches(const std::string &str)
+{
+ return false;
+}
+
+void XLine::Apply(User* u)
+{
+}
+
+void XLine::DefaultApply(User* u, char line)
+{
+ char reason[MAXBUF];
+ snprintf(reason, MAXBUF, "%c-Lined: %s", line, this->reason);
+ if (*ServerInstance->Config->MoronBanner)
+ u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
+ if (ServerInstance->Config->HideBans)
+ User::QuitUser(ServerInstance, u, line + std::string("-Lined"), reason);
+ else
+ User::QuitUser(ServerInstance, u, reason);
+}
+
+bool KLine::Matches(User *u)
+{
+ if (u->exempt)
+ return false;
+
+ if ((match(u->ident, this->identmask)))
+ {
+ if ((match(u->host, this->hostmask, true)) || (match(u->GetIPString(), this->hostmask, true)))
+ {
+ return true;
+ }
+ }
+
+ return false;
+}
+
+void KLine::Apply(User* u)
+{
+ DefaultApply(u, 'K');
+}
+
+bool GLine::Matches(User *u)
+{
+ if (u->exempt)
+ return false;
+
+ if ((match(u->ident, this->identmask)))
+ {
+ if ((match(u->host, this->hostmask, true)) || (match(u->GetIPString(), this->hostmask, true)))
+ {
+ return true;
+ }
+ }
+
+ return false;
+}
+
+void GLine::Apply(User* u)
+{
+ DefaultApply(u, 'G');
+}
+
+bool ELine::Matches(User *u)
+{
+ if (u->exempt)
+ return false;
+
+ if ((match(u->ident, this->identmask)))
+ {
+ if ((match(u->host, this->hostmask, true)) || (match(u->GetIPString(), this->hostmask, true)))
+ {
+ return true;
+ }
+ }
+
+ return false;
+}
+
+bool ZLine::Matches(User *u)
+{
+ if (u->exempt)
+ return false;
+
+ if (match(u->GetIPString(), this->ipaddr, true))
+ return true;
+ else
+ return false;
+}
+
+void ZLine::Apply(User* u)
+{
+ DefaultApply(u, 'Z');
+}
+
+
+bool QLine::Matches(User *u)
+{
+ if (u->exempt)
+ return false;
+
+ if (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');
+}
+
+
+bool ZLine::Matches(const std::string &str)
+{
+ if (match(str.c_str(), this->ipaddr, true))
+ return true;
+ else
+ return false;
+}
+
+bool QLine::Matches(const std::string &str)
+{
+ if (match(str.c_str(), this->nick))
+ return true;
+
+ return false;
+}
+
projects / user / henk / code / inspircd.git / blobdiff