X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_httpd_stats.cpp;h=30eacd7a725915b70ee5fec84600ac6b24ec18bd;hb=43b5073d6f80a8dcb7044ecd127fd5893da033ab;hp=d31807f598ceae632d40e5852cbee823eb7c1ae7;hpb=6278262baaed06e2acf134c53ed0485136d61f50;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp index d31807f59..30eacd7a7 100644 --- a/src/modules/m_httpd_stats.cpp +++ b/src/modules/m_httpd_stats.cpp @@ -1,43 +1,39 @@ -/* +------------------------------------+ - * | 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) 2009 Daniel De Graaf + * Copyright (C) 2007-2008 Robin Burchell + * Copyright (C) 2008 Pippijn van Steenhoven + * Copyright (C) 2006-2008 Craig Edwards + * Copyright (C) 2007 Dennis Friis * - * 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 "httpd.h" -#include "protocol.h" -/* $ModDesc: Provides statistics over HTTP via m_httpd.so */ -/* $ModDep: httpd.h */ +#include "inspircd.h" +#include "modules/httpd.h" +#include "xline.h" class ModuleHttpStats : public Module { - static std::map const &entities; - std::string stylesheet; - bool changed; + static const insp::flat_map& entities; + HTTPdAPI API; public: - - void ReadConfig() + ModuleHttpStats() + : API(this) { - ConfigReader c(ServerInstance); - this->stylesheet = c.ReadValue("httpstats", "stylesheet", 0); - } - - ModuleHttpStats(InspIRCd* Me) : Module(Me) - { - ReadConfig(); - this->changed = true; - Implementation eventlist[] = { I_OnEvent, I_OnRequest }; - ServerInstance->Modules->Attach(eventlist, this, 2); } std::string Sanitize(const std::string &str) @@ -47,7 +43,7 @@ class ModuleHttpStats : public Module for (std::string::const_iterator x = str.begin(); x != str.end(); ++x) { - std::map::const_iterator it = entities.find(*x); + insp::flat_map::const_iterator it = entities.find(*x); if (it != entities.end()) { @@ -55,39 +51,62 @@ class ModuleHttpStats : public Module ret += it->second; ret += ';'; } - else if (*x < 32 || *x > 126) + else if (*x == 0x09 || *x == 0x0A || *x == 0x0D || ((*x >= 0x20) && (*x <= 0x7e))) { - int n = (unsigned char)*x; - ret += ("&#" + ConvToStr(n) + ";"); + // The XML specification defines the following characters as valid inside an XML document: + // Char ::= #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD] | [#x10000-#x10FFFF] + ret += *x; } else { - ret += *x; + // If we reached this point then the string contains characters which can + // not be represented in XML, even using a numeric escape. Therefore, we + // Base64 encode the entire string and wrap it in a CDATA. + ret.clear(); + ret += ""; + break; } } return ret; } - void OnEvent(Event* event) + void DumpMeta(std::stringstream& data, Extensible* ext) + { + data << ""; + for(Extensible::ExtensibleStore::const_iterator i = ext->GetExtList().begin(); i != ext->GetExtList().end(); i++) + { + ExtensionItem* item = i->first; + std::string value = item->serialize(FORMAT_USER, ext, i->second); + if (!value.empty()) + data << "name << "\">" << Sanitize(value) << ""; + else if (!item->name.empty()) + data << "name << "\"/>"; + } + data << ""; + } + + void OnEvent(Event& event) CXX11_OVERRIDE { std::stringstream data(""); - if (event->GetEventID() == "httpd_url") + if (event.id == "httpd_url") { - ServerInstance->Logs->Log("m_http_stats", DEBUG,"Handling httpd event"); - HTTPRequest* http = (HTTPRequest*)event->GetData(); + ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Handling httpd event"); + HTTPRequest* http = (HTTPRequest*)&event; if ((http->GetURI() == "/stats") || (http->GetURI() == "/stats/")) { - data << ""; - - data << "" << ServerInstance->Config->ServerName << "" << Sanitize(ServerInstance->Config->ServerDesc) << ""; + data << "" << ServerInstance->Config->ServerName << "" + << Sanitize(ServerInstance->Config->ServerDesc) << "" + << Sanitize(ServerInstance->GetVersionString()) << ""; data << ""; - data << "" << ServerInstance->Users->clientlist->size() << ""; - data << "" << ServerInstance->chanlist->size() << ""; + data << "" << ServerInstance->Users->GetUsers().size() << ""; + data << "" << ServerInstance->GetChans().size() << ""; data << "" << ServerInstance->Users->all_opers.size() << ""; - data << "" << (ServerInstance->SE->GetMaxFds() - ServerInstance->SE->GetRemainingFds()) << "" << ServerInstance->SE->GetMaxFds() << "" << ServerInstance->SE->GetName() << ""; + data << "" << (SocketEngine::GetUsedFds()) << "" << SocketEngine::GetMaxFds() << "" INSPIRCD_SOCKETENGINE_NAME ""; time_t current_time = 0; current_time = ServerInstance->Time(); @@ -96,69 +115,103 @@ class ModuleHttpStats : public Module stime = gmtime(&server_uptime); data << "" << stime->tm_yday << "" << stime->tm_hour << "" << stime->tm_min << "" << stime->tm_sec << "" << ServerInstance->startup_time << ""; + data << ""; + const std::vector& isupport = ServerInstance->ISupport.GetLines(); + for (std::vector::const_iterator it = isupport.begin(); it != isupport.end(); it++) + { + data << Sanitize(*it) << std::endl; + } + data << ""; + std::vector xltypes = ServerInstance->XLines->GetAllTypes(); + for (std::vector::iterator it = xltypes.begin(); it != xltypes.end(); ++it) + { + XLineLookup* lookup = ServerInstance->XLines->GetAll(*it); + + if (!lookup) + continue; + for (LookupIter i = lookup->begin(); i != lookup->end(); ++i) + { + data << "c_str() << "\">" + << Sanitize(i->second->Displayable()) << "" + << i->second->set_time << "" << i->second->duration + << "" << Sanitize(i->second->reason) + << ""; + } + } - data << ""; - data << ""; - std::vector module_names = ServerInstance->Modules->GetAllModuleNames(0); + data << ""; + const ModuleManager::ModuleMap& mods = ServerInstance->Modules->GetModules(); - for (std::vector::iterator i = module_names.begin(); i != module_names.end(); ++i) + for (ModuleManager::ModuleMap::const_iterator i = mods.begin(); i != mods.end(); ++i) { - Module* m = ServerInstance->Modules->Find(i->c_str()); - Version v = m->GetVersion(); - data << "" << *i << "" << v.version << ""; + Version v = i->second->GetVersion(); + data << "" << i->first << "" << Sanitize(v.description) << ""; } - data << ""; - data << ""; + data << ""; - for (chan_hash::const_iterator a = ServerInstance->chanlist->begin(); a != ServerInstance->chanlist->end(); ++a) + const chan_hash& chans = ServerInstance->GetChans(); + for (chan_hash::const_iterator i = chans.begin(); i != chans.end(); ++i) { - Channel* c = a->second; + Channel* c = i->second; data << ""; - data << "" << c->GetUsers()->size() << "" << c->name << ""; - data << "" << c->GetOppedUsers()->size() << ""; - data << "" << c->GetHalfoppedUsers()->size() << ""; - data << "" << c->GetVoicedUsers()->size() << ""; + data << "" << c->GetUsers().size() << "" << Sanitize(c->name) << ""; data << ""; data << "" << Sanitize(c->topic) << ""; data << "" << Sanitize(c->setby) << ""; data << "" << c->topicset << ""; data << ""; data << "" << Sanitize(c->ChanModes(true)) << ""; - CUList* ulist = c->GetUsers(); - for (CUList::iterator x = ulist->begin(); x != ulist->end(); ++x) + const Channel::MemberMap& ulist = c->GetUsers(); + for (Channel::MemberMap::const_iterator x = ulist.begin(); x != ulist.end(); ++x) { - data << "" << x->first->uuid << "" << Sanitize(c->GetAllPrefixChars(x->first)) << ""; + Membership* memb = x->second; + data << "" << memb->user->uuid << "" + << Sanitize(memb->GetAllPrefixChars()) << "" + << memb->modes << ""; + DumpMeta(data, memb); + data << ""; } + DumpMeta(data, c); + data << ""; } data << ""; - for (user_hash::const_iterator a = ServerInstance->Users->clientlist->begin(); a != ServerInstance->Users->clientlist->end(); ++a) + const user_hash& users = ServerInstance->Users->GetUsers(); + for (user_hash::const_iterator i = users.begin(); i != users.end(); ++i) { - User* u = a->second; + User* u = i->second; data << ""; - data << "" << u->nick << "" << u->uuid << "" << u->host << "" << u->dhost << ""; - data << "" << Sanitize(u->fullname) << "" << u->server << "" << Sanitize(u->awaymsg) << "" << Sanitize(u->oper) << ""; - std::string modes; - for (unsigned char n = 'A'; n <= 'z'; ++n) - if (u->IsModeSet(n)) - modes += n; - - data << modes << "" << Sanitize(u->ident) << "" << u->GetServerPort() << "" << u->GetIPString() << ""; + data << "" << u->nick << "" << u->uuid << "" + << u->host << "" << u->dhost << "" + << Sanitize(u->fullname) << "" << u->server << ""; + if (u->IsAway()) + data << "" << Sanitize(u->awaymsg) << "" << u->awaytime << ""; + if (u->IsOper()) + data << "" << Sanitize(u->oper->name) << ""; + data << "" << u->FormatModes() << "" << Sanitize(u->ident) << ""; + LocalUser* lu = IS_LOCAL(u); + if (lu) + data << "" << lu->GetServerPort() << "" + << lu->server_sa.str() << ""; + data << "" << u->GetIPString() << ""; + + DumpMeta(data, u); + data << ""; } data << ""; - ProtoServerList sl; + ProtocolInterface::ServerList sl; ServerInstance->PI->GetServerList(sl); - for (ProtoServerList::iterator b = sl.begin(); b != sl.end(); ++b) + for (ProtocolInterface::ServerList::const_iterator b = sl.begin(); b != sl.end(); ++b) { data << ""; data << "" << b->servername << ""; @@ -171,39 +224,26 @@ class ModuleHttpStats : public Module data << ""; } - data << ""; - - data << ""; + data << ""; /* Send the document back to m_httpd */ - HTTPDocument response(http->sock, &data, 200); - response.headers.SetHeader("X-Powered-By", "m_httpd_stats.so"); + HTTPDocumentResponse response(this, *http, &data, 200); + response.headers.SetHeader("X-Powered-By", MODNAME); response.headers.SetHeader("Content-Type", "text/xml"); - Request req((char*)&response, (Module*)this, event->GetSource()); - req.Send(); + API->SendResponse(response); } } } - const char* OnRequest(Request* request) - { - return NULL; - } - - - virtual ~ModuleHttpStats() - { - } - - virtual Version GetVersion() + Version GetVersion() CXX11_OVERRIDE { - return Version("$Id$", VF_VENDOR, API_VERSION); + return Version("Provides statistics over HTTP via m_httpd.so", VF_VENDOR); } }; -static std::map const &init_entities() +static const insp::flat_map& init_entities() { - static std::map entities; + static insp::flat_map entities; entities['<'] = "lt"; entities['>'] = "gt"; entities['&'] = "amp"; @@ -211,6 +251,6 @@ static std::map const &init_entities() return entities; } -std::map const &ModuleHttpStats::entities = init_entities (); +const insp::flat_map& ModuleHttpStats::entities = init_entities(); MODULE_INIT(ModuleHttpStats)