X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_httpd_stats.cpp;h=46f474e2df2c8a61f9b2ef19cb85dd533e815e78;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=e68a3756f6a6ca299aa8973857982ed752aeb437;hpb=94288cdc2efb02eab9f27b3225adad839a7f2b58;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp
index e68a3756f..46f474e2d 100644
--- a/src/modules/m_httpd_stats.cpp
+++ b/src/modules/m_httpd_stats.cpp
@@ -2,49 +2,25 @@
  *       | Inspire 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.
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
+ *
  * This program is free but copyrighted software; see
- *	    the file COPYING for details.
+ *          the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include <stdio.h>
-#include "users.h"
-#include "channels.h"
-#include "configreader.h"
-#include "modules.h"
-#include "inspsocket.h"
-#include "helperfuncs.h"
-#include "httpd.h"
 #include "inspircd.h"
+#include "httpd.h"
+#include "protocol.h"
 
 /* $ModDesc: Provides statistics over HTTP via m_httpd.so */
-
-extern std::vector<userrec*> all_opers;
-extern InspIRCd* ServerInstance;
-
-extern int MODCOUNT;
-
-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();
+/* $ModDep: httpd.h */
 
 class ModuleHttpStats : public Module
 {
-	Server* Srv;
+	static std::map<char, char const*> const &entities;
 	std::string stylesheet;
 	bool changed;
 
@@ -56,37 +32,39 @@ class ModuleHttpStats : public Module
 		this->stylesheet = c.ReadValue("httpstats", "stylesheet", 0);
 	}
 
