sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adding ASN.1 protocol to chat cleaner server.

Browse Source
This commit is contained in:
lotodore
2009-08-14 21:18:28 +00:00
parent 1595da68d9
commit 459d7ed574
7 changed files with 136 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
chatcleaner.pro
+3
View File
@@ -44,3 +44,6 @@ HEADERS += cleanerserver.h \
capsfloodcheck.h \
letterrepeatingcheck.h \
urlcheck.h
LIBPATH += lib
LIBS += -lpokerth_lib \
-lpokerth_protocol
src/chatcleaner/cleanerserver.cpp
+114 -3
View File
@@ -2,11 +2,15 @@
#include <QtNetwork>
#include <QtCore>
#include <stdlib.h>
#include <cstdlib>
#include <string>
#include <third_party/asn1/ChatCleanerMessage.h>
#include "messagefilter.h"
#include "cleanerconfig.h"
using namespace std;
CleanerServer::CleanerServer(): config(0), blockConnection(false)
{
config = new CleanerConfig;
@@ -46,7 +50,41 @@ void CleanerServer::newCon()
void CleanerServer::onRead()
{
char buf[1024];
qint64 bytesRead = tcpSocket->read((char *)m_recvBuf + m_recvBufUsed, sizeof(m_recvBuf) - m_recvBufUsed);
bool error = bytesRead < 1;
if (!error)
{
m_recvBufUsed += bytesRead;
asn_dec_rval_t retVal;
do
{
// Try to decode the packets.
InternalChatCleanerPacket recvMsg;
retVal = ber_decode(0, &asn_DEF_ChatCleanerMessage, (void **)recvMsg.GetMsgPtr(), m_recvBuf, m_recvBufUsed);
if(retVal.code == RC_OK)
{
if (retVal.consumed < m_recvBufUsed)
{
m_recvBufUsed -= retVal.consumed;
memmove(m_recvBuf, m_recvBuf + retVal.consumed, m_recvBufUsed);
}
else
m_recvBufUsed = 0;
// Handle the packets.
error = handleMessage(recvMsg);
}
} while (!error && retVal.code == RC_OK);
}
if (error)
{
qDebug() << "Error handling packets from client.";
tcpSocket->close();
}
/* char buf[1024];
tcpSocket->readLine(buf, sizeof(buf));
QString message = QString::fromUtf8("%1").arg(buf);
@@ -56,7 +94,69 @@ void CleanerServer::onRead()
// TESTING DEFAULT VALUES
QString checkMessage = myMessageFilter->check(playerId, nick, message);
tcpSocket->write(checkMessage.toAscii().data(), checkMessage.length());
tcpSocket->write(checkMessage.toAscii().data(), checkMessage.length());*/
}
bool CleanerServer::handleMessage(InternalChatCleanerPacket &msg) {
bool error = true;
if (msg.GetMsg()->present == ChatCleanerMessage_PR_cleanerInitMessage)
{
CleanerInitMessage_t *netInit = &msg.GetMsg()->choice.cleanerInitMessage;
if (netInit->requestedVersion == CLEANER_PROTOCOL_VERSION)
{
string tmpClientSecret((const char *)netInit->clientSecret.buf, netInit->clientSecret.size);
if (clientSecret == QString::fromStdString(tmpClientSecret))
{
error = false;
InternalChatCleanerPacket tmpAck;
tmpAck.GetMsg()->present = ChatCleanerMessage_PR_cleanerInitAckMessage;
CleanerInitAckMessage_t *netAck = &tmpAck.GetMsg()->choice.cleanerInitAckMessage;
netAck->serverVersion = CLEANER_PROTOCOL_VERSION;
string tmpServerSecret(serverSecret.toStdString());
OCTET_STRING_fromBuf(&netAck->serverSecret,
tmpServerSecret.c_str(),
tmpServerSecret.length());
sendMessageToClient(tmpAck);
}
else
qDebug() << "Invalid client secret.";
}
else
qDebug() << "Invalid client version: " << netInit->requestedVersion;
}
else if (msg.GetMsg()->present == ChatCleanerMessage_PR_cleanerChatRequestMessage)
{
error = false;
CleanerChatRequestMessage_t *netRequest = &msg.GetMsg()->choice.cleanerChatRequestMessage;
unsigned playerId = netRequest->playerId;
QString nick(QString::fromUtf8(
string((const char *)netRequest->playerName.buf, netRequest->playerName.size).c_str()));
QString message(QString::fromUtf8(
string((const char *)netRequest->chatMessage.buf, netRequest->chatMessage.size).c_str()));
QString checkMessage = myMessageFilter->check(playerId, nick, message);
if (!checkMessage.isEmpty())
{
InternalChatCleanerPacket tmpReply;
tmpReply.GetMsg()->present = ChatCleanerMessage_PR_cleanerChatReplyMessage;
CleanerChatReplyMessage_t *netReply = &tmpReply.GetMsg()->choice.cleanerChatReplyMessage;
netReply->requestId = netRequest->requestId;
netReply->cleanerActionType = cleanerActionType_cleanerActionNone;
/* cleanerActionType_cleanerActionNone
cleanerActionType_cleanerActionWarning
cleanerActionType_cleanerActionKick
cleanerActionType_cleanerActionBan */
string tmpCheck(checkMessage.toUtf8());
netReply->cleanerText =
OCTET_STRING_new_fromBuf(
&asn_DEF_OCTET_STRING,
(const char *)tmpCheck.c_str(),
tmpCheck.length());
sendMessageToClient(tmpReply);
}
}
return error;
}
void CleanerServer::socketStateChanged(QAbstractSocket::SocketState state) {
@@ -70,3 +170,14 @@ void CleanerServer::refreshConfig() {
config->fillBuffer();
myMessageFilter->refreshConfig();
}
void CleanerServer::sendMessageToClient(InternalChatCleanerPacket &msg)
{
unsigned char buf[MAX_CLEANER_PACKET_SIZE];
asn_enc_rval_t e = der_encode_to_buffer(&asn_DEF_ChatCleanerMessage, msg.GetMsg(), buf, MAX_CLEANER_PACKET_SIZE);
if (e.encoded == -1)
qDebug() << "Failed to encode chat cleaner packet: " << msg.GetMsg()->present;
else
tcpSocket->write((const char *)buf, e.encoded);
}
src/chatcleaner/cleanerserver.h
+5 -2
View File
@@ -3,8 +3,7 @@
#include <QtCore>
#include <QtNetwork>
#include <src/net/internalchatcleanerpacket.h>
#include <src/third_party/asn1/ChatCleanerMessage.h>
#include <net/internalchatcleanerpacket.h>
class MessageFilter;
class CleanerConfig;
@@ -19,8 +18,10 @@ public:
private slots:
void newCon();
void onRead();
bool handleMessage(InternalChatCleanerPacket &msg);
void socketStateChanged(QAbstractSocket::SocketState);
void refreshConfig();
void sendMessageToClient(InternalChatCleanerPacket &msg);
private:
QTcpServer *tcpServer;
@@ -30,6 +31,8 @@ private:
CleanerConfig *config;
bool blockConnection;
QString clientSecret;
QString serverSecret;
unsigned char m_recvBuf[2*MAX_CLEANER_PACKET_SIZE];
unsigned m_recvBufUsed;
src/net/chatcleanermanager.h
-3
View File
@@ -25,9 +25,6 @@
#include <boost/enable_shared_from_this.hpp>
#include <string>
#define CLEANER_PROTOCOL_VERSION 1
#define MAX_CLEANER_PACKET_SIZE 384
class InternalChatCleanerPacket;
class EncodedPacket;
src/net/common/chatcleanermanager.cpp
+9 -5
View File
@@ -193,6 +193,11 @@ ChatCleanerManager::HandleRead(const boost::system::error_code &ec, size_t bytes
boost::asio::placeholders::error,
boost::asio::placeholders::bytes_transferred));
}
else
{
m_socket->close();
m_connected = false;
}
}
else if (ec != boost::asio::error::operation_aborted)
{
@@ -205,7 +210,7 @@ ChatCleanerManager::HandleRead(const boost::system::error_code &ec, size_t bytes
bool
ChatCleanerManager::HandleMessage(InternalChatCleanerPacket &msg)
{
bool error = false;
bool error = true;
if (msg.GetMsg()->present == ChatCleanerMessage_PR_cleanerInitAckMessage)
{
CleanerInitAckMessage_t *netAck = &msg.GetMsg()->choice.cleanerInitAckMessage;
@@ -213,14 +218,13 @@ ChatCleanerManager::HandleMessage(InternalChatCleanerPacket &msg)
{
string tmpSecret((const char *)netAck->serverSecret.buf, netAck->serverSecret.size);
if (m_serverSecret == tmpSecret)
{
m_connected = true;
error = false;
}
}
if (!m_connected)
{
LOG_ERROR("Chat cleaner handshake failed.");
m_socket->close();
error = true;
}
}
return error;
}
src/net/common/internalchatcleanerpacket.cpp
+1
View File
@@ -18,6 +18,7 @@
***************************************************************************/
#include <net/internalchatcleanerpacket.h>
#include <third_party/asn1/ChatCleanerMessage.h>
#include <cstring>
using namespace std;
src/net/internalchatcleanerpacket.h
+4 -1
View File
@@ -21,7 +21,10 @@
#ifndef _INTERNALCHATCLEANERPACKET_H_
#define _INTERNALCHATCLEANERPACKET_H_
#include <third_party/asn1/ChatCleanerMessage.h>
#define CLEANER_PROTOCOL_VERSION 1
#define MAX_CLEANER_PACKET_SIZE 384
typedef struct ChatCleanerMessage ChatCleanerMessage_t;
class InternalChatCleanerPacket
{