]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/m_httpd_stats.cpp
Mark +P mode as oper-only now that it no longer requires an explicit permission string
[user/henk/code/inspircd.git] / src / modules / m_httpd_stats.cpp
index 5e30c90ca4810bf5274b89c6a2b08c2ce4a36f89..00c6a5d7f7669f615803a37159ea5ce18d58337f 100644 (file)
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
 
 #include "inspircd.h"
 #include "httpd.h"
+#include "xline.h"
 #include "protocol.h"
 
 /* $ModDesc: Provides statistics over HTTP via m_httpd.so */
-/* $ModDep: httpd.h */
 
 class ModuleHttpStats : public Module
 {
@@ -67,6 +67,21 @@ class ModuleHttpStats : public Module
                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->name << "\">" << Sanitize(value) << "</meta>";
+                       else if (!item->name.empty())
+                               data << "<meta name=\"" << item->name << "\"/>";
+               }
+               data << "</metadata>";
+       }
+
        void OnEvent(Event& event)
        {
                std::stringstream data("");
@@ -78,9 +93,9 @@ class ModuleHttpStats : public Module
 
                        if ((http->GetURI() == "/stats") || (http->GetURI() == "/stats/"))
                        {
-                               data << "<inspircdstats>";
-
-                               data << "<server><name>" << ServerInstance->Config->ServerName << "</name><gecos>" << Sanitize(ServerInstance->Config->ServerDesc) << "</gecos></server>";
+                               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->clientlist->size() << "</usercount>";
@@ -95,19 +110,34 @@ class ModuleHttpStats : public Module
                                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 << "<isupport>" << Sanitize(ServerInstance->Config->data005) << "</isupport></general><xlines>";
+                               std::vector<std::string> xltypes = ServerInstance->XLines->GetAllTypes();
+                               for (std::vector<std::string>::iterator it = xltypes.begin(); it != xltypes.end(); ++it)
+                               {
+                                       XLineLookup* lookup = ServerInstance->XLines->GetAll(*it);
+
+                                       if (!lookup)
+                                               continue;
+                                       for (LookupIter i = lookup->begin(); i != lookup->end(); ++i)
+                                       {
+                                               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 << "</general>";
-                               data << "<modulelist>";
+                               data << "</xlines><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.version << "</version></module>";
+                                       data << "<module><name>" << *i << "</name><description>" << Sanitize(v.description) << "</description></module>";
                                }
-                               data << "</modulelist>";
-                               data << "<channellist>";
+                               data << "</modulelist><channellist>";
 
                                for (chan_hash::const_iterator a = ServerInstance->chanlist->begin(); a != ServerInstance->chanlist->end(); ++a)
                                {
@@ -125,9 +155,16 @@ class ModuleHttpStats : public Module
 
                                        for (UserMembCIter x = ulist->begin(); x != ulist->end(); ++x)
                                        {
-                                               data << "<channelmember><uid>" << x->first->uuid << "</uid><privs>" << Sanitize(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>";
                                }
 
@@ -138,14 +175,22 @@ 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>" << 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 << "<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->NameStr()) << "</opertype>";
+                                       data << "<modes>" << u->FormatModes() << "</modes><ident>" << Sanitize(u->ident) << "</ident>";
+                                       LocalUser* lu = IS_LOCAL(u);
+                                       if (lu)
+                                               data << "<port>" << lu->GetServerPort() << "</port><servaddr>"
+                                                       << irc::sockets::satouser(lu->server_sa) << "</servaddr>";
+                                       data << "<ipaddress>" << u->GetIPString() << "</ipaddress>";
+
+                                       DumpMeta(data, u);
+
                                        data << "</user>";
                                }
 
@@ -167,9 +212,7 @@ class ModuleHttpStats : public Module
                                        data << "</server>";
                                }
 
-                               data << "</serverlist>";
-
-                               data << "</inspircdstats>";
+                               data << "</serverlist></inspircdstats>";
 
                                /* Send the document back to m_httpd */
                                HTTPDocumentResponse response(this, *http, &data, 200);
@@ -186,7 +229,7 @@ class ModuleHttpStats : public Module
 
        virtual Version GetVersion()
        {
-               return Version("Provides statistics over HTTP via m_httpd.so", VF_VENDOR, API_VERSION);
+               return Version("Provides statistics over HTTP via m_httpd.so", VF_VENDOR);
        }
 };