Mamanyonyo/akashi-esquizolandia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #328 from AttorneyOnline/update-packet-handler

Browse Source 
Modify checks in Akashis packet creation
This commit is contained in:
in1tiate 2023-01-08 13:45:12 -06:00 committed by GitHub
commit 479ad5df28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/src/packet/packet_factory.cpp
View File

@ -15,16 +15,23 @@ AOPacket *PacketFactory::createPacket(QString raw_packet)
QString header; QString header;
QStringList contents; QStringList contents;
if (raw_packet.at(0) == '#' || raw_packet.contains("%") || raw_packet.isEmpty()) { if (raw_packet.isEmpty()) {
qDebug() << "Empty packet received.";
return PacketFactory::createPacket("Unknown", {"Unknown"});
}
if (raw_packet.at(0) == '#' || raw_packet.contains("%")) {
qDebug() << "FantaCrypt or otherwise invalid packet received"; qDebug() << "FantaCrypt or otherwise invalid packet received";
return PacketFactory::createPacket("Unknown", {"Unknown"}); return PacketFactory::createPacket("Unknown", {"Unknown"});
} }
QStringList packet_contents = raw_packet.split("#"); QStringList packet_contents = raw_packet.split("#");
header = packet_contents[0]; header = packet_contents[0];
packet_contents.removeFirst(); // Remove header packet_contents.removeFirst(); // Remove header
packet_contents.removeLast(); // Remove anything trailing after delimiter
if (!packet_contents.isEmpty()) {
packet_contents.removeLast(); // Remove anything trailing after delimiter
}
contents = packet_contents; contents = packet_contents;
AOPacket *packet = PacketFactory::createPacket(header, contents); AOPacket *packet = PacketFactory::createPacket(header, contents);

3
tests/unittest_aopacket/tst_unittest_aopacket.cpp
View File

@ -166,6 +166,9 @@ void Packet::createPacketFromString_data()
QTest::newRow("Empty packet") << "" QTest::newRow("Empty packet") << ""
<< "Unknown" << "Unknown"
<< QStringList{"Unknown"}; << QStringList{"Unknown"};
QTest::newRow("Bogus Packet - PR 328") << "ZZ#%@%#@^#@&^#@$^@&$^*@&$*@^$&*@$@^$&*@^$&#^&#@$#%"
<< "Unknown"
<< QStringList{"Unknown"};
} }
void Packet::createPacketFromString() void Packet::createPacketFromString()