char a[MAXBUF],b[MAXBUF];
strlcpy(a,s1.c_str(),MAXBUF);
strlcpy(b,s2.c_str(),MAXBUF);
+ strlower(a);
+ strlower(b);
return (strcasecmp(a,b) == 0);
}
extern file_cache RULES;
extern address_cache IP;
+extern time_t TIME;
std::vector<KLine> klines;
std::vector<GLine> glines;
std::vector<ZLine> zlines;
std::vector<QLine> qlines;
+std::vector<ELine> elines;
// Reads the default bans from the config file.
// only a very small number of bans are defined
add_kline(0,"<Config>",reason,host);
log(DEBUG,"Read K line (badhost tag): host=%s reason=%s",host,reason);
}
+ for (int i = 0; i < ConfValueEnum("exception",&config_f); i++)
+ {
+ ConfValue("exception","host",i,host,&config_f);
+ ConfValue("exception","reason",i,reason,&config_f);
+ add_eline(0,"<Config>",reason,host);
+ log(DEBUG,"Read E line (exception tag): host=%s reason=%s",host,reason);
+ }
}
// adds a g:line
-void add_gline(long duration, char* source, char* reason, char* hostmask)
+void add_gline(long duration, const char* source,const char* reason,const char* hostmask)
{
del_gline(hostmask);
GLine item;
strlcpy(item.reason,reason,MAXBUF);
strlcpy(item.source,source,MAXBUF);
item.n_matches = 0;
- item.set_time = time(NULL);
+ item.set_time = TIME;
glines.push_back(item);
}
+// adds an e:line (exception to bans)
+
+void add_eline(long duration, const char* source, const char* reason, const char* hostmask)
+{
+ del_eline(hostmask);
+ ELine item;
+ item.duration = duration;
+ strlcpy(item.hostmask,hostmask,MAXBUF);
+ strlcpy(item.reason,reason,MAXBUF);
+ strlcpy(item.source,source,MAXBUF);
+ item.n_matches = 0;
+ item.set_time = TIME;
+ elines.push_back(item);
+}
+
// adds a q:line
-void add_qline(long duration, char* source, char* reason, char* nickname)
+void add_qline(long duration, const char* source, const char* reason, const char* nickname)
{
del_qline(nickname);
QLine item;
strlcpy(item.source,source,MAXBUF);
item.n_matches = 0;
item.is_global = false;
- item.set_time = time(NULL);
+ item.set_time = TIME;
qlines.push_back(item);
}
// adds a z:line
-void add_zline(long duration, char* source, char* reason, char* ipaddr)
+void add_zline(long duration, const char* source, const char* reason, const char* ipaddr)
{
del_zline(ipaddr);
ZLine item;
strlcpy(item.source,source,MAXBUF);
item.n_matches = 0;
item.is_global = false;
- item.set_time = time(NULL);
+ item.set_time = TIME;
zlines.push_back(item);
}
// adds a k:line
-void add_kline(long duration, char* source, char* reason, char* hostmask)
+void add_kline(long duration, const char* source, const char* reason, const char* hostmask)
{
del_kline(hostmask);
KLine item;
strlcpy(item.reason,reason,MAXBUF);
strlcpy(item.source,source,MAXBUF);
item.n_matches = 0;
- item.set_time = time(NULL);
+ item.set_time = TIME;
klines.push_back(item);
}
// deletes a g:line, returns true if the line existed and was removed
-bool del_gline(char* hostmask)
+bool del_gline(const char* hostmask)
{
for (std::vector<GLine>::iterator i = glines.begin(); i != glines.end(); i++)
{
return false;
}
+// deletes a e:line, returns true if the line existed and was removed
+
+bool del_eline(const char* hostmask)
+{
+ for (std::vector<ELine>::iterator i = elines.begin(); i != elines.end(); i++)
+ {
+ if (!strcasecmp(hostmask,i->hostmask))
+ {
+ elines.erase(i);
+ return true;
+ }
+ }
+ return false;
+}
+
// deletes a q:line, returns true if the line existed and was removed
-bool del_qline(char* nickname)
+bool del_qline(const char* nickname)
{
for (std::vector<QLine>::iterator i = qlines.begin(); i != qlines.end(); i++)
{
return false;
}
-bool qline_make_global(char* nickname)
+bool qline_make_global(const char* nickname)
{
for (std::vector<QLine>::iterator i = qlines.begin(); i != qlines.end(); i++)
{
return false;
}
-bool zline_make_global(char* ipaddr)
+bool zline_make_global(const char* ipaddr)
{
for (std::vector<ZLine>::iterator i = zlines.begin(); i != zlines.end(); i++)
{
{
if (i->is_global)
{
- snprintf(data,MAXBUF,"} %s %s %ld %ld :%s",i->ipaddr,i->source,i->set_time,i->duration,i->reason);
+ snprintf(data,MAXBUF,"} %s %s %lu %lu :%s",i->ipaddr,i->source,(unsigned long)i->set_time,(unsigned long)i->duration,i->reason);
serv->SendPacket(data,tcp_host);
}
}
{
if (i->is_global)
{
- snprintf(data,MAXBUF,"{ %s %s %ld %ld :%s",i->nick,i->source,i->set_time,i->duration,i->reason);
+ snprintf(data,MAXBUF,"{ %s %s %lu %lu :%s",i->nick,i->source,(unsigned long)i->set_time,(unsigned long)i->duration,i->reason);
serv->SendPacket(data,tcp_host);
}
}
// glines are always global, so no need to check
for (std::vector<GLine>::iterator i = glines.begin(); i != glines.end(); i++)
{
- snprintf(data,MAXBUF,"# %s %s %ld %ld :%s",i->hostmask,i->source,i->set_time,i->duration,i->reason);
+ snprintf(data,MAXBUF,"# %s %s %lu %lu :%s",i->hostmask,i->source,(unsigned long)i->set_time,(unsigned long)i->duration,i->reason);
serv->SendPacket(data,tcp_host);
}
}
// deletes a z:line, returns true if the line existed and was removed
-bool del_zline(char* ipaddr)
+bool del_zline(const char* ipaddr)
{
for (std::vector<ZLine>::iterator i = zlines.begin(); i != zlines.end(); i++)
{
// deletes a k:line, returns true if the line existed and was removed
-bool del_kline(char* hostmask)
+bool del_kline(const char* hostmask)
{
for (std::vector<KLine>::iterator i = klines.begin(); i != klines.end(); i++)
{
char* matches_qline(const char* nick)
{
+ if (qlines.empty())
+ return NULL;
for (std::vector<QLine>::iterator i = qlines.begin(); i != qlines.end(); i++)
{
if (match(nick,i->nick))
char* matches_gline(const char* host)
{
+ if (glines.empty())
+ return NULL;
for (std::vector<GLine>::iterator i = glines.begin(); i != glines.end(); i++)
{
if (match(host,i->hostmask))
return NULL;
}
+char* matches_exception(const char* host)
+{
+ if (elines.empty())
+ return NULL;
+ char host2[MAXBUF];
+ snprintf(host2,MAXBUF,"*@%s",host);
+ for (std::vector<ELine>::iterator i = elines.begin(); i != elines.end(); i++)
+ {
+ if ((match(host,i->hostmask)) || (match(host2,i->hostmask)))
+ {
+ return i->reason;
+ }
+ }
+ return NULL;
+}
+
+
void gline_set_creation_time(char* host, time_t create_time)
{
for (std::vector<GLine>::iterator i = glines.begin(); i != glines.end(); i++)
char* matches_zline(const char* ipaddr)
{
+ if (zlines.empty())
+ return NULL;
for (std::vector<ZLine>::iterator i = zlines.begin(); i != zlines.end(); i++)
{
if (match(ipaddr,i->ipaddr))
char* matches_kline(const char* host)
{
+ if (klines.empty())
+ return NULL;
for (std::vector<KLine>::iterator i = klines.begin(); i != klines.end(); i++)
{
if (match(host,i->hostmask))
void expire_lines()
{
bool go_again = true;
- time_t current = time(NULL);
+ time_t current = TIME;
// because we mess up an iterator when we remove from the vector, we must bail from
// the loop early if we delete an item, therefore this outer while loop is required.
}
}
+ for (std::vector<ELine>::iterator i = elines.begin(); i != elines.end(); i++)
+ {
+ if ((current > (i->duration + i->set_time)) && (i->duration > 0))
+ {
+ WriteOpers("Expiring timed E-Line %s (set by %s %d seconds ago)",i->hostmask,i->source,i->duration);
+ elines.erase(i);
+ go_again = true;
+ break;
+ }
+ }
+
for (std::vector<GLine>::iterator i = glines.begin(); i != glines.end(); i++)
{
if ((current > (i->duration + i->set_time)) && (i->duration > 0))
if (!strcasecmp(u->second->server,ServerName))
{
snprintf(host,MAXBUF,"%s@%s",u->second->ident,u->second->host);
+ if (elines.size())
+ {
+ // ignore people matching exempts
+ if (matches_exception(host))
+ continue;
+ }
if (glines.size())
{
char* check = matches_gline(host);
if (check)
{
- WriteOpers("*** User %s matches G-Line: %s",u->second->nick,check);
+ WriteOpers("*** User %s matches G-Line: %s",u->registered == 7 ? u->second->nick:"<unknown>",check);
snprintf(reason,MAXBUF,"G-Lined: %s",check);
kill_link(u->second,reason);
go_again = true;
char* check = matches_kline(host);
if (check)
{
- WriteOpers("*** User %s matches K-Line: %s",u->second->nick,check);
+ WriteOpers("*** User %s matches K-Line: %s",u->registered == 7 ? u->second->nick:"<unknown>",check);
snprintf(reason,MAXBUF,"K-Lined: %s",check);
kill_link(u->second,reason);
go_again = true;
if (check)
{
snprintf(reason,MAXBUF,"Matched Q-Lined nick: %s",check);
- WriteOpers("*** Q-Lined nickname %s from %s: %s",u->second->nick,u->second->host,check);
+ WriteOpers("*** Q-Lined nickname %s from %s: %s",u->registered == 7 ? u->second->nick:"<unknown>",u->second->host,check);
kill_link(u->second,reason);
go_again = true;
break;
if (check)
{
snprintf(reason,MAXBUF,"Z-Lined: %s",check);
- WriteOpers("*** User %s matches Z-Line: %s",u->second->nick,u->second->host,check);
+ WriteOpers("*** User %s matches Z-Line: %s",u->registered == 7 ? u->second->nick:"<unknown>",u->second->host,check);
kill_link(u->second,reason);
go_again = true;
break;
}
}
-
-
+void stats_e(userrec* user)
+{
+ for (std::vector<ELine>::iterator i = elines.begin(); i != elines.end(); i++)
+ {
+ WriteServ(user->fd,"223 %s :%s %d %d %s %s",user->nick,i->hostmask,i->set_time,i->duration,i->source,i->reason);
+ }
+}
projects / user / henk / code / inspircd.git / blobdiff