X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_httpd_stats.cpp;h=aa64dc3eabc63783a30a82f9cf38f91632bacae7;hb=da29af8cba49d51e53d6e68237ccbf6370b6dd1f;hp=29b9b190d1aa23ecf957d026cc007ef9e3de70ab;hpb=6050df73f498d05597fb37c6157868df1f6f4db2;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp
index 29b9b190d..eb8e856ac 100644
--- a/src/modules/m_httpd_stats.cpp
+++ b/src/modules/m_httpd_stats.cpp
@@ -1,276 +1,266 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *		       E-mail:
- *		<brain@chatspike.net>
- *	   	  <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
- * This program is free but copyrighted software; see
- *	    the file COPYING for details.
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2008 Pippijn van Steenhoven <pip88nl@gmail.com>
+ *   Copyright (C) 2006-2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *
- * ---------------------------------------------------
+ * 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 <http://www.gnu.org/licenses/>.
  */
 
-using namespace std;
-
-#include <stdio.h>
-#include "users.h"
-#include "channels.h"
-#include "configreader.h"
-#include "modules.h"
-#include "inspsocket.h"
 
-#include "httpd.h"
 #include "inspircd.h"
+#include "modules/httpd.h"
+#include "xline.h"
 
-/* $ModDesc: Provides statistics over HTTP via m_httpd.so */
-
-
-
-typedef std::map<irc::string,int> StatsHash;
-typedef StatsHash::iterator StatsIter;
-
-typedef std::vector<std::pair<int,irc::string> > SortedList;
-typedef SortedList::iterator SortedIter;
-
-static StatsHash* sh = new StatsHash();
-static SortedList* so = new SortedList();
-
-class ModuleHttpStats : public Module
+class ModuleHttpStats : public Module, public HTTPRequestEventListener
 {
-	
-	std::string stylesheet;
-	bool changed;
+	static const insp::flat_map<char, char const*>& entities;
+	HTTPdAPI API;
 
  public:
-
-	void ReadConfig()
+	ModuleHttpStats()
+		: HTTPRequestEventListener(this)
+		, API(this)
 	{
-		ConfigReader c(ServerInstance);
-		this->stylesheet = c.ReadValue("httpstats", "stylesheet", 0);
 	}
 
-	ModuleHttpStats(InspIRCd* Me) : Module::Module(Me)
+	std::string Sanitize(const std::string &str)
 	{
-		
-		ReadConfig();
-		this->changed = false;
-	}
+		std::string ret;
+		ret.reserve(str.length() * 2);
 
-	void InsertOrder(irc::string channel, int count)
-	{
-		/* This function figures out where in the sorted list to put an item from the hash */
-		SortedIter a;
-		for (a = so->begin(); a != so->end(); a++)
+		for (std::string::const_iterator x = str.begin(); x != str.end(); ++x)
 		{
-			/* Found an item equal to or less than, we insert our item before it */
-			if (a->first <= count)
+			insp::flat_map<char, char const*>::const_iterator it = entities.find(*x);
+
+			if (it != entities.end())
 			{
-				so->insert(a,std::pair<int,irc::string>(count,channel));
-				return;
+				ret += '&';
+				ret += it->second;
+				ret += ';';
+			}
+			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]
+				ret += *x;
+			}
+			else
+			{
+				// 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 += "<![CDATA[";
+				ret += BinToBase64(str);
+				ret += "]]>";
+				break;
 			}
 		}
-		/* There are no items in the list yet, insert something at the beginning */
-		so->insert(so->begin(), std::pair<int,irc::string>(count,channel));
+		return ret;
 	}
 
-	void SortList()
+	void DumpMeta(std::stringstream& data, Extensible* ext)
 	{
-		/* Sorts the hash into the sorted list using an insertion sort */
-		so->clear();
-		for (StatsIter a = sh->begin(); a != sh->end(); a++)
-			InsertOrder(a->first, a->second);
-		this->changed = false;
+		data << "<metadata>";
+		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 << "<meta name=\"" << item->name << "\">" << Sanitize(value) << "</meta>";
+			else if (!item->name.empty())
+				data << "<meta name=\"" << item->name << "\"/>";
+		}
+		data << "</metadata>";
 	}
 
