#include "stg/admins.h"
#include "stg/admin.h"
+#include "stg/logger.h"
#include "stg/blowfish.h"
#include "stg/bfstream.h"
#include "stg/common.h"
#include <cassert>
#include <cstring>
+#include <cerrno>
#include <unistd.h>
#include <sys/socket.h>
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),
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.");
XML_ParserReset(m_xmlParser, NULL);
XML_SetElementHandler(m_xmlParser, ParseXMLStart, ParseXMLEnd);
XML_SetUserData(m_xmlParser, this);
-
- /*m_parsers.push_back(new STG::PARSER::GET_SERVER_INFO(m_settings, m_users, m_tariffs));
-
- m_parsers.push_back(new PARSER_GET_USERS);
- m_parsers.push_back(new PARSER_GET_USER);
- m_parsers.push_back(new PARSER_CHG_USER);
- m_parsers.push_back(new PARSER_ADD_USER);
- m_parsers.push_back(new PARSER_DEL_USER);
- m_parsers.push_back(new PARSER_CHECK_USER);
- m_parsers.push_back(new PARSER_SEND_MESSAGE);
- m_parsers.push_back(new PARSER_AUTH_BY);
- m_parsers.push_back(new PARSER_USER_INFO);
-
- m_parsers.push_back(new PARSER_GET_TARIFFS);
- m_parsers.push_back(new PARSER_ADD_TARIFF);
- m_parsers.push_back(new PARSER_DEL_TARIFF);
- m_parsers.push_back(new PARSER_CHG_TARIFF);
-
- m_parsers.push_back(new PARSER_GET_ADMINS);
- m_parsers.push_back(new PARSER_CHG_ADMIN);
- m_parsers.push_back(new PARSER_DEL_ADMIN);
- m_parsers.push_back(new PARSER_ADD_ADMIN);*/
}
Conn::~Conn()
ssize_t res = read(m_sock, m_buffer, m_bufferSize);
if (res < 0)
{
- // TODO: log it
+ m_state = ERROR;
+ 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 " + endpoint() + ". Unexpected EOF.");
+ return false;
+ }
+#ifdef DUMPCRYPTO
+ m_dumper.write(m_buffer, res);
+#endif
m_bufferSize -= res;
+ m_buffer = static_cast<char*>(m_buffer) + res;
return HandleBuffer(res);
}
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;
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);
{
if (strncmp(m_header, STG_HEADER, sizeof(m_header)) != 0)
{
- WriteAnswer(ERR_HEADER, sizeof(ERR_HEADER));
- // TODO: log it
+ Log(__FILE__, "Received invalid header from " + endpoint() + ".");
+ WriteAnswer(ERR_HEADER, sizeof(ERR_HEADER) - 1); // Without \0
m_state = ERROR;
return false;
}
m_state = LOGIN;
m_buffer = m_login;
m_bufferSize = sizeof(m_login);
- return WriteAnswer(OK_HEADER, sizeof(OK_HEADER));
+ return WriteAnswer(OK_HEADER, sizeof(OK_HEADER) - 1); // Without \0
}
bool Conn::HandleLogin()
{
if (m_admins.Find(m_login, &m_admin)) // ADMINS::Find returns true on error.
{
- WriteAnswer(ERR_LOGIN, sizeof(ERR_LOGIN));
- // TODO: log it
+ 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
m_state = ERROR;
return false;
}
m_state = CRYPTO_LOGIN;
m_buffer = m_cryptoLogin;
m_bufferSize = sizeof(m_cryptoLogin);
- return WriteAnswer(OK_LOGIN, sizeof(OK_LOGIN));
+ return WriteAnswer(OK_LOGIN, sizeof(OK_LOGIN) - 1); // Without \0
}
bool Conn::HandleCryptoLogin()
if (strncmp(m_login, login, sizeof(login)) != 0)
{
- WriteAnswer(ERR_LOGINS, sizeof(ERR_LOGINS));
- // TODO: log it
+ 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;
}
m_buffer = m_data;
m_bufferSize = sizeof(m_data);
m_stream = new STG::DECRYPT_STREAM(m_admin->GetPassword(), DataCallback, &m_dataState);
- return WriteAnswer(OK_LOGINS, sizeof(OK_LOGINS));
+ 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();
}
assert(data != NULL);
DataState& state = *static_cast<DataState *>(data);
- if (XML_Parse(state.conn.m_xmlParser,
- static_cast<const char *>(block),
- size, state.final) == XML_STATUS_ERROR)
+ const char * xml = static_cast<const char *>(block);
+ size_t length = strnlen(xml, size);
+
+ state.final = state.final || length < size || size == 0;
+
+ if (XML_Parse(state.conn.m_xmlParser, xml, length, state.final) == XML_STATUS_ERROR)
{
- // TODO: log it
- printfd(__FILE__, "XML parse error at line %d, %d: %s. Is final: %d",
+ 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<int>(XML_GetCurrentLineNumber(state.conn.m_xmlParser)),
static_cast<int>(XML_GetCurrentColumnNumber(state.conn.m_xmlParser)),
XML_ErrorString(XML_GetErrorCode(state.conn.m_xmlParser)), (int)state.final);
+ printfd(__FILE__, "Data block: '%s' of size %d\n", xml, length);
+ state.conn.m_state = ERROR;
return false;
}
{
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;
}
if (conn.m_parser == NULL)
{
- // TODO: log it
+ conn.Log(__FILE__, "Received unknown command '" + std::string(el) + "' from " + conn.m_admin->GetLogin() + "@" + conn.endpoint() + ".");
conn.m_state = ERROR;
return;
}
if (conn.m_parser == NULL)
{
- // TODO: log it
+ // No need to log it.
conn.m_state = ERROR;
return;
}
bool Conn::WriteResponse()
{
STG::ENCRYPT_STREAM stream(m_admin->GetPassword(), WriteCallback, this);
- const std::string & answer = m_parser->GetAnswer();
+ std::string answer;
+ if (m_parser != NULL)
+ answer = m_parser->GetAnswer();
+ else
+ answer = "<Error result=\"Unknown command.\"/>";
+ 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();
}
Conn & conn = *static_cast<Conn *>(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);
+}
git.stg.codes / stg.git / blobdiff