nanopenguin/verts-twmailer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed messages longer than buffer size

Browse Source 
issue if command end is never received
This commit is contained in:
Benedikt Galbavy 2023-10-18 00:37:15 +02:00
parent 1711b3d9d0
commit 49b4daae83
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server.cpp
View File

@ -15,7 +15,6 @@
#include <locale> #include <locale>
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>
#include <boost/algorithm/string.hpp>
#include <boost/compute/detail/sha1.hpp> #include <boost/compute/detail/sha1.hpp>
#include <netinet/in.h> #include <netinet/in.h>
@ -191,6 +190,8 @@ void *clientCommunication(void *data)
return NULL; return NULL;
} }
std::string incomplete_message;
do { do {
size = recv(*current_socket, buffer, BUF - 1, 0); size = recv(*current_socket, buffer, BUF - 1, 0);
if (size == -1) { if (size == -1) {
@ -216,7 +217,7 @@ void *clientCommunication(void *data)
buffer[size] = '\0'; buffer[size] = '\0';
std::stringstream ss(buffer); std::stringstream ss(incomplete_message.append(buffer));
std::string line; std::string line;
std::vector<std::string> lines; std::vector<std::string> lines;
@ -233,9 +234,15 @@ void *clientCommunication(void *data)
else if (boost::iequals(lines.at(0), "READ")) cmd = READ; else if (boost::iequals(lines.at(0), "READ")) cmd = READ;
else if (boost::iequals(lines.at(0), "DEL")) cmd = DEL; else if (boost::iequals(lines.at(0), "DEL")) cmd = DEL;
else if (boost::iequals(lines.at(0), "QUIT")) cmd = QUIT; else if (boost::iequals(lines.at(0), "QUIT")) cmd = QUIT;
else continue; // TODO: error message
switch (cmd) { switch (cmd) {
case SEND: case SEND:
if (lines.size() < 5 || lines.back().compare(".") != 0) {
incomplete_message = buffer;
continue; // issues if command end is never received
}
if (lines.at(3).length() > 80) { if (lines.at(3).length() > 80) {
// send error // send error
break; break;