-	void OnEvent(Event* event)
+	ModResult HandleRequest(HTTPRequest* http)
 	{
 		std::stringstream data("");
 
-		if (event->GetEventID() == "httpd_url")
 		{
-			HTTPRequest* http = (HTTPRequest*)event->GetData();
+			ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Handling httpd event");
 
 			if ((http->GetURI() == "/stats") || (http->GetURI() == "/stats/"))
 			{
-				data << "<!DOCTYPE html PUBLIC \
-					\"-//W3C//DTD XHTML 1.1//EN\" \
-					\"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">\n\
-					<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\">";
-
-				data << "<head>";
-				data << "<link rel='stylesheet' href='" << this->stylesheet << "' type='text/css' />";
-				data << "<title>InspIRCd server statisitics for " << ServerInstance->Config->ServerName << " (" << ServerInstance->Config->ServerDesc << ")</title>";
-				data << "</head><body>";
-				data << "<h1>InspIRCd server statisitics for " << ServerInstance->Config->ServerName << " (" << ServerInstance->Config->ServerDesc << ")</h1>";
-
-				data << "<div class='totals'>";
-				data << "<h2>Totals</h2>";
-				data << "<table>";
-				data << "<tr><td>Users</td><td>" << ServerInstance->clientlist.size() << "</td></tr>";
-				data << "<tr><td>Channels</td><td>" << ServerInstance->chanlist.size() << "</td></tr>";
-				data << "<tr><td>Opers</td><td>" << ServerInstance->all_opers.size() << "</td></tr>";
-				data << "<tr><td>Sockets</td><td>" << (ServerInstance->SE->GetMaxFds() - ServerInstance->SE->GetRemainingFds()) << " (Max: " << ServerInstance->SE->GetMaxFds() << " via socket engine '" << ServerInstance->SE->GetName() << "')</td></tr>";
-				data << "</table>";
-				data << "</div>";
-
-				data << "<div class='modules'>";
-				data << "<h2>Modules</h2>";
-				data << "<table>";
-				for (int i = 0; i <= ServerInstance->GetModuleCount(); i++)
+				data << "<inspircdstats><server><name>" << ServerInstance->Config->ServerName << "</name><gecos>"
+					<< Sanitize(ServerInstance->Config->ServerDesc) << "</gecos><version>"
+					<< Sanitize(ServerInstance->GetVersionString()) << "</version></server>";
+
+				data << "<general>";
+				data << "<usercount>" << ServerInstance->Users->GetUsers().size() << "</usercount>";
+				data << "<channelcount>" << ServerInstance->GetChans().size() << "</channelcount>";
+				data << "<opercount>" << ServerInstance->Users->all_opers.size() << "</opercount>";
+				data << "<socketcount>" << (SocketEngine::GetUsedFds()) << "</socketcount><socketmax>" << SocketEngine::GetMaxFds() << "</socketmax><socketengine>" INSPIRCD_SOCKETENGINE_NAME "</socketengine>";
+				data << "<uptime><boot_time_t>" << ServerInstance->startup_time << "</boot_time_t></uptime>";
+
+				data << "<isupport>";
+				const std::vector<Numeric::Numeric>& isupport = ServerInstance->ISupport.GetLines();
+				for (std::vector<Numeric::Numeric>::const_iterator i = isupport.begin(); i != isupport.end(); ++i)
 				{
-					if (ServerInstance->Config->module_names[i] != "")
-						data << "<tr><td>" << ServerInstance->Config->module_names[i] << "</td></tr>";
+					const Numeric::Numeric& num = *i;
+					for (std::vector<std::string>::const_iterator j = num.GetParams().begin(); j != num.GetParams().end()-1; ++j)
+						data << "<token>" << Sanitize(*j) << "</token>" << std::endl;
 				}
-				data << "</table>";
-				data << "</div>";
-
-				data << "<div class='channels'>";
-				data << "<h2>Channels</h2>";
-				data << "<table>";
-				data << "<tr><th>Users</th><th>Name</th><th>@</th><th>%</th><th>+</th><th>Topic</th></tr>";
-
-				/* If the list has changed since last time it was displayed, re-sort it
-				 * this time only (not every time, as this would be moronic)
-				 */
-				if (this->changed)
-					this->SortList();
-
-				int n = 0;
-				for (SortedIter a = so->begin(); ((a != so->end()) && (n < 25)); a++, n++)
+				data << "</isupport></general><xlines>";
+				std::vector<std::string> xltypes = ServerInstance->XLines->GetAllTypes();
+				for (std::vector<std::string>::iterator it = xltypes.begin(); it != xltypes.end(); ++it)
 				{
-					chanrec* c = ServerInstance->FindChan(a->second.c_str());
-					if (c)
+					XLineLookup* lookup = ServerInstance->XLines->GetAll(*it);
+
+					if (!lookup)
+						continue;
+					for (LookupIter i = lookup->begin(); i != lookup->end(); ++i)
 					{
-						data << "<tr><td>" << a->first << "</td><td>" << a->second << "</td>";
-						data << "<td>" << c->GetOppedUsers()->size() << "</td>";
-						data << "<td>" << c->GetHalfoppedUsers()->size() << "</td>";
-						data << "<td>" << c->GetVoicedUsers()->size() << "</td>";
-						data << "<td>" << c->topic << "</td>";
-						data << "</tr>";
+						data << "<xline type=\"" << it->c_str() << "\"><mask>"
+							<< Sanitize(i->second->Displayable()) << "</mask><settime>"
+							<< i->second->set_time << "</settime><duration>" << i->second->duration
+							<< "</duration><reason>" << Sanitize(i->second->reason)
+							<< "</reason></xline>";
 					}
 				}
 
-				data << "</table>";
-				data << "</div>";
+				data << "</xlines><modulelist>";
+				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 << "<module><name>" << i->first << "</name><description>" << Sanitize(v.description) << "</description></module>";
+				}
+				data << "</modulelist><channellist>";
 
+				const chan_hash& chans = ServerInstance->GetChans();
+				for (chan_hash::const_iterator i = chans.begin(); i != chans.end(); ++i)
+				{
+					Channel* c = i->second;
+
+					data << "<channel>";
+					data << "<usercount>" << c->GetUsers().size() << "</usercount><channelname>" << Sanitize(c->name) << "</channelname>";
+					data << "<channeltopic>";
+					data << "<topictext>" << Sanitize(c->topic) << "</topictext>";
+					data << "<setby>" << Sanitize(c->setby) << "</setby>";
+					data << "<settime>" << c->topicset << "</settime>";
+					data << "</channeltopic>";
+					data << "<channelmodes>" << Sanitize(c->ChanModes(true)) << "</channelmodes>";
+
+					const Channel::MemberMap& ulist = c->GetUsers();
+					for (Channel::MemberMap::const_iterator x = ulist.begin(); x != ulist.end(); ++x)
+					{
+						Membership* memb = x->second;
+						data << "<channelmember><uid>" << memb->user->uuid << "</uid><privs>"
+							<< Sanitize(memb->GetAllPrefixChars()) << "</privs><modes>"
+							<< memb->modes << "</modes>";
+						DumpMeta(data, memb);
+						data << "</channelmember>";
+					}
 
+					DumpMeta(data, c);
 
+					data << "</channel>";
+				}
 
-				data << "<div class='validion'>";
-				data << "<p><a href='http://validator.w3.org/check?uri=referer'><img src='http://www.w3.org/Icons/valid-xhtml11' alt='Valid XHTML 1.1' height='31' width='88' /></a></p>";
-				data << "</div>";
-				
-				data << "</body>";
-				data << "</html>";
+				data << "</channellist><userlist>";
 
-				/* Send the document back to m_httpd */
-				HTTPDocument response(http->sock, &data, 200, "X-Powered-By: m_http_stats.so\r\nContent-Type: text/html; charset=iso-8859-1\r\n");
-				Request req((char*)&response, (Module*)this, event->GetSource());
-				req.Send();
+				const user_hash& users = ServerInstance->Users->GetUsers();
+				for (user_hash::const_iterator i = users.begin(); i != users.end(); ++i)
+				{
+					User* u = i->second;
+
+					data << "<user>";
+					data << "<nickname>" << u->nick << "</nickname><uuid>" << u->uuid << "</uuid><realhost>"
+						<< u->host << "</realhost><displayhost>" << u->dhost << "</displayhost><gecos>"
+						<< Sanitize(u->fullname) << "</gecos><server>" << u->server->GetName() << "</server>";
+					if (u->IsAway())
+						data << "<away>" << Sanitize(u->awaymsg) << "</away><awaytime>" << u->awaytime << "</awaytime>";
+					if (u->IsOper())
+						data << "<opertype>" << Sanitize(u->oper->name) << "</opertype>";
+					data << "<modes>" << u->FormatModes() << "</modes><ident>" << Sanitize(u->ident) << "</ident>";
+					LocalUser* lu = IS_LOCAL(u);
+					if (lu)
+						data << "<port>" << lu->GetServerPort() << "</port><servaddr>"
+							<< lu->server_sa.str() << "</servaddr>";
+					data << "<ipaddress>" << u->GetIPString() << "</ipaddress>";
+
+					DumpMeta(data, u);
+
+					data << "</user>";
+				}
 
-				ServerInstance->Log(DEBUG,"Sent");
-			}
-		}
-	}
+				data << "</userlist><serverlist>";
 
