X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_httpd_config.cpp;h=25d2f54bf369431b986d82139c8b83419aba9e86;hb=e86b4311c090d9f3d06c5762a978563acfd84039;hp=cfdaa4290c3bd0e525290c097db4a243b07e20dd;hpb=8790551dc182cd8804ee7d8ef89ccb31067cc2a4;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_httpd_config.cpp b/src/modules/m_httpd_config.cpp index cfdaa4290..25d2f54bf 100644 --- a/src/modules/m_httpd_config.cpp +++ b/src/modules/m_httpd_config.cpp @@ -20,91 +20,57 @@ #include "inspircd.h" #include "modules/httpd.h" -#include "protocol.h" -/* $ModDesc: Allows for the server configuration to be viewed over HTTP via m_httpd.so */ - -class ModuleHttpConfig : public Module +class ModuleHttpConfig : public Module, public HTTPRequestEventListener { + HTTPdAPI API; + public: - void init() + ModuleHttpConfig() + : HTTPRequestEventListener(this) + , API(this) { - Implementation eventlist[] = { I_OnEvent }; - ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); } - std::string Sanitize(const std::string &str) + ModResult OnHTTPRequest(HTTPRequest& request) CXX11_OVERRIDE { - std::string ret; - - for (std::string::const_iterator x = str.begin(); x != str.end(); ++x) - { - switch (*x) - { - case '<': - ret += "<"; - break; - case '>': - ret += ">"; - break; - case '&': - ret += "&"; - break; - case '"': - ret += """; - break; - default: - if (*x < 32 || *x > 126) - { - int n = *x; - ret += ("" + ConvToStr(n) + ";"); - } - else - ret += *x; - break; - } - } - return ret; - } + if ((request.GetPath() != "/config") && (request.GetPath() != "/config/")) + return MOD_RES_PASSTHRU; - void OnEvent(Event& event) - { - std::stringstream data(""); + ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Handling request for the HTTP /config route"); + std::stringstream buffer; - if (event.id == "httpd_url") + ConfigDataHash& config = ServerInstance->Config->config_data; + for (ConfigDataHash::const_iterator citer = config.begin(); citer != config.end(); ++citer) { - ServerInstance->Logs->Log("m_http_stats", LOG_DEBUG,"Handling httpd event"); - HTTPRequest* http = (HTTPRequest*)&event; + // Show the location of the tag in a comment. + ConfigTag* tag = citer->second; + buffer << "# " << tag->getTagLocation() << std::endl + << '<' << tag->tag << ' '; - if ((http->GetURI() == "/config") || (http->GetURI() == "/config/")) + // Print out the tag with all keys aligned vertically. + const std::string indent(tag->tag.length() + 2, ' '); + const ConfigItems& items = tag->getItems(); + for (ConfigItems::const_iterator kiter = items.begin(); kiter != items.end(); ) { - data << "
";
-
- for (ConfigDataHash::iterator x = ServerInstance->Config->config_data.begin(); x != ServerInstance->Config->config_data.end(); ++x)
- {
- data << "<" << x->first << " ";
- ConfigTag* tag = x->second;
- for (std::vector
";
- }
-
- data << "";
- /* Send the document back to m_httpd */
- HTTPDocumentResponse response(this, *http, &data, 200);
- response.headers.SetHeader("X-Powered-By", "m_httpd_config.so");
- response.headers.SetHeader("Content-Type", "text/html");
- response.Send();
+ ConfigItems::const_iterator curr = kiter++;
+ buffer << curr->first << "=\"" << ServerConfig::Escape(curr->second) << '"';
+ if (kiter != items.end())
+ buffer << std::endl << indent;
}
+ buffer << '>' << std::endl << std::endl;
}
+
+ HTTPDocumentResponse response(this, request, &buffer, 200);
+ response.headers.SetHeader("X-Powered-By", MODNAME);
+ response.headers.SetHeader("Content-Type", "text/plain");
+ API->SendResponse(response);
+ return MOD_RES_DENY;
}
- virtual Version GetVersion()
+ Version GetVersion() CXX11_OVERRIDE
{
- return Version("Allows for the server configuration to be viewed over HTTP via m_httpd.so", VF_VENDOR);
+ return Version("Allows for the server configuration to be viewed over HTTP via m_httpd", VF_VENDOR);
}
};