X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/750f1f62ce6576bf1ad86366a5fb8ce1c4524ccd..11c19b3afd4aa6a215d95b34de23213e113226d9:/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 8bba49be..513218e2 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/conn.cpp +++ b/projects/stargazer/plugins/configuration/sgconfig/conn.cpp @@ -45,8 +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, - PLUGIN_LOGGER & logger) + Admins & admins, int sock, const sockaddr_in& addr, + PluginLogger & logger) : m_registry(registry), m_admins(admins), m_admin(NULL), @@ -60,7 +60,12 @@ Conn::Conn(const BASE_PARSER::REGISTRY & registry, 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."); @@ -76,6 +81,9 @@ Conn::~Conn() close(m_sock); XML_ParserFree(m_xmlParser); + + delete m_stream; + delete m_parser; } bool Conn::Read() @@ -84,16 +92,20 @@ bool Conn::Read() if (res < 0) { m_state = ERROR; - Log(__FILE__, "Failed to read data from " + inet_ntostring(IP()) + ":" + x2str(Port()) + ". Reason: '" + strerror(errno) + "'"); + Log(__FILE__, "Failed to read data from " + endpoint() + ". Reason: '" + strerror(errno) + "'"); return false; } if (res == 0 && m_state != DATA) // EOF is ok for data. { m_state = ERROR; - Log(__FILE__, "Failed to read data from " + inet_ntostring(IP()) + ":" + x2str(Port()) + ". Unexpected EOF."); + 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); } @@ -103,7 +115,7 @@ bool Conn::WriteAnswer(const void* buffer, size_t size) if (res < 0) { m_state = ERROR; - Log(__FILE__, "Failed to write data to " + inet_ntostring(IP()) + ":" + x2str(Port()) + ". Reason: '" + strerror(errno) + "'."); + Log(__FILE__, "Failed to write data to " + endpoint() + ". Reason: '" + strerror(errno) + "'."); return false; } return true; @@ -140,7 +152,7 @@ bool Conn::HandleHeader() { if (strncmp(m_header, STG_HEADER, sizeof(m_header)) != 0) { - Log(__FILE__, "Received invalid header from " + inet_ntostring(IP()) + ":" + x2str(Port()) + "."); + Log(__FILE__, "Received invalid header from " + endpoint() + "."); WriteAnswer(ERR_HEADER, sizeof(ERR_HEADER) - 1); // Without \0 m_state = ERROR; return false; @@ -153,15 +165,15 @@ bool Conn::HandleHeader() bool Conn::HandleLogin() { - if (m_admins.Find(m_login, &m_admin)) // ADMINS::Find returns true on error. + if (m_admins.find(m_login, &m_admin)) // ADMINS::Find returns true on error. { std::string login(m_login, strnlen(m_login, sizeof(m_login))); - Log(__FILE__, "Received invalid login '" + ToPrintable(login) + "' from " + inet_ntostring(IP()) + ":" + x2str(Port()) + "."); + Log(__FILE__, "Received invalid login '" + ToPrintable(login) + "' from " + endpoint() + "."); WriteAnswer(ERR_LOGIN, sizeof(ERR_LOGIN) - 1); // Without \0 m_state = ERROR; return false; } - m_admin->SetIP(IP()); + m_admin->setIP(IP()); m_state = CRYPTO_LOGIN; m_buffer = m_cryptoLogin; m_bufferSize = sizeof(m_cryptoLogin); @@ -172,12 +184,12 @@ bool Conn::HandleCryptoLogin() { char login[ADM_LOGIN_LEN + 1]; BLOWFISH_CTX ctx; - InitContext(m_admin->GetPassword().c_str(), ADM_PASSWD_LEN, &ctx); + InitContext(m_admin->password().c_str(), ADM_PASSWD_LEN, &ctx); DecryptString(login, m_cryptoLogin, ADM_LOGIN_LEN, &ctx); if (strncmp(m_login, login, sizeof(login)) != 0) { - Log(__FILE__, "Attempt to connect with wrong password from " + m_admin->GetLogin() + "@" + inet_ntostring(IP()) + ":" + x2str(Port()) + "."); + Log(__FILE__, "Attempt to connect with wrong password from " + m_admin->login() + "@" + endpoint() + "."); WriteAnswer(ERR_LOGINS, sizeof(ERR_LOGINS) - 1); // Without \0 m_state = ERROR; return false; @@ -186,13 +198,14 @@ bool Conn::HandleCryptoLogin() m_state = DATA; m_buffer = m_data; m_bufferSize = sizeof(m_data); - m_stream = new STG::DECRYPT_STREAM(m_admin->GetPassword(), DataCallback, &m_dataState); + m_stream = new STG::DECRYPT_STREAM(m_admin->password(), DataCallback, &m_dataState); return WriteAnswer(OK_LOGINS, sizeof(OK_LOGINS) - 1); // Without \0 } 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(); } @@ -208,11 +221,11 @@ 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) { - state.conn.Log(__FILE__, "Received invalid XML from " + state.conn.m_admin->GetLogin() + "@" + inet_ntostring(state.conn.IP()) + ":" + x2str(state.conn.Port()) + "."); + state.conn.Log(__FILE__, "Received invalid XML from " + state.conn.m_admin->login() + "@" + 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)), - XML_ErrorString(XML_GetErrorCode(state.conn.m_xmlParser)), (int)state.final); + XML_ErrorString(XML_GetErrorCode(state.conn.m_xmlParser)), static_cast(state.final)); printfd(__FILE__, "Data block: '%s' of size %d\n", xml, length); state.conn.m_state = ERROR; return false; @@ -222,7 +235,7 @@ bool Conn::DataCallback(const void * block, size_t size, void * data) { if (!state.conn.WriteResponse()) { - state.conn.Log(__FILE__, "Failed to write response to " + state.conn.m_admin->GetLogin() + "@" + inet_ntostring(state.conn.IP()) + ":" + x2str(state.conn.Port()) + "."); + state.conn.Log(__FILE__, "Failed to write response to " + state.conn.m_admin->login() + "@" + state.conn.endpoint() + "."); state.conn.m_state = ERROR; return false; } @@ -242,7 +255,7 @@ void Conn::ParseXMLStart(void * data, const char * el, const char ** attr) if (conn.m_parser == NULL) { - conn.Log(__FILE__, "Received unknown command '" + std::string(el) + "' from " + conn.m_admin->GetLogin() + "@" + inet_ntostring(conn.IP()) + ":" + x2str(conn.Port()) + "."); + conn.Log(__FILE__, "Received unknown command '" + std::string(el) + "' from " + conn.m_admin->login() + "@" + conn.endpoint() + "."); conn.m_state = ERROR; return; } @@ -267,12 +280,14 @@ void Conn::ParseXMLEnd(void * data, const char * el) bool Conn::WriteResponse() { - STG::ENCRYPT_STREAM stream(m_admin->GetPassword(), WriteCallback, this); + STG::ENCRYPT_STREAM stream(m_admin->password(), WriteCallback, this); std::string answer; if (m_parser != NULL) answer = m_parser->GetAnswer(); else answer = ""; + 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();