From e84858dc7f1efdfb76efc1e115e6999fd222af74 Mon Sep 17 00:00:00 2001 From: linuxdaemon Date: Mon, 28 Jan 2019 10:39:07 -0600 Subject: Refactor m_httpd_stats, add subpages (#1554) --- src/modules/m_httpd_stats.cpp | 414 +++++++++++++++++++++++++----------------- 1 file changed, 247 insertions(+), 167 deletions(-) (limited to 'src/modules/m_httpd_stats.cpp') diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp index 6db292eb3..4b18eadc4 100644 --- a/src/modules/m_httpd_stats.cpp +++ b/src/modules/m_httpd_stats.cpp @@ -25,34 +25,41 @@ #include "modules/httpd.h" #include "xline.h" -class ModuleHttpStats : public Module, public HTTPRequestEventListener +namespace Stats { - static const insp::flat_map& entities; - HTTPdAPI API; + struct Entities + { + static const insp::flat_map& entities; + }; - public: - ModuleHttpStats() - : HTTPRequestEventListener(this) - , API(this) + static const insp::flat_map& init_entities() { + static insp::flat_map entities; + entities['<'] = "lt"; + entities['>'] = "gt"; + entities['&'] = "amp"; + entities['"'] = "quot"; + return entities; } - std::string Sanitize(const std::string &str) + const insp::flat_map& Entities::entities = init_entities(); + + std::string Sanitize(const std::string& str) { std::string ret; ret.reserve(str.length() * 2); for (std::string::const_iterator x = str.begin(); x != str.end(); ++x) { - insp::flat_map::const_iterator it = entities.find(*x); + insp::flat_map::const_iterator it = Entities::entities.find(*x); - if (it != entities.end()) + if (it != Entities::entities.end()) { ret += '&'; ret += it->second; ret += ';'; } - else if (*x == 0x09 || *x == 0x0A || *x == 0x0D || ((*x >= 0x20) && (*x <= 0x7e))) + else if (*x == 0x09 || *x == 0x0A || *x == 0x0D || ((*x >= 0x20) && (*x <= 0x7e))) { // The XML specification defines the following characters as valid inside an XML document: // Char ::= #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD] | [#x10000-#x10FFFF] @@ -73,10 +80,10 @@ class ModuleHttpStats : public Module, public HTTPRequestEventListener return ret; } - void DumpMeta(std::stringstream& data, Extensible* ext) + void DumpMeta(std::ostream& data, Extensible* ext) { data << ""; - for(Extensible::ExtensibleStore::const_iterator i = ext->GetExtList().begin(); i != ext->GetExtList().end(); i++) + 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); @@ -88,156 +95,241 @@ class ModuleHttpStats : public Module, public HTTPRequestEventListener data << ""; } - ModResult HandleRequest(HTTPRequest* http) + std::ostream& ServerInfo(std::ostream& data) + { + return data << "" << ServerInstance->Config->ServerName << "" + << Sanitize(ServerInstance->Config->ServerDesc) << "" + << Sanitize(ServerInstance->GetVersionString()) << ""; + } + + std::ostream& ISupport(std::ostream& data) + { + data << ""; + const std::vector& isupport = ServerInstance->ISupport.GetLines(); + for (std::vector::const_iterator i = isupport.begin(); i != isupport.end(); ++i) + { + const Numeric::Numeric& num = *i; + for (std::vector::const_iterator j = num.GetParams().begin(); j != num.GetParams().end() - 1; ++j) + data << "" << Sanitize(*j) << ""; + } + return data << ""; + } + + std::ostream& General(std::ostream& data) + { + data << ""; + data << "" << ServerInstance->Users->GetUsers().size() << ""; + data << "" << ServerInstance->Users->GetLocalUsers().size() << ""; + data << "" << ServerInstance->GetChans().size() << ""; + data << "" << ServerInstance->Users->all_opers.size() << ""; + data << "" << (SocketEngine::GetUsedFds()) << "" << SocketEngine::GetMaxFds() << ""; + data << "" << ServerInstance->startup_time << ""; + + data << ISupport; + return data << ""; + } + + std::ostream& XLines(std::ostream& data) + { + 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) + << ""; + } + } + return data << ""; + } + + std::ostream& Modules(std::ostream& data) { - std::stringstream data(""); + data << ""; + const ModuleManager::ModuleMap& mods = ServerInstance->Modules->GetModules(); + for (ModuleManager::ModuleMap::const_iterator i = mods.begin(); i != mods.end(); ++i) { - ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Handling httpd event"); + Version v = i->second->GetVersion(); + data << "" << i->first << "" << Sanitize(v.description) << ""; + } + return data << ""; + } - if ((http->GetURI() == "/stats") || (http->GetURI() == "/stats/")) + std::ostream& Channels(std::ostream& data) + { + data << ""; + + const chan_hash& chans = ServerInstance->GetChans(); + for (chan_hash::const_iterator i = chans.begin(); i != chans.end(); ++i) + { + Channel* c = i->second; + + data << ""; + 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)) << ""; + + const Channel::MemberMap& ulist = c->GetUsers(); + for (Channel::MemberMap::const_iterator x = ulist.begin(); x != ulist.end(); ++x) { - data << "" << ServerInstance->Config->ServerName << "" - << Sanitize(ServerInstance->Config->ServerDesc) << "" - << Sanitize(ServerInstance->GetVersionString()) << ""; - - data << ""; - data << "" << ServerInstance->Users->GetUsers().size() << ""; - data << "" << ServerInstance->GetChans().size() << ""; - data << "" << ServerInstance->Users->all_opers.size() << ""; - data << "" << (SocketEngine::GetUsedFds()) << "" << SocketEngine::GetMaxFds() << ""; - data << "" << ServerInstance->startup_time << ""; - - data << ""; - const std::vector& isupport = ServerInstance->ISupport.GetLines(); - for (std::vector::const_iterator i = isupport.begin(); i != isupport.end(); ++i) - { - const Numeric::Numeric& num = *i; - for (std::vector::const_iterator j = num.GetParams().begin(); j != num.GetParams().end()-1; ++j) - data << "" << Sanitize(*j) << "" << 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 << ""; - const ModuleManager::ModuleMap& mods = ServerInstance->Modules->GetModules(); - - for (ModuleManager::ModuleMap::const_iterator i = mods.begin(); i != mods.end(); ++i) - { - Version v = i->second->GetVersion(); - data << "" << i->first << "" << Sanitize(v.description) << ""; - } - data << ""; - - const chan_hash& chans = ServerInstance->GetChans(); - for (chan_hash::const_iterator i = chans.begin(); i != chans.end(); ++i) - { - Channel* c = i->second; - - data << ""; - 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)) << ""; - - const Channel::MemberMap& ulist = c->GetUsers(); - for (Channel::MemberMap::const_iterator x = ulist.begin(); x != ulist.end(); ++x) - { - Membership* memb = x->second; - data << "" << memb->user->uuid << "" - << Sanitize(memb->GetAllPrefixChars()) << "" - << memb->modes << ""; - DumpMeta(data, memb); - data << ""; - } - - DumpMeta(data, c); - - data << ""; - } - - data << ""; - - const user_hash& users = ServerInstance->Users->GetUsers(); - for (user_hash::const_iterator i = users.begin(); i != users.end(); ++i) - { - User* u = i->second; - - data << ""; - data << "" << u->nick << "" << u->uuid << "" - << u->GetRealHost() << "" << u->GetDisplayedHost() << "" - << Sanitize(u->GetRealName()) << "" << u->server->GetName() << ""; - if (u->IsAway()) - data << "" << Sanitize(u->awaymsg) << "" << u->awaytime << ""; - if (u->IsOper()) - data << "" << Sanitize(u->oper->name) << ""; - data << "" << u->GetModeLetters().substr(1) << "" << 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 << ""; - - ProtocolInterface::ServerList sl; - ServerInstance->PI->GetServerList(sl); - - for (ProtocolInterface::ServerList::const_iterator b = sl.begin(); b != sl.end(); ++b) - { - data << ""; - data << "" << b->servername << ""; - data << "" << b->parentname << ""; - data << "" << Sanitize(b->description) << ""; - data << "" << b->usercount << ""; + Membership* memb = x->second; + data << "" << memb->user->uuid << "" + << Sanitize(memb->GetAllPrefixChars()) << "" + << memb->modes << ""; + DumpMeta(data, memb); + data << ""; + } + + DumpMeta(data, c); + + data << ""; + } + + return data << ""; + } + + std::ostream& Users(std::ostream& data) + { + data << ""; + const user_hash& users = ServerInstance->Users->GetUsers(); + for (user_hash::const_iterator i = users.begin(); i != users.end(); ++i) + { + User* u = i->second; + + data << ""; + data << "" << u->nick << "" << u->uuid << "" + << u->GetRealHost() << "" << u->GetDisplayedHost() << "" + << Sanitize(u->GetRealName()) << "" << u->server->GetName() << ""; + if (u->IsAway()) + data << "" << Sanitize(u->awaymsg) << "" << u->awaytime << ""; + if (u->IsOper()) + data << "" << Sanitize(u->oper->name) << ""; + data << "" << u->GetModeLetters().substr(1) << "" << Sanitize(u->ident) << ""; + LocalUser* lu = IS_LOCAL(u); + if (lu) + data << "" << lu->GetServerPort() << "" + << lu->server_sa.str() << ""; + data << "" << u->GetIPString() << ""; + + DumpMeta(data, u); + + data << ""; + } + return data << ""; + } + + std::ostream& Servers(std::ostream& data) + { + data << ""; + + ProtocolInterface::ServerList sl; + ServerInstance->PI->GetServerList(sl); + + for (ProtocolInterface::ServerList::const_iterator b = sl.begin(); b != sl.end(); ++b) + { + data << ""; + data << "" << b->servername << ""; + data << "" << b->parentname << ""; + data << "" << Sanitize(b->description) << ""; + data << "" << b->usercount << ""; // This is currently not implemented, so, commented out. // data << "" << b->opercount << ""; - data << "" << b->latencyms << ""; - data << ""; - } - - data << ""; - - const CommandParser::CommandMap& commands = ServerInstance->Parser.GetCommands(); - for (CommandParser::CommandMap::const_iterator i = commands.begin(); i != commands.end(); ++i) - { - data << "" << i->second->name << "" << i->second->use_count << ""; - } - - data << ""; - - /* Send the document back to m_httpd */ - HTTPDocumentResponse response(this, *http, &data, 200); - response.headers.SetHeader("X-Powered-By", MODNAME); - response.headers.SetHeader("Content-Type", "text/xml"); - API->SendResponse(response); - return MOD_RES_DENY; // Handled - } + data << "" << b->latencyms << ""; + data << ""; + } + + return data << ""; + } + + std::ostream& Commands(std::ostream& data) + { + data << ""; + + const CommandParser::CommandMap& commands = ServerInstance->Parser.GetCommands(); + for (CommandParser::CommandMap::const_iterator i = commands.begin(); i != commands.end(); ++i) + { + data << "" << i->second->name << "" << i->second->use_count << ""; + } + return data << ""; + } +} + +class ModuleHttpStats : public Module, public HTTPRequestEventListener +{ + HTTPdAPI API; + + public: + ModuleHttpStats() + : HTTPRequestEventListener(this) + , API(this) + { + } + + ModResult HandleRequest(HTTPRequest* http) + { + std::string uri = http->GetURI(); + + if (uri != "/stats" && uri.substr(0, 7) != "/stats/") + return MOD_RES_PASSTHRU; + + if (uri[uri.size() - 1] == '/') + uri.erase(uri.size() - 1, 1); + + ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Handling httpd event"); + + bool found = true; + std::stringstream data; + data << ""; + + if (uri == "/stats") + { + data << Stats::ServerInfo << Stats::General + << Stats::XLines << Stats::Modules + << Stats::Channels << Stats::Users + << Stats::Servers << Stats::Commands; + } + else if (uri == "/stats/general") + { + data << Stats::General; + } + else if (uri == "/stats/users") + { + data << Stats::Users; } - return MOD_RES_PASSTHRU; + else + { + found = false; + } + + if (found) + { + data << ""; + } + else + { + data.clear(); + data.str(std::string()); + } + + /* Send the document back to m_httpd */ + HTTPDocumentResponse response(this, *http, &data, found ? 200 : 404); + response.headers.SetHeader("X-Powered-By", MODNAME); + response.headers.SetHeader("Content-Type", "text/xml"); + API->SendResponse(response); + return MOD_RES_DENY; // Handled } ModResult OnHTTPRequest(HTTPRequest& req) CXX11_OVERRIDE @@ -251,16 +343,4 @@ class ModuleHttpStats : public Module, public HTTPRequestEventListener } }; -static const insp::flat_map& init_entities() -{ - static insp::flat_map entities; - entities['<'] = "lt"; - entities['>'] = "gt"; - entities['&'] = "amp"; - entities['"'] = "quot"; - return entities; -} - -const insp::flat_map& ModuleHttpStats::entities = init_entities(); - MODULE_INIT(ModuleHttpStats) -- cgit v1.2.3