X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_httpd_stats.cpp;h=5288130ce359c246ca3557e5956acc22740a1a40;hb=a8878569083bfa4753e9e118adee0ed1da6a0325;hp=9699ddca2397fc1e3574f8e58193f3ba48f8f8d3;hpb=a3719e0ad57b0c98471f71899658906fa5a3aaac;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp
index 9699ddca2..5288130ce 100644
--- a/src/modules/m_httpd_stats.cpp
+++ b/src/modules/m_httpd_stats.cpp
@@ -2,11 +2,11 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  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.
  *
  * ---------------------------------------------------
  */
@@ -16,11 +16,10 @@
 #include "protocol.h"
 
 /* $ModDesc: Provides statistics over HTTP via m_httpd.so */
-/* $ModDep: httpd.h */
 
 class ModuleHttpStats : public Module
 {
-	
+	static std::map<char, char const*> const &entities;
 	std::string stylesheet;
 	bool changed;
 
@@ -28,56 +27,100 @@ class ModuleHttpStats : public Module
 
 	void ReadConfig()
 	{
-		ConfigReader c(ServerInstance);
+		ConfigReader c;
 		this->stylesheet = c.ReadValue("httpstats", "stylesheet", 0);
 	}
 
-	ModuleHttpStats(InspIRCd* Me) : Module(Me)
-	{
+	ModuleHttpStats() 	{
 		ReadConfig();
 		this->changed = true;
-		Implementation eventlist[] = { I_OnEvent, I_OnRequest };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
+		Implementation eventlist[] = { I_OnEvent };
+		ServerInstance->Modules->Attach(eventlist, this, 1);
+	}
+
+	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 DumpMeta(std::stringstream& data, Extensible* ext)
+	{
+		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->key << "\">" << Sanitize(value) << "</meta>";
+			else if (!item->key.empty())
+				data << "<meta name=\"" << item->key << "\"/>";
+		}
+		data << "</metadata>";
 	}
 
-	void OnEvent(Event* event)
+	void OnEvent(Event& event)
 	{
 		std::stringstream data("");
 
-		if (event->GetEventID() == "httpd_url")
+		if (event.id == "httpd_url")
 		{
 			ServerInstance->Logs->Log("m_http_stats", DEBUG,"Handling httpd event");
-			HTTPRequest* http = (HTTPRequest*)event->GetData();
+			HTTPRequest* http = (HTTPRequest*)&event;
 
 			if ((http->GetURI() == "/stats") || (http->GetURI() == "/stats/"))
 			{
 				data << "<inspircdstats>";
 
-				data << "<server><name>" << ServerInstance->Config->ServerName << "</name><gecos>" << ServerInstance->Config->ServerDesc << "</gecos></server>";
+				data << "<server><name>" << ServerInstance->Config->ServerName << "</name><gecos>"
+					<< Sanitize(ServerInstance->Config->ServerDesc) << "</gecos><version>"
+					<< Sanitize(ServerInstance->GetVersionString()) << "</version><revision>"
+					<< Sanitize(ServerInstance->GetRevision()) << "</revision></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>";
+				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></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 << "<isupport>" << Sanitize(ServerInstance->Config->data005) << "</isupport></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 << "<module><name>" << *i << "</name><version>" << v.version << "</version><description>" << Sanitize(v.description) << "</description></module>";
 				}
 				data << "</modulelist>";
 				data << "<channellist>";
@@ -88,17 +131,26 @@ class ModuleHttpStats : public Module
 
 					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>";
-					CUList* ulist = c->GetUsers();
-
-					for (CUList::iterator x = ulist->begin(); x != ulist->end(); ++x)
+					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 << "<channelmember><uid>" << x->first->uuid << "</uid><privs>" << c->GetAllPrefixChars(x->first) << "</privs></channelmember>";
+						Membership* memb = x->second;
+						data << "<channelmember><uid>" << memb->user->uuid << "</uid><privs>"
+							<< Sanitize(c->GetAllPrefixChars(x->first)) << "</privs><modes>"
+							<< memb->modes << "</modes>";
+						DumpMeta(data, memb);
+						data << "</channelmember>";
 					}
+
+					DumpMeta(data, c);
+
 					data << "</channel>";
 				}
 
@@ -109,19 +161,25 @@ class ModuleHttpStats : public Module
 					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>" << u->fullname << "</gecos><server>" << u->server << "</server><away>" << u->awaymsg << "</away><opertype>" << 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>" << u->ident << "</ident><port>" << u->GetPort() << "</port><ipaddress>" << u->GetIPString() << "</ipaddress>";
+					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 << "</server>";
+					if (IS_AWAY(u))
+						data << "<away>" << Sanitize(u->awaymsg) << "</away><awaytime>" << u->awaytime << "</awaytime>";
+					if (IS_OPER(u))
+						data << "<opertype>" << Sanitize(u->oper) << "</opertype>";
+					data << "<modes>" << u->FormatModes() << "</modes><ident>" << Sanitize(u->ident) << "</ident>";
+					if (IS_LOCAL(u))
+						data << "<port>" << u->GetServerPort() << "</port><servaddr>" << irc::sockets::satouser(&u->server_sa) << "</servaddr>";
+					data << "<ipaddress>" << u->GetIPString() << "</ipaddress>";
+
+					DumpMeta(data, u);
+
 					data << "</user>";
 				}
 
 				data << "</userlist><serverlist>";
-				
+
 				ProtoServerList sl;
 				ServerInstance->PI->GetServerList(sl);
 
@@ -130,39 +188,47 @@ class ModuleHttpStats : public Module
 					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>";
+// This is currently not implemented, so, commented out.
+//					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);
+				HTTPDocumentResponse response(this, *http, &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();
+				response.Send();
 			}
 		}
 	}
 
-	const char* OnRequest(Request* request)
-	{
-		return NULL;
-	}
-
-
 	virtual ~ModuleHttpStats()
 	{
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version(1, 2, 0, 0, VF_VENDOR, API_VERSION);
+		return Version("Provides statistics over HTTP via m_httpd.so", VF_VENDOR);
 	}
 };
 
+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)