-	ModuleHttpStats(Server* Me) : Module::Module(Me)
-	{
-		Srv = Me;
+	ModuleHttpStats() 	{
 		ReadConfig();
-		this->changed = false;
+		this->changed = true;
+		Implementation eventlist[] = { I_OnEvent, I_OnRequest };
+		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 
-	void InsertOrder(irc::string channel, int count)
+	std::string Sanitize(const std::string &str)
 	{
-		/* 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++)
+		std::string ret;
+		ret.reserve(str.length() * 2);
+
+		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)
+			std::map<char, char const*>::const_iterator it = entities.find(*x);
+
+			if (it != entities.end())
+			{
+				ret += '&';
+				ret += it->second;
+				ret += ';';
+			}
+			else if (*x < 32 || *x > 126)
 			{
-				so->insert(a,std::pair<int,irc::string>(count,channel));
-				return;
+				int n = (unsigned char)*x;
+				ret += ("&#" + ConvToStr(n) + ";");
+			}
+			else
+			{
+				ret += *x;
 			}
 		}
-		/* There are no items in the list yet, insert something at the beginning */
-		so->insert(so->begin(), std::pair<int,irc::string>(count,channel));
-	}
-
-	void SortList()
-	{
-		/* 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;
+		return ret;
 	}
 
 	void OnEvent(Event* event)
@@ -95,185 +73,140 @@ class ModuleHttpStats : public Module
 
 		if (event->GetEventID() == "httpd_url")
 		{
+			ServerInstance->Logs->Log("m_http_stats", DEBUG,"Handling httpd event");
 			HTTPRequest* http = (HTTPRequest*)event->GetData();
 
 			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>" << 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 <= MODCOUNT; i++)
+				data << "<inspircdstats>";
+
+				data << "<server><name>" << ServerInstance->Config->ServerName << "</name><gecos>" << Sanitize(ServerInstance->Config->ServerDesc) << "</gecos></server>";
+
+				data << "<general>";
+				data << "<usercount>" << ServerInstance->Users->clientlist->size() << "</usercount>";
+				data << "<channelcount>" << ServerInstance->chanlist->size() << "</channelcount>";
+				data << "<opercount>" << ServerInstance->Users->all_opers.size() << "</opercount>";
+				data << "<socketcount>" << (ServerInstance->SE->GetUsedFds()) << "</socketcount><socketmax>" << ServerInstance->SE->GetMaxFds() << "</socketmax><socketengine>" << ServerInstance->SE->GetName() << "</socketengine>";
+
+				time_t current_time = 0;
+				current_time = ServerInstance->Time();
+				time_t server_uptime = current_time - ServerInstance->startup_time;
+				struct tm* stime;
+				stime = gmtime(&server_uptime);
+				data << "<uptime><days>" << stime->tm_yday << "</days><hours>" << stime->tm_hour << "</hours><mins>" << stime->tm_min << "</mins><secs>" << stime->tm_sec << "</secs><boot_time_t>" << ServerInstance->startup_time << "</boot_time_t></uptime>";
+
+
+				data << "</general>";
+				data << "<modulelist>";
+				std::vector<std::string> module_names = ServerInstance->Modules->GetAllModuleNames(0);
+
+				for (std::vector<std::string>::iterator i = module_names.begin(); i != module_names.end(); ++i)
 				{
-					if (ServerInstance->Config->module_names[i] != "")
-						data << "<tr><td>" << ServerInstance->Config->module_names[i] << "</td></tr>";
+					Module* m = ServerInstance->Modules->Find(i->c_str());
+					Version v = m->GetVersion();
+					data << "<module><name>" << *i << "</name><version>" << v.version << "</version></module>";
 				}
-				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 << "</modulelist>";
+				data << "<channellist>";
+
+				for (chan_hash::const_iterator a = ServerInstance->chanlist->begin(); a != ServerInstance->chanlist->end(); ++a)
 				{
-					chanrec* c = ServerInstance->FindChan(a->second.c_str());
-					if (c)
+					Channel* c = a->second;
+
+					data << "<channel>";
+					data << "<usercount>" << c->GetUsers()->size() << "</usercount><channelname>" << 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 UserMembList* ulist = c->GetUsers();
+
+					for (UserMembCIter x = ulist->begin(); x != ulist->end(); ++x)
 					{
-						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 << "<channelmember><uid>" << x->first->uuid << "</uid><privs>" << Sanitize(c->GetAllPrefixChars(x->first)) << "</privs></channelmember>";
 					}
+
+					data << "</channel>";
 				}
 
-				data << "</table>";
-				data << "</div>";
+				data << "</channellist><userlist>";
 
+				for (user_hash::const_iterator a = ServerInstance->Users->clientlist->begin(); a != ServerInstance->Users->clientlist->end(); ++a)
+				{
+					User* u = a->second;
+
+					data << "<user>";
+					data << "<nickname>" << u->nick << "</nickname><uuid>" << u->uuid << "</uuid><realhost>" << u->host << "</realhost><displayhost>" << u->dhost << "</displayhost>";
+					data << "<gecos>" << Sanitize(u->fullname) << "</gecos><server>" << u->server << "</server><away>" << Sanitize(u->awaymsg) << "</away><opertype>" << Sanitize(u->oper) << "</opertype><modes>";
+					std::string modes;
+					for (unsigned char n = 'A'; n <= 'z'; ++n)
+						if (u->IsModeSet(n))
+							modes += n;
+
+					data << modes << "</modes><ident>" << Sanitize(u->ident) << "</ident><port>" << u->GetServerPort() << "</port><ipaddress>" << u->GetIPString() << "</ipaddress>";
+					data << "</user>";
+				}
 
+				data << "</userlist><serverlist>";
 
+				ProtoServerList sl;
+				ServerInstance->PI->GetServerList(sl);
 
+				for (ProtoServerList::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>";
+				}
+
+				data << "</serverlist>";
 
-				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 << "</inspircdstats>";
 
 				/* 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");
+				HTTPDocument response(http->sock, &data, 200);
+				response.headers.SetHeader("X-Powered-By", "m_httpd_stats.so");
+				response.headers.SetHeader("Content-Type", "text/xml");
 				Request req((char*)&response, (Module*)this, event->GetSource());
 				req.Send();
-
-				log(DEBUG,"Sent");
-			}
-		}
-	}
-
-	void OnChannelDelete(chanrec* chan)
-	{
-		StatsIter a = sh->find(chan->name);
-		if (a != sh->end())
-		{
-			sh->erase(a);
-		}
-		this->changed = true;
-	}
-
-	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;
-	}
-
-	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;
-	}
-
-	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())
-				{
-					a->second--;
-				}
 			}
 		}
-		this->changed = true;
 	}
 
-	char* OnRequest(Request* request)
+	const char* OnRequest(Request* request)
 	{
 		return NULL;
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnEvent] = List[I_OnRequest] = List[I_OnChannelDelete] = List[I_OnUserJoin] = List[I_OnUserPart] = List[I_OnUserQuit] = 1;
-	}
 
 	virtual ~ModuleHttpStats()
 	{
-		delete sh;
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+		return Version("Provides statistics over HTTP via m_httpd.so", VF_VENDOR, API_VERSION);
 	}
 };
 
-
-class ModuleHttpStatsFactory : public ModuleFactory
+static std::map<char, char const*> const &init_entities()
 {
- public:
-	ModuleHttpStatsFactory()
-	{
-	}
-	
-	~ModuleHttpStatsFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(Server* Me)
-	{
-		return new ModuleHttpStats(Me);
-	}
-};
+	static std::map<char, char const*> entities;
+	entities['<'] = "lt";
+	entities['>'] = "gt";
+	entities['&'] = "amp";
+	entities['"'] = "quot";
+	return entities;
+}
 
+std::map<char, char const*> const &ModuleHttpStats::entities = init_entities ();
 
-extern "C" void * init_module( void )
-{
-	return new ModuleHttpStatsFactory;
-}
+MODULE_INIT(ModuleHttpStats)