X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fxline.cpp;h=a28e61766f40b85182c5e239b83ee524a4fd6d4a;hb=bcf2e57d8125fceb2f573fe77ac122158aa75a13;hp=b0064e1cf5a51ec00987c8cb90a8df7c4abed5d8;hpb=048943811113612fdb94bdcb81d111bd4b13d1d9;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/xline.cpp b/src/xline.cpp index b0064e1cf..a28e61766 100644 --- a/src/xline.cpp +++ b/src/xline.cpp @@ -12,11 +12,8 @@ */ #include "inspircd.h" -#include "users.h" -#include "modules.h" #include "wildcard.h" #include "xline.h" -#include "cull_list.h" /* Version two, now with optimized expiry! * @@ -27,7 +24,7 @@ * 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 + * (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 * soonest is always pointed at by vector::begin(), so a simple while loop can * very efficiently, very quickly and above all SAFELY pick off the first few @@ -69,9 +66,8 @@ bool DoZLine(ServerConfig* conf, const char* tag, char** entries, ValueList &val { const char* reason = values[0].GetString(); const char* ipmask = values[1].GetString(); - + conf->GetInstance()->XLines->add_zline(0,"",reason,ipmask); - conf->GetInstance()->Log(DEBUG,"Read Z line (badip tag): ipmask=%s reason=%s",ipmask,reason); return true; } @@ -79,9 +75,8 @@ bool DoQLine(ServerConfig* conf, const char* tag, char** entries, ValueList &val { const char* reason = values[0].GetString(); const char* nick = values[1].GetString(); - + conf->GetInstance()->XLines->add_qline(0,"",reason,nick); - conf->GetInstance()->Log(DEBUG,"Read Q line (badnick tag): nick=%s reason=%s",nick,reason); return true; } @@ -89,9 +84,8 @@ bool DoKLine(ServerConfig* conf, const char* tag, char** entries, ValueList &val { const char* reason = values[0].GetString(); const char* host = values[1].GetString(); - + conf->GetInstance()->XLines->add_kline(0,"",reason,host); - conf->GetInstance()->Log(DEBUG,"Read K line (badhost tag): host=%s reason=%s",host,reason); return true; } @@ -99,9 +93,8 @@ bool DoELine(ServerConfig* conf, const char* tag, char** entries, ValueList &val { const char* reason = values[0].GetString(); const char* host = values[1].GetString(); - + conf->GetInstance()->XLines->add_eline(0,"",reason,host); - conf->GetInstance()->Log(DEBUG,"Read E line (exception tag): host=%s reason=%s",host,reason); return true; } @@ -114,9 +107,9 @@ IdentHostPair XLineManager::IdentSplit(const std::string &ident_and_host) 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 = "*"; + n.first.assign("*"); if (!n.second.length()) - n.second = "*"; + n.second.assign("*"); } else { @@ -132,10 +125,11 @@ bool XLineManager::add_gline(long duration, const char* source,const char* reaso { IdentHostPair ih = IdentSplit(hostmask); - bool ret = del_gline(hostmask); - + if (del_gline(hostmask, true)) + return false; + GLine* item = new GLine(ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str()); - + if (duration) { glines.push_back(item); @@ -145,8 +139,8 @@ bool XLineManager::add_gline(long duration, const char* source,const char* reaso { pglines.push_back(item); } - - return !ret; + + return true; } // adds an e:line (exception to bans) @@ -155,7 +149,8 @@ bool XLineManager::add_eline(long duration, const char* source, const char* reas { IdentHostPair ih = IdentSplit(hostmask); - bool ret = del_eline(hostmask); + if (del_eline(hostmask, true)) + return false; ELine* item = new ELine(ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str()); @@ -168,14 +163,16 @@ bool XLineManager::add_eline(long duration, const char* source, const char* reas { pelines.push_back(item); } - return !ret; + return true; } // adds a q:line bool XLineManager::add_qline(long duration, const char* source, const char* reason, const char* nickname) { - bool ret = del_qline(nickname); + if (del_qline(nickname, true)) + return false; + QLine* item = new QLine(ServerInstance->Time(), duration, source, reason, nickname); if (duration) @@ -187,15 +184,13 @@ bool XLineManager::add_qline(long duration, const char* source, const char* reas { pqlines.push_back(item); } - return !ret; + return true; } // adds a z:line bool XLineManager::add_zline(long duration, const char* source, const char* reason, const char* ipaddr) { - bool ret = del_zline(ipaddr); - if (strchr(ipaddr,'@')) { while (*ipaddr != '@') @@ -203,6 +198,9 @@ bool XLineManager::add_zline(long duration, const char* source, const char* reas ipaddr++; } + if (del_zline(ipaddr, true)) + return false; + ZLine* item = new ZLine(ServerInstance->Time(), duration, source, reason, ipaddr); if (duration) @@ -214,7 +212,7 @@ bool XLineManager::add_zline(long duration, const char* source, const char* reas { pzlines.push_back(item); } - return !ret; + return true; } // adds a k:line @@ -223,7 +221,8 @@ bool XLineManager::add_kline(long duration, const char* source, const char* reas { IdentHostPair ih = IdentSplit(hostmask); - bool ret = del_kline(hostmask); + if (del_kline(hostmask, true)) + return false; KLine* item = new KLine(ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str()); @@ -236,20 +235,23 @@ bool XLineManager::add_kline(long duration, const char* source, const char* reas { pklines.push_back(item); } - return !ret; + return true; } // deletes a g:line, returns true if the line existed and was removed -bool XLineManager::del_gline(const char* hostmask) +bool XLineManager::del_gline(const char* hostmask, bool simulate) { IdentHostPair ih = IdentSplit(hostmask); for (std::vector::iterator i = glines.begin(); i != glines.end(); i++) { if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask)) { - delete *i; - glines.erase(i); + if (!simulate) + { + delete *i; + glines.erase(i); + } return true; } } @@ -257,8 +259,11 @@ bool XLineManager::del_gline(const char* hostmask) { if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask)) { - delete *i; - pglines.erase(i); + if (!simulate) + { + delete *i; + pglines.erase(i); + } return true; } } @@ -267,15 +272,18 @@ bool XLineManager::del_gline(const char* hostmask) // deletes a e:line, returns true if the line existed and was removed -bool XLineManager::del_eline(const char* hostmask) +bool XLineManager::del_eline(const char* hostmask, bool simulate) { IdentHostPair ih = IdentSplit(hostmask); for (std::vector::iterator i = elines.begin(); i != elines.end(); i++) { if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask)) { - delete *i; - elines.erase(i); + if (!simulate) + { + delete *i; + elines.erase(i); + } return true; } } @@ -283,8 +291,11 @@ bool XLineManager::del_eline(const char* hostmask) { if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask)) { - delete *i; - pelines.erase(i); + if (!simulate) + { + delete *i; + pelines.erase(i); + } return true; } } @@ -293,14 +304,17 @@ bool XLineManager::del_eline(const char* hostmask) // deletes a q:line, returns true if the line existed and was removed -bool XLineManager::del_qline(const char* nickname) +bool XLineManager::del_qline(const char* nickname, bool simulate) { for (std::vector::iterator i = qlines.begin(); i != qlines.end(); i++) { if (!strcasecmp(nickname,(*i)->nick)) { - delete *i; - qlines.erase(i); + if (!simulate) + { + delete *i; + qlines.erase(i); + } return true; } } @@ -308,8 +322,11 @@ bool XLineManager::del_qline(const char* nickname) { if (!strcasecmp(nickname,(*i)->nick)) { - delete *i; - pqlines.erase(i); + if (!simulate) + { + delete *i; + pqlines.erase(i); + } return true; } } @@ -318,14 +335,17 @@ bool XLineManager::del_qline(const char* nickname) // deletes a z:line, returns true if the line existed and was removed -bool XLineManager::del_zline(const char* ipaddr) +bool XLineManager::del_zline(const char* ipaddr, bool simulate) { for (std::vector::iterator i = zlines.begin(); i != zlines.end(); i++) { if (!strcasecmp(ipaddr,(*i)->ipaddr)) { - delete *i; - zlines.erase(i); + if (!simulate) + { + delete *i; + zlines.erase(i); + } return true; } } @@ -333,8 +353,11 @@ bool XLineManager::del_zline(const char* ipaddr) { if (!strcasecmp(ipaddr,(*i)->ipaddr)) { - delete *i; - pzlines.erase(i); + if (!simulate) + { + delete *i; + pzlines.erase(i); + } return true; } } @@ -343,15 +366,18 @@ bool XLineManager::del_zline(const char* ipaddr) // deletes a k:line, returns true if the line existed and was removed -bool XLineManager::del_kline(const char* hostmask) +bool XLineManager::del_kline(const char* hostmask, bool simulate) { IdentHostPair ih = IdentSplit(hostmask); for (std::vector::iterator i = klines.begin(); i != klines.end(); i++) { if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask)) { - delete *i; - klines.erase(i); + if (!simulate) + { + delete *i; + klines.erase(i); + } return true; } } @@ -359,8 +385,11 @@ bool XLineManager::del_kline(const char* hostmask) { if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask)) { - delete *i; - pklines.erase(i); + if (!simulate) + { + delete *i; + pklines.erase(i); + } return true; } } @@ -418,7 +447,7 @@ GLine* XLineManager::matches_gline(userrec* user, bool permonly) } ELine* XLineManager::matches_exception(userrec* user, bool permonly) -{ +{ if ((elines.empty()) && (pelines.empty())) return NULL; char host2[MAXBUF]; @@ -469,7 +498,7 @@ void XLineManager::gline_set_creation_time(const char* host, time_t create_time) return; } } - return ; + return ; } void XLineManager::eline_set_creation_time(const char* host, time_t create_time) @@ -483,7 +512,7 @@ void XLineManager::eline_set_creation_time(const char* host, time_t create_time) return; } } - for (std::vector::iterator i = pelines.begin(); i != pelines.end(); i++) + for (std::vector::iterator i = pelines.begin(); i != pelines.end(); i++) { if (!strcasecmp(host,(*i)->hostmask)) { @@ -658,7 +687,7 @@ void XLineManager::expire_lines() ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed Q-Line %s (set by %s %d seconds ago)",(*i)->nick,(*i)->source,(*i)->duration); qlines.erase(i); } - + } // applies lines, removing clients and changing nicks etc as applicable @@ -675,7 +704,6 @@ void XLineManager::apply_lines(const int What) if ((!pglines.size()) && (!pklines.size()) && (!pzlines.size()) && (!pqlines.size())) return; - CullList* Goners = new CullList(ServerInstance); XLine* check = NULL; for (std::vector::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++) { @@ -690,7 +718,12 @@ void XLineManager::apply_lines(const int What) if ((check = matches_gline(u,true))) { snprintf(reason,MAXBUF,"G-Lined: %s",check->reason); - Goners->AddItem(u,reason); + if (*ServerInstance->Config->MoronBanner) + u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner); + if (ServerInstance->Config->HideBans) + userrec::QuitUser(ServerInstance, u, "G-Lined", reason); + else + userrec::QuitUser(ServerInstance, u, reason); } } @@ -699,7 +732,12 @@ void XLineManager::apply_lines(const int What) if ((check = matches_kline(u,true))) { snprintf(reason,MAXBUF,"K-Lined: %s",check->reason); - Goners->AddItem(u,reason); + if (*ServerInstance->Config->MoronBanner) + u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner); + if (ServerInstance->Config->HideBans) + userrec::QuitUser(ServerInstance, u, "K-Lined", reason); + else + userrec::QuitUser(ServerInstance, u, reason); } } @@ -708,7 +746,12 @@ void XLineManager::apply_lines(const int What) if ((check = matches_qline(u->nick,true))) { snprintf(reason,MAXBUF,"Q-Lined: %s",check->reason); - Goners->AddItem(u,reason); + if (*ServerInstance->Config->MoronBanner) + u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner); + if (ServerInstance->Config->HideBans) + userrec::QuitUser(ServerInstance, u, "Q-Lined", reason); + else + userrec::QuitUser(ServerInstance, u, reason); } } @@ -717,13 +760,15 @@ void XLineManager::apply_lines(const int What) if ((check = matches_zline(u->GetIPString(),true))) { snprintf(reason,MAXBUF,"Z-Lined: %s",check->reason); - Goners->AddItem(u,reason); + if (*ServerInstance->Config->MoronBanner) + u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner); + if (ServerInstance->Config->HideBans) + userrec::QuitUser(ServerInstance, u, "Z-Lined", reason); + else + userrec::QuitUser(ServerInstance, u, reason); } } } - - Goners->Apply(); - DELETE(Goners); } else { @@ -732,8 +777,7 @@ void XLineManager::apply_lines(const int What) if ((!glines.size()) && (!klines.size()) && (!zlines.size()) && (!qlines.size()) && (!pglines.size()) && (!pklines.size()) && (!pzlines.size()) && (!pqlines.size())) return; - - CullList* Goners = new CullList(ServerInstance); + XLine* check = NULL; for (std::vector::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++) { @@ -750,7 +794,12 @@ void XLineManager::apply_lines(const int What) if ((check = matches_gline(u))) { snprintf(reason,MAXBUF,"G-Lined: %s",check->reason); - Goners->AddItem(u,reason); + if (*ServerInstance->Config->MoronBanner) + u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner); + if (ServerInstance->Config->HideBans) + userrec::QuitUser(ServerInstance, u, "G-Lined", reason); + else + userrec::QuitUser(ServerInstance, u, reason); } } if ((What & APPLY_KLINES) && (klines.size() || pklines.size())) @@ -758,7 +807,12 @@ void XLineManager::apply_lines(const int What) if ((check = matches_kline(u))) { snprintf(reason,MAXBUF,"K-Lined: %s",check->reason); - Goners->AddItem(u,reason); + if (*ServerInstance->Config->MoronBanner) + u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner); + if (ServerInstance->Config->HideBans) + userrec::QuitUser(ServerInstance, u, "K-Lined", reason); + else + userrec::QuitUser(ServerInstance, u, reason); } } if ((What & APPLY_QLINES) && (qlines.size() || pqlines.size())) @@ -766,21 +820,28 @@ void XLineManager::apply_lines(const int What) if ((check = matches_qline(u->nick))) { snprintf(reason,MAXBUF,"Q-Lined: %s",check->reason); - Goners->AddItem(u,reason); + if (*ServerInstance->Config->MoronBanner) + u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner); + if (ServerInstance->Config->HideBans) + userrec::QuitUser(ServerInstance, u, "Q-Lined", reason); + else + userrec::QuitUser(ServerInstance, u, reason); } } if ((What & APPLY_ZLINES) && (zlines.size() || pzlines.size())) { if ((check = matches_zline(u->GetIPString()))) { - snprintf(reason,MAXBUF,"Z-Lined: %s",check->reason); - Goners->AddItem(u,reason); + snprintf(reason,MAXBUF,"Z-Lined: %s", check->reason); + if (*ServerInstance->Config->MoronBanner) + u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner); + if (ServerInstance->Config->HideBans) + userrec::QuitUser(ServerInstance, u, "Z-Lined", reason); + else + userrec::QuitUser(ServerInstance, u, reason); } } } - - Goners->Apply(); - DELETE(Goners); } }