X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsnomasks.cpp;h=28533e4bd1ce7883f6a91783efb9df398e759127;hb=e2b0f3dc9ef4d56c71d7abda13e6139ca092e387;hp=889457ade88ba82e5cff1fbbff4f7c1a503bf1e0;hpb=86775e2e98f55b3b88befe2daff0ca23f02f3155;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/snomasks.cpp b/src/snomasks.cpp index 889457ade..28533e4bd 100644 --- a/src/snomasks.cpp +++ b/src/snomasks.cpp @@ -1,169 +1,115 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * Copyright (C) 2019 Matt Schatz + * Copyright (C) 2018 Sadie Powell + * Copyright (C) 2013-2014 Attila Molnar + * Copyright (C) 2013 Daniel Vassdal + * Copyright (C) 2013 Adam + * Copyright (C) 2012, 2019 Robby + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2009 Uli Schlachter + * Copyright (C) 2008 Robin Burchell + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2006, 2010 Craig Edwards * - * This program is free but copyrighted software; see - * the file COPYING for details. + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. * - * --------------------------------------------------- + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ -/* $Core */ #include "inspircd.h" -#include -#include "snomasks.h" - -SnomaskManager::SnomaskManager(InspIRCd* Instance) : ServerInstance(Instance) -{ - SnoMasks.clear(); - this->SetupDefaults(); -} - -SnomaskManager::~SnomaskManager() -{ - for (std::map::iterator i = SnoMasks.begin(); i != SnoMasks.end(); i++) - { - delete i->second; - } - SnoMasks.clear(); -} void SnomaskManager::FlushSnotices() { - for (std::map::iterator i = SnoMasks.begin(); i != SnoMasks.end(); i++) - { - i->second->Flush(); - } -} - -bool SnomaskManager::EnableSnomask(char letter, const std::string &type) -{ - if (SnoMasks.find(letter) == SnoMasks.end()) - { - Snomask *s = new Snomask(ServerInstance, letter, type); - SnoMasks[letter] = s; - return true; - } - return false; + for (int i=0; i < 26; i++) + masks[i].Flush(); } -bool SnomaskManager::DisableSnomask(char letter) +void SnomaskManager::EnableSnomask(char letter, const std::string &type) { - SnoList::iterator n = SnoMasks.find(letter); - if (n != SnoMasks.end()) - { - delete n->second; // destroy the snomask - SnoMasks.erase(n); - return true; - } - return false; + if (letter >= 'a' && letter <= 'z') + masks[letter - 'a'].Description = type; } void SnomaskManager::WriteToSnoMask(char letter, const std::string &text) { - /* Only send to snomask chars which are enabled */ - SnoList::iterator n = SnoMasks.find(letter); - if (n != SnoMasks.end()) - { - n->second->SendMessage(text); - } + if (letter >= 'a' && letter <= 'z') + masks[letter - 'a'].SendMessage(text, letter); + if (letter >= 'A' && letter <= 'Z') + masks[letter - 'A'].SendMessage(text, letter); } void SnomaskManager::WriteGlobalSno(char letter, const std::string& text) { WriteToSnoMask(letter, text); letter = toupper(letter); - ServerInstance->PI->SendSNONotice(std::string(1, letter), text); + ServerInstance->PI->SendSNONotice(letter, text); } void SnomaskManager::WriteToSnoMask(char letter, const char* text, ...) { - char textbuffer[MAXBUF]; - va_list argsPtr; - - va_start(argsPtr, text); - vsnprintf(textbuffer, MAXBUF, text, argsPtr); - va_end(argsPtr); - - this->WriteToSnoMask(letter, std::string(textbuffer)); + std::string textbuffer; + VAFORMAT(textbuffer, text, text); + this->WriteToSnoMask(letter, textbuffer); } void SnomaskManager::WriteGlobalSno(char letter, const char* text, ...) { - char textbuffer[MAXBUF]; - va_list argsPtr; - - va_start(argsPtr, text); - vsnprintf(textbuffer, MAXBUF, text, argsPtr); - va_end(argsPtr); - - this->WriteGlobalSno(letter, std::string(textbuffer)); + std::string textbuffer; + VAFORMAT(textbuffer, text, text); + this->WriteGlobalSno(letter, textbuffer); } -bool SnomaskManager::IsEnabled(char letter) +SnomaskManager::SnomaskManager() { - return (SnoMasks.find(letter) != SnoMasks.end()); + EnableSnomask('c',"CONNECT"); /* Local connect notices */ + EnableSnomask('q',"QUIT"); /* Local quit notices */ + EnableSnomask('k',"KILL"); /* Kill notices */ + EnableSnomask('o',"OPER"); /* Oper up/down notices */ + EnableSnomask('a',"ANNOUNCEMENT"); /* formerly WriteOpers() - generic notices to all opers */ + EnableSnomask('x',"XLINE"); /* X-line notices (G/Z/Q/K/E/R/SHUN/CBan) */ + EnableSnomask('t',"STATS"); /* Local or remote stats request */ } -void SnomaskManager::SetupDefaults() +bool SnomaskManager::IsSnomaskUsable(char ch) const { - this->EnableSnomask('c',"CONNECT"); /* Local connect notices */ - this->EnableSnomask('C',"REMOTECONNECT"); /* Remote connect notices */ - this->EnableSnomask('q',"QUIT"); /* Local quit notices */ - this->EnableSnomask('Q',"REMOTEQUIT"); /* Remote quit notices */ - this->EnableSnomask('k',"KILL"); /* Kill notices */ - this->EnableSnomask('K',"REMOTEKILL"); /* Remote kill notices */ - this->EnableSnomask('l',"LINK"); /* Linking notices */ - this->EnableSnomask('L',"REMOTELINK"); /* Remote linking notices */ - this->EnableSnomask('o',"OPER"); /* Oper up/down notices */ - this->EnableSnomask('O',"REMOTEOPER"); /* Remote oper up/down notices */ - this->EnableSnomask('a',"ANNOUNCEMENT"); /* formerly WriteOpers() - generic notices to all opers */ - this->EnableSnomask('A',"REMOTEANNOUNCEMENT"); /* formerly WriteOpers() - generic notices to all opers */ - this->EnableSnomask('d',"DEBUG"); /* Debug notices */ - this->EnableSnomask('x',"XLINE"); /* Xline notice (g/z/q/k/e) */ - this->EnableSnomask('t',"STATS"); /* Local or remote stats request */ - this->EnableSnomask('f',"FLOOD"); /* Flooding notices */ + return ((isalpha(ch)) && (!masks[tolower(ch) - 'a'].Description.empty())); } -/*************************************************************************************/ +Snomask::Snomask() + : Count(0) +{ +} -void Snomask::SendMessage(const std::string &message) +void Snomask::SendMessage(const std::string& message, char letter) { - if (message != LastMessage) + if ((!ServerInstance->Config->NoSnoticeStack) && (message == LastMessage) && (letter == LastLetter)) { - this->Flush(); - LastMessage = message; - - std::string desc = this->Description; - ModResult MOD_RESULT; - char mysnomask = MySnomask; - ServerInstance->Logs->Log("snomask", DEFAULT, "%s: %s", desc.c_str(), message.c_str()); - - FIRST_MOD_RESULT(ServerInstance, OnSendSnotice, MOD_RESULT, (mysnomask, desc, message)); - - LastBlocked = (MOD_RESULT == MOD_RES_DENY); - - if (!LastBlocked) - { - /* Only opers can receive snotices, so we iterate the oper list */ - std::list::iterator i = ServerInstance->Users->all_opers.begin(); - - while (i != ServerInstance->Users->all_opers.end()) - { - User* a = *i; - if (IS_LOCAL(a) && a->IsModeSet('s') && a->IsNoticeMaskSet(mysnomask) && !a->quitting) - { - a->WriteServ("NOTICE %s :*** %s: %s", a->nick.c_str(), desc.c_str(), message.c_str()); - } - - i++; - } - } + Count++; + return; } + + this->Flush(); + + std::string desc = GetDescription(letter); + ModResult MOD_RESULT; + FIRST_MOD_RESULT(OnSendSnotice, MOD_RESULT, (letter, desc, message)); + if (MOD_RESULT == MOD_RES_DENY) + return; + + Snomask::Send(letter, desc, message); + LastMessage = message; + LastLetter = letter; Count++; } @@ -171,33 +117,41 @@ void Snomask::Flush() { if (Count > 1) { - std::string desc = this->Description; - std::string mesg = "(last message repeated "+ConvToStr(Count)+" times)"; - char mysnomask = MySnomask; - - ServerInstance->Logs->Log("snomask", DEFAULT, "%s: %s", desc.c_str(), mesg.c_str()); + std::string desc = GetDescription(LastLetter); + std::string msg = "(last message repeated " + ConvToStr(Count) + " times)"; - FOREACH_MOD(I_OnSendSnotice, OnSendSnotice(mysnomask, desc, mesg)); - - if (!LastBlocked) - { - /* Only opers can receive snotices, so we iterate the oper list */ - std::list::iterator i = ServerInstance->Users->all_opers.begin(); + FOREACH_MOD(OnSendSnotice, (LastLetter, desc, msg)); + Snomask::Send(LastLetter, desc, msg); + } - while (i != ServerInstance->Users->all_opers.end()) - { - User* a = *i; - if (IS_LOCAL(a) && a->IsModeSet('s') && a->IsNoticeMaskSet(mysnomask) && !a->quitting) - { - a->WriteServ("NOTICE %s :*** %s: %s", a->nick.c_str(), desc.c_str(), mesg.c_str()); - } + LastMessage.clear(); + Count = 0; +} - i++; - } - } +void Snomask::Send(char letter, const std::string& desc, const std::string& msg) +{ + ServerInstance->Logs->Log(desc, LOG_DEFAULT, msg); + const std::string finalmsg = InspIRCd::Format("*** %s: %s", desc.c_str(), msg.c_str()); + /* Only opers can receive snotices, so we iterate the oper list */ + const UserManager::OperList& opers = ServerInstance->Users->all_opers; + for (UserManager::OperList::const_iterator i = opers.begin(); i != opers.end(); ++i) + { + User* user = *i; + // IsNoticeMaskSet() returns false for opers who aren't +s, no need to check for it separately + if (IS_LOCAL(user) && user->IsNoticeMaskSet(letter)) + user->WriteNotice(finalmsg); } - LastMessage = ""; - LastBlocked = false; - Count = 0; +} + +std::string Snomask::GetDescription(char letter) const +{ + std::string ret; + if (isupper(letter)) + ret = "REMOTE"; + if (!Description.empty()) + ret += Description; + else + ret += std::string("SNO-") + (char)tolower(letter); + return ret; }