From 004c4cbe5f4c37cf455cb6d0caa434fbbb3406ea Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 2 Jan 2014 11:02:14 -0500 Subject: Move modules out of extras that dont have external dependencies --- data/modules.example.conf | 12 +- modules/extra/m_httpd.cpp | 474 --------------------- modules/extra/m_proxyscan.cpp | 379 ---------------- modules/extra/m_sql_log.cpp | 109 +++++ modules/extra/m_xmlrpc.cpp | 186 -------- modules/extra/m_xmlrpc_main.cpp | 280 ------------ modules/extra/webcpanel/CMakeLists.txt | 6 - modules/extra/webcpanel/pages/chanserv/access.cpp | 162 ------- modules/extra/webcpanel/pages/chanserv/access.h | 27 -- modules/extra/webcpanel/pages/chanserv/akick.cpp | 94 ---- modules/extra/webcpanel/pages/chanserv/akick.h | 27 -- modules/extra/webcpanel/pages/chanserv/drop.cpp | 58 --- modules/extra/webcpanel/pages/chanserv/drop.h | 25 -- modules/extra/webcpanel/pages/chanserv/info.cpp | 28 -- modules/extra/webcpanel/pages/chanserv/info.h | 25 -- modules/extra/webcpanel/pages/chanserv/modes.cpp | 108 ----- modules/extra/webcpanel/pages/chanserv/modes.h | 27 -- modules/extra/webcpanel/pages/chanserv/set.cpp | 155 ------- modules/extra/webcpanel/pages/chanserv/set.h | 27 -- modules/extra/webcpanel/pages/chanserv/utils.cpp | 45 -- modules/extra/webcpanel/pages/chanserv/utils.h | 19 - modules/extra/webcpanel/pages/confirm.cpp | 32 -- modules/extra/webcpanel/pages/confirm.h | 22 - modules/extra/webcpanel/pages/hostserv/request.cpp | 36 -- modules/extra/webcpanel/pages/hostserv/request.h | 24 -- modules/extra/webcpanel/pages/index.cpp | 99 ----- modules/extra/webcpanel/pages/index.h | 22 - modules/extra/webcpanel/pages/logout.cpp | 23 - modules/extra/webcpanel/pages/logout.h | 20 - modules/extra/webcpanel/pages/memoserv/memos.cpp | 115 ----- modules/extra/webcpanel/pages/memoserv/memos.h | 25 -- modules/extra/webcpanel/pages/nickserv/access.cpp | 40 -- modules/extra/webcpanel/pages/nickserv/access.h | 25 -- modules/extra/webcpanel/pages/nickserv/alist.cpp | 59 --- modules/extra/webcpanel/pages/nickserv/alist.h | 25 -- modules/extra/webcpanel/pages/nickserv/cert.cpp | 43 -- modules/extra/webcpanel/pages/nickserv/cert.h | 25 -- modules/extra/webcpanel/pages/nickserv/info.cpp | 118 ----- modules/extra/webcpanel/pages/nickserv/info.h | 25 -- modules/extra/webcpanel/pages/operserv/akill.cpp | 64 --- modules/extra/webcpanel/pages/operserv/akill.h | 25 -- modules/extra/webcpanel/pages/register.cpp | 24 -- modules/extra/webcpanel/pages/register.h | 22 - modules/extra/webcpanel/static_fileserver.cpp | 42 -- modules/extra/webcpanel/static_fileserver.h | 19 - modules/extra/webcpanel/template_fileserver.cpp | 261 ------------ modules/extra/webcpanel/template_fileserver.h | 27 -- .../templates/default/chanserv/access.html | 77 ---- .../templates/default/chanserv/akick.html | 61 --- .../templates/default/chanserv/chanlist.html | 17 - .../webcpanel/templates/default/chanserv/drop.html | 32 -- .../webcpanel/templates/default/chanserv/main.html | 3 - .../templates/default/chanserv/modes.html | 56 --- .../webcpanel/templates/default/chanserv/set.html | 93 ---- .../extra/webcpanel/templates/default/confirm.html | 51 --- .../extra/webcpanel/templates/default/cubes.png | Bin 723 -> 0 bytes .../extra/webcpanel/templates/default/favicon.ico | Bin 3774 -> 0 bytes .../extra/webcpanel/templates/default/footer.html | 14 - .../extra/webcpanel/templates/default/header.html | 64 --- .../templates/default/hostserv/request.html | 45 -- .../extra/webcpanel/templates/default/login.html | 55 --- modules/extra/webcpanel/templates/default/logo.png | Bin 19247 -> 0 bytes .../templates/default/memoserv/memos.html | 112 ----- .../templates/default/nickserv/access.html | 42 -- .../templates/default/nickserv/alist.html | 23 - .../webcpanel/templates/default/nickserv/cert.html | 42 -- .../webcpanel/templates/default/nickserv/info.html | 72 ---- .../templates/default/operserv/akill.html | 77 ---- .../webcpanel/templates/default/register.html | 65 --- .../extra/webcpanel/templates/default/style.css | 166 -------- modules/extra/webcpanel/webcpanel.cpp | 270 ------------ modules/extra/webcpanel/webcpanel.h | 178 -------- modules/m_httpd.cpp | 474 +++++++++++++++++++++ modules/m_proxyscan.cpp | 379 ++++++++++++++++ modules/m_sql_log.cpp | 109 ----- modules/m_xmlrpc.cpp | 186 ++++++++ modules/m_xmlrpc_main.cpp | 280 ++++++++++++ modules/webcpanel/CMakeLists.txt | 6 + modules/webcpanel/pages/chanserv/access.cpp | 162 +++++++ modules/webcpanel/pages/chanserv/access.h | 27 ++ modules/webcpanel/pages/chanserv/akick.cpp | 94 ++++ modules/webcpanel/pages/chanserv/akick.h | 27 ++ modules/webcpanel/pages/chanserv/drop.cpp | 58 +++ modules/webcpanel/pages/chanserv/drop.h | 25 ++ modules/webcpanel/pages/chanserv/info.cpp | 28 ++ modules/webcpanel/pages/chanserv/info.h | 25 ++ modules/webcpanel/pages/chanserv/modes.cpp | 108 +++++ modules/webcpanel/pages/chanserv/modes.h | 27 ++ modules/webcpanel/pages/chanserv/set.cpp | 155 +++++++ modules/webcpanel/pages/chanserv/set.h | 27 ++ modules/webcpanel/pages/chanserv/utils.cpp | 45 ++ modules/webcpanel/pages/chanserv/utils.h | 19 + modules/webcpanel/pages/confirm.cpp | 32 ++ modules/webcpanel/pages/confirm.h | 22 + modules/webcpanel/pages/hostserv/request.cpp | 36 ++ modules/webcpanel/pages/hostserv/request.h | 24 ++ modules/webcpanel/pages/index.cpp | 99 +++++ modules/webcpanel/pages/index.h | 22 + modules/webcpanel/pages/logout.cpp | 23 + modules/webcpanel/pages/logout.h | 20 + modules/webcpanel/pages/memoserv/memos.cpp | 115 +++++ modules/webcpanel/pages/memoserv/memos.h | 25 ++ modules/webcpanel/pages/nickserv/access.cpp | 40 ++ modules/webcpanel/pages/nickserv/access.h | 25 ++ modules/webcpanel/pages/nickserv/alist.cpp | 59 +++ modules/webcpanel/pages/nickserv/alist.h | 25 ++ modules/webcpanel/pages/nickserv/cert.cpp | 43 ++ modules/webcpanel/pages/nickserv/cert.h | 25 ++ modules/webcpanel/pages/nickserv/info.cpp | 118 +++++ modules/webcpanel/pages/nickserv/info.h | 25 ++ modules/webcpanel/pages/operserv/akill.cpp | 64 +++ modules/webcpanel/pages/operserv/akill.h | 25 ++ modules/webcpanel/pages/register.cpp | 24 ++ modules/webcpanel/pages/register.h | 22 + modules/webcpanel/static_fileserver.cpp | 42 ++ modules/webcpanel/static_fileserver.h | 19 + modules/webcpanel/template_fileserver.cpp | 261 ++++++++++++ modules/webcpanel/template_fileserver.h | 27 ++ .../templates/default/chanserv/access.html | 77 ++++ .../templates/default/chanserv/akick.html | 61 +++ .../templates/default/chanserv/chanlist.html | 17 + .../webcpanel/templates/default/chanserv/drop.html | 32 ++ .../webcpanel/templates/default/chanserv/main.html | 3 + .../templates/default/chanserv/modes.html | 56 +++ .../webcpanel/templates/default/chanserv/set.html | 93 ++++ modules/webcpanel/templates/default/confirm.html | 51 +++ modules/webcpanel/templates/default/cubes.png | Bin 0 -> 723 bytes modules/webcpanel/templates/default/favicon.ico | Bin 0 -> 3774 bytes modules/webcpanel/templates/default/footer.html | 14 + modules/webcpanel/templates/default/header.html | 64 +++ .../templates/default/hostserv/request.html | 45 ++ modules/webcpanel/templates/default/login.html | 55 +++ modules/webcpanel/templates/default/logo.png | Bin 0 -> 19247 bytes .../templates/default/memoserv/memos.html | 112 +++++ .../templates/default/nickserv/access.html | 42 ++ .../templates/default/nickserv/alist.html | 23 + .../webcpanel/templates/default/nickserv/cert.html | 42 ++ .../webcpanel/templates/default/nickserv/info.html | 72 ++++ .../templates/default/operserv/akill.html | 77 ++++ modules/webcpanel/templates/default/register.html | 65 +++ modules/webcpanel/templates/default/style.css | 166 ++++++++ modules/webcpanel/webcpanel.cpp | 270 ++++++++++++ modules/webcpanel/webcpanel.h | 178 ++++++++ 143 files changed, 5144 insertions(+), 5144 deletions(-) delete mode 100644 modules/extra/m_httpd.cpp delete mode 100644 modules/extra/m_proxyscan.cpp create mode 100644 modules/extra/m_sql_log.cpp delete mode 100644 modules/extra/m_xmlrpc.cpp delete mode 100644 modules/extra/m_xmlrpc_main.cpp delete mode 100644 modules/extra/webcpanel/CMakeLists.txt delete mode 100644 modules/extra/webcpanel/pages/chanserv/access.cpp delete mode 100644 modules/extra/webcpanel/pages/chanserv/access.h delete mode 100644 modules/extra/webcpanel/pages/chanserv/akick.cpp delete mode 100644 modules/extra/webcpanel/pages/chanserv/akick.h delete mode 100644 modules/extra/webcpanel/pages/chanserv/drop.cpp delete mode 100644 modules/extra/webcpanel/pages/chanserv/drop.h delete mode 100644 modules/extra/webcpanel/pages/chanserv/info.cpp delete mode 100644 modules/extra/webcpanel/pages/chanserv/info.h delete mode 100644 modules/extra/webcpanel/pages/chanserv/modes.cpp delete mode 100644 modules/extra/webcpanel/pages/chanserv/modes.h delete mode 100644 modules/extra/webcpanel/pages/chanserv/set.cpp delete mode 100644 modules/extra/webcpanel/pages/chanserv/set.h delete mode 100644 modules/extra/webcpanel/pages/chanserv/utils.cpp delete mode 100644 modules/extra/webcpanel/pages/chanserv/utils.h delete mode 100644 modules/extra/webcpanel/pages/confirm.cpp delete mode 100644 modules/extra/webcpanel/pages/confirm.h delete mode 100644 modules/extra/webcpanel/pages/hostserv/request.cpp delete mode 100644 modules/extra/webcpanel/pages/hostserv/request.h delete mode 100644 modules/extra/webcpanel/pages/index.cpp delete mode 100644 modules/extra/webcpanel/pages/index.h delete mode 100644 modules/extra/webcpanel/pages/logout.cpp delete mode 100644 modules/extra/webcpanel/pages/logout.h delete mode 100644 modules/extra/webcpanel/pages/memoserv/memos.cpp delete mode 100644 modules/extra/webcpanel/pages/memoserv/memos.h delete mode 100644 modules/extra/webcpanel/pages/nickserv/access.cpp delete mode 100644 modules/extra/webcpanel/pages/nickserv/access.h delete mode 100644 modules/extra/webcpanel/pages/nickserv/alist.cpp delete mode 100644 modules/extra/webcpanel/pages/nickserv/alist.h delete mode 100644 modules/extra/webcpanel/pages/nickserv/cert.cpp delete mode 100644 modules/extra/webcpanel/pages/nickserv/cert.h delete mode 100644 modules/extra/webcpanel/pages/nickserv/info.cpp delete mode 100644 modules/extra/webcpanel/pages/nickserv/info.h delete mode 100644 modules/extra/webcpanel/pages/operserv/akill.cpp delete mode 100644 modules/extra/webcpanel/pages/operserv/akill.h delete mode 100644 modules/extra/webcpanel/pages/register.cpp delete mode 100644 modules/extra/webcpanel/pages/register.h delete mode 100644 modules/extra/webcpanel/static_fileserver.cpp delete mode 100644 modules/extra/webcpanel/static_fileserver.h delete mode 100644 modules/extra/webcpanel/template_fileserver.cpp delete mode 100644 modules/extra/webcpanel/template_fileserver.h delete mode 100644 modules/extra/webcpanel/templates/default/chanserv/access.html delete mode 100644 modules/extra/webcpanel/templates/default/chanserv/akick.html delete mode 100644 modules/extra/webcpanel/templates/default/chanserv/chanlist.html delete mode 100644 modules/extra/webcpanel/templates/default/chanserv/drop.html delete mode 100644 modules/extra/webcpanel/templates/default/chanserv/main.html delete mode 100644 modules/extra/webcpanel/templates/default/chanserv/modes.html delete mode 100644 modules/extra/webcpanel/templates/default/chanserv/set.html delete mode 100644 modules/extra/webcpanel/templates/default/confirm.html delete mode 100644 modules/extra/webcpanel/templates/default/cubes.png delete mode 100644 modules/extra/webcpanel/templates/default/favicon.ico delete mode 100644 modules/extra/webcpanel/templates/default/footer.html delete mode 100644 modules/extra/webcpanel/templates/default/header.html delete mode 100644 modules/extra/webcpanel/templates/default/hostserv/request.html delete mode 100644 modules/extra/webcpanel/templates/default/login.html delete mode 100644 modules/extra/webcpanel/templates/default/logo.png delete mode 100644 modules/extra/webcpanel/templates/default/memoserv/memos.html delete mode 100644 modules/extra/webcpanel/templates/default/nickserv/access.html delete mode 100644 modules/extra/webcpanel/templates/default/nickserv/alist.html delete mode 100644 modules/extra/webcpanel/templates/default/nickserv/cert.html delete mode 100644 modules/extra/webcpanel/templates/default/nickserv/info.html delete mode 100644 modules/extra/webcpanel/templates/default/operserv/akill.html delete mode 100644 modules/extra/webcpanel/templates/default/register.html delete mode 100644 modules/extra/webcpanel/templates/default/style.css delete mode 100644 modules/extra/webcpanel/webcpanel.cpp delete mode 100644 modules/extra/webcpanel/webcpanel.h create mode 100644 modules/m_httpd.cpp create mode 100644 modules/m_proxyscan.cpp delete mode 100644 modules/m_sql_log.cpp create mode 100644 modules/m_xmlrpc.cpp create mode 100644 modules/m_xmlrpc_main.cpp create mode 100644 modules/webcpanel/CMakeLists.txt create mode 100644 modules/webcpanel/pages/chanserv/access.cpp create mode 100644 modules/webcpanel/pages/chanserv/access.h create mode 100644 modules/webcpanel/pages/chanserv/akick.cpp create mode 100644 modules/webcpanel/pages/chanserv/akick.h create mode 100644 modules/webcpanel/pages/chanserv/drop.cpp create mode 100644 modules/webcpanel/pages/chanserv/drop.h create mode 100644 modules/webcpanel/pages/chanserv/info.cpp create mode 100644 modules/webcpanel/pages/chanserv/info.h create mode 100644 modules/webcpanel/pages/chanserv/modes.cpp create mode 100644 modules/webcpanel/pages/chanserv/modes.h create mode 100644 modules/webcpanel/pages/chanserv/set.cpp create mode 100644 modules/webcpanel/pages/chanserv/set.h create mode 100644 modules/webcpanel/pages/chanserv/utils.cpp create mode 100644 modules/webcpanel/pages/chanserv/utils.h create mode 100644 modules/webcpanel/pages/confirm.cpp create mode 100644 modules/webcpanel/pages/confirm.h create mode 100644 modules/webcpanel/pages/hostserv/request.cpp create mode 100644 modules/webcpanel/pages/hostserv/request.h create mode 100644 modules/webcpanel/pages/index.cpp create mode 100644 modules/webcpanel/pages/index.h create mode 100644 modules/webcpanel/pages/logout.cpp create mode 100644 modules/webcpanel/pages/logout.h create mode 100644 modules/webcpanel/pages/memoserv/memos.cpp create mode 100644 modules/webcpanel/pages/memoserv/memos.h create mode 100644 modules/webcpanel/pages/nickserv/access.cpp create mode 100644 modules/webcpanel/pages/nickserv/access.h create mode 100644 modules/webcpanel/pages/nickserv/alist.cpp create mode 100644 modules/webcpanel/pages/nickserv/alist.h create mode 100644 modules/webcpanel/pages/nickserv/cert.cpp create mode 100644 modules/webcpanel/pages/nickserv/cert.h create mode 100644 modules/webcpanel/pages/nickserv/info.cpp create mode 100644 modules/webcpanel/pages/nickserv/info.h create mode 100644 modules/webcpanel/pages/operserv/akill.cpp create mode 100644 modules/webcpanel/pages/operserv/akill.h create mode 100644 modules/webcpanel/pages/register.cpp create mode 100644 modules/webcpanel/pages/register.h create mode 100644 modules/webcpanel/static_fileserver.cpp create mode 100644 modules/webcpanel/static_fileserver.h create mode 100644 modules/webcpanel/template_fileserver.cpp create mode 100644 modules/webcpanel/template_fileserver.h create mode 100644 modules/webcpanel/templates/default/chanserv/access.html create mode 100644 modules/webcpanel/templates/default/chanserv/akick.html create mode 100644 modules/webcpanel/templates/default/chanserv/chanlist.html create mode 100644 modules/webcpanel/templates/default/chanserv/drop.html create mode 100644 modules/webcpanel/templates/default/chanserv/main.html create mode 100644 modules/webcpanel/templates/default/chanserv/modes.html create mode 100644 modules/webcpanel/templates/default/chanserv/set.html create mode 100644 modules/webcpanel/templates/default/confirm.html create mode 100644 modules/webcpanel/templates/default/cubes.png create mode 100644 modules/webcpanel/templates/default/favicon.ico create mode 100644 modules/webcpanel/templates/default/footer.html create mode 100644 modules/webcpanel/templates/default/header.html create mode 100644 modules/webcpanel/templates/default/hostserv/request.html create mode 100644 modules/webcpanel/templates/default/login.html create mode 100644 modules/webcpanel/templates/default/logo.png create mode 100644 modules/webcpanel/templates/default/memoserv/memos.html create mode 100644 modules/webcpanel/templates/default/nickserv/access.html create mode 100644 modules/webcpanel/templates/default/nickserv/alist.html create mode 100644 modules/webcpanel/templates/default/nickserv/cert.html create mode 100644 modules/webcpanel/templates/default/nickserv/info.html create mode 100644 modules/webcpanel/templates/default/operserv/akill.html create mode 100644 modules/webcpanel/templates/default/register.html create mode 100644 modules/webcpanel/templates/default/style.css create mode 100644 modules/webcpanel/webcpanel.cpp create mode 100644 modules/webcpanel/webcpanel.h diff --git a/data/modules.example.conf b/data/modules.example.conf index 3fdd1c92b..a6c226750 100644 --- a/data/modules.example.conf +++ b/data/modules.example.conf @@ -159,7 +159,7 @@ module { name = "help" } } /* - * m_httpd [EXTRA] + * m_httpd * * Allows services to serve web pages. By itself, this module does nothing useful. * @@ -342,7 +342,7 @@ module { name = "help" } } /* - * m_proxyscan [EXTRA] + * m_proxyscan * * This module allows you to scan connecting clients for open proxies. * Note that using this will allow users to get the IP of your services. @@ -469,7 +469,7 @@ module { name = "help" } } /* - * m_sql_log + * m_sql_log [EXTRA] * * This module adds an additional target option to log{} blocks * that allows logging Service's logs to SQL. To log to SQL, add @@ -633,7 +633,7 @@ module { name = "help" } } /* - * m_xmlrpc [EXTRA] + * m_xmlrpc * * Allows remote applications (websites) to execute queries in real time to retrieve data from Anope. * By itself this module does nothing, but allows other modules (m_xmlrpc_main) to receive and send XMLRPC queries. @@ -647,7 +647,7 @@ module { name = "help" } } /* - * m_xmlrpc_main [EXTRA] + * m_xmlrpc_main * * Adds the main XMLRPC core functions. * Requires m_xmlrpc. @@ -655,7 +655,7 @@ module { name = "help" } #module { name = "m_xmlrpc_main" } /* - * webcpanel [EXTRA] + * webcpanel * * This module creates a web configuration panel that allows users and operators to perform any task * as they could over IRC. If you are using the default configuration you should be able to access diff --git a/modules/extra/m_httpd.cpp b/modules/extra/m_httpd.cpp deleted file mode 100644 index e08452d81..000000000 --- a/modules/extra/m_httpd.cpp +++ /dev/null @@ -1,474 +0,0 @@ -/* - * (C) 2003-2014 Anope Team - * Contact us at team@anope.org - * - * Please read COPYING and README for further details. - */ - -#include "module.h" -#include "modules/httpd.h" -#include "modules/ssl.h" - -static Anope::string BuildDate() -{ - char timebuf[64]; - struct tm *tm = localtime(&Anope::CurTime); - strftime(timebuf, sizeof(timebuf), "%a, %d %b %Y %H:%M:%S %Z", tm); - return timebuf; -} - -static Anope::string GetStatusFromCode(HTTPError err) -{ - switch (err) - { - case HTTP_ERROR_OK: - return "200 OK"; - case HTTP_FOUND: - return "302 Found"; - case HTTP_BAD_REQUEST: - return "400 Bad Request"; - case HTTP_PAGE_NOT_FOUND: - return "404 Not Found"; - case HTTP_NOT_SUPPORTED: - return "505 HTTP Version Not Supported"; - } - - return "501 Not Implemented"; -} - -class MyHTTPClient : public HTTPClient -{ - HTTPProvider *provider; - HTTPMessage message; - bool header_done, served; - Anope::string page_name; - Reference page; - Anope::string ip; - - unsigned content_length; - - enum - { - ACTION_NONE, - ACTION_GET, - ACTION_POST - } action; - - void Serve() - { - if (this->served) - return; - this->served = true; - - if (!this->page) - { - this->SendError(HTTP_PAGE_NOT_FOUND, "Page not found"); - return; - } - - if (this->ip == this->provider->ext_ip) - { - for (unsigned i = 0; i < this->provider->ext_headers.size(); ++i) - { - const Anope::string &token = this->provider->ext_headers[i]; - - if (this->message.headers.count(token)) - { - this->ip = this->message.headers[token]; - Log(LOG_DEBUG, "httpd") << "m_httpd: IP for connection " << this->GetFD() << " changed to " << this->ip; - break; - } - } - } - - Log(LOG_DEBUG, "httpd") << "m_httpd: Serving page " << this->page_name << " to " << this->ip; - - HTTPReply reply; - reply.content_type = this->page->GetContentType(); - - if (this->page->OnRequest(this->provider, this->page_name, this, this->message, reply)) - this->SendReply(&reply); - } - - public: - time_t created; - - MyHTTPClient(HTTPProvider *l, int f, const sockaddrs &a) : Socket(f, l->IsIPv6()), HTTPClient(l, f, a), provider(l), header_done(false), served(false), ip(a.addr()), content_length(0), action(ACTION_NONE), created(Anope::CurTime) - { - Log(LOG_DEBUG, "httpd") << "Accepted connection " << f << " from " << a.addr(); - } - - ~MyHTTPClient() - { - Log(LOG_DEBUG, "httpd") << "Closing connection " << this->GetFD() << " from " << this->ip; - } - - /* Close connection once all data is written */ - bool ProcessWrite() anope_override - { - return !BinarySocket::ProcessWrite() || this->write_buffer.empty() ? false : true; - } - - const Anope::string GetIP() anope_override - { - return this->ip; - } - - bool Read(const char *buffer, size_t l) anope_override - { - message.content.append(buffer, l); - - for (size_t nl; !this->header_done && (nl = message.content.find('\n')) != Anope::string::npos;) - { - Anope::string token = message.content.substr(0, nl).trim(); - message.content = message.content.substr(nl + 1); - - if (token.empty()) - this->header_done = true; - else - this->Read(token); - } - - if (!this->header_done) - return true; - - if (this->message.content.length() >= this->content_length) - { - sepstream sep(this->message.content, '&'); - Anope::string token; - - while (sep.GetToken(token)) - { - size_t sz = token.find('='); - if (sz == Anope::string::npos || !sz || sz + 1 >= token.length()) - continue; - this->message.post_data[token.substr(0, sz)] = HTTPUtils::URLDecode(token.substr(sz + 1)); - Log(LOG_DEBUG_2) << "HTTP POST from " << this->clientaddr.addr() << ": " << token.substr(0, sz) << ": " << this->message.post_data[token.substr(0, sz)]; - } - - this->Serve(); - } - - return true; - } - - bool Read(const Anope::string &buf) - { - Log(LOG_DEBUG_2) << "HTTP from " << this->clientaddr.addr() << ": " << buf; - - if (this->action == ACTION_NONE) - { - std::vector params; - spacesepstream(buf).GetTokens(params); - - if (params.empty() || (params[0] != "GET" && params[0] != "POST")) - { - this->SendError(HTTP_BAD_REQUEST, "Unknown operation"); - return true; - } - - if (params.size() != 3) - { - this->SendError(HTTP_BAD_REQUEST, "Invalid parameters"); - return true; - } - - if (params[0] == "GET") - this->action = ACTION_GET; - else if (params[0] == "POST") - this->action = ACTION_POST; - - Anope::string targ = params[1]; - size_t q = targ.find('?'); - if (q != Anope::string::npos) - { - sepstream sep(targ.substr(q + 1), '&'); - targ = targ.substr(0, q); - - Anope::string token; - while (sep.GetToken(token)) - { - size_t sz = token.find('='); - if (sz == Anope::string::npos || !sz || sz + 1 >= token.length()) - continue; - this->message.get_data[token.substr(0, sz)] = HTTPUtils::URLDecode(token.substr(sz + 1)); - } - } - - this->page = this->provider->FindPage(targ); - this->page_name = targ; - } - else if (buf.find("Cookie: ") == 0) - { - spacesepstream sep(buf.substr(8)); - Anope::string token; - - while (sep.GetToken(token)) - { - size_t sz = token.find('='); - if (sz == Anope::string::npos || !sz || sz + 1 >= token.length()) - continue; - size_t end = token.length() - (sz + 1); - if (!sep.StreamEnd()) - --end; // Remove trailing ; - this->message.cookies[token.substr(0, sz)] = token.substr(sz + 1, end); - } - } - else if (buf.find("Content-Length: ") == 0) - { - try - { - this->content_length = convertTo(buf.substr(16)); - } - catch (const ConvertException &ex) { } - } - else if (buf.find(':') != Anope::string::npos) - { - size_t sz = buf.find(':'); - if (sz + 2 < buf.length()) - this->message.headers[buf.substr(0, sz)] = buf.substr(sz + 2); - } - - return true; - } - - void SendError(HTTPError err, const Anope::string &msg) anope_override - { - HTTPReply h; - - h.error = err; - - h.Write(msg); - - this->SendReply(&h); - } - - void SendReply(HTTPReply *msg) anope_override - { - this->WriteClient("HTTP/1.1 " + GetStatusFromCode(msg->error)); - this->WriteClient("Date: " + BuildDate()); - this->WriteClient("Server: Anope-" + Anope::VersionShort()); - if (msg->content_type.empty()) - this->WriteClient("Content-Type: text/html"); - else - this->WriteClient("Content-Type: " + msg->content_type); - this->WriteClient("Content-Length: " + stringify(msg->length)); - - for (unsigned i = 0; i < msg->cookies.size(); ++i) - { - Anope::string buf = "Set-Cookie:"; - - for (HTTPReply::cookie::iterator it = msg->cookies[i].begin(), it_end = msg->cookies[i].end(); it != it_end; ++it) - buf += " " + it->first + "=" + it->second + ";"; - - buf.erase(buf.length() - 1); - - this->WriteClient(buf); - } - - typedef std::map map; - for (map::iterator it = msg->headers.begin(), it_end = msg->headers.end(); it != it_end; ++it) - this->WriteClient(it->first + ": " + it->second); - - this->WriteClient("Connection: Close"); - this->WriteClient(""); - - for (unsigned i = 0; i < msg->out.size(); ++i) - { - HTTPReply::Data* d = msg->out[i]; - - this->Write(d->buf, d->len); - - delete d; - } - - msg->out.clear(); - } -}; - -class MyHTTPProvider : public HTTPProvider, public Timer -{ - int timeout; - std::map pages; - std::list > clients; - - public: - MyHTTPProvider(Module *c, const Anope::string &n, const Anope::string &i, const unsigned short p, const int t, bool s) : Socket(-1, i.find(':') != Anope::string::npos), HTTPProvider(c, n, i, p, s), Timer(c, 10, Anope::CurTime, true), timeout(t) { } - - void Tick(time_t) anope_override - { - while (!this->clients.empty()) - { - Reference& c = this->clients.front(); - if (c && c->created + this->timeout >= Anope::CurTime) - break; - - delete c; - this->clients.pop_front(); - } - } - - ClientSocket* OnAccept(int fd, const sockaddrs &addr) anope_override - { - MyHTTPClient *c = new MyHTTPClient(this, fd, addr); - this->clients.push_back(c); - return c; - } - - bool RegisterPage(HTTPPage *page) anope_override - { - return this->pages.insert(std::make_pair(page->GetURL(), page)).second; - } - - void UnregisterPage(HTTPPage *page) anope_override - { - this->pages.erase(page->GetURL()); - } - - HTTPPage* FindPage(const Anope::string &pname) - { - if (this->pages.count(pname) == 0) - return NULL; - return this->pages[pname]; - } -}; - -class HTTPD : public Module -{ - ServiceReference sslref; - std::map providers; - public: - HTTPD(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, EXTRA | VENDOR), sslref("SSLService", "ssl") - { - - } - - ~HTTPD() - { - for (std::map::const_iterator it = SocketEngine::Sockets.begin(), it_end = SocketEngine::Sockets.end(); it != it_end;) - { - Socket *s = it->second; - ++it; - - if (dynamic_cast(s) || dynamic_cast(s)) - delete s; - } - - this->providers.clear(); - } - - void OnReload(Configuration::Conf *config) anope_override - { - Configuration::Block *conf = config->GetModule(this); - std::set existing; - - for (int i = 0; i < conf->CountBlock("httpd"); ++i) - { - Configuration::Block *block = conf->GetBlock("httpd", i); - - - const Anope::string &hname = block->Get("name", "httpd/main"); - existing.insert(hname); - - Anope::string ip = block->Get("ip"); - int port = block->Get("port", "8080"); - int timeout = block->Get("timeout", "30"); - bool ssl = block->Get("ssl", "no"); - Anope::string ext_ip = block->Get("extforward_ip"); - Anope::string ext_header = block->Get("extforward_header"); - - if (ip.empty()) - { - Log(this) << "You must configure a bind IP for HTTP server " << hname; - continue; - } - else if (port <= 0 || port > 65535) - { - Log(this) << "You must configure a (valid) listen port for HTTP server " << hname; - continue; - } - - MyHTTPProvider *p; - if (this->providers.count(hname) == 0) - { - try - { - p = new MyHTTPProvider(this, hname, ip, port, timeout, ssl); - if (ssl && sslref) - sslref->Init(p); - } - catch (const SocketException &ex) - { - Log(this) << "Unable to create HTTP server " << hname << ": " << ex.GetReason(); - continue; - } - this->providers[hname] = p; - - Log(this) << "Created HTTP server " << hname; - } - else - { - p = this->providers[hname]; - - if (p->GetIP() != ip || p->GetPort() != port) - { - delete p; - this->providers.erase(hname); - - Log(this) << "Changing HTTP server " << hname << " to " << ip << ":" << port; - - try - { - p = new MyHTTPProvider(this, hname, ip, port, timeout, ssl); - if (ssl && sslref) - sslref->Init(p); - } - catch (const SocketException &ex) - { - Log(this) << "Unable to create HTTP server " << hname << ": " << ex.GetReason(); - continue; - } - - this->providers[hname] = p; - } - } - - - p->ext_ip = ext_ip; - spacesepstream(ext_header).GetTokens(p->ext_headers); - } - - for (std::map::iterator it = this->providers.begin(), it_end = this->providers.end(); it != it_end;) - { - HTTPProvider *p = it->second; - ++it; - - if (existing.count(p->name) == 0) - { - Log(this) << "Removing HTTP server " << p->name; - this->providers.erase(p->name); - delete p; - } - } - } - - void OnModuleLoad(User *u, Module *m) anope_override - { - if (m->name != "m_ssl") - return; - - for (std::map::iterator it = this->providers.begin(), it_end = this->providers.end(); it != it_end; ++it) - { - MyHTTPProvider *p = it->second; - - if (p->IsSSL() && sslref) - try - { - sslref->Init(p); - } - catch (const CoreException &) { } // Throws on reinitialization - } - } -}; - -MODULE_INIT(HTTPD) diff --git a/modules/extra/m_proxyscan.cpp b/modules/extra/m_proxyscan.cpp deleted file mode 100644 index 98178260c..000000000 --- a/modules/extra/m_proxyscan.cpp +++ /dev/null @@ -1,379 +0,0 @@ -/* - * (C) 2003-2014 Anope Team - * Contact us at team@anope.org - * - * Please read COPYING and README for further details. - */ - -#include "module.h" - -struct ProxyCheck -{ - std::set types; - std::vector ports; - time_t duration; - Anope::string reason; -}; - -static Anope::string ProxyCheckString; -static Anope::string target_ip; -static unsigned short target_port; -static bool add_to_akill; - -class ProxyCallbackListener : public ListenSocket -{ - class ProxyCallbackClient : public ClientSocket, public BufferedSocket - { - public: - ProxyCallbackClient(ListenSocket *l, int f, const sockaddrs &a) : Socket(f, l->IsIPv6()), ClientSocket(l, a), BufferedSocket() - { - } - - void OnAccept() anope_override - { - this->Write(ProxyCheckString); - } - - bool ProcessWrite() anope_override - { - return !BufferedSocket::ProcessWrite() || this->write_buffer.empty() ? false : true; - } - }; - - public: - ProxyCallbackListener(const Anope::string &b, int p) : Socket(-1, b.find(':') != Anope::string::npos), ListenSocket(b, p, false) - { - } - - ClientSocket *OnAccept(int fd, const sockaddrs &addr) anope_override - { - return new ProxyCallbackClient(this, fd, addr); - } -}; - -class ProxyConnect : public ConnectionSocket -{ - static ServiceReference akills; - - public: - static std::set proxies; - - ProxyCheck proxy; - unsigned short port; - time_t created; - - ProxyConnect(ProxyCheck &p, unsigned short po) : Socket(-1), ConnectionSocket(), proxy(p), - port(po), created(Anope::CurTime) - { - proxies.insert(this); - } - - ~ProxyConnect() - { - proxies.erase(this); - } - - virtual void OnConnect() anope_override = 0; - virtual const Anope::string GetType() const = 0; - - protected: - void Ban() - { - Anope::string reason = this->proxy.reason; - - reason = reason.replace_all_cs("%t", this->GetType()); - reason = reason.replace_all_cs("%i", this->conaddr.addr()); - reason = reason.replace_all_cs("%p", stringify(this->conaddr.port())); - - BotInfo *OperServ = Config->GetClient("OperServ"); - Log(OperServ) << "PROXYSCAN: Open " << this->GetType() << " proxy found on " << this->conaddr.addr() << ":" << this->conaddr.port() << " (" << reason << ")"; - XLine *x = new XLine("*@" + this->conaddr.addr(), OperServ ? OperServ->nick : "", Anope::CurTime + this->proxy.duration, reason, XLineManager::GenerateUID()); - if (add_to_akill && akills) - { - akills->AddXLine(x); - akills->Send(NULL, x); - } - else - { - if (IRCD->CanSZLine) - IRCD->SendSZLine(NULL, x); - else - IRCD->SendAkill(NULL, x); - delete x; - } - } -}; -ServiceReference ProxyConnect::akills("XLineManager", "xlinemanager/sgline"); -std::set ProxyConnect::proxies; - -class HTTPProxyConnect : public ProxyConnect, public BufferedSocket -{ - public: - HTTPProxyConnect(ProxyCheck &p, unsigned short po) : Socket(-1), ProxyConnect(p, po), BufferedSocket() - { - } - - void OnConnect() anope_override - { - this->Write("CONNECT %s:%d HTTP/1.0", target_ip.c_str(), target_port); - this->Write("Content-length: 0"); - this->Write("Connection: close"); - this->Write(""); - } - - const Anope::string GetType() const anope_override - { - return "HTTP"; - } - - bool ProcessRead() anope_override - { - bool b = BufferedSocket::ProcessRead(); - if (this->GetLine() == ProxyCheckString) - { - this->Ban(); - return false; - } - return b; - } -}; - -class SOCKS5ProxyConnect : public ProxyConnect, public BinarySocket -{ - public: - SOCKS5ProxyConnect(ProxyCheck &p, unsigned short po) : Socket(-1), ProxyConnect(p, po), BinarySocket() - { - } - - void OnConnect() anope_override - { - sockaddrs target_addr; - char buf[4 + sizeof(target_addr.sa4.sin_addr.s_addr) + sizeof(target_addr.sa4.sin_port)]; - int ptr = 0; - target_addr.pton(AF_INET, target_ip, target_port); - if (!target_addr.valid()) - return; - - buf[ptr++] = 5; // Version - buf[ptr++] = 1; // # of methods - buf[ptr++] = 0; // No authentication - - this->Write(buf, ptr); - - ptr = 1; - buf[ptr++] = 1; // Connect - buf[ptr++] = 0; // Reserved - buf[ptr++] = 1; // IPv4 - memcpy(buf + ptr, &target_addr.sa4.sin_addr.s_addr, sizeof(target_addr.sa4.sin_addr.s_addr)); - ptr += sizeof(target_addr.sa4.sin_addr.s_addr); - memcpy(buf + ptr, &target_addr.sa4.sin_port, sizeof(target_addr.sa4.sin_port)); - ptr += sizeof(target_addr.sa4.sin_port); - - this->Write(buf, ptr); - } - - const Anope::string GetType() const anope_override - { - return "SOCKS5"; - } - - bool Read(const char *buffer, size_t l) anope_override - { - if (l >= ProxyCheckString.length() && !strncmp(buffer, ProxyCheckString.c_str(), ProxyCheckString.length())) - { - this->Ban(); - return false; - } - return true; - } -}; - -class ModuleProxyScan : public Module -{ - Anope::string listen_ip; - unsigned short listen_port; - Anope::string con_notice, con_source; - std::vector proxyscans; - - ProxyCallbackListener *listener; - - class ConnectionTimeout : public Timer - { - public: - ConnectionTimeout(Module *c, long timeout) : Timer(c, timeout, Anope::CurTime, true) - { - } - - void Tick(time_t) anope_override - { - for (std::set::iterator it = ProxyConnect::proxies.begin(), it_end = ProxyConnect::proxies.end(); it != it_end; ++it) - { - ProxyConnect *p = *it; - - if (p->created + this->GetSecs() < Anope::CurTime) - p->flags[SF_DEAD] = true; - } - } - } connectionTimeout; - - public: - ModuleProxyScan(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, EXTRA | VENDOR), - connectionTimeout(this, 5) - { - - - this->listener = NULL; - } - - ~ModuleProxyScan() - { - for (std::set::iterator it = ProxyConnect::proxies.begin(), it_end = ProxyConnect::proxies.end(); it != it_end;) - { - ProxyConnect *p = *it; - ++it; - delete p; - } - - for (std::map::const_iterator it = SocketEngine::Sockets.begin(), it_end = SocketEngine::Sockets.end(); it != it_end;) - { - Socket *s = it->second; - ++it; - - ClientSocket *cs = dynamic_cast(s); - if (cs != NULL && cs->ls == this->listener) - delete s; - } - - delete this->listener; - } - - void OnReload(Configuration::Conf *conf) anope_override - { - Configuration::Block *config = Config->GetModule(this); - - Anope::string s_target_ip = config->Get("target_ip"); - if (s_target_ip.empty()) - throw ConfigException(this->name + " target_ip may not be empty"); - - int s_target_port = config->Get("target_port", "-1"); - if (s_target_port <= 0) - throw ConfigException(this->name + " target_port may not be empty and must be a positive number"); - - Anope::string s_listen_ip = config->Get("listen_ip"); - if (s_listen_ip.empty()) - throw ConfigException(this->name + " listen_ip may not be empty"); - - int s_listen_port = config->Get("listen_port", "-1"); - if (s_listen_port <= 0) - throw ConfigException(this->name + " listen_port may not be empty and must be a positive number"); - - target_ip = s_target_ip; - target_port = s_target_port; - this->listen_ip = s_listen_ip; - this->listen_port = s_listen_port; - this->con_notice = config->Get("connect_notice"); - this->con_source = config->Get("connect_source"); - add_to_akill = config->Get("add_to_akill", "true"); - this->connectionTimeout.SetSecs(config->Get("timeout", "5s")); - - ProxyCheckString = Config->GetBlock("networkinfo")->Get("networkname") + " proxy check"; - delete this->listener; - this->listener = NULL; - try - { - this->listener = new ProxyCallbackListener(this->listen_ip, this->listen_port); - } - catch (const SocketException &ex) - { - throw ConfigException("m_proxyscan: " + ex.GetReason()); - } - - this->proxyscans.clear(); - for (int i = 0; i < config->CountBlock("proxyscan"); ++i) - { - Configuration::Block *block = config->GetBlock("proxyscan", i); - ProxyCheck p; - Anope::string token; - - commasepstream sep(block->Get("type")); - while (sep.GetToken(token)) - { - if (!token.equals_ci("HTTP") && !token.equals_ci("SOCKS5")) - continue; - p.types.insert(token); - } - if (p.types.empty()) - continue; - - commasepstream sep2(block->Get("port")); - while (sep2.GetToken(token)) - { - try - { - unsigned short port = convertTo(token); - p.ports.push_back(port); - } - catch (const ConvertException &) { } - } - if (p.ports.empty()) - continue; - - p.duration = block->Get("time", "4h"); - p.reason = block->Get("reason"); - if (p.reason.empty()) - continue; - - this->proxyscans.push_back(p); - } - } - - void OnUserConnect(User *user, bool &exempt) anope_override - { - if (exempt || user->Quitting() || !Me->IsSynced() || !user->server->IsSynced()) - return; - - /* At this time we only support IPv4 */ - sockaddrs user_ip; - user_ip.pton(AF_INET, user->ip); - if (!user_ip.valid()) - /* User doesn't have a valid IPv4 IP (ipv6/spoof/etc) */ - return; - - if (!this->con_notice.empty() && !this->con_source.empty()) - { - BotInfo *bi = BotInfo::Find(this->con_source); - if (bi) - user->SendMessage(bi, this->con_notice); - } - - for (unsigned i = this->proxyscans.size(); i > 0; --i) - { - ProxyCheck &p = this->proxyscans[i - 1]; - - for (std::set::iterator it = p.types.begin(), it_end = p.types.end(); it != it_end; ++it) - { - for (unsigned k = 0; k < p.ports.size(); ++k) - { - try - { - ProxyConnect *con = NULL; - if (it->equals_ci("HTTP")) - con = new HTTPProxyConnect(p, p.ports[k]); - else if (it->equals_ci("SOCKS5")) - con = new SOCKS5ProxyConnect(p, p.ports[k]); - else - continue; - con->Connect(user->ip, p.ports[k]); - } - catch (const SocketException &ex) - { - Log(LOG_DEBUG) << "m_proxyscan: " << ex.GetReason(); - } - } - } - } - } -}; - -MODULE_INIT(ModuleProxyScan) - diff --git a/modules/extra/m_sql_log.cpp b/modules/extra/m_sql_log.cpp new file mode 100644 index 000000000..b0c6c037f --- /dev/null +++ b/modules/extra/m_sql_log.cpp @@ -0,0 +1,109 @@ +/* + * + * (C) 2003-2014 Anope Team + * Contact us at team@anope.org + * + * Please read COPYING and README for further details. + * + */ + +#include "module.h" +#include "modules/sql.h" + +class SQLLog : public Module +{ + std::set inited; + Anope::string table; + + public: + SQLLog(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR) + { + } + + void OnReload(Configuration::Conf *conf) anope_override + { + Configuration::Block *config = conf->GetModule(this); + this->table = config->Get("table", "logs"); + } + + void OnLogMessage(LogInfo *li, const Log *l, const Anope::string &msg) anope_override + { + Anope::string ref_name; + ServiceReference SQL; + + for (unsigned i = 0; i < li->targets.size(); ++i) + { + const Anope::string &target = li->targets[i]; + size_t sz = target.find("sql_log:"); + if (!sz) + { + ref_name = target.substr(8); + SQL = ServiceReference("SQL::Provider", ref_name); + break; + } + } + + if (!SQL) + return; + + if (!inited.count(ref_name)) + { + inited.insert(ref_name); + + SQL::Query create("CREATE TABLE IF NOT EXISTS `" + table + "` (" + "`date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP," + "`type` varchar(64) NOT NULL," + "`user` varchar(64) NOT NULL," + "`acc` varchar(64) NOT NULL," + "`command` varchar(64) NOT NULL," + "`channel` varchar(64) NOT NULL," + "`msg` text NOT NULL" + ")"); + + SQL->Run(NULL, create); + } + + SQL::Query insert("INSERT INTO `" + table + "` (`type`,`user`,`acc`,`command`,`channel`,`msg`)" + "VALUES (@type@, @user@, @acc@, @command@, @channel@, @msg@)"); + + switch (l->type) + { + case LOG_ADMIN: + insert.SetValue("type", "ADMIN"); + break; + case LOG_OVERRIDE: + insert.SetValue("type", "OVERRIDE"); + break; + case LOG_COMMAND: + insert.SetValue("type", "COMMAND"); + break; + case LOG_SERVER: + insert.SetValue("type", "SERVER"); + break; + case LOG_CHANNEL: + insert.SetValue("type", "CHANNEL"); + break; + case LOG_USER: + insert.SetValue("type", "USER"); + break; + case LOG_MODULE: + insert.SetValue("type", "MODULE"); + break; + case LOG_NORMAL: + insert.SetValue("type", "NORMAL"); + break; + default: + return; + } + + insert.SetValue("user", l->u ? l->u->nick : ""); + insert.SetValue("acc", l->nc ? l->nc->display : ""); + insert.SetValue("command", l->c ? l->c->name : ""); + insert.SetValue("channel", l->ci ? l->ci->name : ""); + insert.SetValue("msg", msg); + + SQL->Run(NULL, insert); + } +}; + +MODULE_INIT(SQLLog) diff --git a/modules/extra/m_xmlrpc.cpp b/modules/extra/m_xmlrpc.cpp deleted file mode 100644 index 36401b800..000000000 --- a/modules/extra/m_xmlrpc.cpp +++ /dev/null @@ -1,186 +0,0 @@ - -#include "module.h" -#include "modules/xmlrpc.h" -#include "modules/httpd.h" - -static struct special_chars -{ - Anope::string character; - Anope::string replace; - - special_chars(const Anope::string &c, const Anope::string &r) : character(c), replace(r) { } -} -special[] = { - special_chars("&", "&"), - special_chars("\"", """), - special_chars("<", "<"), - special_chars(">", "&qt;"), - special_chars("'", "'"), - special_chars("\n", " "), - special_chars("\002", ""), // bold - special_chars("\003", ""), // color - special_chars("\035", ""), // italics - special_chars("\037", ""), // underline - special_chars("\026", ""), // reverses - special_chars("", "") -}; - -class MyXMLRPCServiceInterface : public XMLRPCServiceInterface, public HTTPPage -{ - std::deque events; - - public: - MyXMLRPCServiceInterface(Module *creator, const Anope::string &sname) : XMLRPCServiceInterface(creator, sname), HTTPPage("/xmlrpc", "text/xml") { } - - void Register(XMLRPCEvent *event) - { - this->events.push_back(event); - } - - void Unregister(XMLRPCEvent *event) - { - std::deque::iterator it = std::find(this->events.begin(), this->events.end(), event); - - if (it != this->events.end()) - this->events.erase(it); - } - - Anope::string Sanitize(const Anope::string &string) anope_override - { - Anope::string ret = string; - for (int i = 0; special[i].character.empty() == false; ++i) - ret = ret.replace_all_cs(special[i].character, special[i].replace); - return ret; - } - - private: - static bool GetData(Anope::string &content, Anope::string &tag, Anope::string &data) - { - if (content.empty()) - return false; - - Anope::string prev, cur; - bool istag; - - do - { - prev = cur; - cur.clear(); - - int len = 0; - istag = false; - - if (content[0] == '<') - { - len = content.find_first_of('>'); - istag = true; - } - else if (content[0] != '>') - { - len = content.find_first_of('<'); - } - - if (len) - { - if (istag) - { - cur = content.substr(1, len - 1); - content.erase(0, len + 1); - while (!content.empty() && content[0] == ' ') - content.erase(content.begin()); - } - else - { - cur = content.substr(0,len); - content.erase(0, len); - } - } - } - while (istag && !content.empty()); - - tag = prev; - data = cur; - return !istag && !data.empty(); - } - - public: - bool OnRequest(HTTPProvider *provider, const Anope::string &page_name, HTTPClient *client, HTTPMessage &message, HTTPReply &reply) anope_override - { - Anope::string content = message.content, tname, data; - XMLRPCRequest request(reply); - - while (GetData(content, tname, data)) - { - Log(LOG_DEBUG) << "m_xmlrpc: Tag name: " << tname << ", data: " << data; - if (tname == "methodName") - request.name = data; - else if (tname == "name" && data == "id") - { - GetData(content, tname, data); - request.id = data; - } - else if (tname == "string") - request.data.push_back(data); - } - - for (unsigned i = 0; i < this->events.size(); ++i) - { - XMLRPCEvent *e = this->events[i]; - - if (!e->Run(this, client, request)) - return false; - else if (!request.get_replies().empty()) - { - this->Reply(request); - return true; - } - } - - reply.error = HTTP_PAGE_NOT_FOUND; - reply.Write("Unrecognized query"); - return true; - } - - void Reply(XMLRPCRequest &request) - { - if (!request.id.empty()) - request.reply("id", request.id); - - Anope::string r = "\n\n" + request.name + "\n\n\n\n\n"; - for (std::map::const_iterator it = request.get_replies().begin(); it != request.get_replies().end(); ++it) - r += "\n" + it->first + "\n\n" + this->Sanitize(it->second) + "\n\n\n"; - r += "\n\n\n\n"; - - request.r.Write(r); - } -}; - -class ModuleXMLRPC : public Module -{ - ServiceReference httpref; - public: - MyXMLRPCServiceInterface xmlrpcinterface; - - ModuleXMLRPC(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, EXTRA | VENDOR), - httpref("HTTPProvider", "httpd/main"), xmlrpcinterface(this, "xmlrpc") - { - if (!httpref) - throw ModuleException("Unable to find http reference, is m_httpd loaded?"); - httpref->RegisterPage(&xmlrpcinterface); - - } - - ~ModuleXMLRPC() - { - if (httpref) - httpref->UnregisterPage(&xmlrpcinterface); - } - - void OnReload(Configuration::Conf *conf) anope_override - { - this->httpref = ServiceReference("HTTPProvider", conf->GetModule(this)->Get("server", "httpd/main")); - } -}; - -MODULE_INIT(ModuleXMLRPC) - diff --git a/modules/extra/m_xmlrpc_main.cpp b/modules/extra/m_xmlrpc_main.cpp deleted file mode 100644 index 17dd8b96f..000000000 --- a/modules/extra/m_xmlrpc_main.cpp +++ /dev/null @@ -1,280 +0,0 @@ -#include "module.h" -#include "modules/xmlrpc.h" - -static Module *me; - -class XMLRPCIdentifyRequest : public IdentifyRequest -{ - XMLRPCRequest request; - HTTPReply repl; /* Request holds a reference to the HTTPReply, because we might exist long enough to invalidate it - we'll copy it here then reset the reference before we use it */ - Reference client; - Reference xinterface; - - public: - XMLRPCIdentifyRequest(Module *m, XMLRPCRequest& req, HTTPClient *c, XMLRPCServiceInterface* iface, const Anope::string &acc, const Anope::string &pass) : IdentifyRequest(m, acc, pass), request(req), repl(request.r), client(c), xinterface(iface) { } - - void OnSuccess() anope_override - { - if (!xinterface || !client) - return; - - request.r = this->repl; - - request.reply("result", "Success"); - request.reply("account", GetAccount()); - - xinterface->Reply(request); - client->SendReply(&request.r); - } - - void OnFail() anope_override - { - if (!xinterface || !client) - return; - - request.r = this->repl; - - request.reply("error", "Invalid password"); - - xinterface->Reply(request); - client->SendReply(&request.r); - } -}; - -class MyXMLRPCEvent : public XMLRPCEvent -{ - public: - bool Run(XMLRPCServiceInterface *iface, HTTPClient *client, XMLRPCRequest &request) anope_override - { - if (request.name == "command") - this->DoCommand(iface, client, request); - else if (request.name == "checkAuthentication") - return this->DoCheckAuthentication(iface, client, request); - else if (request.name == "stats") - this->DoStats(iface, client, request); - else if (request.name == "channel") - this->DoChannel(iface, client, request); - else if (request.name == "user") - this->DoUser(iface, client, request); - else if (request.name == "opers") - this->DoOperType(iface, client, request); - - return true; - } - - private: - void DoCommand(XMLRPCServiceInterface *iface, HTTPClient *client, XMLRPCRequest &request) - { - Anope::string service = request.data.size() > 0 ? request.data[0] : ""; - Anope::string user = request.data.size() > 1 ? request.data[1] : ""; - Anope::string command = request.data.size() > 2 ? request.data[2] : ""; - - if (service.empty() || user.empty() || command.empty()) - request.reply("error", "Invalid parameters"); - else - { - BotInfo *bi = BotInfo::Find(service); - if (!bi) - request.reply("error", "Invalid service"); - else - { - request.reply("result", "Success"); - - NickAlias *na = NickAlias::Find(user); - - Anope::string out; - - struct XMLRPCommandReply : CommandReply - { - Anope::string &str; - - XMLRPCommandReply(Anope::string &s) : str(s) { } - - void SendMessage(BotInfo *, const Anope::string &msg) anope_override - { - str += msg + "\n"; - }; - } - reply(out); - - CommandSource source(user, NULL, na ? *na->nc : NULL, &reply, bi); - Command::Run(source, command); - - if (!out.empty()) - request.reply("return", iface->Sanitize(out)); - } - } - } - - bool DoCheckAuthentication(XMLRPCServiceInterface *iface, HTTPClient *client, XMLRPCRequest &request) - { - Anope::string username = request.data.size() > 0 ? request.data[0] : ""; - Anope::string password = request.data.size() > 1 ? request.data[1] : ""; - - if (username.empty() || password.empty()) - request.reply("error", "Invalid parameters"); - else - { - XMLRPCIdentifyRequest *req = new XMLRPCIdentifyRequest(me, request, client, iface, username, password); - FOREACH_MOD(OnCheckAuthentication, (NULL, req)); - req->Dispatch(); - return false; - } - - return true; - } - - void DoStats(XMLRPCServiceInterface *iface, HTTPClient *client, XMLRPCRequest &request) - { - request.reply("uptime", stringify(Anope::CurTime - Anope::StartTime)); - request.reply("uplinkname", Me->GetLinks().front()->GetName()); - { - Anope::string buf; - for (std::set::iterator it = Servers::Capab.begin(); it != Servers::Capab.end(); ++it) - buf += " " + *it; - if (!buf.empty()) - buf.erase(buf.begin()); - request.reply("uplinkcapab", buf); - } - request.reply("usercount", stringify(UserListByNick.size())); - request.reply("maxusercount", stringify(MaxUserCount)); - request.reply("channelcount", stringify(ChannelList.size())); - } - - void DoChannel(XMLRPCServiceInterface *iface, HTTPClient *client, XMLRPCRequest &request) - { - if (request.data.empty()) - return; - - Channel *c = Channel::Find(request.data[0]); - - request.reply("name", iface->Sanitize(c ? c->name : request.data[0])); - - if (c) - { - request.reply("bancount", stringify(c->HasMode("BAN"))); - int count = 0; - std::pair its = c->GetModeList("BAN"); - for (; its.first != its.second; ++its.first) - request.reply("ban" + stringify(++count), iface->Sanitize(its.first->second)); - - request.reply("exceptcount", stringify(c->HasMode("EXCEPT"))); - count = 0; - its = c->GetModeList("EXCEPT"); - for (; its.first != its.second; ++its.first) - request.reply("except" + stringify(++count), iface->Sanitize(its.first->second)); - - request.reply("invitecount", stringify(c->HasMode("INVITEOVERRIDE"))); - count = 0; - its = c->GetModeList("INVITEOVERRIDE"); - for (; its.first != its.second; ++its.first) - request.reply("invite" + stringify(++count), iface->Sanitize(its.first->second)); - - Anope::string users; - for (Channel::ChanUserList::const_iterator it = c->users.begin(); it != c->users.end(); ++it) - { - ChanUserContainer *uc = it->second; - users += uc->status.BuildModePrefixList() + uc->user->nick + " "; - } - if (!users.empty()) - { - users.erase(users.length() - 1); - request.reply("users", iface->Sanitize(users)); - } - - if (!c->topic.empty()) - request.reply("topic", iface->Sanitize(c->topic)); - - if (!c->topic_setter.empty()) - request.reply("topicsetter", iface->Sanitize(c->topic_setter)); - - request.reply("topictime", stringify(c->topic_time)); - request.reply("topicts", stringify(c->topic_ts)); - } - } - - void DoUser(XMLRPCServiceInterface *iface, HTTPClient *client, XMLRPCRequest &request) - { - if (request.data.empty()) - return; - - User *u = User::Find(request.data[0]); - - request.reply("nick", iface->Sanitize(u ? u->nick : request.data[0])); - - if (u) - { - request.reply("ident", iface->Sanitize(u->GetIdent())); - request.reply("vident", iface->Sanitize(u->GetVIdent())); - request.reply("host", iface->Sanitize(u->host)); - if (!u->vhost.empty()) - request.reply("vhost", iface->Sanitize(u->vhost)); - if (!u->chost.empty()) - request.reply("chost", iface->Sanitize(u->chost)); - if (!u->ip.empty()) - request.reply("ip", u->ip); - request.reply("timestamp", stringify(u->timestamp)); - request.reply("signon", stringify(u->signon)); - if (u->Account()) - { - request.reply("account", iface->Sanitize(u->Account()->display)); - if (u->Account()->o) - request.reply("opertype", iface->Sanitize(u->Account()->o->ot->GetName())); - } - - Anope::string channels; - for (User::ChanUserList::const_iterator it = u->chans.begin(); it != u->chans.end(); ++it) - { - ChanUserContainer *cc = it->second; - channels += cc->status.BuildModePrefixList() + cc->chan->name + " "; - } - if (!channels.empty()) - { - channels.erase(channels.length() - 1); - request.reply("channels", channels); - } - } - } - - void DoOperType(XMLRPCServiceInterface *iface, HTTPClient *client, XMLRPCRequest &request) - { - for (unsigned i = 0; i < Config->MyOperTypes.size(); ++i) - { - OperType *ot = Config->MyOperTypes[i]; - Anope::string perms; - for (std::list::const_iterator it2 = ot->GetPrivs().begin(), it2_end = ot->GetPrivs().end(); it2 != it2_end; ++it2) - perms += " " + *it2; - for (std::list::const_iterator it2 = ot->GetCommands().begin(), it2_end = ot->GetCommands().end(); it2 != it2_end; ++it2) - perms += " " + *it2; - request.reply(ot->GetName(), perms); - } - } -}; - -class ModuleXMLRPCMain : public Module -{ - ServiceReference xmlrpc; - - MyXMLRPCEvent stats; - - public: - ModuleXMLRPCMain(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, EXTRA | VENDOR), xmlrpc("XMLRPCServiceInterface", "xmlrpc") - { - me = this; - - if (!xmlrpc) - throw ModuleException("Unable to find xmlrpc reference, is m_xmlrpc loaded?"); - - xmlrpc->Register(&stats); - } - - ~ModuleXMLRPCMain() - { - if (xmlrpc) - xmlrpc->Unregister(&stats); - } -}; - -MODULE_INIT(ModuleXMLRPCMain) - diff --git a/modules/extra/webcpanel/CMakeLists.txt b/modules/extra/webcpanel/CMakeLists.txt deleted file mode 100644 index 247973f61..000000000 --- a/modules/extra/webcpanel/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -build_subdir(${CMAKE_CURRENT_SOURCE_DIR}) - -install(DIRECTORY templates - DESTINATION "${DB_DIR}/modules/webcpanel" -) - diff --git a/modules/extra/webcpanel/pages/chanserv/access.cpp b/modules/extra/webcpanel/pages/chanserv/access.cpp deleted file mode 100644 index d87613ed7..000000000 --- a/modules/extra/webcpanel/pages/chanserv/access.cpp +++ /dev/null @@ -1,162 +0,0 @@ -/* - * (C) 2003-2014 Anope Team - * Contact us at team@anope.org - * - * Please read COPYING and README for further details. - */ - -#include "../../webcpanel.h" -#include "utils.h" - -WebCPanel::ChanServ::Access::Access(const Anope::string &cat, const Anope::string &u) : WebPanelProtectedPage(cat, u) -{ -} - -bool WebCPanel::ChanServ::Access::OnRequest(HTTPProvider *server, const Anope::string &page_name, HTTPClient *client, HTTPMessage &message, HTTPReply &reply, NickAlias *na, TemplateFileServer::Replacements &replacements) -{ - TemplateFileServer Page("chanserv/access.html"); - const Anope::string &chname = message.get_data["channel"]; - - BuildChanList(na, replacements); - - if (chname.empty()) - { - Page.Serve(server, page_name, client, message, reply, replacements); - return true; - } - - ChannelInfo *ci = ChannelInfo::Find(chname); - - if (!ci) - { - replacements["MESSAGES"] = "Channel not registered."; - Page.Serve(server, page_name, client, message, reply, replacements); - return true; - } - - AccessGroup u_access = ci->AccessFor(na->nc); - bool has_priv = na->nc->IsServicesOper() && na->nc->o->ot->HasPriv("chanserv/access/modify"); - - if (!u_access.HasPriv("ACCESS_LIST") && !has_priv) - { - replacements["MESSAGES"] = "Access denied."; - Page.Serve(server, page_name, client, message, reply, replacements); - return true; - } - - replacements["ACCESS_LIST"] = "YES"; - - const ChanAccess *highest = u_access.Highest(); - - if (u_access.HasPriv("ACCESS_CHANGE") || has_priv) - { - if (message.get_data["del"].empty() == false && message.get_data["mask"].empty() == false) - { - std::vector params; - params.push_back(ci->name); - params.push_back("DEL"); - params.push_back(message.get_data["mask"]); - - WebPanel::RunCommand(na->nc->display, na->nc, "ChanServ", "chanserv/access", params, replacements); - } - else if (message.post_data["mask"].empty() == false && message.post_data["access"].empty() == false && message.post_data["provider"].empty() == false) - { - // Generic access add code here, works with any provider (so we can't call a command exactly) - AccessProvider *a = NULL; - for (std::list::const_iterator it = AccessProvider::GetProviders().begin(); it != AccessProvider::GetProviders().end(); ++it) - if ((*it)->name == message.post_data["provider"]) - a = *it; - - if (a) - { - bool denied = false; - - for (unsigned i = 0, end = ci->GetAccessCount(); i < end; ++i) - { - ChanAccess *acc = ci->GetAccess(i); - - if (acc->mask == message.post_data["mask"]) - { - if ((!highest || *acc >= *highest) && !u_access.founder && !has_priv) - { - replacements["MESSAGES"] = "Access denied"; - denied = true; - } - else - delete acc; - break; - } - } - - - unsigned access_max = Config->GetModule("chanserv")->Get("accessmax", "1024"); - if (access_max && ci->GetAccessCount() >= access_max) - replacements["MESSAGES"] = "Sorry, you can only have " + stringify(access_max) + " access entries on a channel."; - else if (!denied) - { - ChanAccess *new_acc = a->Create(); - new_acc->ci = ci; - new_acc->mask = message.post_data["mask"]; - new_acc->creator = na->nc->display; - try - { - new_acc->AccessUnserialize(message.post_data["access"]); - } - catch (...) - { - replacements["MESSAGES"] = "Invalid access expression for the given type"; - delete new_acc; - new_acc = NULL; - } - if (new_acc) - { - new_acc->last_seen = 0; - new_acc->created = Anope::CurTime; - - if ((!highest || *highest <= *new_acc) && !u_access.founder && !has_priv) - delete new_acc; - else if (new_acc->AccessSerialize().empty()) - { - replacements["MESSAGES"] = "Invalid access expression for the given type"; - delete new_acc; - } - else - { - ci->AddAccess(new_acc); - replacements["MESSAGES"] = "Access for " + new_acc->mask + " set to " + new_acc->AccessSerialize(); - } - } - } - } - } - } - - replacements["ESCAPED_CHANNEL"] = HTTPUtils::URLEncode(chname); - replacements["ACCESS_CHANGE"] = u_access.HasPriv("ACCESS_CHANGE") ? "YES" : "NO"; - - for (unsigned i = 0; i < ci->GetAccessCount(); ++i) - { - ChanAccess *access = ci->GetAccess(i); - - replacements["MASKS"] = HTTPUtils::Escape(access->mask); - replacements["ACCESSES"] = HTTPUtils::Escape(access->AccessSerialize()); - replacements["CREATORS"] = HTTPUtils::Escape(access->creator); - } - - for