aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

when banning an ip address, terminate the connection of everyone with that address

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2012-01-29 20:55:24 +01:00
parent 7faa033855
commit eb06d6b4ea
3 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
servatrice/src/servatrice.cpp
View file

@ -394,6 +394,16 @@ int Servatrice::getUsersWithAddress(const QHostAddress &address) const
return result; return result;
} }
QList<ServerSocketInterface *> Servatrice::getUsersWithAddressAsList(const QHostAddress &address) const
{
QMutexLocker locker(&serverMutex);
QList<ServerSocketInterface *> result;
for (int i = 0; i < clients.size(); ++i)
if (static_cast<ServerSocketInterface *>(clients[i])->getPeerAddress() == address)
result.append(static_cast<ServerSocketInterface *>(clients[i]));
return result;
}
int Servatrice::startSession(const QString &userName, const QString &address) int Servatrice::startSession(const QString &userName, const QString &address)
{ {
if (authenticationMethod == AuthenticationNone) if (authenticationMethod == AuthenticationNone)

1
servatrice/src/servatrice.h
View file

@ -73,6 +73,7 @@ public:
void updateLoginMessage(); void updateLoginMessage();
ServerInfo_User getUserData(const QString &name); ServerInfo_User getUserData(const QString &name);
int getUsersWithAddress(const QHostAddress &address) const; int getUsersWithAddress(const QHostAddress &address) const;
QList<ServerSocketInterface *> getUsersWithAddressAsList(const QHostAddress &address) const;
QMap<QString, ServerInfo_User> getBuddyList(const QString &name); QMap<QString, ServerInfo_User> getBuddyList(const QString &name);
QMap<QString, ServerInfo_User> getIgnoreList(const QString &name); QMap<QString, ServerInfo_User> getIgnoreList(const QString &name);
bool isInBuddyList(const QString &whoseList, const QString &who); bool isInBuddyList(const QString &whoseList, const QString &who);

13
servatrice/src/serversocketinterface.cpp
View file

@ -505,16 +505,21 @@ Response::ResponseCode ServerSocketInterface::cmdBanFromServer(const Command_Ban
servatrice->execSqlQuery(query); servatrice->execSqlQuery(query);
servatrice->dbMutex.unlock(); servatrice->dbMutex.unlock();
QList<ServerSocketInterface *> userList = servatrice->getUsersWithAddressAsList(QHostAddress(address));
ServerSocketInterface *user = static_cast<ServerSocketInterface *>(server->getUsers().value(userName)); ServerSocketInterface *user = static_cast<ServerSocketInterface *>(server->getUsers().value(userName));
if (user) { if (user && !userList.contains(user))
userList.append(user);
if (!userList.isEmpty()) {
Event_ConnectionClosed event; Event_ConnectionClosed event;
event.set_reason(Event_ConnectionClosed::BANNED); event.set_reason(Event_ConnectionClosed::BANNED);
if (cmd.has_visible_reason()) if (cmd.has_visible_reason())
event.set_reason_str(cmd.visible_reason()); event.set_reason_str(cmd.visible_reason());
SessionEvent *se = user->prepareSessionEvent(event); for (int i = 0; i < userList.size(); ++i) {
user->sendProtocolItem(*se); SessionEvent *se = userList[i]->prepareSessionEvent(event);
userList[i]->sendProtocolItem(*se);
userList[i]->deleteLater();
delete se; delete se;
user->deleteLater(); }
} }
return Response::RespOk; return Response::RespOk;