X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fxline.cpp;h=86a6081f226ca2878c793f3043d30210145ca03a;hb=77123f4dec9f29105f6c0ceea0262cfe8e9eaa1a;hp=0815f3c614f6789375a272919b4fac88fb41fb64;hpb=b70de5aa7840e8b43c9c5bdbeb0146ec1d5ea1a0;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/xline.cpp b/src/xline.cpp index 0815f3c61..86a6081f2 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,59 +35,17 @@ using namespace std; #include "inspstring.h" #include "helperfuncs.h" #include "hashcomp.h" +#include "typedefs.h" +#include "cull_list.h" + +extern ServerConfig *Config; extern int MODCOUNT; extern std::vector modules; extern std::vector factory; - -extern int LogLevel; -extern char ServerName[MAXBUF]; -extern char Network[MAXBUF]; -extern char ServerDesc[MAXBUF]; -extern char AdminName[MAXBUF]; -extern char AdminEmail[MAXBUF]; -extern char AdminNick[MAXBUF]; -extern char diepass[MAXBUF]; -extern char restartpass[MAXBUF]; -extern char motd[MAXBUF]; -extern char rules[MAXBUF]; -extern char list[MAXBUF]; -extern char PrefixQuit[MAXBUF]; -extern char DieValue[MAXBUF]; - -extern int debugging; -extern int WHOWAS_STALE; -extern int WHOWAS_MAX; -extern int DieDelay; -extern time_t startup_time; -extern int NetBufferSize; -extern time_t nb_start; - -extern std::vector module_names; - -extern int boundPortCount; -extern int portCount; - -extern int ports[MAXSOCKS]; - -extern std::stringstream config_f; - -extern FILE *log_file; - -typedef nspace::hash_map, irc::StrHashComp> user_hash; -typedef nspace::hash_map, irc::StrHashComp> chan_hash; -typedef nspace::hash_map, irc::InAddr_HashComp> address_cache; -typedef nspace::hash_map, irc::StrHashComp> whowas_hash; -typedef std::deque command_table; - - +extern ServerConfig* Config; extern user_hash clientlist; -extern chan_hash chanlist; -extern whowas_hash whowas; -extern command_table cmdlist; -extern file_cache MOTD; -extern file_cache RULES; -extern address_cache IP; +extern std::vector local_users; /* Version two, now with optimized expiry! * @@ -150,50 +97,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(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(const char* tag) +{ + apply_lines(APPLY_ALL); + return true; +} + +bool DoZLine(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(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(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(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); @@ -201,6 +161,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); @@ -210,36 +171,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); @@ -257,13 +221,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,'@')) @@ -287,13 +252,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); @@ -310,6 +276,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 @@ -339,14 +306,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)) @@ -355,7 +322,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 @@ -472,8 +439,8 @@ 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)) return i->reason; @@ -485,17 +452,17 @@ char* matches_gline(const char* host) 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))) + return i->reason; for (std::vector::iterator i = pelines.begin(); i != pelines.end(); i++) if ((match(host,i->hostmask)) || (match(host2,i->hostmask))) return i->reason; - return NULL; + return NULL; } @@ -587,8 +554,8 @@ 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)) return i->reason; @@ -602,8 +569,8 @@ 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)) return i->reason; @@ -620,7 +587,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 ) @@ -630,12 +597,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 @@ -652,35 +619,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); } @@ -690,116 +657,99 @@ 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 = local_users.begin(); u2 != 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 (u->second->fd > -1) + if ((check = matches_kline(host))) { - 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,"K-Lined: %s",check); + Goners->AddItem(u,reason); + } + } + if ((What & APPLY_QLINES) && (qlines.size() || pqlines.size())) + { + if ((check = matches_qline(u->nick))) + { + snprintf(reason,MAXBUF,"Q-Lined: %s",check); + Goners->AddItem(u,reason); + } + } + if ((What & APPLY_ZLINES) && (zlines.size() || pzlines.size())) + { + if ((check = matches_zline((char*)inet_ntoa(u->ip4)))) + { + snprintf(reason,MAXBUF,"Z-Lined: %s",check); + Goners->AddItem(u,reason); } } } + + Goners->Apply(); + delete Goners; } void stats_k(userrec* user) { 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); + WriteServ(user->fd,"216 %s :%s %d %d %s :%s",user->nick,i->hostmask,i->set_time,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); + WriteServ(user->fd,"216 %s :%s %d %d %s :%s",user->nick,i->hostmask,i->set_time,i->duration,i->source,i->reason); } void stats_g(userrec* user) { 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); + WriteServ(user->fd,"223 %s :%s %d %d %s :%s",user->nick,i->hostmask,i->set_time,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); + WriteServ(user->fd,"223 %s :%s %d %d %s :%s",user->nick,i->hostmask,i->set_time,i->duration,i->source,i->reason); } void stats_q(userrec* user) { 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); + WriteServ(user->fd,"217 %s :%s %d %d %s :%s",user->nick,i->nick,i->set_time,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); + WriteServ(user->fd,"217 %s :%s %d %d %s :%s",user->nick,i->nick,i->set_time,i->duration,i->source,i->reason); } void stats_z(userrec* user) { 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); + WriteServ(user->fd,"223 %s :%s %d %d %s :%s",user->nick,i->ipaddr,i->set_time,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); + WriteServ(user->fd,"223 %s :%s %d %d %s :%s",user->nick,i->ipaddr,i->set_time,i->duration,i->source,i->reason); } 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); + 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); 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); + WriteServ(user->fd,"223 %s :%s %d %d %s :%s",user->nick,i->hostmask,i->set_time,i->duration,i->source,i->reason); }