X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_httpd_stats.cpp;h=022d91f1e7d0836b0f70819d72cdb07dfaaac0a6;hb=61d586b1a3ad689669f6dcdc285b0d021ca814bd;hp=36deda11b5bb98e4e8a13ae7e3dbc18fb9d5b484;hpb=55b81f917cd313a8814d3364048af0036b41a2ca;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp index 36deda11b..022d91f1e 100644 --- a/src/modules/m_httpd_stats.cpp +++ b/src/modules/m_httpd_stats.cpp @@ -1,42 +1,40 @@ -/* +------------------------------------+ - * | 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 "modules/httpd.h" #include "xline.h" #include "protocol.h" -/* $ModDesc: Provides statistics over HTTP via m_httpd.so */ - class ModuleHttpStats : public Module { static std::map const &entities; - std::string stylesheet; - bool changed; + HTTPdAPI API; public: - - void ReadConfig() + ModuleHttpStats() + : API(this) { - ConfigReader c; - this->stylesheet = c.ReadValue("httpstats", "stylesheet", 0); - } - - ModuleHttpStats() { - ReadConfig(); - this->changed = true; - Implementation eventlist[] = { I_OnEvent }; - ServerInstance->Modules->Attach(eventlist, this, 1); } std::string Sanitize(const std::string &str) @@ -54,14 +52,22 @@ class ModuleHttpStats : public Module ret += it->second; ret += ';'; } - else if (*x < 32 || *x > 126) + else if (*x == 0x9 || *x == 0xA || *x == 0xD || *x >= 0x20) { - 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; @@ -75,20 +81,20 @@ class ModuleHttpStats : public Module ExtensionItem* item = i->first; std::string value = item->serialize(FORMAT_USER, ext, i->second); if (!value.empty()) - data << "key << "\">" << Sanitize(value) << ""; - else if (!item->key.empty()) - data << "key << "\"/>"; + data << "name << "\">" << Sanitize(value) << ""; + else if (!item->name.empty()) + data << "name << "\"/>"; } data << ""; } - void OnEvent(Event& event) + void OnEvent(Event& event) CXX11_OVERRIDE { std::stringstream data(""); if (event.id == "httpd_url") { - ServerInstance->Logs->Log("m_http_stats", DEBUG,"Handling httpd event"); + ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Handling httpd event"); HTTPRequest* http = (HTTPRequest*)&event; if ((http->GetURI() == "/stats") || (http->GetURI() == "/stats/")) @@ -110,7 +116,13 @@ 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 << "" << Sanitize(ServerInstance->Config->data005) << ""; + 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) { @@ -135,7 +147,7 @@ class ModuleHttpStats : public Module { Module* m = ServerInstance->Modules->Find(i->c_str()); Version v = m->GetVersion(); - data << "" << *i << "" << v.version << "" << Sanitize(v.description) << ""; + data << "" << *i << "" << Sanitize(v.description) << ""; } data << ""; @@ -144,7 +156,7 @@ class ModuleHttpStats : public Module Channel* c = a->second; data << ""; - data << "" << c->GetUsers()->size() << "" << c->name << ""; + data << "" << c->GetUsers()->size() << "" << Sanitize(c->name) << ""; data << ""; data << "" << Sanitize(c->topic) << ""; data << "" << Sanitize(c->setby) << ""; @@ -178,10 +190,10 @@ class ModuleHttpStats : public Module data << "" << u->nick << "" << u->uuid << "" << u->host << "" << u->dhost << "" << Sanitize(u->fullname) << "" << u->server << ""; - if (IS_AWAY(u)) + if (u->IsAway()) data << "" << Sanitize(u->awaymsg) << "" << u->awaytime << ""; - if (IS_OPER(u)) - data << "" << Sanitize(u->oper->NameStr()) << ""; + if (u->IsOper()) + data << "" << Sanitize(u->oper->name) << ""; data << "" << u->FormatModes() << "" << Sanitize(u->ident) << ""; LocalUser* lu = IS_LOCAL(u); if (lu) @@ -196,10 +208,10 @@ class ModuleHttpStats : public Module 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 << ""; @@ -216,18 +228,14 @@ class ModuleHttpStats : public Module /* Send the document back to m_httpd */ HTTPDocumentResponse response(this, *http, &data, 200); - response.headers.SetHeader("X-Powered-By", "m_httpd_stats.so"); + response.headers.SetHeader("X-Powered-By", MODNAME); response.headers.SetHeader("Content-Type", "text/xml"); - response.Send(); + API->SendResponse(response); } } } - virtual ~ModuleHttpStats() - { - } - - virtual Version GetVersion() + Version GetVersion() CXX11_OVERRIDE { return Version("Provides statistics over HTTP via m_httpd.so", VF_VENDOR); }