X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_httpd_stats.cpp;h=5aa433318dd2d0c9070385b1f30bf8f99bc958d3;hb=e078fae142238765f279b50c309f22a5a0761ce4;hp=9e89bd1497e25688eb16fcf97658219b67416f57;hpb=4e7c9f5a9257723765f9994aff90440a0b6cf3c9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp
index 9e89bd149..5aa433318 100644
--- a/src/modules/m_httpd_stats.cpp
+++ b/src/modules/m_httpd_stats.cpp
@@ -2,249 +2,211 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
- *	    the file COPYING for details.
+ *          the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
 #include "inspircd.h"
 #include "httpd.h"
+#include "protocol.h"
 
 /* $ModDesc: Provides statistics over HTTP via m_httpd.so */
 /* $ModDep: httpd.h */
 
-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();
-
-static StatsHash* Servers = new StatsHash();
-
 class ModuleHttpStats : public Module
 {
-	
-	std::string stylesheet;
-	bool changed;
+        static std::map<char, char const*> const &entities;
+        std::string stylesheet;
+        bool changed;
 
  public:
 
-	void ReadConfig()
-	{
-		ConfigReader c(ServerInstance);
-		this->stylesheet = c.ReadValue("httpstats", "stylesheet", 0);
-	}
-
-	ModuleHttpStats(InspIRCd* Me) : Module(Me)
-	{
-		ReadConfig();
-		this->changed = true;
-	}
-
-	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++)
-		{
-			/* Found an item equal to or less than, we insert our item before it */
-			if (a->first <= count)
-			{
-				so->insert(a,std::pair<int,irc::string>(count,channel));
-				return;
-			}
-		}
-		/* 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);
-		for (user_hash::iterator u = ServerInstance->clientlist->begin(); u != ServerInstance->clientlist->end(); u++)
-		{
-			StatsHash::iterator n = Servers->find(u->second->server);
-			if (n != Servers->end())
-			{
-				n->second++;
-			}
-			else
-			{
-				Servers->insert(std::make_pair<irc::string,int>(u->second->server,1));
-			}
-		}
-		this->changed = false;
-	}
-
-	void OnEvent(Event* event)
-	{
-		std::stringstream data("");
-
-		if (event->GetEventID() == "httpd_url")
-		{
-			HTTPRequest* http = (HTTPRequest*)event->GetData();
-
-			if ((http->GetURI() == "/stats") || (http->GetURI() == "/stats/"))
-			{
-				data << "<inspircdstats>";
-
-				data << "<server><name>" << ServerInstance->Config->ServerName << "</name><gecos>" << ServerInstance->Config->ServerDesc << "</gecos></server>";
-
-				data << "<general>";
-				data << "<usercount>" << ServerInstance->clientlist->size() << "</usercount>";
-				data << "<channelcount>" << ServerInstance->chanlist->size() << "</channelcount>";
-				data << "<opercount>" << ServerInstance->all_opers.size() << "</opercount>";
-				data << "<socketcount>" << (ServerInstance->SE->GetMaxFds() - ServerInstance->SE->GetRemainingFds()) << "</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></uptime>";
-
-
-				data << "</general>";
-				data << "<modulelist>";
-				for (int i = 0; i <= ServerInstance->GetModuleCount(); i++)
-				{
-					if (!ServerInstance->Config->module_names[i].empty())
-					{
-						Version v = ServerInstance->modules[i]->GetVersion();
-						data << "<module><name>" << ServerInstance->Config->module_names[i] << "</name><version>" << 
-							v.Major << "." <<  v.Minor << "." << v.Revision << "." << v.Build << "</version></module>";
-					}
-				}
-				data << "</modulelist>";
-
-				data << "<channellist>";
-				/* 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();
-
-				for (SortedIter a = so->begin(); a != so->end(); a++)
-				{
-					chanrec* c = ServerInstance->FindChan(a->second.c_str());
-					if (c && !c->IsModeSet('s') && !c->IsModeSet('p'))
-					{
-						data << "<channel>";
-						data << "<usercount>" << c->GetUsers()->size() << "</usercount><channelname>" << c->name << "</channelname>";
-						data << "<channelops>" << c->GetOppedUsers()->size() << "</channelops>";
-						data << "<channelhalfops>" << c->GetHalfoppedUsers()->size() << "</channelhalfops>";
-						data << "<channelvoices>" << c->GetVoicedUsers()->size() << "</channelvoices>";
-						data << "<channeltopic>" << c->topic << "</channeltopic>";
-						data << "<channelmodes>" << c->ChanModes(false) << "</channelmodes>";
-						data << "</channel>";
-					}
-				}
-
-				data << "</channellist>";
-
-				data << "<serverlist>";
-				
-				for (StatsHash::iterator b = Servers->begin(); b != Servers->end(); b++)
-				{
-					data << "<server>";
-					data << "<servername>" << b->first << "</servername>";
-					data << "<usercount>" << b->second << "</usercount>";
-					data << "</server>";
-				}
-				data << "</serverlist>";
-
-				data << "</inspircdstats>";
-
-				/* Send the document back to m_httpd */
-				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();
-			}
-		}
-	}
-
-	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, bool &silent)
-	{
-		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, bool &silent)
-	{
-		StatsIter a = sh->find(channel->name);
-		if (a != sh->end())
-		{
-			a->second--;
-		}
-		this->changed = true;
-	}
-
-	void OnUserQuit(userrec* user, const std::string &message, const std::string &oper_message)
-	{
-		for (UCListIter v = user->chans.begin(); v != user->chans.end(); v++)
-		{
-			chanrec* c = v->first;
-			StatsIter a = sh->find(c->name);
-			if (a != sh->end())
-			{
-				a->second--;
-			}
-		}
-		this->changed = true;
-	}
-
-	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;
-		delete so;
-	}
-
-	virtual Version GetVersion()
-	{
-		return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
-	}
+        void ReadConfig()
+        {
+                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)
+        {
+                std::string ret;
+                ret.reserve(str.length() * 2);
+
+                for (std::string::const_iterator x = str.begin(); x != str.end(); ++x)
+                {
+                        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)
+                        {
+                                int n = (unsigned char)*x;
+                                ret += ("&#" + ConvToStr(n) + ";");
+                        }
+                        else
+                        {
+                                ret += *x;
+                        }
+                }
+                return ret;
+        }
+
+        void OnEvent(Event* event)
+        {
+                std::stringstream data("");
+
+                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 << "<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->GetMaxFds() - ServerInstance->SE->GetRemainingFds()) << "</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)
+                                {
+                                        Module* m = ServerInstance->Modules->Find(i->c_str());
+                                        Version v = m->GetVersion();
+                                        data << "<module><name>" << *i << "</name><version>" << v.Major << "." <<  v.Minor << "." << v.Revision << "." << v.Build << "</version></module>";
+                                }
+                                data << "</modulelist>";
+                                data << "<channellist>";
+
+                                for (chan_hash::const_iterator a = ServerInstance->chanlist->begin(); a != ServerInstance->chanlist->end(); ++a)
+                                {
+                                        Channel* c = a->second;
+
+                                        data << "<channel>";
+                                        data << "<usercount>" << c->GetUsers()->size() << "</usercount><channelname>" << c->name << "</channelname>";
+                                        data << "<channelops>" << c->GetOppedUsers()->size() << "</channelops>";
+                                        data << "<channelhalfops>" << c->GetHalfoppedUsers()->size() << "</channelhalfops>";
+                                        data << "<channelvoices>" << c->GetVoicedUsers()->size() << "</channelvoices>";
+                                        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>";
+                                        CUList* ulist = c->GetUsers();
+
+                                        for (CUList::iterator x = ulist->begin(); x != ulist->end(); ++x)
+                                        {
+                                                data << "<channelmember><uid>" << x->first->uuid << "</uid><privs>" << Sanitize(c->GetAllPrefixChars(x->first)) << "</privs></channelmember>";
+                                        }
+                                        data << "</channel>";
+                                }
+
+                                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->GetPort() << "</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>";
+                                        data << "<opercount>" << b->opercount << "</opercount>";
+                                        data << "<lagmillisecs>" << b->latencyms << "</lagmillisecs>";
+                                        data << "</server>";
+                                }
+                                data << "</serverlist>";
+
+                                data << "</inspircdstats>";
+
+                                /* Send the document back to m_httpd */
+                                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();
+                        }
+                }
+        }
+
+        const char* OnRequest(Request* request)
+        {
+                return NULL;
+        }
+
+
+        virtual ~ModuleHttpStats()
+        {
+        }
+
+        virtual Version GetVersion()
+        {
+                return Version(1, 2, 0, 0, VF_VENDOR, API_VERSION);
+        }
 };
 
+static std::map<char, char const*> const &init_entities()
+{
+        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 ();
+
 MODULE_INIT(ModuleHttpStats)