diff --git a/servatrice/servatrice.ini.example b/servatrice/servatrice.ini.example index 05a5ba3a..a7429d33 100644 --- a/servatrice/servatrice.ini.example +++ b/servatrice/servatrice.ini.example @@ -22,7 +22,7 @@ port=4747 ; long delays (lag), you may want to try increasing this value; default is 1. number_pools=1 -; When database is enabled, servatrice writes the server status in the "update" database table; this +; When database is enabled, servatrice writes the server status in the "update" database table; this ; setting defines every how many milliseconds servatrice will update its status; default is 15000 (15 secs) statusupdate=15000 @@ -125,6 +125,11 @@ max_game_inactivity_time=120 ; Maximum number of users that can connect from the same IP address; useful to avoid bots, default is 4 max_users_per_address=4 +; You may want to allow an unlimited number of users from a trusted source. This setting can contain a +; comma-separed list of IP addresses which will allow an unlimited number of connections from each of the +; IP addresses listed (ignoring the max_users_per_address). Default is "127.0.0.1,::1"; example: "192.73.233.244,81.4.100.74" +trusted_sources="" + ; Servatrice can avoid users from flooding rooms with large number messages in an interval of time. ; This setting defines the length in seconds of the considered interval; default is 10 message_counting_interval=10 diff --git a/servatrice/src/servatrice.cpp b/servatrice/src/servatrice.cpp index 168c230c..e0eb40fb 100644 --- a/servatrice/src/servatrice.cpp +++ b/servatrice/src/servatrice.cpp @@ -22,6 +22,7 @@ #include #include #include +#include #include #include "servatrice.h" #include "servatrice_database_interface.h" @@ -34,7 +35,10 @@ #include "main.h" #include "decklist.h" #include "pb/event_server_message.pb.h" -#include "pb/event_server_shutdown.pb.h" +#include "pb/event_server_shutdo; You may want to allow an unlimited number of users from a trusted source. This setting can contain a +; comma-separed list of IP addresses which will allow an unlimited number of connections from each of the +; IP addresses listed (ignoring the max_users_per_address). Default is "127.0.0.1,::1"; example: "192.73.233.244,81.4.100.74" +trusted_sources=""wn.pb.h" #include "pb/event_connection_closed.pb.h" Servatrice_GameServer::Servatrice_GameServer(Servatrice *_server, int _numberPools, const QSqlDatabase &_sqlDatabase, QObject *parent) @@ -45,25 +49,25 @@ Servatrice_GameServer::Servatrice_GameServer(Servatrice *_server, int _numberPoo server->setThreaded(false); Servatrice_DatabaseInterface *newDatabaseInterface = new Servatrice_DatabaseInterface(0, server); Servatrice_ConnectionPool *newPool = new Servatrice_ConnectionPool(newDatabaseInterface); - + server->addDatabaseInterface(thread(), newDatabaseInterface); newDatabaseInterface->initDatabase(_sqlDatabase); - + connectionPools.append(newPool); } else for (int i = 0; i < _numberPools; ++i) { Servatrice_DatabaseInterface *newDatabaseInterface = new Servatrice_DatabaseInterface(i, server); Servatrice_ConnectionPool *newPool = new Servatrice_ConnectionPool(newDatabaseInterface); - + QThread *newThread = new QThread; newThread->setObjectName("pool_" + QString::number(i)); newPool->moveToThread(newThread); newDatabaseInterface->moveToThread(newThread); server->addDatabaseInterface(newThread, newDatabaseInterface); - + newThread->start(); QMetaObject::invokeMethod(newDatabaseInterface, "initDatabase", Qt::BlockingQueuedConnection, Q_ARG(QSqlDatabase, _sqlDatabase)); - + connectionPools.append(newPool); } } @@ -98,12 +102,12 @@ void Servatrice_GameServer::incomingConnection(qintptr socketDescriptor) } qDebug() << "Pool utilisation:" << debugStr; Servatrice_ConnectionPool *pool = connectionPools[poolIndex]; - + ServerSocketInterface *ssi = new ServerSocketInterface(server, pool->getDatabaseInterface()); ssi->moveToThread(pool->thread()); pool->addClient(); connect(ssi, SIGNAL(destroyed()), pool, SLOT(removeClient())); - + QMetaObject::invokeMethod(ssi, "initConnection", Qt::QueuedConnection, Q_ARG(int, socketDescriptor)); } @@ -111,11 +115,11 @@ void Servatrice_IslServer::incomingConnection(int socketDescriptor) { QThread *thread = new QThread; connect(thread, SIGNAL(finished()), thread, SLOT(deleteLater())); - + IslInterface *interface = new IslInterface(socketDescriptor, cert, privateKey, server); interface->moveToThread(thread); connect(interface, SIGNAL(destroyed()), thread, SLOT(quit())); - + thread->start(); QMetaObject::invokeMethod(interface, "initServer", Qt::QueuedConnection); } @@ -137,7 +141,7 @@ bool Servatrice::initServer() serverName = settingsCache->value("server/name", "My Cockatrice server").toString(); serverId = settingsCache->value("server/id", 0).toInt(); bool regServerOnly = settingsCache->value("authentication/regonly", 0).toBool(); - + const QString authenticationMethodStr = settingsCache->value("authentication/method").toString(); if (authenticationMethodStr == "sql") { qDebug() << "Authenticating method: sql"; @@ -148,22 +152,22 @@ bool Servatrice::initServer() } else { if (regServerOnly) { qDebug() << "Registration only server enabled but no authentication method defined: Error."; - return false; + return false; } qDebug() << "Authenticating method: none"; authenticationMethod = AuthenticationNone; } - + QString dbTypeStr = settingsCache->value("database/type").toString(); if (dbTypeStr == "mysql") databaseType = DatabaseMySql; else databaseType = DatabaseNone; - + servatriceDatabaseInterface = new Servatrice_DatabaseInterface(-1, this); setDatabaseInterface(servatriceDatabaseInterface); - + if (databaseType != DatabaseNone) { settingsCache->beginGroup("database"); dbPrefix = settingsCache->value("prefix").toString(); @@ -173,13 +177,13 @@ bool Servatrice::initServer() settingsCache->value("user").toString(), settingsCache->value("password").toString()); settingsCache->endGroup(); - + updateServerList(); - + qDebug() << "Clearing previous sessions..."; servatriceDatabaseInterface->clearSessionTables(); } - + const QString roomMethod = settingsCache->value("rooms/method").toString(); if (roomMethod == "sql") { QSqlQuery query(servatriceDatabaseInterface->getDatabase()); @@ -193,7 +197,7 @@ bool Servatrice::initServer() QStringList gameTypes; while (query2.next()) gameTypes.append(query2.value(0).toString()); - + addRoom(new Server_Room(query.value(0).toInt(), query.value(1).toString(), query.value(2).toString(), @@ -207,7 +211,7 @@ bool Servatrice::initServer() int size = settingsCache->beginReadArray("rooms/roomlist"); for (int i = 0; i < size; ++i) { settingsCache->setArrayIndex(i); - + QStringList gameTypes; int size2 = settingsCache->beginReadArray("game_types"); for (int j = 0; j < size2; ++j) { @@ -215,7 +219,7 @@ bool Servatrice::initServer() gameTypes.append(settingsCache->value("name").toString()); } settingsCache->endArray(); - + Server_Room *newRoom = new Server_Room( i, settingsCache->value("name").toString(), @@ -240,17 +244,17 @@ bool Servatrice::initServer() QStringList("Standard"), this ); - addRoom(newRoom); + addRoom(newRoom); } settingsCache->endArray(); } - + updateLoginMessage(); - + maxGameInactivityTime = settingsCache->value("game/max_game_inactivity_time", 120).toInt(); maxPlayerInactivityTime = settingsCache->value("game/max_player_inactivity_time", 15).toInt(); - + maxUsersPerAddress = settingsCache->value("security/max_users_per_address", 4).toInt(); messageCountingInterval = settingsCache->value("security/message_counting_interval", 10).toInt(); maxMessageCountPerInterval = settingsCache->value("security/max_message_count_per_interval", 10).toInt(); @@ -283,7 +287,7 @@ bool Servatrice::initServer() QSslKey key(&keyFile, QSsl::Rsa, QSsl::Pem, QSsl::PrivateKey); if (key.isNull()) throw QString("Invalid private key."); - + QMutableListIterator serverIterator(serverList); while (serverIterator.hasNext()) { const ServerProperties &prop = serverIterator.next(); @@ -291,22 +295,22 @@ bool Servatrice::initServer() serverIterator.remove(); continue; } - + QThread *thread = new QThread; thread->setObjectName("isl_" + QString::number(prop.id)); connect(thread, SIGNAL(finished()), thread, SLOT(deleteLater())); - + IslInterface *interface = new IslInterface(prop.id, prop.hostname, prop.address.toString(), prop.controlPort, prop.cert, cert, key, this); interface->moveToThread(thread); connect(interface, SIGNAL(destroyed()), thread, SLOT(quit())); - + thread->start(); QMetaObject::invokeMethod(interface, "initClient", Qt::BlockingQueuedConnection); } - + const int networkPort = settingsCache->value("servernetwork/port", 14747).toInt(); qDebug() << "Starting ISL server on port" << networkPort; - + islServer = new Servatrice_IslServer(this, cert, key, this); if (islServer->listen(QHostAddress::Any, networkPort)) qDebug() << "ISL server listening."; @@ -316,11 +320,11 @@ bool Servatrice::initServer() qDebug() << "ERROR --" << error; return false; } - + pingClock = new QTimer(this); connect(pingClock, SIGNAL(timeout()), this, SIGNAL(pingClockTimeout())); pingClock->start(1000); - + int statusUpdateTime = settingsCache->value("server/statusupdate", 15000).toInt(); statusUpdateClock = new QTimer(this); connect(statusUpdateClock, SIGNAL(timeout()), this, SLOT(statusUpdate())); @@ -328,7 +332,7 @@ bool Servatrice::initServer() qDebug() << "Starting status update clock, interval " << statusUpdateTime << " ms"; statusUpdateClock->start(statusUpdateTime); } - + const int numberPools = settingsCache->value("server/number_pools", 1).toInt(); gameServer = new Servatrice_GameServer(this, numberPools, servatriceDatabaseInterface->getDatabase(), this); gameServer->setMaxPendingConnections(1000); @@ -351,10 +355,10 @@ void Servatrice::addDatabaseInterface(QThread *thread, Servatrice_DatabaseInterf void Servatrice::updateServerList() { qDebug() << "Updating server list..."; - + serverListMutex.lock(); serverList.clear(); - + QSqlQuery query(servatriceDatabaseInterface->getDatabase()); query.prepare("select id, ssl_cert, hostname, address, game_port, control_port from " + dbPrefix + "_servers order by id asc"); servatriceDatabaseInterface->execSqlQuery(query); @@ -363,7 +367,7 @@ void Servatrice::updateServerList() serverList.append(prop); qDebug() << QString("#%1 CERT=%2 NAME=%3 IP=%4:%5 CPORT=%6").arg(prop.id).arg(QString(prop.cert.digest().toHex())).arg(prop.hostname).arg(prop.address.toString()).arg(prop.gamePort).arg(prop.controlPort); } - + serverListMutex.unlock(); } @@ -372,17 +376,23 @@ QList Servatrice::getServerList() const serverListMutex.lock(); QList result = serverList; serverListMutex.unlock(); - + return result; } int Servatrice::getUsersWithAddress(const QHostAddress &address) const { int result = 0; - QReadLocker locker(&clientsLock); - for (int i = 0; i < clients.size(); ++i) - if (static_cast(clients[i])->getPeerAddress() == address) - ++result; + QString trustedSources = settingsCache->value("server/trusted_sources","127.0.0.1,::1").toString(); + + if (trustedSources.contains(address.toString(),Qt::CaseInsensitive)) { + //allow all clients from trusted sources regardsless of number of connections + } else { + QReadLocker locker(&clientsLock); + for (int i = 0; i < clients.size(); ++i) + if (static_cast(clients[i])->getPeerAddress() == address) + ++result; + } return result; } @@ -400,18 +410,18 @@ void Servatrice::updateLoginMessage() { if (!servatriceDatabaseInterface->checkSql()) return; - + QSqlQuery query(servatriceDatabaseInterface->getDatabase()); query.prepare("select message from " + dbPrefix + "_servermessages where id_server = :id_server order by timest desc limit 1"); query.bindValue(":id_server", serverId); if (servatriceDatabaseInterface->execSqlQuery(query)) if (query.next()) { const QString newLoginMessage = query.value(0).toString(); - + loginMessageMutex.lock(); loginMessage = newLoginMessage; loginMessageMutex.unlock(); - + Event_ServerMessage event; event.set_message(newLoginMessage.toStdString()); SessionEvent *se = Server_ProtocolHandler::prepareSessionEvent(event); @@ -426,12 +436,12 @@ void Servatrice::statusUpdate() { if (!servatriceDatabaseInterface->checkSql()) return; - + const int uc = getUsersCount(); // for correct mutex locking order const int gc = getGamesCount(); - + uptime += statusUpdateClock->interval() / 1000; - + txBytesMutex.lock(); quint64 tx = txBytes; txBytes = 0; @@ -440,7 +450,7 @@ void Servatrice::statusUpdate() quint64 rx = rxBytes; rxBytes = 0; rxBytesMutex.unlock(); - + QSqlQuery query(servatriceDatabaseInterface->getDatabase()); query.prepare("insert into " + dbPrefix + "_uptime (id_server, timest, uptime, users_count, games_count, tx_bytes, rx_bytes) values(:id, NOW(), :uptime, :users_count, :games_count, :tx, :rx)"); query.bindValue(":id", serverId); @@ -481,7 +491,7 @@ void Servatrice::incRxBytes(quint64 num) void Servatrice::shutdownTimeout() { --shutdownMinutes; - + SessionEvent *se; if (shutdownMinutes) { Event_ServerShutdown event; @@ -493,13 +503,13 @@ void Servatrice::shutdownTimeout() event.set_reason(Event_ConnectionClosed::SERVER_SHUTDOWN); se = Server_ProtocolHandler::prepareSessionEvent(event); } - + clientsLock.lockForRead(); for (int i = 0; i < clients.size(); ++i) clients[i]->sendProtocolItem(*se); clientsLock.unlock(); delete se; - + if (!shutdownMinutes) deleteLater(); } @@ -507,14 +517,14 @@ void Servatrice::shutdownTimeout() bool Servatrice::islConnectionExists(int serverId) const { // Only call with islLock locked at least for reading - + return islInterfaces.contains(serverId); } void Servatrice::addIslInterface(int serverId, IslInterface *interface) { // Only call with islLock locked for writing - + islInterfaces.insert(serverId, interface); connect(interface, SIGNAL(externalUserJoined(ServerInfo_User)), this, SLOT(externalUserJoined(ServerInfo_User))); connect(interface, SIGNAL(externalUserLeft(QString)), this, SLOT(externalUserLeft(QString))); @@ -531,7 +541,7 @@ void Servatrice::addIslInterface(int serverId, IslInterface *interface) void Servatrice::removeIslInterface(int serverId) { // Only call with islLock locked for writing - + // XXX we probably need to delete everything that belonged to it... islInterfaces.remove(serverId); } @@ -539,7 +549,7 @@ void Servatrice::removeIslInterface(int serverId) void Servatrice::doSendIslMessage(const IslMessage &msg, int serverId) { QReadLocker locker(&islLock); - + if (serverId == -1) { QMapIterator islIterator(islInterfaces); while (islIterator.hasNext()) diff --git a/servatrice/src/serversocketinterface.cpp b/servatrice/src/serversocketinterface.cpp index f91029d7..705e2edf 100644 --- a/servatrice/src/serversocketinterface.cpp +++ b/servatrice/src/serversocketinterface.cpp @@ -22,6 +22,7 @@ #include #include #include +#include "settingscache.h" #include "serversocketinterface.h" #include "servatrice.h" #include "servatrice_database_interface.h" @@ -72,7 +73,7 @@ ServerSocketInterface::ServerSocketInterface(Servatrice *_server, Servatrice_Dat socket->setSocketOption(QAbstractSocket::LowDelayOption, 1); connect(socket, SIGNAL(readyRead()), this, SLOT(readClient())); connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(catchSocketError(QAbstractSocket::SocketError))); - + // Never call flushOutputQueue directly from outputQueueChanged. In case of a socket error, // it could lead to this object being destroyed while another function is still on the call stack. -> mutex deadlocks etc. connect(this, SIGNAL(outputQueueChanged()), this, SLOT(flushOutputQueue()), Qt::QueuedConnection); @@ -81,7 +82,7 @@ ServerSocketInterface::ServerSocketInterface(Servatrice *_server, Servatrice_Dat ServerSocketInterface::~ServerSocketInterface() { logger->logMessage("ServerSocketInterface destructor", this); - + flushOutputQueue(); } @@ -90,7 +91,7 @@ void ServerSocketInterface::initConnection(int socketDescriptor) // Add this object to the server's list of connections before it can receive socket events. // Otherwise, in case a of a socket error, it could be removed from the list before it is added. server->addClient(this); - + socket->setSocketDescriptor(socketDescriptor); logger->logMessage(QString("Incoming connection: %1").arg(socket->peerAddress().toString()), this); initSessionDeprecated(); @@ -99,7 +100,7 @@ void ServerSocketInterface::initConnection(int socketDescriptor) void ServerSocketInterface::initSessionDeprecated() { // dirty hack to make v13 client display the correct error message - + QByteArray buf; buf.append(""); socket->write(buf); @@ -115,7 +116,7 @@ bool ServerSocketInterface::initSession() SessionEvent *identSe = prepareSessionEvent(identEvent); sendProtocolItem(*identSe); delete identSe; - + int maxUsers = servatrice->getMaxUsersPerAddress(); if ((maxUsers > 0) && (servatrice->getUsersWithAddress(socket->peerAddress()) >= maxUsers)) { Event_ConnectionClosed event; @@ -123,10 +124,10 @@ bool ServerSocketInterface::initSession() SessionEvent *se = prepareSessionEvent(event); sendProtocolItem(*se); delete se; - + return false; } - + return true; } @@ -135,7 +136,7 @@ void ServerSocketInterface::readClient() QByteArray data = socket->readAll(); servatrice->incRxBytes(data.size()); inputBuffer.append(data); - + do { if (!messageInProgress) { if (inputBuffer.size() >= 4) { @@ -150,12 +151,12 @@ void ServerSocketInterface::readClient() } if (inputBuffer.size() < messageLength) return; - + CommandContainer newCommandContainer; newCommandContainer.ParseFromArray(inputBuffer.data(), messageLength); inputBuffer.remove(0, messageLength); messageInProgress = false; - + // dirty hack to make v13 client display the correct error message if (handshakeStarted) processCommandContainer(newCommandContainer); @@ -171,7 +172,7 @@ void ServerSocketInterface::readClient() void ServerSocketInterface::catchSocketError(QAbstractSocket::SocketError socketError) { qDebug() << "Socket error:" << socketError; - + prepareDestroy(); } @@ -180,7 +181,7 @@ void ServerSocketInterface::transmitProtocolItem(const ServerMessage &item) outputQueueMutex.lock(); outputQueue.append(item); outputQueueMutex.unlock(); - + emit outputQueueChanged(); } @@ -189,12 +190,12 @@ void ServerSocketInterface::flushOutputQueue() QMutexLocker locker(&outputQueueMutex); if (outputQueue.isEmpty()) return; - + int totalBytes = 0; while (!outputQueue.isEmpty()) { ServerMessage item = outputQueue.takeFirst(); locker.unlock(); - + QByteArray buf; unsigned int size = item.ByteSize(); buf.resize(size + 4); @@ -205,7 +206,7 @@ void ServerSocketInterface::flushOutputQueue() buf.data()[0] = (unsigned char) (size >> 24); // In case socket->write() calls catchSocketError(), the mutex must not be locked during this call. socket->write(buf); - + totalBytes += size + 4; locker.relock(); } @@ -260,39 +261,39 @@ Response::ResponseCode ServerSocketInterface::cmdAddToList(const Command_AddToLi { if (authState != PasswordRight) return Response::RespFunctionNotAllowed; - + QString list = QString::fromStdString(cmd.list()); QString user = QString::fromStdString(cmd.user_name()); - + if ((list != "buddy") && (list != "ignore")) return Response::RespContextError; - + if (list == "buddy") if (databaseInterface->isInBuddyList(QString::fromStdString(userInfo->name()), user)) return Response::RespContextError; if (list == "ignore") if (databaseInterface->isInIgnoreList(QString::fromStdString(userInfo->name()), user)) return Response::RespContextError; - + int id1 = userInfo->id(); int id2 = sqlInterface->getUserIdInDB(user); if (id2 < 0) return Response::RespNameNotFound; if (id1 == id2) return Response::RespContextError; - + QSqlQuery query(sqlInterface->getDatabase()); query.prepare("insert into " + servatrice->getDbPrefix() + "_" + list + "list (id_user1, id_user2) values(:id1, :id2)"); query.bindValue(":id1", id1); query.bindValue(":id2", id2); if (!sqlInterface->execSqlQuery(query)) return Response::RespInternalError; - + Event_AddToList event; event.set_list_name(cmd.list()); event.mutable_user_info()->CopyFrom(databaseInterface->getUserData(user)); rc.enqueuePreResponseItem(ServerMessage::SESSION_EVENT, prepareSessionEvent(event)); - + return Response::RespOk; } @@ -300,37 +301,37 @@ Response::ResponseCode ServerSocketInterface::cmdRemoveFromList(const Command_Re { if (authState != PasswordRight) return Response::RespFunctionNotAllowed; - + QString list = QString::fromStdString(cmd.list()); QString user = QString::fromStdString(cmd.user_name()); - + if ((list != "buddy") && (list != "ignore")) return Response::RespContextError; - + if (list == "buddy") if (!databaseInterface->isInBuddyList(QString::fromStdString(userInfo->name()), user)) return Response::RespContextError; if (list == "ignore") if (!databaseInterface->isInIgnoreList(QString::fromStdString(userInfo->name()), user)) return Response::RespContextError; - + int id1 = userInfo->id(); int id2 = sqlInterface->getUserIdInDB(user); if (id2 < 0) return Response::RespNameNotFound; - + QSqlQuery query(sqlInterface->getDatabase()); query.prepare("delete from " + servatrice->getDbPrefix() + "_" + list + "list where id_user1 = :id1 and id_user2 = :id2"); query.bindValue(":id1", id1); query.bindValue(":id2", id2); if (!sqlInterface->execSqlQuery(query)) return Response::RespInternalError; - + Event_RemoveFromList event; event.set_list_name(cmd.list()); event.set_user_name(cmd.user_name()); rc.enqueuePreResponseItem(ServerMessage::SESSION_EVENT, prepareSessionEvent(event)); - + return Response::RespOk; } @@ -340,7 +341,7 @@ int ServerSocketInterface::getDeckPathId(int basePathId, QStringList path) return 0; if (path[0].isEmpty()) return 0; - + QSqlQuery query(sqlInterface->getDatabase()); query.prepare("select id from " + servatrice->getDbPrefix() + "_decklist_folders where id_parent = :id_parent and name = :name and id_user = :id_user"); query.bindValue(":id_parent", basePathId); @@ -370,31 +371,31 @@ bool ServerSocketInterface::deckListHelper(int folderId, ServerInfo_DeckStorage_ query.bindValue(":id_user", userInfo->id()); if (!sqlInterface->execSqlQuery(query)) return false; - + while (query.next()) { ServerInfo_DeckStorage_TreeItem *newItem = folder->add_items(); newItem->set_id(query.value(0).toInt()); newItem->set_name(query.value(1).toString().toStdString()); - + if (!deckListHelper(newItem->id(), newItem->mutable_folder())) return false; } - + query.prepare("select id, name, upload_time from " + servatrice->getDbPrefix() + "_decklist_files where id_folder = :id_folder and id_user = :id_user"); query.bindValue(":id_folder", folderId); query.bindValue(":id_user", userInfo->id()); if (!sqlInterface->execSqlQuery(query)) return false; - + while (query.next()) { ServerInfo_DeckStorage_TreeItem *newItem = folder->add_items(); newItem->set_id(query.value(0).toInt()); newItem->set_name(query.value(1).toString().toStdString()); - + ServerInfo_DeckStorage_File *newFile = newItem->mutable_file(); newFile->set_creation_time(query.value(2).toDateTime().toTime_t()); } - + return true; } @@ -405,15 +406,15 @@ Response::ResponseCode ServerSocketInterface::cmdDeckList(const Command_DeckList { if (authState != PasswordRight) return Response::RespFunctionNotAllowed; - + sqlInterface->checkSql(); - + Response_DeckList *re = new Response_DeckList; ServerInfo_DeckStorage_Folder *root = re->mutable_root(); - + if (!deckListHelper(0, root)) return Response::RespContextError; - + rc.setResponseExtension(re); return Response::RespOk; } @@ -422,13 +423,13 @@ Response::ResponseCode ServerSocketInterface::cmdDeckNewDir(const Command_DeckNe { if (authState != PasswordRight) return Response::RespFunctionNotAllowed; - + sqlInterface->checkSql(); - + int folderId = getDeckPathId(QString::fromStdString(cmd.path())); if (folderId == -1) return Response::RespNameNotFound; - + QSqlQuery query(sqlInterface->getDatabase()); query.prepare("insert into " + servatrice->getDbPrefix() + "_decklist_folders (id_parent, id_user, name) values(:id_parent, :id_user, :name)"); query.bindValue(":id_parent", folderId); @@ -443,17 +444,17 @@ void ServerSocketInterface::deckDelDirHelper(int basePathId) { sqlInterface->checkSql(); QSqlQuery query(sqlInterface->getDatabase()); - + query.prepare("select id from " + servatrice->getDbPrefix() + "_decklist_folders where id_parent = :id_parent"); query.bindValue(":id_parent", basePathId); sqlInterface->execSqlQuery(query); while (query.next()) deckDelDirHelper(query.value(0).toInt()); - + query.prepare("delete from " + servatrice->getDbPrefix() + "_decklist_files where id_folder = :id_folder"); query.bindValue(":id_folder", basePathId); sqlInterface->execSqlQuery(query); - + query.prepare("delete from " + servatrice->getDbPrefix() + "_decklist_folders where id = :id"); query.bindValue(":id", basePathId); sqlInterface->execSqlQuery(query); @@ -463,9 +464,9 @@ Response::ResponseCode ServerSocketInterface::cmdDeckDelDir(const Command_DeckDe { if (authState != PasswordRight) return Response::RespFunctionNotAllowed; - + sqlInterface->checkSql(); - + int basePathId = getDeckPathId(QString::fromStdString(cmd.path())); if ((basePathId == -1) || (basePathId == 0)) return Response::RespNameNotFound; @@ -477,21 +478,21 @@ Response::ResponseCode ServerSocketInterface::cmdDeckDel(const Command_DeckDel & { if (authState != PasswordRight) return Response::RespFunctionNotAllowed; - + sqlInterface->checkSql(); QSqlQuery query(sqlInterface->getDatabase()); - + query.prepare("select id from " + servatrice->getDbPrefix() + "_decklist_files where id = :id and id_user = :id_user"); query.bindValue(":id", cmd.deck_id()); query.bindValue(":id_user", userInfo->id()); sqlInterface->execSqlQuery(query); if (!query.next()) return Response::RespNameNotFound; - + query.prepare("delete from " + servatrice->getDbPrefix() + "_decklist_files where id = :id"); query.bindValue(":id", cmd.deck_id()); sqlInterface->execSqlQuery(query); - + return Response::RespOk; } @@ -499,24 +500,24 @@ Response::ResponseCode ServerSocketInterface::cmdDeckUpload(const Command_DeckUp { if (authState != PasswordRight) return Response::RespFunctionNotAllowed; - + if (!cmd.has_deck_list()) return Response::RespInvalidData; - + sqlInterface->checkSql(); - + QString deckStr = QString::fromStdString(cmd.deck_list()); DeckList deck(deckStr); - + QString deckName = deck.getName(); if (deckName.isEmpty()) deckName = "Unnamed deck"; - + if (cmd.has_path()) { int folderId = getDeckPathId(QString::fromStdString(cmd.path())); if (folderId == -1) return Response::RespNameNotFound; - + QSqlQuery query(sqlInterface->getDatabase()); query.prepare("insert into " + servatrice->getDbPrefix() + "_decklist_files (id_folder, id_user, name, upload_time, content) values(:id_folder, :id_user, :name, NOW(), :content)"); query.bindValue(":id_folder", folderId); @@ -524,7 +525,7 @@ Response::ResponseCode ServerSocketInterface::cmdDeckUpload(const Command_DeckUp query.bindValue(":name", deckName); query.bindValue(":content", deckStr); sqlInterface->execSqlQuery(query); - + Response_DeckUpload *re = new Response_DeckUpload; ServerInfo_DeckStorage_TreeItem *fileInfo = re->mutable_new_file(); fileInfo->set_id(query.lastInsertId().toInt()); @@ -539,10 +540,10 @@ Response::ResponseCode ServerSocketInterface::cmdDeckUpload(const Command_DeckUp query.bindValue(":name", deckName); query.bindValue(":content", deckStr); sqlInterface->execSqlQuery(query); - + if (query.numRowsAffected() == 0) return Response::RespNameNotFound; - + Response_DeckUpload *re = new Response_DeckUpload; ServerInfo_DeckStorage_TreeItem *fileInfo = re->mutable_new_file(); fileInfo->set_id(cmd.deck_id()); @@ -551,7 +552,7 @@ Response::ResponseCode ServerSocketInterface::cmdDeckUpload(const Command_DeckUp rc.setResponseExtension(re); } else return Response::RespInvalidData; - + return Response::RespOk; } @@ -559,19 +560,19 @@ Response::ResponseCode ServerSocketInterface::cmdDeckDownload(const Command_Deck { if (authState != PasswordRight) return Response::RespFunctionNotAllowed; - + DeckList *deck; try { deck = sqlInterface->getDeckFromDatabase(cmd.deck_id(), userInfo->id()); } catch(Response::ResponseCode r) { return r; } - + Response_DeckDownload *re = new Response_DeckDownload; re->set_deck(deck->writeToString_Native().toStdString()); rc.setResponseExtension(re); delete deck; - + return Response::RespOk; } @@ -579,16 +580,16 @@ Response::ResponseCode ServerSocketInterface::cmdReplayList(const Command_Replay { if (authState != PasswordRight) return Response::RespFunctionNotAllowed; - + Response_ReplayList *re = new Response_ReplayList; - + QSqlQuery query1(sqlInterface->getDatabase()); query1.prepare("select a.id_game, a.replay_name, b.room_name, b.time_started, b.time_finished, b.descr, a.do_not_hide from cockatrice_replays_access a left join cockatrice_games b on b.id = a.id_game where a.id_player = :id_player and (a.do_not_hide = 1 or date_add(b.time_started, interval 7 day) > now())"); query1.bindValue(":id_player", userInfo->id()); sqlInterface->execSqlQuery(query1); while (query1.next()) { ServerInfo_ReplayMatch *matchInfo = re->add_match_list(); - + const int gameId = query1.value(0).toInt(); matchInfo->set_game_id(gameId); matchInfo->set_room_name(query1.value(2).toString().toStdString()); @@ -599,7 +600,7 @@ Response::ResponseCode ServerSocketInterface::cmdReplayList(const Command_Replay matchInfo->set_game_name(query1.value(5).toString().toStdString()); const QString replayName = query1.value(1).toString(); matchInfo->set_do_not_hide(query1.value(6).toBool()); - + { QSqlQuery query2(sqlInterface->getDatabase()); query2.prepare("select player_name from cockatrice_games_players where id_game = :id_game"); @@ -621,7 +622,7 @@ Response::ResponseCode ServerSocketInterface::cmdReplayList(const Command_Replay } } } - + rc.setResponseExtension(re); return Response::RespOk; } @@ -630,7 +631,7 @@ Response::ResponseCode ServerSocketInterface::cmdReplayDownload(const Command_Re { if (authState != PasswordRight) return Response::RespFunctionNotAllowed; - + { QSqlQuery query(sqlInterface->getDatabase()); query.prepare("select 1 from " + servatrice->getDbPrefix() + "_replays_access a left join " + servatrice->getDbPrefix() + "_replays b on a.id_game = b.id_game where b.id = :id_replay and a.id_player = :id_player"); @@ -641,7 +642,7 @@ Response::ResponseCode ServerSocketInterface::cmdReplayDownload(const Command_Re if (!query.next()) return Response::RespAccessDenied; } - + QSqlQuery query(sqlInterface->getDatabase()); query.prepare("select replay from " + servatrice->getDbPrefix() + "_replays where id = :id_replay"); query.bindValue(":id_replay", cmd.replay_id()); @@ -649,13 +650,13 @@ Response::ResponseCode ServerSocketInterface::cmdReplayDownload(const Command_Re return Response::RespInternalError; if (!query.next()) return Response::RespNameNotFound; - + QByteArray data = query.value(0).toByteArray(); - + Response_ReplayDownload *re = new Response_ReplayDownload; re->set_replay_data(data.data(), data.size()); rc.setResponseExtension(re); - + return Response::RespOk; } @@ -663,16 +664,16 @@ Response::ResponseCode ServerSocketInterface::cmdReplayModifyMatch(const Command { if (authState != PasswordRight) return Response::RespFunctionNotAllowed; - + if (!sqlInterface->checkSql()) return Response::RespInternalError; - + QSqlQuery query(sqlInterface->getDatabase()); query.prepare("update " + servatrice->getDbPrefix() + "_replays_access set do_not_hide=:do_not_hide where id_player = :id_player and id_game = :id_game"); query.bindValue(":id_player", userInfo->id()); query.bindValue(":id_game", cmd.game_id()); query.bindValue(":do_not_hide", cmd.do_not_hide()); - + if (!sqlInterface->execSqlQuery(query)) return Response::RespInternalError; return query.numRowsAffected() > 0 ? Response::RespOk : Response::RespNameNotFound; @@ -682,15 +683,15 @@ Response::ResponseCode ServerSocketInterface::cmdReplayDeleteMatch(const Command { if (authState != PasswordRight) return Response::RespFunctionNotAllowed; - + if (!sqlInterface->checkSql()) return Response::RespInternalError; - + QSqlQuery query(sqlInterface->getDatabase()); query.prepare("delete from " + servatrice->getDbPrefix() + "_replays_access where id_player = :id_player and id_game = :id_game"); query.bindValue(":id_player", userInfo->id()); query.bindValue(":id_game", cmd.game_id()); - + if (!sqlInterface->execSqlQuery(query)) return Response::RespInternalError; return query.numRowsAffected() > 0 ? Response::RespOk : Response::RespNameNotFound; @@ -704,11 +705,14 @@ Response::ResponseCode ServerSocketInterface::cmdBanFromServer(const Command_Ban { if (!sqlInterface->checkSql()) return Response::RespInternalError; - + QString userName = QString::fromStdString(cmd.user_name()); QString address = QString::fromStdString(cmd.address()); + QString trustedSources = settingsCache->value("server/trusted_sources","127.0.0.1,::1").toString(); int minutes = cmd.minutes(); - + if (trustedSources.contains(address,Qt::CaseInsensitive)) + address = ""; + QSqlQuery query(sqlInterface->getDatabase()); query.prepare("insert into " + servatrice->getDbPrefix() + "_bans (user_name, ip_address, id_admin, time_from, minutes, reason, visible_reason) values(:user_name, :ip_address, :id_admin, NOW(), :minutes, :reason, :visible_reason)"); query.bindValue(":user_name", userName); @@ -718,7 +722,7 @@ Response::ResponseCode ServerSocketInterface::cmdBanFromServer(const Command_Ban query.bindValue(":reason", QString::fromStdString(cmd.reason())); query.bindValue(":visible_reason", QString::fromStdString(cmd.visible_reason())); sqlInterface->execSqlQuery(query); - + servatrice->clientsLock.lockForRead(); QList userList = servatrice->getUsersWithAddressAsList(QHostAddress(address)); ServerSocketInterface *user = static_cast(server->getUsers().value(userName)); @@ -739,7 +743,7 @@ Response::ResponseCode ServerSocketInterface::cmdBanFromServer(const Command_Ban } } servatrice->clientsLock.unlock(); - + return Response::RespOk; }