X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fxline.cpp;h=d3821b528147c2a66b05c43782823d4064379c41;hb=eb28eaea35d9d109a0b7b890de9d957d562da675;hp=0e0ed92573dbf5a923ee0fc765a5ac56921482f2;hpb=d582107b33c3b154747a0a38f33963af7ad3c53f;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/xline.cpp b/src/xline.cpp index 0e0ed9257..d3821b528 100644 --- a/src/xline.cpp +++ b/src/xline.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * Inspire is copyright (C) 2002-2004 ChatSpike-Dev. + * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. * E-mail: * * @@ -18,18 +18,7 @@ using namespace std; #include "inspircd_config.h" #include "inspircd.h" -#include "inspircd_io.h" -#include "inspircd_util.h" -#include -#include -#include -#include #include -#ifdef GCC3 -#include -#else -#include -#endif #include #include #include @@ -46,14 +35,15 @@ using namespace std; #include "inspstring.h" #include "helperfuncs.h" #include "hashcomp.h" +#include "typedefs.h" +#include "configreader.h" +#include "cull_list.h" + +extern InspIRCd* ServerInstance; extern int MODCOUNT; extern std::vector modules; extern std::vector factory; -extern ServerConfig* Config; -extern std::stringstream config_f; -typedef nspace::hash_map, irc::StrHashComp> user_hash; -extern user_hash clientlist; /* Version two, now with optimized expiry! * @@ -61,8 +51,8 @@ extern user_hash clientlist; * very efficient. I have improved the efficiency of the algorithm in two ways: * * (1) There are now two lists of items for each linetype. One list holds temporary - * items, and the other list holds permenant items (ones which will expire). - * Items which are on the permenant list are NEVER checked at all by the + * 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 * current time + duration. This means that the line which is due to expire the @@ -105,50 +95,63 @@ bool KSortComparison ( const KLine one, const KLine two ); // this way these days, such as qlines against // services nicks, etc. -void read_xline_defaults() +bool InitXLine(ServerConfig* conf, const char* tag) { - char ipmask[MAXBUF]; - char nick[MAXBUF]; - char host[MAXBUF]; - char reason[MAXBUF]; + return true; +} - for (int i = 0; i < ConfValueEnum("badip",&config_f); i++) - { - ConfValue("badip","ipmask",i,ipmask,&config_f); - ConfValue("badip","reason",i,reason,&config_f); - add_zline(0,"",reason,ipmask); - log(DEBUG,"Read Z line (badip tag): ipmask=%s reason=%s",ipmask,reason); - } +bool DoneXLine(ServerConfig* conf, const char* tag) +{ + apply_lines(APPLY_ALL); + return true; +} + +bool DoZLine(ServerConfig* conf, const char* tag, char** entries, void** values, int* types) +{ + char* reason = (char*)values[0]; + char* ipmask = (char*)values[1]; - for (int i = 0; i < ConfValueEnum("badnick",&config_f); i++) - { - ConfValue("badnick","nick",i,nick,&config_f); - ConfValue("badnick","reason",i,reason,&config_f); - add_qline(0,"",reason,nick); - log(DEBUG,"Read Q line (badnick tag): nick=%s reason=%s",nick,reason); - } + add_zline(0,"",reason,ipmask); + log(DEBUG,"Read Z line (badip tag): ipmask=%s reason=%s",ipmask,reason); + return true; +} + +bool DoQLine(ServerConfig* conf, const char* tag, char** entries, void** values, int* types) +{ + char* reason = (char*)values[0]; + char* nick = (char*)values[1]; - for (int i = 0; i < ConfValueEnum("badhost",&config_f); i++) - { - ConfValue("badhost","host",i,host,&config_f); - ConfValue("badhost","reason",i,reason,&config_f); - 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); - } + add_qline(0,"",reason,nick); + log(DEBUG,"Read Q line (badnick tag): nick=%s reason=%s",nick,reason); + return true; +} + +bool DoKLine(ServerConfig* conf, const char* tag, char** entries, void** values, int* types) +{ + char* reason = (char*)values[0]; + char* host = (char*)values[1]; + + add_kline(0,"",reason,host); + log(DEBUG,"Read K line (badhost tag): host=%s reason=%s",host,reason); + return true; +} + +bool DoELine(ServerConfig* conf, const char* tag, char** entries, void** values, int* types) +{ + char* reason = (char*)values[0]; + char* host = (char*)values[1]; + + add_eline(0,"",reason,host); + log(DEBUG,"Read E line (exception tag): host=%s reason=%s",host,reason); + return true; } // adds a g:line -void add_gline(long duration, const char* source,const char* reason,const char* hostmask) +bool add_gline(long duration, const char* source,const char* reason,const char* hostmask) { - del_gline(hostmask); + bool ret = del_gline(hostmask); + GLine item; item.duration = duration; strlcpy(item.hostmask,hostmask,199); @@ -156,6 +159,7 @@ void add_gline(long duration, const char* source,const char* reason,const char* strlcpy(item.source,source,255); item.n_matches = 0; item.set_time = TIME; + if (duration) { glines.push_back(item); @@ -165,36 +169,39 @@ void add_gline(long duration, const char* source,const char* reason,const char* { pglines.push_back(item); } + + return !ret; } // adds an e:line (exception to bans) -void add_eline(long duration, const char* source, const char* reason, const char* hostmask) +bool 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,199); - strlcpy(item.reason,reason,MAXBUF); - strlcpy(item.source,source,255); - item.n_matches = 0; - item.set_time = TIME; + bool ret = del_eline(hostmask); + ELine item; + item.duration = duration; + strlcpy(item.hostmask,hostmask,199); + strlcpy(item.reason,reason,MAXBUF); + strlcpy(item.source,source,255); + item.n_matches = 0; + item.set_time = TIME; if (duration) { - elines.push_back(item); + elines.push_back(item); sort(elines.begin(), elines.end(),ESortComparison); } else { pelines.push_back(item); } + return !ret; } // adds a q:line -void add_qline(long duration, const char* source, const char* reason, const char* nickname) +bool add_qline(long duration, const char* source, const char* reason, const char* nickname) { - del_qline(nickname); + bool ret = del_qline(nickname); QLine item; item.duration = duration; strlcpy(item.nick,nickname,63); @@ -212,13 +219,14 @@ void add_qline(long duration, const char* source, const char* reason, const char { pqlines.push_back(item); } + return !ret; } // adds a z:line -void add_zline(long duration, const char* source, const char* reason, const char* ipaddr) +bool add_zline(long duration, const char* source, const char* reason, const char* ipaddr) { - del_zline(ipaddr); + bool ret = del_zline(ipaddr); ZLine item; item.duration = duration; if (strchr(ipaddr,'@')) @@ -242,13 +250,14 @@ void add_zline(long duration, const char* source, const char* reason, const char { pzlines.push_back(item); } + return !ret; } // adds a k:line -void add_kline(long duration, const char* source, const char* reason, const char* hostmask) +bool add_kline(long duration, const char* source, const char* reason, const char* hostmask) { - del_kline(hostmask); + bool ret = del_kline(hostmask); KLine item; item.duration = duration; strlcpy(item.hostmask,hostmask,200); @@ -265,6 +274,7 @@ void add_kline(long duration, const char* source, const char* reason, const char { pklines.push_back(item); } + return !ret; } // deletes a g:line, returns true if the line existed and was removed @@ -294,14 +304,14 @@ bool del_gline(const char* hostmask) 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; - } - } + for (std::vector::iterator i = elines.begin(); i != elines.end(); i++) + { + if (!strcasecmp(hostmask,i->hostmask)) + { + elines.erase(i); + return true; + } + } for (std::vector::iterator i = pelines.begin(); i != pelines.end(); i++) { if (!strcasecmp(hostmask,i->hostmask)) @@ -310,7 +320,7 @@ bool del_eline(const char* hostmask) return true; } } - return false; + return false; } // deletes a q:line, returns true if the line existed and was removed @@ -427,34 +437,34 @@ char* matches_qline(const char* nick) char* matches_gline(const char* host) { - if ((glines.empty()) && (pglines.empty())) - return NULL; + if ((glines.empty()) && (pglines.empty())) + return NULL; for (std::vector::iterator i = glines.begin(); i != glines.end(); i++) - if (match(host,i->hostmask)) + if (match(host,i->hostmask, true)) return i->reason; for (std::vector::iterator i = pglines.begin(); i != pglines.end(); i++) - if (match(host,i->hostmask)) + if (match(host,i->hostmask, true)) return i->reason; return NULL; } char* matches_exception(const char* host) { - if ((elines.empty()) && (pelines.empty())) - return NULL; + if ((elines.empty()) && (pelines.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; + for (std::vector::iterator i = elines.begin(); i != elines.end(); i++) + if ((match(host,i->hostmask)) || (match(host2,i->hostmask, true))) + return i->reason; for (std::vector::iterator i = pelines.begin(); i != pelines.end(); i++) - if ((match(host,i->hostmask)) || (match(host2,i->hostmask))) + if ((match(host,i->hostmask)) || (match(host2,i->hostmask, true))) return i->reason; - return NULL; + return NULL; } -void gline_set_creation_time(char* host, time_t create_time) +void gline_set_creation_time(const char* host, time_t create_time) { for (std::vector::iterator i = glines.begin(); i != glines.end(); i++) { @@ -475,7 +485,7 @@ void gline_set_creation_time(char* host, time_t create_time) return ; } -void eline_set_creation_time(char* host, time_t create_time) +void eline_set_creation_time(const char* host, time_t create_time) { for (std::vector::iterator i = elines.begin(); i != elines.end(); i++) { @@ -496,7 +506,7 @@ void eline_set_creation_time(char* host, time_t create_time) return; } -void qline_set_creation_time(char* nick, time_t create_time) +void qline_set_creation_time(const char* nick, time_t create_time) { for (std::vector::iterator i = qlines.begin(); i != qlines.end(); i++) { @@ -517,7 +527,7 @@ void qline_set_creation_time(char* nick, time_t create_time) return; } -void zline_set_creation_time(char* ip, time_t create_time) +void zline_set_creation_time(const char* ip, time_t create_time) { for (std::vector::iterator i = zlines.begin(); i != zlines.end(); i++) { @@ -542,13 +552,13 @@ void zline_set_creation_time(char* ip, time_t create_time) char* matches_zline(const char* ipaddr) { - if ((zlines.empty()) && (pzlines.empty())) - return NULL; + if ((zlines.empty()) && (pzlines.empty())) + return NULL; for (std::vector::iterator i = zlines.begin(); i != zlines.end(); i++) - if (match(ipaddr,i->ipaddr)) + if (match(ipaddr,i->ipaddr, true)) return i->reason; for (std::vector::iterator i = pzlines.begin(); i != pzlines.end(); i++) - if (match(ipaddr,i->ipaddr)) + if (match(ipaddr,i->ipaddr, true)) return i->reason; return NULL; } @@ -557,13 +567,13 @@ char* matches_zline(const char* ipaddr) char* matches_kline(const char* host) { - if ((klines.empty()) && (pklines.empty())) - return NULL; + if ((klines.empty()) && (pklines.empty())) + return NULL; for (std::vector::iterator i = klines.begin(); i != klines.end(); i++) - if (match(host,i->hostmask)) + if (match(host,i->hostmask, true)) return i->reason; for (std::vector::iterator i = pklines.begin(); i != pklines.end(); i++) - if (match(host,i->hostmask)) + if (match(host,i->hostmask, true)) return i->reason; return NULL; } @@ -575,7 +585,7 @@ bool GSortComparison ( const GLine one, const GLine two ) bool ESortComparison ( const ELine one, const ELine two ) { - return (one.duration + one.set_time) < (two.duration + two.set_time); + return (one.duration + one.set_time) < (two.duration + two.set_time); } bool ZSortComparison ( const ZLine one, const ZLine two ) @@ -585,12 +595,12 @@ bool ZSortComparison ( const ZLine one, const ZLine two ) bool KSortComparison ( const KLine one, const KLine two ) { - return (one.duration + one.set_time) < (two.duration + two.set_time); + return (one.duration + one.set_time) < (two.duration + two.set_time); } bool QSortComparison ( const QLine one, const QLine two ) { - return (one.duration + one.set_time) < (two.duration + two.set_time); + return (one.duration + one.set_time) < (two.duration + two.set_time); } // removes lines that have expired @@ -607,35 +617,35 @@ void expire_lines() while ((glines.size()) && (current > (glines.begin()->duration + glines.begin()->set_time))) { std::vector::iterator i = glines.begin(); - WriteOpers("Expiring timed G-Line %s (set by %s %d seconds ago)",i->hostmask,i->source,i->duration); + WriteOpers("*** Expiring timed G-Line %s (set by %s %d seconds ago)",i->hostmask,i->source,i->duration); glines.erase(i); } while ((elines.size()) && (current > (elines.begin()->duration + elines.begin()->set_time))) { std::vector::iterator i = elines.begin(); - WriteOpers("Expiring timed E-Line %s (set by %s %d seconds ago)",i->hostmask,i->source,i->duration); + WriteOpers("*** Expiring timed E-Line %s (set by %s %d seconds ago)",i->hostmask,i->source,i->duration); elines.erase(i); } while ((zlines.size()) && (current > (zlines.begin()->duration + zlines.begin()->set_time))) { std::vector::iterator i = zlines.begin(); - WriteOpers("Expiring timed Z-Line %s (set by %s %d seconds ago)",i->ipaddr,i->source,i->duration); + WriteOpers("*** 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()->duration + klines.begin()->set_time))) { std::vector::iterator i = klines.begin(); - WriteOpers("Expiring timed K-Line %s (set by %s %d seconds ago)",i->hostmask,i->source,i->duration); + WriteOpers("*** Expiring timed K-Line %s (set by %s %d seconds ago)",i->hostmask,i->source,i->duration); klines.erase(i); } while ((qlines.size()) && (current > (qlines.begin()->duration + qlines.begin()->set_time))) { std::vector::iterator i = qlines.begin(); - WriteOpers("Expiring timed Q-Line %s (set by %s %d seconds ago)",i->nick,i->source,i->duration); + WriteOpers("*** Expiring timed Q-Line %s (set by %s %d seconds ago)",i->nick,i->source,i->duration); qlines.erase(i); } @@ -645,116 +655,104 @@ void expire_lines() void apply_lines(const int What) { - bool go_again = true; char reason[MAXBUF]; char host[MAXBUF]; - - if ((!glines.size()) && (!klines.size()) && (!zlines.size()) && (!qlines.size())) + + if ((!glines.size()) && (!klines.size()) && (!zlines.size()) && (!qlines.size()) && + (!pglines.size()) && (!pklines.size()) && (!pzlines.size()) && (!pqlines.size())) return; - - while (go_again) + + CullList* Goners = new CullList(); + char* check = NULL; + for (std::vector::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++) { - go_again = false; - for (user_hash::const_iterator u = clientlist.begin(); u != clientlist.end(); u++) + userrec* u = (userrec*)(*u2); + u->MakeHost(host); + if (elines.size() || pelines.size()) + { + // ignore people matching exempts + if (matches_exception(host)) + continue; + } + if ((What & APPLY_GLINES) && (glines.size() || pglines.size())) + { + if ((check = matches_gline(host))) + { + snprintf(reason,MAXBUF,"G-Lined: %s",check); + Goners->AddItem(u,reason); + } + } + if ((What & APPLY_KLINES) && (klines.size() || pklines.size())) + { + if ((check = matches_kline(host))) + { + snprintf(reason,MAXBUF,"K-Lined: %s",check); + Goners->AddItem(u,reason); + } + } + if ((What & APPLY_QLINES) && (qlines.size() || pqlines.size())) { - if (u->second->fd > -1) + if ((check = matches_qline(u->nick))) { - snprintf(host,MAXBUF,"%s@%s",u->second->ident,u->second->host); - if (elines.size()) - { - // ignore people matching exempts - if (matches_exception(host)) - continue; - } - if ((What & APPLY_GLINES) && (glines.size() || pglines.size())) - { - 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; - } - } - if ((What & APPLY_KLINES) && (klines.size() || pklines.size())) - { - 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; - } - } - if ((What & APPLY_QLINES) && (qlines.size() || pqlines.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 ((What & APPLY_ZLINES) && (zlines.size() || pzlines.size())) - { - 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; - } - } + snprintf(reason,MAXBUF,"Q-Lined: %s",check); + Goners->AddItem(u,reason); + } + } + if ((What & APPLY_ZLINES) && (zlines.size() || pzlines.size())) + { + if ((check = matches_zline(u->GetIPString()))) + { + snprintf(reason,MAXBUF,"Z-Lined: %s",check); + Goners->AddItem(u,reason); } } } + + Goners->Apply(); + DELETE(Goners); } -void stats_k(userrec* user) +void stats_k(userrec* user, string_list &results) { + std::string sn = ServerInstance->Config->ServerName; for (std::vector::iterator i = klines.begin(); i != klines.end(); i++) - WriteServ(user->fd,"216 %s :%s %d %d %s %s",user->nick,i->hostmask,i->set_time,i->duration,i->source,i->reason); + results.push_back(sn+" 216 "+user->nick+" :"+i->hostmask+" "+ConvToStr(i->set_time)+" "+ConvToStr(i->duration)+" "+i->source+" :"+i->reason); for (std::vector::iterator i = pklines.begin(); i != pklines.end(); i++) - WriteServ(user->fd,"216 %s :%s %d %d %s %s",user->nick,i->hostmask,i->set_time,i->duration,i->source,i->reason); + results.push_back(sn+" 216 "+user->nick+" :"+i->hostmask+" "+ConvToStr(i->set_time)+" "+ConvToStr(i->duration)+" "+i->source+" :"+i->reason); } -void stats_g(userrec* user) +void stats_g(userrec* user, string_list &results) { + std::string sn = ServerInstance->Config->ServerName; for (std::vector::iterator i = glines.begin(); i != glines.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); + results.push_back(sn+" 223 "+user->nick+" :"+i->hostmask+" "+ConvToStr(i->set_time)+" "+ConvToStr(i->duration)+" "+i->source+" :"+i->reason); for (std::vector::iterator i = pglines.begin(); i != pglines.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); + results.push_back(sn+" 223 "+user->nick+" :"+i->hostmask+" "+ConvToStr(i->set_time)+" "+ConvToStr(i->duration)+" "+i->source+" :"+i->reason); } -void stats_q(userrec* user) +void stats_q(userrec* user, string_list &results) { + std::string sn = ServerInstance->Config->ServerName; for (std::vector::iterator i = qlines.begin(); i != qlines.end(); i++) - WriteServ(user->fd,"217 %s :%s %d %d %s %s",user->nick,i->nick,i->set_time,i->duration,i->source,i->reason); + results.push_back(sn+" 217 "+user->nick+" :"+i->nick+" "+ConvToStr(i->set_time)+" "+ConvToStr(i->duration)+" "+i->source+" :"+i->reason); for (std::vector::iterator i = pqlines.begin(); i != pqlines.end(); i++) - WriteServ(user->fd,"217 %s :%s %d %d %s %s",user->nick,i->nick,i->set_time,i->duration,i->source,i->reason); + results.push_back(sn+" 217 "+user->nick+" :"+i->nick+" "+ConvToStr(i->set_time)+" "+ConvToStr(i->duration)+" "+i->source+" :"+i->reason); } -void stats_z(userrec* user) +void stats_z(userrec* user, string_list &results) { + std::string sn = ServerInstance->Config->ServerName; for (std::vector::iterator i = zlines.begin(); i != zlines.end(); i++) - WriteServ(user->fd,"223 %s :%s %d %d %s %s",user->nick,i->ipaddr,i->set_time,i->duration,i->source,i->reason); + results.push_back(sn+" 223 "+user->nick+" :"+i->ipaddr+" "+ConvToStr(i->set_time)+" "+ConvToStr(i->duration)+" "+i->source+" :"+i->reason); for (std::vector::iterator i = pzlines.begin(); i != pzlines.end(); i++) - WriteServ(user->fd,"223 %s :%s %d %d %s %s",user->nick,i->ipaddr,i->set_time,i->duration,i->source,i->reason); + results.push_back(sn+" 223 "+user->nick+" :"+i->ipaddr+" "+ConvToStr(i->set_time)+" "+ConvToStr(i->duration)+" "+i->source+" :"+i->reason); } -void stats_e(userrec* user) +void stats_e(userrec* user, string_list &results) { - 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); + std::string sn = ServerInstance->Config->ServerName; + for (std::vector::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); for (std::vector::iterator i = pelines.begin(); i != pelines.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); + results.push_back(sn+" 223 "+user->nick+" :"+i->hostmask+" "+ConvToStr(i->set_time)+" "+ConvToStr(i->duration)+" "+i->source+" :"+i->reason); }