-	void OnChannelDelete(chanrec* chan)
-	{
-		StatsIter a = sh->find(chan->name);
-		if (a != sh->end())
-		{
-			sh->erase(a);
-		}
-		this->changed = true;
-	}
+				ProtocolInterface::ServerList sl;
+				ServerInstance->PI->GetServerList(sl);
 
-	void OnUserJoin(userrec* user, chanrec* channel)
-	{
-		StatsIter a = sh->find(channel->name);
-		if (a != sh->end())
-		{
-			a->second++;
-		}
-		else
-		{
-			irc::string name = channel->name;
-			sh->insert(std::pair<irc::string,int>(name,1));
-		}
-		this->changed = true;
-	}
+				for (ProtocolInterface::ServerList::const_iterator b = sl.begin(); b != sl.end(); ++b)
+				{
+					data << "<server>";
+					data << "<servername>" << b->servername << "</servername>";
+					data << "<parentname>" << b->parentname << "</parentname>";
+					data << "<gecos>" << b->gecos << "</gecos>";
+					data << "<usercount>" << b->usercount << "</usercount>";
+// This is currently not implemented, so, commented out.
+//					data << "<opercount>" << b->opercount << "</opercount>";
+					data << "<lagmillisecs>" << b->latencyms << "</lagmillisecs>";
+					data << "</server>";
+				}
 
