X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_httpd_config.cpp;h=f729b277402e2dfb73ce3e3a057bf0957696aebf;hb=de4e4860091fe5a9a530acdb25f9a17e22323acf;hp=6fd7f405013e6fcc22092bd4c32ac5833bb5712b;hpb=ae6967b8b30ebc956e3158127ecba5d01dc09204;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_httpd_config.cpp b/src/modules/m_httpd_config.cpp index 6fd7f4050..f729b2774 100644 --- a/src/modules/m_httpd_config.cpp +++ b/src/modules/m_httpd_config.cpp @@ -32,83 +32,45 @@ class ModuleHttpConfig : public Module, public HTTPRequestEventListener { } - std::string Sanitize(const std::string &str) + ModResult OnHTTPRequest(HTTPRequest& request) CXX11_OVERRIDE { - std::string ret; + if ((request.GetURI() != "/config") && (request.GetURI() != "/config/")) + return MOD_RES_PASSTHRU; - 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; - } - - ModResult HandleRequest(HTTPRequest* http) - { - std::stringstream data(""); + ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Handling request for the HTTP /config route"); + std::stringstream buffer; + ConfigDataHash& config = ServerInstance->Config->config_data; + for (ConfigDataHash::const_iterator citer = config.begin(); citer != config.end(); ++citer) { - ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Handling httpd 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", MODNAME);
- response.headers.SetHeader("Content-Type", "text/html");
- API->SendResponse(response);
- return MOD_RES_DENY; // Handled
+ 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;
}
- return MOD_RES_PASSTHRU;
- }
- ModResult OnHTTPRequest(HTTPRequest& req) CXX11_OVERRIDE
- {
- return HandleRequest(&req);
+ 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;
}
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);
}
};