X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_httpd_stats.cpp;h=37a7c34784d18ea73c7eb248031c102138ca4606;hb=73b5d276db1903256c7432e333b4db8d01d58d05;hp=ed7223f20e8aebc13bead0e77836e3e88f2c19d5;hpb=050e232499a04bb516c2dfee50b1f8c41ef1f5a6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp
index ed7223f20..37a7c3478 100644
--- a/src/modules/m_httpd_stats.cpp
+++ b/src/modules/m_httpd_stats.cpp
@@ -6,7 +6,7 @@
  * 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.
  *
  * ---------------------------------------------------
  */
@@ -20,7 +20,7 @@
 
 class ModuleHttpStats : public Module
 {
-	
+	static std::map<char, char const*> const &entities;
 	std::string stylesheet;
 	bool changed;
 
@@ -40,6 +40,34 @@ class ModuleHttpStats : public Module
 		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("");
@@ -53,31 +81,31 @@ class ModuleHttpStats : public Module
 			{
 				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></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->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 << "<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 << "<module><name>" << *i << "</name><version>" << v.version << "</version></module>";
 				}
 				data << "</modulelist>";
 				data << "<channellist>";
@@ -91,14 +119,19 @@ class ModuleHttpStats : public Module
 					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 << "<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>" << c->GetAllPrefixChars(x->first) << "</privs></channelmember>";
+						data << "<channelmember><uid>" << x->first->uuid << "</uid><privs>" << Sanitize(c->GetAllPrefixChars(x->first)) << "</privs></channelmember>";
 					}
+
 					data << "</channel>";
 				}
 
@@ -110,18 +143,18 @@ class ModuleHttpStats : public Module
 
 					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>";
+					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>";
+					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);
 
@@ -130,11 +163,13 @@ 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>";
 					data << "<lagmillisecs>" << b->latencyms << "</lagmillisecs>";
 					data << "</server>";
 				}
+
 				data << "</serverlist>";
 
 				data << "</inspircdstats>";
@@ -161,8 +196,20 @@ class ModuleHttpStats : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1, 2, 0, 0, VF_VENDOR, API_VERSION);
+		return Version("$Id$", 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)