-	void OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage)
-	{
-		StatsIter a = sh->find(channel->name);
-		if (a != sh->end())
-		{
-			a->second--;
-		}
-		this->changed = true;
-	}
+				data << "</serverlist><commandlist>";
 
-	void OnUserQuit(userrec* user, const std::string &message)
-	{
-		for (std::vector<ucrec*>::const_iterator v = user->chans.begin(); v != user->chans.end(); v++)
-		{
-			if (((ucrec*)(*v))->channel)
-			{
-				chanrec* c = ((ucrec*)(*v))->channel;
-				StatsIter a = sh->find(c->name);
-				if (a != sh->end())
+				const CommandParser::CommandMap& commands = ServerInstance->Parser.GetCommands();
+				for (CommandParser::CommandMap::const_iterator i = commands.begin(); i != commands.end(); ++i)
 				{
-					a->second--;
+					data << "<command><name>" << i->second->name << "</name><usecount>" << i->second->use_count << "</usecount></command>";
 				}
-			}
-		}
-		this->changed = true;
-	}
 
-	char* OnRequest(Request* request)
-	{
-		return NULL;
-	}
+				data << "</commandlist></inspircdstats>";
 
-	void Implements(char* List)
-	{
-		List[I_OnEvent] = List[I_OnRequest] = List[I_OnChannelDelete] = List[I_OnUserJoin] = List[I_OnUserPart] = List[I_OnUserQuit] = 1;
+				/* 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
+			}
+		}
+		return MOD_RES_PASSTHRU;
 	}
 
-	virtual ~ModuleHttpStats()
+	ModResult OnHTTPRequest(HTTPRequest& req) CXX11_OVERRIDE
 	{
-		delete sh;
+		return HandleRequest(&req);
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+		return Version("Provides statistics over HTTP via m_httpd.so", VF_VENDOR);
 	}
 };
 
-
-class ModuleHttpStatsFactory : public ModuleFactory
+static const insp::flat_map<char, char const*>& init_entities()
 {
- public:
-	ModuleHttpStatsFactory()
-	{
-	}
-	
-	~ModuleHttpStatsFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleHttpStats(Me);
-	}
-};
+	static insp::flat_map<char, char const*> entities;
+	entities['<'] = "lt";
+	entities['>'] = "gt";
+	entities['&'] = "amp";
+	entities['"'] = "quot";
+	return entities;
+}
 
+const insp::flat_map<char, char const*>& ModuleHttpStats::entities = init_entities();
 
-extern "C" void * init_module( void )
-{
-	return new ModuleHttpStatsFactory;
-}
+MODULE_INIT(ModuleHttpStats)