#include "conn.h"
-#include "parser.h"
-
-#include "parser_server_info.h"
-#include "parser_admins.h"
-#include "parser_tariffs.h"
-#include "parser_users.h"
-#include "parser_message.h"
-#include "parser_auth_by.h"
-#include "parser_user_info.h"
-
-#include "stg/settings.h"
#include "stg/admins.h"
-#include "stg/users.h"
-#include "stg/tariffs.h"
#include "stg/admin.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::OK_LOGINS[] = "OKLS";
const char Conn::ERR_LOGINS[] = "ERLS";
-Conn::Conn(const SETTINGS & settings,
- ADMINS & admins,
- USERS & users,
- TARIFFS & tariffs,
- int sock, const sockaddr_in& addr)
- : m_settings(settings),
+Conn::Conn(const BASE_PARSER::REGISTRY & registry,
+ ADMINS & admins, int sock, const sockaddr_in& addr)
+ : m_registry(registry),
m_admins(admins),
- m_users(users),
- m_tariffs(tariffs),
m_admin(NULL),
m_sock(sock),
m_addr(addr),
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()
shutdown(m_sock, SHUT_RDWR);
close(m_sock);
- /*std::map<std::string, BASE_PARSER *>::iterator it(m_parsers.begin());
- for (; it != m_parsers.end(); ++it)
- delete it->second;*/
XML_ParserFree(m_xmlParser);
}
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
+ 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
return false;
}
return true;
}
-BASE_PARSER * Conn::GetParser(const std::string & tag)
+BASE_PARSER * Conn::GetParser(const std::string & tag) const
{
- if (strcasecmp(tag.c_str(), "getserverinfo") == 0)
- return new STG::PARSER::GET_SERVER_INFO(*m_admin, m_settings, m_users, m_tariffs);
- if (strcasecmp(tag.c_str(), "getadmins") == 0)
- return new STG::PARSER::GET_ADMINS(*m_admin, m_admins);
- if (strcasecmp(tag.c_str(), "addadmin") == 0)
- return new STG::PARSER::ADD_ADMIN(*m_admin, m_admins);
- if (strcasecmp(tag.c_str(), "deladmin") == 0)
- return new STG::PARSER::DEL_ADMIN(*m_admin, m_admins);
- if (strcasecmp(tag.c_str(), "chgadmin") == 0)
- return new STG::PARSER::CHG_ADMIN(*m_admin, m_admins);
- return NULL;
+ BASE_PARSER::REGISTRY::const_iterator it = m_registry.find(tag);
+ if (it == m_registry.end())
+ return NULL;
+ return it->second->create(*m_admin);
}
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);
{
if (strncmp(m_header, STG_HEADER, sizeof(m_header)) != 0)
{
- WriteAnswer(ERR_HEADER, sizeof(ERR_HEADER));
+ printfd(__FILE__, "Wrong header from %s:%d.\n", inet_ntostring(IP()).c_str(), Port());
+ WriteAnswer(ERR_HEADER, sizeof(ERR_HEADER) - 1); // Without \0
// TODO: log it
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));
+ printfd(__FILE__, "Wrong login ('%s') from %s:%d.\n", m_login, inet_ntostring(IP()).c_str(), Port());
+ WriteAnswer(ERR_LOGIN, sizeof(ERR_LOGIN) - 1); // Without \0
// TODO: log it
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));
+ printfd(__FILE__, "Wrong password from %s:%d: '%s' != '%s'.\n", inet_ntostring(IP()).c_str(), Port(), login, m_login);
+ WriteAnswer(ERR_LOGINS, sizeof(ERR_LOGINS) - 1); // Without \0
// TODO: log it
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)
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",
+ 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 (conn.m_parser == NULL)
{
+ printfd(__FILE__, "Failed to find a suitable parser for '%s'.\n", el);
// TODO: log it
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);
}
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: '%s'\n", answer.length(), answer.c_str());
stream.Put(answer.c_str(), answer.length() + 1 /* including \0 */, true /* final */);
return stream.IsOk();
}
git.stg.codes / stg.git / blobdiff