X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fxline.cpp;h=92f5ac3a42067f8309cff510fac4043aff7338fb;hb=483ec8439c6564f8e3783223a01c641326b6f2d8;hp=64753674ddebac045a0ab0b61d22600aad32c57f;hpb=5e6e38272250d2862e0eec59ad9ad6710c420e5f;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/xline.cpp b/src/xline.cpp index 64753674d..92f5ac3a4 100644 --- a/src/xline.cpp +++ b/src/xline.cpp @@ -1,3 +1,19 @@ +/* +------------------------------------+ + * | Inspire Internet Relay Chat Daemon | + * +------------------------------------+ + * + * Inspire is copyright (C) 2002-2004 ChatSpike-Dev. + * E-mail: + * + * + * + * Written by Craig Edwards, Craig McLure, and others. + * This program is free but copyrighted software; see + * the file COPYING for details. + * + * --------------------------------------------------- + */ + #include "inspircd.h" #include "inspircd_io.h" #include "inspircd_util.h" @@ -34,6 +50,7 @@ #include "message.h" #include "commands.h" #include "xline.h" +#include "inspstring.h" #ifdef GCC3 #define nspace __gnu_cxx @@ -45,8 +62,8 @@ using namespace std; extern int MODCOUNT; -extern vector modules; -extern vector factory; +extern std::vector modules; +extern std::vector factory; extern int LogLevel; extern char ServerName[MAXBUF]; @@ -74,7 +91,6 @@ extern time_t nb_start; extern std::vector fd_reap; extern std::vector module_names; -extern char bannerBuffer[MAXBUF]; extern int boundPortCount; extern int portCount; extern int UDPportCount; @@ -90,7 +106,11 @@ extern FILE *log_file; namespace nspace { +#ifdef GCC34 + template<> struct hash +#else template<> struct nspace::hash +#endif { size_t operator()(const struct in_addr &a) const { @@ -99,14 +119,17 @@ namespace nspace return q; } }; - +#ifdef GCC34 + template<> struct hash +#else template<> struct nspace::hash +#endif { size_t operator()(const string &s) const { char a[MAXBUF]; static struct hash strhash; - strcpy(a,s.c_str()); + strlcpy(a,s.c_str(),MAXBUF); strlower(a); return strhash(a); } @@ -120,8 +143,10 @@ struct StrHashComp bool operator()(const string& s1, const string& s2) const { char a[MAXBUF],b[MAXBUF]; - strcpy(a,s1.c_str()); - strcpy(b,s2.c_str()); + strlcpy(a,s1.c_str(),MAXBUF); + strlcpy(b,s2.c_str(),MAXBUF); + strlower(a); + strlower(b); return (strcasecmp(a,b) == 0); } @@ -158,11 +183,13 @@ extern file_cache MOTD; extern file_cache RULES; extern address_cache IP; +extern time_t TIME; std::vector klines; std::vector glines; std::vector zlines; std::vector qlines; +std::vector elines; // Reads the default bans from the config file. // only a very small number of bans are defined @@ -199,73 +226,95 @@ void read_xline_defaults() add_kline(0,"",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,"",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; item.duration = duration; - strncpy(item.hostmask,hostmask,MAXBUF); - strncpy(item.reason,reason,MAXBUF); - strncpy(item.source,source,MAXBUF); + strlcpy(item.hostmask,hostmask,MAXBUF); + 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; item.duration = duration; - strncpy(item.nick,nickname,MAXBUF); - strncpy(item.reason,reason,MAXBUF); - strncpy(item.source,source,MAXBUF); + strlcpy(item.nick,nickname,MAXBUF); + strlcpy(item.reason,reason,MAXBUF); + 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; item.duration = duration; - strncpy(item.ipaddr,ipaddr,MAXBUF); - strncpy(item.reason,reason,MAXBUF); - strncpy(item.source,source,MAXBUF); + strlcpy(item.ipaddr,ipaddr,MAXBUF); + strlcpy(item.reason,reason,MAXBUF); + 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; item.duration = duration; - strncpy(item.hostmask,hostmask,MAXBUF); - strncpy(item.reason,reason,MAXBUF); - strncpy(item.source,source,MAXBUF); + strlcpy(item.hostmask,hostmask,MAXBUF); + 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::iterator i = glines.begin(); i != glines.end(); i++) { @@ -278,9 +327,24 @@ bool del_gline(char* hostmask) return false; } +// deletes a e:line, returns true if the line existed and was removed + +bool del_eline(const char* hostmask) +{ + for (std::vector::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::iterator i = qlines.begin(); i != qlines.end(); i++) { @@ -293,7 +357,7 @@ bool del_qline(char* nickname) return false; } -bool qline_make_global(char* nickname) +bool qline_make_global(const char* nickname) { for (std::vector::iterator i = qlines.begin(); i != qlines.end(); i++) { @@ -306,7 +370,7 @@ bool qline_make_global(char* nickname) return false; } -bool zline_make_global(char* ipaddr) +bool zline_make_global(const char* ipaddr) { for (std::vector::iterator i = zlines.begin(); i != zlines.end(); i++) { @@ -328,7 +392,7 @@ void sync_xlines(serverrec* serv, char* tcp_host) { 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); } } @@ -336,14 +400,14 @@ void sync_xlines(serverrec* serv, char* 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::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); } } @@ -351,7 +415,7 @@ void sync_xlines(serverrec* serv, char* 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::iterator i = zlines.begin(); i != zlines.end(); i++) { @@ -366,7 +430,7 @@ bool del_zline(char* ipaddr) // 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::iterator i = klines.begin(); i != klines.end(); i++) { @@ -383,6 +447,8 @@ bool del_kline(char* hostmask) char* matches_qline(const char* nick) { + if (qlines.empty()) + return NULL; for (std::vector::iterator i = qlines.begin(); i != qlines.end(); i++) { if (match(nick,i->nick)) @@ -397,6 +463,8 @@ char* matches_qline(const char* nick) char* matches_gline(const char* host) { + if (glines.empty()) + return NULL; for (std::vector::iterator i = glines.begin(); i != glines.end(); i++) { if (match(host,i->hostmask)) @@ -407,6 +475,23 @@ char* matches_gline(const char* host) return NULL; } +char* matches_exception(const char* host) +{ + if (elines.empty()) + return NULL; + char host2[MAXBUF]; + snprintf(host2,MAXBUF,"*@%s",host); + for (std::vector::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::iterator i = glines.begin(); i != glines.end(); i++) @@ -450,6 +535,8 @@ void zline_set_creation_time(char* ip, time_t create_time) char* matches_zline(const char* ipaddr) { + if (zlines.empty()) + return NULL; for (std::vector::iterator i = zlines.begin(); i != zlines.end(); i++) { if (match(ipaddr,i->ipaddr)) @@ -464,6 +551,8 @@ char* matches_zline(const char* ipaddr) char* matches_kline(const char* host) { + if (klines.empty()) + return NULL; for (std::vector::iterator i = klines.begin(); i != klines.end(); i++) { if (match(host,i->hostmask)) @@ -479,7 +568,7 @@ char* matches_kline(const char* host) 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. @@ -498,6 +587,17 @@ void expire_lines() } } + for (std::vector::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::iterator i = glines.begin(); i != glines.end(); i++) { if ((current > (i->duration + i->set_time)) && (i->duration > 0)) @@ -541,6 +641,9 @@ void apply_lines() char reason[MAXBUF]; char host[MAXBUF]; + if ((!glines.size()) && (!klines.size()) && (!zlines.size()) && (!qlines.size())) + return; + while (go_again) { go_again = false; @@ -549,67 +652,62 @@ void apply_lines() if (!strcasecmp(u->second->server,ServerName)) { snprintf(host,MAXBUF,"%s@%s",u->second->ident,u->second->host); - char* check = matches_gline(host); - if (check) + if (elines.size()) { - WriteOpers("*** User %s matches G-Line: %s",u->second->nick,check); - snprintf(reason,MAXBUF,"G-Lined: %s",check); - kill_link(u->second,reason); - go_again = true; - break; + // ignore people matching exempts + if (matches_exception(host)) + continue; } - } - } - - for (user_hash::const_iterator u = clientlist.begin(); u != clientlist.end(); u++) - { - if (!strcasecmp(u->second->server,ServerName)) - { - snprintf(host,MAXBUF,"%s@%s",u->second->ident,u->second->host); - char* check = matches_kline(host); - if (check) + if (glines.size()) { - WriteOpers("*** User %s matches K-Line: %s",u->second->nick,check); - snprintf(reason,MAXBUF,"K-Lined: %s",check); - kill_link(u->second,reason); - go_again = true; - break; + char* check = matches_gline(host); + if (check) + { + WriteOpers("*** User %s matches G-Line: %s",u->second->registered == 7 ? u->second->nick:"",check); + snprintf(reason,MAXBUF,"G-Lined: %s",check); + kill_link(u->second,reason); + go_again = true; + break; + } } - } - } - - for (user_hash::const_iterator u = clientlist.begin(); u != clientlist.end(); u++) - { - if (!strcasecmp(u->second->server,ServerName)) - { - char* check = matches_qline(u->second->nick); - if (check) + if (klines.size()) { - snprintf(reason,MAXBUF,"Matched Q-Lined nick: %s",check); - WriteOpers("*** Q-Lined nickname %s from %s: %s",u->second->nick,u->second->host,check); - WriteServ(u->second->fd,"432 %s %s :Invalid nickname: %s",u->second->nick,u->second->nick,check); - kill_link(u->second,reason); - go_again = true; - break; + char* check = matches_kline(host); + if (check) + { + WriteOpers("*** User %s matches K-Line: %s",u->second->registered == 7 ? u->second->nick:"",check); + snprintf(reason,MAXBUF,"K-Lined: %s",check); + kill_link(u->second,reason); + go_again = true; + break; + } } - } - } - - for (user_hash::const_iterator u = clientlist.begin(); u != clientlist.end(); u++) - { - if (!strcasecmp(u->second->server,ServerName)) - { - char* check = matches_zline(u->second->ip); - if (check) + if (qlines.size()) + { + char* check = matches_qline(u->second->nick); + if (check) + { + snprintf(reason,MAXBUF,"Matched Q-Lined nick: %s",check); + WriteOpers("*** Q-Lined nickname %s from %s: %s",u->second->registered == 7 ? u->second->nick:"",u->second->host,check); + kill_link(u->second,reason); + go_again = true; + break; + } + } + if (zlines.size()) { - WriteOpers("*** User %s matches Z-Line: %s",u->second->nick,u->second->host,check); - WriteServ(u->second->fd,"432 %s %s :Invalid nickname: %s",u->second->nick,u->second->nick,check); - go_again = true; - break; + char* check = matches_zline(u->second->ip); + if (check) + { + snprintf(reason,MAXBUF,"Z-Lined: %s",check); + WriteOpers("*** User %s matches Z-Line: %s",u->second->registered == 7 ? u->second->nick:"",u->second->host,check); + kill_link(u->second,reason); + go_again = true; + break; + } } } } - } } @@ -645,5 +743,10 @@ void stats_z(userrec* user) } } - - +void stats_e(userrec* user) +{ + for (std::vector::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); + } +}