From 7dbbf41d330bef5fce27fd80be01fabe55446042 Mon Sep 17 00:00:00 2001 From: Salanto <62221668+Salanto@users.noreply.github.com> Date: Tue, 16 Nov 2021 22:07:26 +0100 Subject: [PATCH 1/3] Add IPID to global messages when user is authenticated This adds the ability to send altered packets to a specific group of users and the original to everyone else. --- core/include/server.h | 16 ++++++++++++++++ core/src/commands/messaging.cpp | 7 +++---- core/src/server.cpp | 15 +++++++++++++++ 3 files changed, 34 insertions(+), 4 deletions(-) diff --git a/core/include/server.h b/core/include/server.h index d6c86f8..0c47b99 100644 --- a/core/include/server.h +++ b/core/include/server.h @@ -75,6 +75,14 @@ class Server : public QObject { */ void start(); + /** + * @brief Enum to specifc different targets to send altered packets to a specific usergroup. + */ + enum class TARGET_TYPE { + AUTHENTICATED + }; + Q_ENUM(TARGET_TYPE) + /** * @brief Gets a pointer to a client by IPID. * @@ -129,6 +137,14 @@ class Server : public QObject { */ void broadcast(AOPacket packet); + /** + * @brief Sends a packet to clients, sends an altered packet to a specific usergroup. + * @param The packet to send to the clients. + * @param The altered packet to send to the other clients. + * @param tENUM to determine the targets of the altered packet. + */ + void broadcast(AOPacket packet, AOPacket other_packet, enum TARGET_TYPE target); + /** * @brief Returns the character's character ID (= their index in the character list). * diff --git a/core/src/commands/messaging.cpp b/core/src/commands/messaging.cpp index 7582501..356743c 100644 --- a/core/src/commands/messaging.cpp +++ b/core/src/commands/messaging.cpp @@ -71,10 +71,9 @@ void AOClient::cmdG(int argc, QStringList argv) QString l_sender_name = m_ooc_name; QString l_sender_area = server->m_area_names.value(m_current_area); QString l_sender_message = argv.join(" "); - for (AOClient* l_client : qAsConst(server->m_clients)) { - if (l_client->m_global_enabled) - l_client->sendPacket("CT", {"[G][" + l_sender_area + "]" + l_sender_name, l_sender_message}); - } + AOPacket l_packet = AOPacket("CT", {"[G][" + m_ipid + "][" + l_sender_area + "]" + l_sender_name, l_sender_message}); + AOPacket l_other_packet = AOPacket("CT", {"[G][" + l_sender_area + "]" + l_sender_name, l_sender_message}); + server->broadcast(l_packet, l_other_packet, Server::TARGET_TYPE::AUTHENTICATED); return; } diff --git a/core/src/server.cpp b/core/src/server.cpp index 46741bb..a93d2a8 100644 --- a/core/src/server.cpp +++ b/core/src/server.cpp @@ -215,6 +215,21 @@ void Server::broadcast(AOPacket packet) } } +void Server::broadcast(AOPacket packet, AOPacket other_packet, TARGET_TYPE target) +{ + switch (target) { + case TARGET_TYPE::AUTHENTICATED: + for (AOClient* client : qAsConst(m_clients)){ + if (client->m_authenticated) { + client->sendPacket(other_packet); + } + else { + client->sendPacket(packet); + } + } + } +} + QList Server::getClientsByIpid(QString ipid) { QList return_clients; From d943981ef132a2990e413b8a4c162491efe19c63 Mon Sep 17 00:00:00 2001 From: Salanto <62221668+Salanto@users.noreply.github.com> Date: Sat, 20 Nov 2021 17:35:05 +0100 Subject: [PATCH 2/3] Allow easier handling of targeting user groups when sending packets --- core/include/aoclient.h | 20 ++++++++++---------- core/include/server.h | 17 +++++++++++++++-- core/src/commands/messaging.cpp | 12 ++---------- core/src/server.cpp | 18 ++++++++++++++++++ core/src/testimony_recorder.cpp | 8 ++++---- 5 files changed, 49 insertions(+), 26 deletions(-) diff --git a/core/include/aoclient.h b/core/include/aoclient.h index 31ee401..e5f2914 100644 --- a/core/include/aoclient.h +++ b/core/include/aoclient.h @@ -307,6 +307,16 @@ class AOClient : public QObject { */ bool m_is_logging_in = false; + /** + * @brief Checks if the client would be authorised to something based on its necessary permissions. + * + * @param acl_mask The permissions bitflag that the client's own permissions should be checked against. + * + * @return True if the client's permissions are high enough for `acl_mask`, or higher than it. + * False if the client is missing some permissions. + */ + bool checkAuth(unsigned long long acl_mask); + public slots: /** * @brief A slot for when the client disconnects from the server. @@ -433,16 +443,6 @@ class AOClient : public QObject { */ void sendServerBroadcast(QString message); - /** - * @brief Checks if the client would be authorised to something based on its necessary permissions. - * - * @param acl_mask The permissions bitflag that the client's own permissions should be checked against. - * - * @return True if the client's permissions are high enough for `acl_mask`, or higher than it. - * False if the client is missing some permissions. - */ - bool checkAuth(unsigned long long acl_mask); - /** * @name Packet headers * diff --git a/core/include/server.h b/core/include/server.h index 0c47b99..8b4d43f 100644 --- a/core/include/server.h +++ b/core/include/server.h @@ -79,7 +79,8 @@ class Server : public QObject { * @brief Enum to specifc different targets to send altered packets to a specific usergroup. */ enum class TARGET_TYPE { - AUTHENTICATED + AUTHENTICATED, + MODCHAT }; Q_ENUM(TARGET_TYPE) @@ -139,9 +140,21 @@ class Server : public QObject { /** * @brief Sends a packet to clients, sends an altered packet to a specific usergroup. + * * @param The packet to send to the clients. + * + * @param ENUM to determine the targets of the altered packet. + */ + void broadcast(AOPacket packet, TARGET_TYPE target); + + /** + * @brief Sends a packet to clients, sends an altered packet to a specific usergroup. + * + * @param The packet to send to the clients. + * * @param The altered packet to send to the other clients. - * @param tENUM to determine the targets of the altered packet. + * + * @param ENUM to determine the targets of the altered packet. */ void broadcast(AOPacket packet, AOPacket other_packet, enum TARGET_TYPE target); diff --git a/core/src/commands/messaging.cpp b/core/src/commands/messaging.cpp index 356743c..556889a 100644 --- a/core/src/commands/messaging.cpp +++ b/core/src/commands/messaging.cpp @@ -173,11 +173,7 @@ void AOClient::cmdM(int argc, QStringList argv) QString l_sender_name = m_ooc_name; QString l_sender_message = argv.join(" "); - for (AOClient* client : qAsConst(server->m_clients)) { - if (client->checkAuth(ACLFlags.value("MODCHAT"))) - client->sendPacket("CT", {"[M]" + l_sender_name, l_sender_message}); - } - return; + server->broadcast(AOPacket("CT", {"[M]" + l_sender_name, l_sender_message}), Server::TARGET_TYPE::MODCHAT); } void AOClient::cmdGM(int argc, QStringList argv) @@ -187,11 +183,7 @@ void AOClient::cmdGM(int argc, QStringList argv) QString l_sender_name = m_ooc_name; QString l_sender_area = server->m_area_names.value(m_current_area); QString l_sender_message = argv.join(" "); - for (AOClient* l_client : qAsConst(server->m_clients)) { - if (l_client->m_global_enabled) { - l_client->sendPacket("CT", {"[G][" + l_sender_area + "]" + "["+ l_sender_name+"][M]", l_sender_message}); - } - } + server->broadcast(AOPacket("CT", {"[G][" + l_sender_area + "]" + "["+ l_sender_name+"][M]", l_sender_message}),Server::TARGET_TYPE::MODCHAT); } void AOClient::cmdLM(int argc, QStringList argv) diff --git a/core/src/server.cpp b/core/src/server.cpp index a93d2a8..ce5816b 100644 --- a/core/src/server.cpp +++ b/core/src/server.cpp @@ -215,6 +215,21 @@ void Server::broadcast(AOPacket packet) } } +void Server::broadcast(AOPacket packet, TARGET_TYPE target) +{ + switch (target) { + case TARGET_TYPE::MODCHAT: + for (AOClient* l_client : qAsConst(m_clients)) { + if (l_client->checkAuth(l_client->ACLFlags.value("MODCHAT"))) { + l_client->sendPacket(packet); + } + } + default: + //Unimplemented, so not handled. + break; + } +} + void Server::broadcast(AOPacket packet, AOPacket other_packet, TARGET_TYPE target) { switch (target) { @@ -227,6 +242,9 @@ void Server::broadcast(AOPacket packet, AOPacket other_packet, TARGET_TYPE targe client->sendPacket(packet); } } + default: + //Unimplemented, so not handled. + break; } } diff --git a/core/src/testimony_recorder.cpp b/core/src/testimony_recorder.cpp index c626b67..50d4aa8 100644 --- a/core/src/testimony_recorder.cpp +++ b/core/src/testimony_recorder.cpp @@ -43,10 +43,10 @@ void AOClient::addStatement(QStringList packet) area->addStatement(c_statement, packet); area->setTestimonyRecording(AreaData::TestimonyRecording::PLAYBACK); } - else { - sendServerMessage("Unable to add more statements. The maximum amount of statements has been reached."); - area->setTestimonyRecording(AreaData::TestimonyRecording::PLAYBACK); - } + else { + sendServerMessage("Unable to add more statements. The maximum amount of statements has been reached."); + area->setTestimonyRecording(AreaData::TestimonyRecording::PLAYBACK); + } } } From 578aee2251c52aa5100c88b8f3fcf3e5e662a811 Mon Sep 17 00:00:00 2001 From: Salanto <62221668+Salanto@users.noreply.github.com> Date: Sat, 20 Nov 2021 18:07:49 +0100 Subject: [PATCH 3/3] More example implementation. --- core/include/server.h | 3 ++- core/src/commands/messaging.cpp | 7 ++----- core/src/server.cpp | 17 +++++++++++------ 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/core/include/server.h b/core/include/server.h index 8b4d43f..a6c7e96 100644 --- a/core/include/server.h +++ b/core/include/server.h @@ -80,7 +80,8 @@ class Server : public QObject { */ enum class TARGET_TYPE { AUTHENTICATED, - MODCHAT + MODCHAT, + ADVERT }; Q_ENUM(TARGET_TYPE) diff --git a/core/src/commands/messaging.cpp b/core/src/commands/messaging.cpp index 556889a..040b6cd 100644 --- a/core/src/commands/messaging.cpp +++ b/core/src/commands/messaging.cpp @@ -71,6 +71,7 @@ void AOClient::cmdG(int argc, QStringList argv) QString l_sender_name = m_ooc_name; QString l_sender_area = server->m_area_names.value(m_current_area); QString l_sender_message = argv.join(" "); + //Slightly better readability AOPacket l_packet = AOPacket("CT", {"[G][" + m_ipid + "][" + l_sender_area + "]" + l_sender_name, l_sender_message}); AOPacket l_other_packet = AOPacket("CT", {"[G][" + l_sender_area + "]" + l_sender_name, l_sender_message}); server->broadcast(l_packet, l_other_packet, Server::TARGET_TYPE::AUTHENTICATED); @@ -83,11 +84,7 @@ void AOClient::cmdNeed(int argc, QStringList argv) QString l_sender_area = server->m_area_names.value(m_current_area); QString l_sender_message = argv.join(" "); - for (AOClient* l_client : qAsConst(server->m_clients)) { - if (l_client->m_advert_enabled) { - l_client->sendServerMessage({"=== Advert ===\n[" + l_sender_area + "] needs " + l_sender_message+ "."}); - } - } + server->broadcast(AOPacket("CT",{"=== Advert ===\n[" + l_sender_area + "] needs " + l_sender_message+ "."}),Server::TARGET_TYPE::ADVERT); } void AOClient::cmdSwitch(int argc, QStringList argv) diff --git a/core/src/server.cpp b/core/src/server.cpp index ce5816b..da0c521 100644 --- a/core/src/server.cpp +++ b/core/src/server.cpp @@ -217,16 +217,21 @@ void Server::broadcast(AOPacket packet) void Server::broadcast(AOPacket packet, TARGET_TYPE target) { - switch (target) { - case TARGET_TYPE::MODCHAT: - for (AOClient* l_client : qAsConst(m_clients)) { + for (AOClient* l_client : qAsConst(m_clients)) { + switch (target) { + case TARGET_TYPE::MODCHAT: if (l_client->checkAuth(l_client->ACLFlags.value("MODCHAT"))) { l_client->sendPacket(packet); } + break; + case TARGET_TYPE::ADVERT: + if (l_client->m_advert_enabled) { + l_client->sendPacket(packet); + } + break; + default: + break; } - default: - //Unimplemented, so not handled. - break; } }