X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_xline_db.cpp;h=c514ffb76e2230dfc919a915a0899205b15fdc8b;hb=aa05a6fd4d5c11dc8e8adc469134a2802446fe9f;hp=af011173a42ca300d66a604675918d6feed53e2c;hpb=27c6e9c76ecf069521b0a561241cf362134a3eef;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_xline_db.cpp b/src/modules/m_xline_db.cpp index af011173a..c514ffb76 100644 --- a/src/modules/m_xline_db.cpp +++ b/src/modules/m_xline_db.cpp @@ -1,33 +1,47 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2008 Thomas Stagner + * Copyright (C) 2008 Robin Burchell * - * 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 . */ + #include "inspircd.h" #include "xline.h" - -/* $ModDesc: Keeps a dynamic log of all XLines created, and stores them in a seperate conf file (xline.db). */ +#include class ModuleXLineDB : public Module { - std::vector xlines; + bool dirty; + std::string xlinedbpath; public: - ModuleXLineDB(InspIRCd* Me) : Module(Me) + void init() CXX11_OVERRIDE { - Implementation eventlist[] = { I_OnAddLine, I_OnDelLine }; - ServerInstance->Modules->Attach(eventlist, this, 2); - } + /* Load the configuration + * Note: + * This is on purpose not changed on a rehash. It would be non-trivial to change the database on-the-fly. + * Imagine a scenario where the new file already exists. Merging the current XLines with the existing database is likely a bad idea + * ...and so is discarding all current in-memory XLines for the ones in the database. + */ + ConfigTag* Conf = ServerInstance->Config->ConfValue("xlinedb"); + xlinedbpath = ServerInstance->Config->Paths.PrependData(Conf->getString("filename", "xline.db")); - virtual ~ModuleXLineDB() - { + // Read xlines before attaching to events + ReadDatabase(); + + dirty = false; } /** Called whenever an xline is added by a local user. @@ -35,18 +49,9 @@ class ModuleXLineDB : public Module * @param source The sender of the line or NULL for local server * @param line The xline being added */ - void OnAddLine(User* source, XLine* line) + void OnAddLine(User* source, XLine* line) CXX11_OVERRIDE { - xlines.push_back(line); - - for (std::vector::iterator i = xlines.begin(); i != xlines.end(); i++) - { - line = (*i); - ServerInstance->WriteOpers("%s %s %s %lu %lu :%s", line->type.c_str(), line->Displayable(), -ServerInstance->Config->ServerName, line->set_time, line->duration, line->reason); - } - - WriteDatabase(); + dirty = true; } /** Called whenever an xline is deleted. @@ -54,40 +59,44 @@ ServerInstance->Config->ServerName, line->set_time, line->duration, line->reason * @param source The user removing the line or NULL for local server * @param line the line being deleted */ - void OnDelLine(User* source, XLine* line) + void OnDelLine(User* source, XLine* line) CXX11_OVERRIDE { - for (std::vector::iterator i = xlines.begin(); i != xlines.end(); i++) + dirty = true; + } + + void OnExpireLine(XLine *line) CXX11_OVERRIDE + { + dirty = true; + } + + void OnBackgroundTimer(time_t now) CXX11_OVERRIDE + { + if (dirty) { - if ((*i) == line) - { - xlines.erase(i); - break; - } + if (WriteDatabase()) + dirty = false; } - - WriteDatabase(); } bool WriteDatabase() { - FILE *f; - /* * We need to perform an atomic write so as not to fuck things up. - * So, let's write to a temporary file, flush and sync the FD, then rename the file.. + * So, let's write to a temporary file, flush it, then rename the file.. * Technically, that means that this can block, but I have *never* seen that. - * -- w00t + * -- w00t */ - ServerInstance->Log(DEBUG, "xlinedb: Opening temporary database"); - f = fopen("xline.db.new", "w"); - if (!f) + ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Opening temporary database"); + std::string xlinenewdbpath = xlinedbpath + ".new"; + std::ofstream stream(xlinenewdbpath.c_str()); + if (!stream.is_open()) { - ServerInstance->Log(DEBUG, "xlinedb: Cannot create database! %s (%d)", strerror(errno), errno); - ServerInstance->SNO->WriteToSnoMask('x', "database: cannot create new db: %s (%d)", strerror(errno), errno); + ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Cannot create database \"%s\"! %s (%d)", xlinenewdbpath.c_str(), strerror(errno), errno); + ServerInstance->SNO->WriteToSnoMask('a', "database: cannot create new xline db \"%s\": %s (%d)", xlinenewdbpath.c_str(), strerror(errno), errno); return false; } - ServerInstance->Log(DEBUG, "xlinedb: Opened. Writing.."); + ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Opened. Writing.."); /* * Now, much as I hate writing semi-unportable formats, additional @@ -96,45 +105,120 @@ ServerInstance->Config->ServerName, line->set_time, line->duration, line->reason * semblance of backwards compatibility for reading on startup.. * -- w00t */ - fprintf(f, "VERSION 1\n"); + stream << "VERSION 1" << std::endl; // Now, let's write. - XLine *line; - for (std::vector::iterator i = xlines.begin(); i != xlines.end(); i++) + std::vector types = ServerInstance->XLines->GetAllTypes(); + for (std::vector::const_iterator it = types.begin(); it != types.end(); ++it) { - line = (*i); - fprintf(f, "%s %s %s %lu %lu :%s\n", line->type.c_str(), line->Displayable(), - ServerInstance->Config->ServerName, line->set_time, line->duration, line->reason); + XLineLookup* lookup = ServerInstance->XLines->GetAll(*it); + if (!lookup) + continue; // Not possible as we just obtained the list from XLineManager + + for (LookupIter i = lookup->begin(); i != lookup->end(); ++i) + { + XLine* line = i->second; + stream << "LINE " << line->type << " " << line->Displayable() << " " + << ServerInstance->Config->ServerName << " " << line->set_time << " " + << line->duration << " :" << line->reason << std::endl; + } } - ServerInstance->Log(DEBUG, "xlinedb: Finished writing XLines. Checking for error.."); + ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Finished writing XLines. Checking for error.."); - int write_error = 0; - write_error = ferror(f); - write_error |= fclose(f); - if (write_error) + if (stream.fail()) { - ServerInstance->Log(DEBUG, "xlinedb: Cannot write to new database! %s (%d)", strerror(errno), errno); - ServerInstance->SNO->WriteToSnoMask('x', "database: cannot write to new db: %s (%d)", strerror(errno), errno); + ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Cannot write to new database \"%s\"! %s (%d)", xlinenewdbpath.c_str(), strerror(errno), errno); + ServerInstance->SNO->WriteToSnoMask('a', "database: cannot write to new xline db \"%s\": %s (%d)", xlinenewdbpath.c_str(), strerror(errno), errno); return false; } + stream.close(); +#ifdef _WIN32 + remove(xlinedbpath.c_str()); +#endif // Use rename to move temporary to new db - this is guarenteed not to fuck up, even in case of a crash. - if (rename("xline.db.new", "xline.db") < 0) + if (rename(xlinenewdbpath.c_str(), xlinedbpath.c_str()) < 0) { - ServerInstance->Log(DEBUG, "xlinedb: Cannot move new to old database! %s (%d)", strerror(errno), errno); - ServerInstance->SNO->WriteToSnoMask('x', "database: cannot replace old with new db: %s (%d)", strerror(errno), errno); + ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Cannot replace old database \"%s\" with new database \"%s\"! %s (%d)", xlinedbpath.c_str(), xlinenewdbpath.c_str(), strerror(errno), errno); + ServerInstance->SNO->WriteToSnoMask('a', "database: cannot replace old xline db \"%s\" with new db \"%s\": %s (%d)", xlinedbpath.c_str(), xlinenewdbpath.c_str(), strerror(errno), errno); return false; } return true; } - virtual Version GetVersion() + bool ReadDatabase() + { + // If the xline database doesn't exist then we don't need to load it. + if (!FileSystem::FileExists(xlinedbpath)) + return true; + + std::ifstream stream(xlinedbpath.c_str()); + if (!stream.is_open()) + { + ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Cannot read database \"%s\"! %s (%d)", xlinedbpath.c_str(), strerror(errno), errno); + ServerInstance->SNO->WriteToSnoMask('a', "database: cannot read xline db \"%s\": %s (%d)", xlinedbpath.c_str(), strerror(errno), errno); + return false; + } + + std::string line; + while (std::getline(stream, line)) + { + // Inspired by the command parser. :) + irc::tokenstream tokens(line); + int items = 0; + std::string command_p[7]; + std::string tmp; + + while (tokens.GetToken(tmp) && (items < 7)) + { + command_p[items] = tmp; + items++; + } + + ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Processing %s", line.c_str()); + + if (command_p[0] == "VERSION") + { + if (command_p[1] != "1") + { + stream.close(); + ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "I got database version %s - I don't understand it", command_p[1].c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "database: I got a database version (%s) I don't understand", command_p[1].c_str()); + return false; + } + } + else if (command_p[0] == "LINE") + { + // Mercilessly stolen from spanningtree + XLineFactory* xlf = ServerInstance->XLines->GetFactory(command_p[1]); + + if (!xlf) + { + ServerInstance->SNO->WriteToSnoMask('a', "database: Unknown line type (%s).", command_p[1].c_str()); + continue; + } + + XLine* xl = xlf->Generate(ServerInstance->Time(), atoi(command_p[5].c_str()), command_p[3], command_p[6], command_p[2]); + xl->SetCreateTime(atoi(command_p[4].c_str())); + + if (ServerInstance->XLines->AddLine(xl, NULL)) + { + ServerInstance->SNO->WriteToSnoMask('x', "database: Added a line of type %s", command_p[1].c_str()); + } + else + delete xl; + } + } + stream.close(); + return true; + } + + Version GetVersion() CXX11_OVERRIDE { - return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION); + return Version("Keeps a dynamic log of all XLines created, and stores them in a separate conf file (xline.db).", VF_VENDOR); } }; MODULE_INIT(ModuleXLineDB) -