janis/ma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adding support for uploading log entrys to server

Browse Source
This commit is contained in:
jakani24
2024-03-09 14:02:14 +01:00
parent ead2ec02db
commit 732dbb8432
26 changed files with 342 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
src/client_backend/log.h
View File

@@ -5,14 +5,21 @@
#include <ctime>
#include <iomanip>
#include <sstream>
#include "connect.h"
#include "well_known.h"
#include "settings.h"
#include "security.h"
enum class LOGLEVEL {
INFO,
WARN,
ERR,
VIRUS,
RISK,
PANIC
PANIC,
INFO_NOSEND,
WARN_NOSEND,
ERR_NOSEND,
PANIC_NOSEND
};
std::string get_loglevel(LOGLEVEL level);
@@ -30,10 +37,10 @@ void log(LOGLEVEL level, const std::string& message, Args&&... args) {
logStream << std::put_time(&tm, "%Y-%m-%d %H:%M:%S") << " " << prefix << " " << message;
if constexpr (sizeof...(args) > 0) {
((logStream << ' ' << std::forward<Args>(args)), ...);
((to_srv << ' ' << std::forward<Args>(args)), ...);
((to_srv << ' ' << std::forward<Args>(args)), ...);
}
logStream << std::endl;
to_srv << std::endl;
//to_srv << std::endl;
std::string logString = logStream.str();
std::string to_srv_string = to_srv.str();
printf("info from logger: %s", logString.c_str());
@@ -41,68 +48,79 @@ void log(LOGLEVEL level, const std::string& message, Args&&... args) {
FILE* fp;
switch (level) {
case LOGLEVEL::INFO:
error=fopen_s(&fp, INFOFILE, "a");
error = fopen_s(&fp, INFOFILE, "a");
break;
case LOGLEVEL::WARN:
error=fopen_s(&fp, WARNFILE, "a");
error = fopen_s(&fp, WARNFILE, "a");
break;
case LOGLEVEL::ERR:
error=fopen_s(&fp, ERRORFILE, "a");
error = fopen_s(&fp, ERRORFILE, "a");
break;
case LOGLEVEL::VIRUS:
error=fopen_s(&fp, VIRUSFILE, "a");
break;
error = fopen_s(&fp, VIRUSFILE, "a");
break;
case LOGLEVEL::RISK:
error=fopen_s(&fp, RISKFILE, "a");
break;
error = fopen_s(&fp, RISKFILE, "a");
break;
case LOGLEVEL::PANIC:
error = fopen_s(&fp, PANICFILE, "a");
break;
default:
error=fopen_s(&fp, LOGFILE, "a");
break;
}
if (error != 0) {
//panic, create log entry, return 1;
//printf("a");
return;
case LOGLEVEL::INFO_NOSEND:
error = fopen_s(&fp, INFOFILE, "a");
break;
case LOGLEVEL::WARN_NOSEND:
error = fopen_s(&fp, WARNFILE, "a");
break;
case LOGLEVEL::ERR_NOSEND:
error = fopen_s(&fp, ERRORFILE, "a");
break;
default:
error = fopen_s(&fp, LOGFILE, "a");
break;
}
if (error != 0) {
//panic, create log entry, return 1;
return;
}
else {
switch (level) {
case LOGLEVEL::INFO:
fprintf_s(fp, "%s", logString.c_str());
break;
case LOGLEVEL::WARN:
fprintf_s(fp, "%s", logString.c_str());
break;
case LOGLEVEL::ERR:
fprintf_s(fp, "%s", logString.c_str());
break;
case LOGLEVEL::VIRUS:
fprintf_s(fp, "%s", logString.c_str());
break;
case LOGLEVEL::RISK:
fprintf_s(fp, "%s", logString.c_str());
break;
case LOGLEVEL::PANIC:
fprintf_s(fp, "%s", logString.c_str());
break;
default:
fprintf_s(fp, "%s", logString.c_str());
break;
}
//write log entry to disk
fprintf_s(fp, "%s", logString.c_str());
fclose(fp);
//write to general log file
if (fopen_s(&fp, LOGFILE, "a") == 0) {
fprintf_s(fp, "%s", logString.c_str());
fclose(fp);
}
//write to server log file
if (fopen_s(&fp, SRV_LOGFILE, "a") == 0) {
fprintf_s(fp, "%s", to_srv_string.c_str());
fprintf_s(fp, "%s\n", to_srv_string.c_str());
fclose(fp);
}
}
//send log so srv
//build up the log string: loglevel&logtext&machineid&date
//to_srv_string=includes the log message
//we now need to build up the request string and append the machineid
if (level!=LOGLEVEL::INFO_NOSEND && level!=LOGLEVEL::WARN_NOSEND && level!=LOGLEVEL::ERR_NOSEND && level!=LOGLEVEL::PANIC_NOSEND) {
char* url = new char[3000];
if (get_setting("server:server_url", url) == 0 or strcmp(url, "nan") == 0) {
strcat_s(url, 3000, "/api/php/log/add_entry.php?logtext=");//need to add machine_id and apikey
strcat_s(url, 3000, url_encode(to_srv_string.c_str()));
strcat_s(url, 3000, "&machine_id=");
strcat_s(url, 3000, get_machineid(SECRETS));
strcat_s(url, 3000, "&apikey=");
strcat_s(url, 3000, get_apikey(SECRETS));
fast_send(url, get_setting("communication:unsafe_tls");
//we might not want to log an error occuring here because it will create a loop
delete[] url;
}
else {
delete[] url;
return;
}
}//else we do not send the log to the server
}
#endif // LOGGER_H