X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/899b65fa18e88f77d584d79f71592a2b51a632c2..a84a49ca1eb7c31f79f6328e9dc453399ee120f9:/projects/stargazer/plugins/configuration/sgconfig/conn.cpp?ds=sidebyside diff --git a/projects/stargazer/plugins/configuration/sgconfig/conn.cpp b/projects/stargazer/plugins/configuration/sgconfig/conn.cpp index abcc677b..71de7356 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/conn.cpp +++ b/projects/stargazer/plugins/configuration/sgconfig/conn.cpp @@ -22,6 +22,7 @@ #include "stg/admins.h" #include "stg/admin.h" +#include "stg/logger.h" #include "stg/blowfish.h" #include "stg/bfstream.h" #include "stg/common.h" @@ -44,7 +45,8 @@ const char Conn::OK_LOGINS[] = "OKLS"; const char Conn::ERR_LOGINS[] = "ERLS"; Conn::Conn(const BASE_PARSER::REGISTRY & registry, - ADMINS & admins, int sock, const sockaddr_in& addr) + ADMINS & admins, int sock, const sockaddr_in& addr, + PLUGIN_LOGGER & logger) : m_registry(registry), m_admins(admins), m_admin(NULL), @@ -57,7 +59,13 @@ Conn::Conn(const BASE_PARSER::REGISTRY & registry, m_buffer(m_header), m_bufferSize(sizeof(m_header)), m_stream(NULL), + m_logger(logger), +#ifdef DUMPCRYPTO + m_dataState(false, *this), + m_dumper(endpoint()) +#else m_dataState(false, *this) +#endif { if (m_xmlParser == NULL) throw Error("Failed to create XML parser."); @@ -73,6 +81,9 @@ Conn::~Conn() close(m_sock); XML_ParserFree(m_xmlParser); + + delete m_stream; + delete m_parser; } bool Conn::Read() @@ -80,19 +91,21 @@ bool Conn::Read() ssize_t res = read(m_sock, m_buffer, m_bufferSize); if (res < 0) { - printfd(__FILE__, "Failed to read data from %s:%d: '%s'.\n", inet_ntostring(IP()).c_str(), Port(), strerror(errno)); m_state = ERROR; - // TODO: log it + Log(__FILE__, "Failed to read data from " + endpoint() + ". Reason: '" + strerror(errno) + "'"); return false; } if (res == 0 && m_state != DATA) // EOF is ok for data. { - printfd(__FILE__, "Failed to read data from %s:%d: 'EOF'.\n", inet_ntostring(IP()).c_str(), Port()); m_state = ERROR; - // TODO: log it + Log(__FILE__, "Failed to read data from " + endpoint() + ". Unexpected EOF."); return false; } +#ifdef DUMPCRYPTO + m_dumper.write(m_buffer, res); +#endif m_bufferSize -= res; + m_buffer = static_cast(m_buffer) + res; return HandleBuffer(res); } @@ -101,7 +114,8 @@ bool Conn::WriteAnswer(const void* buffer, size_t size) ssize_t res = write(m_sock, buffer, size); if (res < 0) { - // TODO: log it + m_state = ERROR; + Log(__FILE__, "Failed to write data to " + endpoint() + ". Reason: '" + strerror(errno) + "'."); return false; } return true; @@ -109,7 +123,7 @@ bool Conn::WriteAnswer(const void* buffer, size_t size) BASE_PARSER * Conn::GetParser(const std::string & tag) const { - BASE_PARSER::REGISTRY::const_iterator it = m_registry.find(tag); + BASE_PARSER::REGISTRY::const_iterator it = m_registry.find(ToLower(tag)); if (it == m_registry.end()) return NULL; return it->second->create(*m_admin); @@ -117,7 +131,6 @@ BASE_PARSER * Conn::GetParser(const std::string & tag) const bool Conn::HandleBuffer(size_t size) { - printfd(__FILE__, "Got %d bytes. State: %s.\n", size, (m_state == DATA ? "DATA" : (m_state == HEADER ? "HEADER" : (m_state == LOGIN ? "LOGIN" : (m_state == CRYPTO_LOGIN ? "CRYPTO_LOGIN" : (m_state == DONE ? "DONE" : "ERROR")))))); if (m_state == DATA) return HandleData(size); @@ -139,9 +152,8 @@ bool Conn::HandleHeader() { if (strncmp(m_header, STG_HEADER, sizeof(m_header)) != 0) { - printfd(__FILE__, "Wrong header from %s:%d.\n", inet_ntostring(IP()).c_str(), Port()); + Log(__FILE__, "Received invalid header from " + endpoint() + "."); WriteAnswer(ERR_HEADER, sizeof(ERR_HEADER) - 1); // Without \0 - // TODO: log it m_state = ERROR; return false; } @@ -155,9 +167,9 @@ bool Conn::HandleLogin() { if (m_admins.Find(m_login, &m_admin)) // ADMINS::Find returns true on error. { - printfd(__FILE__, "Wrong login ('%s') from %s:%d.\n", m_login, inet_ntostring(IP()).c_str(), Port()); + std::string login(m_login, strnlen(m_login, sizeof(m_login))); + Log(__FILE__, "Received invalid login '" + ToPrintable(login) + "' from " + endpoint() + "."); WriteAnswer(ERR_LOGIN, sizeof(ERR_LOGIN) - 1); // Without \0 - // TODO: log it m_state = ERROR; return false; } @@ -177,9 +189,8 @@ bool Conn::HandleCryptoLogin() if (strncmp(m_login, login, sizeof(login)) != 0) { - printfd(__FILE__, "Wrong password from %s:%d: '%s' != '%s'.\n", inet_ntostring(IP()).c_str(), Port(), login, m_login); + Log(__FILE__, "Attempt to connect with wrong password from " + m_admin->GetLogin() + "@" + endpoint() + "."); WriteAnswer(ERR_LOGINS, sizeof(ERR_LOGINS) - 1); // Without \0 - // TODO: log it m_state = ERROR; return false; } @@ -193,7 +204,8 @@ bool Conn::HandleCryptoLogin() bool Conn::HandleData(size_t size) { - m_stream->Put(m_buffer, size, size == 0 || memchr(m_buffer, 0, size) != NULL); + m_stream->Put(m_data, size, size == 0 || memchr(m_data, 0, size) != NULL); + m_buffer = m_data; return m_stream->IsOk(); } @@ -209,7 +221,7 @@ bool Conn::DataCallback(const void * block, size_t size, void * data) if (XML_Parse(state.conn.m_xmlParser, xml, length, state.final) == XML_STATUS_ERROR) { - // TODO: log it + state.conn.Log(__FILE__, "Received invalid XML from " + state.conn.m_admin->GetLogin() + "@" + state.conn.endpoint() + "."); printfd(__FILE__, "XML parse error at line %d, %d: %s. Is final: %d\n", static_cast(XML_GetCurrentLineNumber(state.conn.m_xmlParser)), static_cast(XML_GetCurrentColumnNumber(state.conn.m_xmlParser)), @@ -223,7 +235,7 @@ bool Conn::DataCallback(const void * block, size_t size, void * data) { if (!state.conn.WriteResponse()) { - // TODO: log it + state.conn.Log(__FILE__, "Failed to write response to " + state.conn.m_admin->GetLogin() + "@" + state.conn.endpoint() + "."); state.conn.m_state = ERROR; return false; } @@ -243,13 +255,10 @@ void Conn::ParseXMLStart(void * data, const char * el, const char ** attr) if (conn.m_parser == NULL) { - printfd(__FILE__, "Failed to find a suitable parser for '%s'.\n", el); - // TODO: log it + conn.Log(__FILE__, "Received unknown command '" + std::string(el) + "' from " + conn.m_admin->GetLogin() + "@" + conn.endpoint() + "."); conn.m_state = ERROR; return; } - else - printfd(__FILE__, "Using parser '%s'.\n", conn.m_parser->GetTag().c_str()); conn.m_parser->Start(data, el, attr); } @@ -261,7 +270,7 @@ void Conn::ParseXMLEnd(void * data, const char * el) if (conn.m_parser == NULL) { - // TODO: log it + // No need to log it. conn.m_state = ERROR; return; } @@ -277,7 +286,9 @@ bool Conn::WriteResponse() answer = m_parser->GetAnswer(); else answer = ""; - printfd(__FILE__, "Writing %d bytes of answer: '%s'\n", answer.length(), answer.c_str()); + delete m_parser; + m_parser = NULL; + printfd(__FILE__, "Writing %d bytes of answer.\n", answer.length()); stream.Put(answer.c_str(), answer.length() + 1 /* including \0 */, true /* final */); return stream.IsOk(); } @@ -288,3 +299,9 @@ bool Conn::WriteCallback(const void * block, size_t size, void * data) Conn & conn = *static_cast(data); return WriteAll(conn.m_sock, block, size);; } + +void Conn::Log(const char * file, const std::string & message) +{ + printfd(file, "%s\n", message.c_str()); + m_logger(message); +}