From: Maxim Mamontov Date: Sun, 25 Oct 2015 16:51:30 +0000 (+0200) Subject: Merge branch 'stg-2.409' into stg-2.409-radius X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/71d9db6cff1be807f6d010467b58efb95a6a61aa?hp=02efb4e1196ca467e796f65ef1d49db27a5254f8 Merge branch 'stg-2.409' into stg-2.409-radius --- diff --git a/projects/stargazer/plugins/configuration/sgconfig/conn.cpp b/projects/stargazer/plugins/configuration/sgconfig/conn.cpp index 8bba49be..c792125e 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/conn.cpp +++ b/projects/stargazer/plugins/configuration/sgconfig/conn.cpp @@ -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."); @@ -84,16 +89,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 +112,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 +149,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; @@ -156,7 +165,7 @@ bool Conn::HandleLogin() 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; @@ -177,7 +186,7 @@ bool Conn::HandleCryptoLogin() 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->GetLogin() + "@" + endpoint() + "."); WriteAnswer(ERR_LOGINS, sizeof(ERR_LOGINS) - 1); // Without \0 m_state = ERROR; return false; @@ -192,7 +201,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(); } @@ -208,7 +218,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) { - 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->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)), @@ -222,7 +232,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->GetLogin() + "@" + state.conn.endpoint() + "."); state.conn.m_state = ERROR; return false; } @@ -242,7 +252,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->GetLogin() + "@" + conn.endpoint() + "."); conn.m_state = ERROR; return; } diff --git a/projects/stargazer/plugins/configuration/sgconfig/conn.h b/projects/stargazer/plugins/configuration/sgconfig/conn.h index fae0c4b2..c67c972e 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/conn.h +++ b/projects/stargazer/plugins/configuration/sgconfig/conn.h @@ -23,6 +23,8 @@ #include "parser.h" +#include "dumphelpers.h" + #include "stg/os_int.h" #include "stg/const.h" @@ -63,6 +65,8 @@ class Conn uint32_t IP() const { return *(uint32_t *)(&m_addr.sin_addr); } uint16_t Port() const { return ntohs(m_addr.sin_port); } + std::string endpoint() const { return inet_ntostring(IP()) + ":" + x2str(Port()); } + bool Read(); bool IsOk() const { return m_state != ERROR; } @@ -127,6 +131,10 @@ class Conn Conn & conn; } m_dataState; +#ifdef DUMPCRYPTO + Dumper m_dumper; +#endif + static bool DataCallback(const void * block, size_t size, void * data); static void ParseXMLStart(void * data, const char * el, const char ** attr); static void ParseXMLEnd(void * data, const char * el); diff --git a/projects/stargazer/plugins/configuration/sgconfig/dumphelpers.h b/projects/stargazer/plugins/configuration/sgconfig/dumphelpers.h new file mode 100644 index 00000000..cc02d14d --- /dev/null +++ b/projects/stargazer/plugins/configuration/sgconfig/dumphelpers.h @@ -0,0 +1,85 @@ +#ifndef __STG_DUMP_HELPERS_H__ +#define __STG_DUMP_HELPERS_H__ + +#include "stg/common.h" + +#include +#include +#include +#include + +#include +#include + +namespace STG +{ + +class Dumper +{ + public: + explicit Dumper(const std::string& tag) + : m_stream(getName(tag).c_str()) + { + } + ~Dumper() {} + + void write(const void* data, size_t size) + { + writePrefix(); + m_stream << " "; + writeHEX(data, size); + } + + private: + std::ofstream m_stream; + + tm getTime() const + { + time_t now = time(NULL); + tm localTime; + localtime_r(&now, &localTime); + return localTime; + } + + std::string getName(const std::string& tag) const + { + tm localTime = getTime(); + + std::ostringstream res; + res << tag + << "-" << (localTime.tm_year + 1900) << twoDigit(localTime.tm_mon + 1) << twoDigit(localTime.tm_mday) + << "-" << twoDigit(localTime.tm_hour) << twoDigit(localTime.tm_min) << twoDigit(localTime.tm_sec) + << ".data"; + + return res.str(); + } + + void writePrefix() + { + tm localTime = getTime(); + m_stream << "[" << (localTime.tm_year + 1900) << "-" << twoDigit(localTime.tm_mon + 1) << "-" << twoDigit(localTime.tm_mday) + << " " << twoDigit(localTime.tm_hour) << ":" << twoDigit(localTime.tm_min) << ":" << twoDigit(localTime.tm_sec) + << "]"; + } + + void writeHEX(const void* data, size_t size) + { + m_stream << "(" << std::setw(4) << std::setfill(' ') << size << ") "; + const unsigned char* pos = static_cast(data); + for (size_t i = 0; i < size; ++i) + m_stream << std::hex << std::setw(2) << std::setfill('0') << static_cast(*pos++); + m_stream << std::dec << "\n"; + } + + std::string twoDigit(int value) const + { + std::string res = x2str(value); + if (res.length() < 2) + res = "0" + res; + return res; + } +}; + +} // namespace Caster + +#endif diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser_server_info.cpp b/projects/stargazer/plugins/configuration/sgconfig/parser_server_info.cpp index 1873b9bb..75be7537 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/parser_server_info.cpp +++ b/projects/stargazer/plugins/configuration/sgconfig/parser_server_info.cpp @@ -46,7 +46,7 @@ void GET_SERVER_INFO::CreateAnswer() utsn.machine + " " + utsn.nodename; - m_answer = GetOpenTag() + "" + + m_answer = std::string("" + "" + "" + "" + @@ -57,5 +57,5 @@ void GET_SERVER_INFO::CreateAnswer() for (size_t i = 0; i< DIR_NUM; i++) m_answer += ""; - m_answer += GetCloseTag(); + m_answer += ""; } diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp b/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp index c54ae8eb..2e9d7087 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp +++ b/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp @@ -52,9 +52,9 @@ std::string UserToXML(const USER & user, bool loginInStart, bool showPass, time_ std::string answer; if (loginInStart) - answer += ""; + answer += ""; else - answer += ""; + answer += ""; answer += ""; diff --git a/tests/test_crypto.cpp b/tests/test_crypto.cpp index f95ecdb0..8db8ab72 100644 --- a/tests/test_crypto.cpp +++ b/tests/test_crypto.cpp @@ -431,4 +431,40 @@ namespace tut ensure_equals("DecryptString(EncryptString(longTest)) == longTest", source, std::string(longTest)); } + template<> + template<> + void testobject::test<8>() + { + set_test_name("Check old string encryption"); + + BLOWFISH_CTX ctx; + InitContext("123456", 7, &ctx); + const unsigned char source[] = {0xe9, 0xfe, 0xcb, 0xc5, 0xad, 0x3e, 0x87, 0x39, + 0x3d, 0xd5, 0xf4, 0xed, 0xb0, 0x15, 0xe6, 0xcb, + 0x3d, 0xd5, 0xf4, 0xed, 0xb0, 0x15, 0xe6, 0xcb, + 0x3d, 0xd5, 0xf4, 0xed, 0xb0, 0x15, 0xe6, 0xcb}; + char res[32]; + DecryptString(res, source, 32, &ctx); + + ensure_equals("DecryptString(...) == 'admin'", std::string(res), "admin"); + } + + template<> + template<> + void testobject::test<9>() + { + set_test_name("Check new string encryption"); + + BLOWFISH_CTX ctx; + InitContext("123456", 7, &ctx); + const unsigned char source[] = {0xe9, 0xfe, 0xcb, 0xc5, 0xad, 0x3e, 0x87, 0x39, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; + char res[32]; + DecryptString(res, source, 32, &ctx); + + ensure_equals("DecryptString(...) == 'admin'", std::string(res), "admin"); + } + }