From 2720d909f6f41afdfbdd572f3a4550464af8d479 Mon Sep 17 00:00:00 2001 From: AwesomeAim <30537683+AwesomeAim@users.noreply.github.com> Date: Fri, 5 May 2023 10:04:24 -0700 Subject: [PATCH 1/4] change ban checks to return full BanInfo and reorder db_manager to allow for it --- core/include/db_manager.h | 36 ++++++++++++------------- core/src/db_manager.cpp | 56 ++++++++++++++++++++++++--------------- 2 files changed, 52 insertions(+), 40 deletions(-) diff --git a/core/include/db_manager.h b/core/include/db_manager.h index ca29a8f..117d236 100644 --- a/core/include/db_manager.h +++ b/core/include/db_manager.h @@ -59,6 +59,21 @@ class DBManager : public QObject */ ~DBManager(); + /** + * @brief Details about a ban. + */ + struct BanInfo + { + QString ipid; //!< The banned user's IPID. + QHostAddress ip; //!< The banned user's IP. + QString hdid; //!< The banned user's hardware ID. + unsigned long time; //!< The time the ban was registered. + QString reason; //!< The reason given for the ban by the moderator who registered it. + long long duration; //!< The duration of the ban, in seconds. + int id; //!< The unique ID of the ban. + QString moderator; //!< The moderator who issued the ban. + }; + /** * @brief Checks if there is a record in the Bans table with the given IPID. * @@ -68,7 +83,7 @@ class DBManager : public QObject * * First, a `bool` that is true if the query could return at least one such record. * * Then, a `QString` that is the reason for the ban. */ - QPair isIPBanned(QString ipid); + QPair isIPBanned(QString ipid); /** * @brief Checks if there is a record in the Bans table with the given hardware ID. @@ -79,7 +94,7 @@ class DBManager : public QObject * * First, a `bool` that is true if the query could return at least one such record. * * Then, a `QString` that is the reason for the ban. */ - QPair isHDIDBanned(QString hdid); + QPair isHDIDBanned(QString hdid); /** * @brief Gets the ID number of a given ban. @@ -96,21 +111,6 @@ class DBManager : public QObject */ int getBanID(QString hdid); - /** - * @brief Details about a ban. - */ - struct BanInfo - { - QString ipid; //!< The banned user's IPID. - QHostAddress ip; //!< The banned user's IP. - QString hdid; //!< The banned user's hardware ID. - unsigned long time; //!< The time the ban was registered. - QString reason; //!< The reason given for the ban by the moderator who registered it. - long long duration; //!< The duration of the ban, in seconds. - int id; //!< The unique ID of the ban. - QString moderator; //!< The moderator who issued the ban. - }; - /** * @brief Gets the last five bans made on the server. * @@ -274,4 +274,4 @@ class DBManager : public QObject void updateDB(int current_version); }; -#endif // BAN_MANAGER_H \ No newline at end of file +#endif // BAN_MANAGER_H diff --git a/core/src/db_manager.cpp b/core/src/db_manager.cpp index 9b2b11d..63d7f7b 100644 --- a/core/src/db_manager.cpp +++ b/core/src/db_manager.cpp @@ -44,48 +44,60 @@ DBManager::DBManager() : updateDB(db_version); } -QPair DBManager::isIPBanned(QString ipid) +QPair DBManager::isIPBanned(QString ipid) { QSqlQuery query; - query.prepare("SELECT TIME,REASON,DURATION FROM BANS WHERE IPID = ? ORDER BY TIME DESC"); + query.prepare("SELECT * FROM BANS WHERE IPID = ? ORDER BY TIME DESC"); query.addBindValue(ipid); query.exec(); + BanInfo ban; if (query.first()) { - long long ban_time = query.value(0).toLongLong(); - QString reason = query.value(1).toString(); - long long duration = query.value(2).toLongLong(); - if (duration == -2) - return {true, reason}; + ban.id = query.value(0).toInt(); + ban.ipid = query.value(1).toString(); + ban.hdid = query.value(2).toString(); + ban.ip = QHostAddress(query.value(3).toString()); + ban.time = static_cast(query.value(4).toULongLong()); + ban.reason = query.value(5).toString(); + ban.duration = query.value(6).toLongLong(); + ban.moderator = query.value(7).toString(); + if (ban.duration == -2) + return {true, ban}; long long current_time = QDateTime::currentDateTime().toSecsSinceEpoch(); - if (ban_time + duration > current_time) - return {true, reason}; + if (ban.time + ban.duration > current_time) + return {true, ban}; else - return {false, nullptr}; + return {false, ban}; } else - return {false, nullptr}; + return {false, ban}; } -QPair DBManager::isHDIDBanned(QString hdid) +QPair DBManager::isHDIDBanned(QString hdid) { QSqlQuery query; - query.prepare("SELECT TIME,REASON,DURATION FROM BANS WHERE HDID = ? ORDER BY TIME DESC"); + query.prepare("SELECT * FROM BANS WHERE HDID = ? ORDER BY TIME DESC"); query.addBindValue(hdid); query.exec(); + BanInfo ban; if (query.first()) { - long long ban_time = query.value(0).toLongLong(); - QString reason = query.value(1).toString(); - long long duration = query.value(2).toLongLong(); - if (duration == -2) - return {true, reason}; + ban.id = query.value(0).toInt(); + ban.ipid = query.value(1).toString(); + ban.hdid = query.value(2).toString(); + ban.ip = QHostAddress(query.value(3).toString()); + ban.time = static_cast(query.value(4).toULongLong()); + ban.reason = query.value(5).toString(); + ban.duration = query.value(6).toLongLong(); + ban.moderator = query.value(7).toString(); + if (ban.duration == -2) + return {true, ban}; long long current_time = QDateTime::currentDateTime().toSecsSinceEpoch(); - if (ban_time + duration > current_time) - return {true, reason}; + if (ban.time + ban.duration > current_time) + return {true, ban}; else - return {false, nullptr}; + return {false, ban}; } else - return {false, nullptr}; + return {false, ban}; } int DBManager::getBanID(QString hdid) From 83bebb5e259b22e966355dca7e30be6e1a965bbf Mon Sep 17 00:00:00 2001 From: AwesomeAim <30537683+AwesomeAim@users.noreply.github.com> Date: Fri, 5 May 2023 10:30:28 -0700 Subject: [PATCH 2/4] give a more detailed ban message --- core/src/packet/packet_hi.cpp | 9 ++++++++- core/src/server.cpp | 10 ++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/core/src/packet/packet_hi.cpp b/core/src/packet/packet_hi.cpp index 565ddf8..b946ee1 100644 --- a/core/src/packet/packet_hi.cpp +++ b/core/src/packet/packet_hi.cpp @@ -35,7 +35,14 @@ void PacketHI::handlePacket(AreaData *area, AOClient &client) const emit client.getServer()->logConnectionAttempt(client.m_remote_ip.toString(), client.m_ipid, client.m_hwid); auto ban = client.getServer()->getDatabaseManager()->isHDIDBanned(client.m_hwid); if (ban.first) { - client.sendPacket("BD", {ban.second + "\nBan ID: " + QString::number(client.getServer()->getDatabaseManager()->getBanID(client.m_hwid))}); + QString ban_duration; + if (!(ban.second.duration == -2)) { + ban_duration = QDateTime::fromSecsSinceEpoch(ban.second.time).addSecs(ban.second.duration).toString("MM/dd/yyyy, hh:mm"); + } + else { + ban_duration = "The heat death of the universe."; + } + client.sendPacket("BD", {"Reason: " + ban.second.reason + "\nBan ID: " + QString::number(ban.second.id) + "\nUntil: " + ban_duration}); client.m_socket->close(); return; } diff --git a/core/src/server.cpp b/core/src/server.cpp index b84b282..ef86cda 100644 --- a/core/src/server.cpp +++ b/core/src/server.cpp @@ -194,8 +194,14 @@ void Server::clientConnected() is_at_multiclient_limit = true; if (is_banned) { - QString reason = ban.second; - AOPacket *ban_reason = PacketFactory::createPacket("BD", {reason}); + QString ban_duration; + if (!(ban.second.duration == -2)) { + ban_duration = QDateTime::fromSecsSinceEpoch(ban.second.time).addSecs(ban.second.duration).toString("MM/dd/yyyy, hh:mm"); + } + else { + ban_duration = "The heat death of the universe."; + } + AOPacket *ban_reason = PacketFactory::createPacket("BD", {"Reason: " + ban.second.reason + "\nBan ID: " + QString::number(ban.second.id) + "\nUntil: " + ban_duration}); socket->write(ban_reason->toUtf8()); } if (is_banned || is_at_multiclient_limit) { From c37dcee3623019b5ae1d3c3430fd251a34041345 Mon Sep 17 00:00:00 2001 From: AwesomeAim <30537683+AwesomeAim@users.noreply.github.com> Date: Fri, 5 May 2023 10:45:16 -0700 Subject: [PATCH 3/4] websocket connections AND regular connections?! also clean up a warning --- core/src/db_manager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/db_manager.cpp b/core/src/db_manager.cpp index 63d7f7b..b724684 100644 --- a/core/src/db_manager.cpp +++ b/core/src/db_manager.cpp @@ -62,7 +62,7 @@ QPair DBManager::isIPBanned(QString ipid) ban.moderator = query.value(7).toString(); if (ban.duration == -2) return {true, ban}; - long long current_time = QDateTime::currentDateTime().toSecsSinceEpoch(); + unsigned long current_time = QDateTime::currentDateTime().toSecsSinceEpoch(); if (ban.time + ban.duration > current_time) return {true, ban}; else @@ -90,7 +90,7 @@ QPair DBManager::isHDIDBanned(QString hdid) ban.moderator = query.value(7).toString(); if (ban.duration == -2) return {true, ban}; - long long current_time = QDateTime::currentDateTime().toSecsSinceEpoch(); + unsigned long current_time = QDateTime::currentDateTime().toSecsSinceEpoch(); if (ban.time + ban.duration > current_time) return {true, ban}; else From 5fab8d6b5ec5a34bcd0928245820fc91d82e4ee6 Mon Sep 17 00:00:00 2001 From: AwesomeAim <30537683+AwesomeAim@users.noreply.github.com> Date: Fri, 5 May 2023 10:46:31 -0700 Subject: [PATCH 4/4] actually save the file --- core/src/server.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/core/src/server.cpp b/core/src/server.cpp index ef86cda..cb075ba 100644 --- a/core/src/server.cpp +++ b/core/src/server.cpp @@ -281,8 +281,14 @@ void Server::ws_clientConnected() is_at_multiclient_limit = true; if (is_banned) { - QString reason = ban.second; - AOPacket *ban_reason = PacketFactory::createPacket("BD", {reason}); + QString ban_duration; + if (!(ban.second.duration == -2)) { + ban_duration = QDateTime::fromSecsSinceEpoch(ban.second.time).addSecs(ban.second.duration).toString("MM/dd/yyyy, hh:mm"); + } + else { + ban_duration = "The heat death of the universe."; + } + AOPacket *ban_reason = PacketFactory::createPacket("BD", {"Reason: " + ban.second.reason + "\nBan ID: " + QString::number(ban.second.id) + "\nUntil: " + ban_duration}); socket->sendTextMessage(ban_reason->toUtf8()); } if (is_banned || is_at_multiclient_limit) {