#include "modules.h"
#include "wildcard.h"
#include "xline.h"
-#include "cull_list.h"
/* Version two, now with optimized expiry!
*
* items, and the other list holds permanent items (ones which will expire).
* Items which are on the permanent list are NEVER checked at all by the
* expire_lines() function.
- * (2) The temporary xline lists are always kept in strict numerical order, keyed by
+ * (2) The temporary xline lists are always kept in strict numerical order, keyed by
* current time + duration. This means that the line which is due to expire the
* soonest is always pointed at by vector::begin(), so a simple while loop can
* very efficiently, very quickly and above all SAFELY pick off the first few
return true;
}
-bool DoneXLine(ServerConfig* conf, const char* tag)
+bool DoneZLine(ServerConfig* conf, const char* tag)
{
- conf->GetInstance()->XLines->apply_lines(APPLY_ALL);
+ conf->GetInstance()->XLines->apply_lines(APPLY_ZLINES|APPLY_PERM_ONLY);
+ return true;
+}
+
+bool DoneQLine(ServerConfig* conf, const char* tag)
+{
+ conf->GetInstance()->XLines->apply_lines(APPLY_QLINES|APPLY_PERM_ONLY);
+ return true;
+}
+
+bool DoneKLine(ServerConfig* conf, const char* tag)
+{
+ conf->GetInstance()->XLines->apply_lines(APPLY_KLINES|APPLY_PERM_ONLY);
+ return true;
+}
+
+bool DoneELine(ServerConfig* conf, const char* tag)
+{
+ /* Yes, this is supposed to do nothing, we dont 'apply' these */
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()->Log(DEBUG,"Read Z line (badip tag): ipmask=%s reason=%s",ipmask,reason);
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()->Log(DEBUG,"Read Q line (badnick tag): nick=%s reason=%s",nick,reason);
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()->Log(DEBUG,"Read K line (badhost tag): host=%s reason=%s",host,reason);
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()->Log(DEBUG,"Read E line (exception tag): host=%s reason=%s",host,reason);
return true;
}
IdentHostPair ih = IdentSplit(hostmask);
bool ret = del_gline(hostmask);
-
+
GLine* item = new GLine(ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str());
-
+
if (duration)
{
glines.push_back(item);
{
pglines.push_back(item);
}
-
+
return !ret;
}
// returns a pointer to the reason if a nickname matches a qline, NULL if it didnt match
-QLine* XLineManager::matches_qline(const char* nick)
+QLine* XLineManager::matches_qline(const char* nick, bool permonly)
{
if ((qlines.empty()) && (pqlines.empty()))
return NULL;
- for (std::vector<QLine*>::iterator i = qlines.begin(); i != qlines.end(); i++)
- if (match(nick,(*i)->nick))
- return (*i);
+ 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))
return (*i);
// returns a pointer to the reason if a host matches a gline, NULL if it didnt match
-GLine* XLineManager::matches_gline(userrec* user)
+GLine* XLineManager::matches_gline(userrec* user, bool permonly)
{
if ((glines.empty()) && (pglines.empty()))
return NULL;
- for (std::vector<GLine*>::iterator i = glines.begin(); i != glines.end(); i++)
+ if (!permonly)
{
- if ((match(user->ident,(*i)->identmask)))
+ for (std::vector<GLine*>::iterator i = glines.begin(); i != glines.end(); i++)
{
- if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true)))
+ if ((match(user->ident,(*i)->identmask)))
{
- return (*i);
+ if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true)))
+ {
+ return (*i);
+ }
}
}
}
return NULL;
}
-ELine* XLineManager::matches_exception(userrec* user)
-{
+ELine* XLineManager::matches_exception(userrec* user, bool permonly)
+{
if ((elines.empty()) && (pelines.empty()))
return NULL;
char host2[MAXBUF];
snprintf(host2,MAXBUF,"*@%s",user->host);
- for (std::vector<ELine*>::iterator i = elines.begin(); i != elines.end(); i++)
+ if (!permonly)
{
- if ((match(user->ident,(*i)->identmask)))
+ for (std::vector<ELine*>::iterator i = elines.begin(); i != elines.end(); i++)
{
- if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true)))
+ if ((match(user->ident,(*i)->identmask)))
{
- return (*i);
+ if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true)))
+ {
+ return (*i);
+ }
}
}
}
return;
}
}
- return ;
+ return ;
}
void XLineManager::eline_set_creation_time(const char* host, time_t create_time)
return;
}
}
- for (std::vector<ELine*>::iterator i = pelines.begin(); i != pelines.end(); i++)
+ for (std::vector<ELine*>::iterator i = pelines.begin(); i != pelines.end(); i++)
{
if (!strcasecmp(host,(*i)->hostmask))
{
// 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)
+ZLine* XLineManager::matches_zline(const char* ipaddr, bool permonly)
{
if ((zlines.empty()) && (pzlines.empty()))
return NULL;
- for (std::vector<ZLine*>::iterator i = zlines.begin(); i != zlines.end(); i++)
- if (match(ipaddr,(*i)->ipaddr, true))
- return (*i);
+ 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))
return (*i);
// returns a pointer to the reason if a host matches a kline, NULL if it didnt match
-KLine* XLineManager::matches_kline(userrec* user)
+KLine* XLineManager::matches_kline(userrec* user, bool permonly)
{
if ((klines.empty()) && (pklines.empty()))
return NULL;
- for (std::vector<KLine*>::iterator i = klines.begin(); i != klines.end(); i++)
+ if (!permonly)
{
- if ((match(user->ident,(*i)->identmask)))
+ for (std::vector<KLine*>::iterator i = klines.begin(); i != klines.end(); i++)
{
- if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true)))
+ if ((match(user->ident,(*i)->identmask)))
{
- return (*i);
+ if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true)))
+ {
+ return (*i);
+ }
}
}
}
ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed Q-Line %s (set by %s %d seconds ago)",(*i)->nick,(*i)->source,(*i)->duration);
qlines.erase(i);
}
-
+
}
// applies lines, removing clients and changing nicks etc as applicable
void XLineManager::apply_lines(const int What)
{
- char reason[MAXBUF];
-
- if ((!glines.size()) && (!klines.size()) && (!zlines.size()) && (!qlines.size()) &&
- (!pglines.size()) && (!pklines.size()) && (!pzlines.size()) && (!pqlines.size()))
+ if (!What)
return;
- CullList* Goners = new CullList(ServerInstance);
- XLine* check = NULL;
- for (std::vector<userrec*>::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++)
+ if (What & APPLY_PERM_ONLY)
{
- userrec* u = (userrec*)(*u2);
+ char reason[MAXBUF];
- if (elines.size() || pelines.size())
- {
- // ignore people matching exempts
- if (matches_exception(u))
- continue;
- }
- if ((What & APPLY_GLINES) && (glines.size() || pglines.size()))
+ if ((!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++)
{
- if ((check = matches_gline(u)))
+ userrec* u = (userrec*)(*u2);
+
+ if (elines.size() || pelines.size())
+ if (matches_exception(u))
+ continue;
+
+ if ((What & APPLY_GLINES) && pglines.size())
{
- snprintf(reason,MAXBUF,"G-Lined: %s",check->reason);
- Goners->AddItem(u,reason);
+ if ((check = matches_gline(u,true)))
+ {
+ snprintf(reason,MAXBUF,"G-Lined: %s",check->reason);
+ 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)))
+
+ if ((What & APPLY_KLINES) && pklines.size())
{
- snprintf(reason,MAXBUF,"K-Lined: %s",check->reason);
- Goners->AddItem(u,reason);
+ if ((check = matches_kline(u,true)))
+ {
+ snprintf(reason,MAXBUF,"K-Lined: %s",check->reason);
+ 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)))
+
+ if ((What & APPLY_QLINES) && pqlines.size())
{
- snprintf(reason,MAXBUF,"Q-Lined: %s",check->reason);
- Goners->AddItem(u,reason);
+ if ((check = matches_qline(u->nick,true)))
+ {
+ snprintf(reason,MAXBUF,"Q-Lined: %s",check->reason);
+ 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->HideBans)
+ ServerInstance->GlobalCulls.AddItem(u, "Z-Lined", reason);
+ else
+ ServerInstance->GlobalCulls.AddItem(u, reason);
+ }
}
}
- if ((What & APPLY_ZLINES) && (zlines.size() || pzlines.size()))
+ }
+ 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++)
{
- if ((check = matches_zline(u->GetIPString())))
+ userrec* u = (userrec*)(*u2);
+
+ if (elines.size() || pelines.size())
{
- snprintf(reason,MAXBUF,"Z-Lined: %s",check->reason);
- Goners->AddItem(u,reason);
+ // 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->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->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->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->HideBans)
+ ServerInstance->GlobalCulls.AddItem(u, "Z-Lined", reason);
+ else
+ ServerInstance->GlobalCulls.AddItem(u, reason);
+ }
}
}
}
-
- Goners->Apply();
- DELETE(Goners);
}
void XLineManager::stats_k(userrec* user, string_list &results)
projects / user / henk / code / inspircd.git / blobdiff