using namespace std;
-#include "inspircd_config.h"
#include "inspircd.h"
-#include <string>
-#include <map>
-#include <sstream>
-#include <vector>
-#include <deque>
#include "users.h"
-#include "ctables.h"
-#include "globals.h"
#include "modules.h"
-#include "dynamic.h"
#include "wildcard.h"
-#include "commands.h"
#include "xline.h"
-#include "inspstring.h"
-
-#include "hashcomp.h"
-#include "typedefs.h"
-#include "configreader.h"
#include "cull_list.h"
/* Version two, now with optimized expiry!
return true;
}
+IdentHostPair XLineManager::IdentSplit(const std::string &ident_and_host)
+{
+ 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 = "*";
+ if (!n.second.length())
+ n.second = "*";
+ }
+ else
+ {
+ n.second = ident_and_host;
+ }
+
+ return n;
+}
+
// adds a g:line
bool XLineManager::add_gline(long duration, const char* source,const char* reason,const char* hostmask)
{
+ IdentHostPair ih = IdentSplit(hostmask);
+
bool ret = del_gline(hostmask);
GLine item;
item.duration = duration;
- strlcpy(item.hostmask,hostmask,199);
+ strlcpy(item.identmask,ih.first.c_str(),19);
+ strlcpy(item.hostmask,ih.second.c_str(),199);
strlcpy(item.reason,reason,MAXBUF);
strlcpy(item.source,source,255);
item.n_matches = 0;
bool XLineManager::add_eline(long duration, const char* source, const char* reason, const char* hostmask)
{
+ IdentHostPair ih = IdentSplit(hostmask);
+
bool ret = del_eline(hostmask);
+
ELine item;
item.duration = duration;
- strlcpy(item.hostmask,hostmask,199);
+ strlcpy(item.identmask,ih.first.c_str(),19);
+ strlcpy(item.hostmask,ih.second.c_str(),199);
strlcpy(item.reason,reason,MAXBUF);
strlcpy(item.source,source,255);
item.n_matches = 0;
bool XLineManager::add_kline(long duration, const char* source, const char* reason, const char* hostmask)
{
+ IdentHostPair ih = IdentSplit(hostmask);
+
bool ret = del_kline(hostmask);
+
KLine item;
item.duration = duration;
- strlcpy(item.hostmask,hostmask,200);
+ strlcpy(item.identmask,ih.first.c_str(),19);
+ strlcpy(item.hostmask,ih.second.c_str(),200);
strlcpy(item.reason,reason,MAXBUF);
strlcpy(item.source,source,255);
item.n_matches = 0;
bool XLineManager::del_gline(const char* hostmask)
{
+ IdentHostPair ih = IdentSplit(hostmask);
for (std::vector<GLine>::iterator i = glines.begin(); i != glines.end(); i++)
{
- if (!strcasecmp(hostmask,i->hostmask))
+ if (!strcasecmp(ih.first.c_str(),i->identmask) && !strcasecmp(ih.second.c_str(),i->hostmask))
{
glines.erase(i);
return true;
}
for (std::vector<GLine>::iterator i = pglines.begin(); i != pglines.end(); i++)
{
- if (!strcasecmp(hostmask,i->hostmask))
+ if (!strcasecmp(ih.first.c_str(),i->identmask) && !strcasecmp(ih.second.c_str(),i->hostmask))
{
pglines.erase(i);
return true;
bool XLineManager::del_eline(const char* hostmask)
{
+ IdentHostPair ih = IdentSplit(hostmask);
for (std::vector<ELine>::iterator i = elines.begin(); i != elines.end(); i++)
{
- if (!strcasecmp(hostmask,i->hostmask))
+ if (!strcasecmp(ih.first.c_str(),i->identmask) && !strcasecmp(ih.second.c_str(),i->hostmask))
{
elines.erase(i);
return true;
}
for (std::vector<ELine>::iterator i = pelines.begin(); i != pelines.end(); i++)
{
- if (!strcasecmp(hostmask,i->hostmask))
+ if (!strcasecmp(ih.first.c_str(),i->identmask) && !strcasecmp(ih.second.c_str(),i->hostmask))
{
pelines.erase(i);
return true;
bool XLineManager::del_kline(const char* hostmask)
{
+ IdentHostPair ih = IdentSplit(hostmask);
for (std::vector<KLine>::iterator i = klines.begin(); i != klines.end(); i++)
{
- if (!strcasecmp(hostmask,i->hostmask))
+ if (!strcasecmp(ih.first.c_str(),i->identmask) && !strcasecmp(ih.second.c_str(),i->hostmask))
{
klines.erase(i);
return true;
}
for (std::vector<KLine>::iterator i = pklines.begin(); i != pklines.end(); i++)
{
- if (!strcasecmp(hostmask,i->hostmask))
+ if (!strcasecmp(ih.first.c_str(),i->identmask) && !strcasecmp(ih.second.c_str(),i->hostmask))
{
pklines.erase(i);
return true;
// returns a pointer to the reason if a host matches a gline, NULL if it didnt match
-char* XLineManager::matches_gline(const char* host)
+char* XLineManager::matches_gline(userrec* user)
{
if ((glines.empty()) && (pglines.empty()))
return NULL;
for (std::vector<GLine>::iterator i = glines.begin(); i != glines.end(); i++)
- if (match(host,i->hostmask, true))
- return i->reason;
+ {
+ if ((match(user->ident,i->identmask)))
+ {
+ if ((match(user->host,i->hostmask, true)) || (match(user->GetIPString(),i->hostmask, true)))
+ {
+ return i->reason;
+ }
+ }
+ }
for (std::vector<GLine>::iterator i = pglines.begin(); i != pglines.end(); i++)
- if (match(host,i->hostmask, true))
- return i->reason;
+ {
+ if ((match(user->ident,i->identmask)))
+ {
+ if ((match(user->host,i->hostmask, true)) || (match(user->GetIPString(),i->hostmask, true)))
+ {
+ return i->reason;
+ }
+ }
+ }
return NULL;
}
-char* XLineManager::matches_exception(const char* host)
-{
+char* XLineManager::matches_exception(userrec* user)
+{
if ((elines.empty()) && (pelines.empty()))
return NULL;
char host2[MAXBUF];
- snprintf(host2,MAXBUF,"*@%s",host);
+ snprintf(host2,MAXBUF,"*@%s",user->host);
for (std::vector<ELine>::iterator i = elines.begin(); i != elines.end(); i++)
- if ((match(host,i->hostmask)) || (match(host2,i->hostmask, true)))
- return i->reason;
+ {
+ if ((match(user->ident,i->identmask)))
+ {
+ if ((match(user->host,i->hostmask, true)) || (match(user->GetIPString(),i->hostmask, true)))
+ {
+ return i->reason;
+ }
+ }
+ }
for (std::vector<ELine>::iterator i = pelines.begin(); i != pelines.end(); i++)
- if ((match(host,i->hostmask)) || (match(host2,i->hostmask, true)))
- return i->reason;
+ {
+ if ((match(user->ident,i->identmask)))
+ {
+ if ((match(user->host,i->hostmask, true)) || (match(user->GetIPString(),i->hostmask, true)))
+ {
+ return i->reason;
+ }
+ }
+ }
return NULL;
}
// returns a pointer to the reason if a host matches a kline, NULL if it didnt match
-char* XLineManager::matches_kline(const char* host)
+char* XLineManager::matches_kline(userrec* user)
{
if ((klines.empty()) && (pklines.empty()))
return NULL;
for (std::vector<KLine>::iterator i = klines.begin(); i != klines.end(); i++)
- if (match(host,i->hostmask, true))
- return i->reason;
+ {
+ if ((match(user->ident,i->identmask)))
+ {
+ if ((match(user->host,i->hostmask, true)) || (match(user->GetIPString(),i->hostmask, true)))
+ {
+ return i->reason;
+ }
+ }
+ }
for (std::vector<KLine>::iterator i = pklines.begin(); i != pklines.end(); i++)
- if (match(host,i->hostmask, true))
- return i->reason;
+ {
+ if ((match(user->ident,i->identmask)))
+ {
+ if ((match(user->host,i->hostmask, true)) || (match(user->GetIPString(),i->hostmask, true)))
+ {
+ return i->reason;
+ }
+ }
+ }
return NULL;
}
void XLineManager::apply_lines(const int What)
{
char reason[MAXBUF];
- char host[MAXBUF];
if ((!glines.size()) && (!klines.size()) && (!zlines.size()) && (!qlines.size()) &&
(!pglines.size()) && (!pklines.size()) && (!pzlines.size()) && (!pqlines.size()))
for (std::vector<userrec*>::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++)
{
userrec* u = (userrec*)(*u2);
- u->MakeHost(host);
+
if (elines.size() || pelines.size())
{
// ignore people matching exempts
- if (matches_exception(host))
+ if (matches_exception(u))
continue;
}
if ((What & APPLY_GLINES) && (glines.size() || pglines.size()))
{
- if ((check = matches_gline(host)))
+ if ((check = matches_gline(u)))
{
snprintf(reason,MAXBUF,"G-Lined: %s",check);
Goners->AddItem(u,reason);
}
if ((What & APPLY_KLINES) && (klines.size() || pklines.size()))
{
- if ((check = matches_kline(host)))
+ if ((check = matches_kline(u)))
{
snprintf(reason,MAXBUF,"K-Lined: %s",check);
Goners->AddItem(u,reason);
{
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->hostmask+" "+ConvToStr(i->set_time)+" "+ConvToStr(i->duration)+" "+i->source+" :"+i->reason);
+ 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->hostmask+" "+ConvToStr(i->set_time)+" "+ConvToStr(i->duration)+" "+i->source+" :"+i->reason);
+ 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)
{
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->hostmask+" "+ConvToStr(i->set_time)+" "+ConvToStr(i->duration)+" "+i->source+" :"+i->reason);
+ 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->hostmask+" "+ConvToStr(i->set_time)+" "+ConvToStr(i->duration)+" "+i->source+" :"+i->reason);
+ 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)
{
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->hostmask+" "+ConvToStr(i->set_time)+" "+ConvToStr(i->duration)+" "+i->source+" :"+i->reason);
+ 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->hostmask+" "+ConvToStr(i->set_time)+" "+ConvToStr(i->duration)+" "+i->source+" :"+i->reason);
+ 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)
projects / user / henk / code / inspircd.git / blobdiff