diff --git a/src/client_backend/.vs/client_backend/FileContentIndex/11f76172-f41b-47b7-97cd-3de3f68dccf0.vsidx b/src/client_backend/.vs/client_backend/FileContentIndex/11f76172-f41b-47b7-97cd-3de3f68dccf0.vsidx deleted file mode 100644 index 28a376e..0000000 Binary files a/src/client_backend/.vs/client_backend/FileContentIndex/11f76172-f41b-47b7-97cd-3de3f68dccf0.vsidx and /dev/null differ diff --git a/src/client_backend/.vs/client_backend/FileContentIndex/149613ac-abec-4130-bd61-b093d9593ea0.vsidx b/src/client_backend/.vs/client_backend/FileContentIndex/149613ac-abec-4130-bd61-b093d9593ea0.vsidx new file mode 100644 index 0000000..9d4a220 Binary files /dev/null and b/src/client_backend/.vs/client_backend/FileContentIndex/149613ac-abec-4130-bd61-b093d9593ea0.vsidx differ diff --git a/src/client_backend/.vs/client_backend/FileContentIndex/338095ee-8fe2-4bda-95a3-7b4b43db83b0.vsidx b/src/client_backend/.vs/client_backend/FileContentIndex/338095ee-8fe2-4bda-95a3-7b4b43db83b0.vsidx new file mode 100644 index 0000000..2d6fe74 Binary files /dev/null and b/src/client_backend/.vs/client_backend/FileContentIndex/338095ee-8fe2-4bda-95a3-7b4b43db83b0.vsidx differ diff --git a/src/client_backend/.vs/client_backend/FileContentIndex/3ac88e7d-be27-4b8d-bd7a-cc35767ad856.vsidx b/src/client_backend/.vs/client_backend/FileContentIndex/3ac88e7d-be27-4b8d-bd7a-cc35767ad856.vsidx new file mode 100644 index 0000000..621c750 Binary files /dev/null and b/src/client_backend/.vs/client_backend/FileContentIndex/3ac88e7d-be27-4b8d-bd7a-cc35767ad856.vsidx differ diff --git a/src/client_backend/.vs/client_backend/FileContentIndex/702199ac-4d56-4820-8896-80b3c1cb42c2.vsidx b/src/client_backend/.vs/client_backend/FileContentIndex/702199ac-4d56-4820-8896-80b3c1cb42c2.vsidx deleted file mode 100644 index 17f3022..0000000 Binary files a/src/client_backend/.vs/client_backend/FileContentIndex/702199ac-4d56-4820-8896-80b3c1cb42c2.vsidx and /dev/null differ diff --git a/src/client_backend/.vs/client_backend/FileContentIndex/862f81b2-79e2-4858-b8dd-caf783a1c9cd.vsidx b/src/client_backend/.vs/client_backend/FileContentIndex/862f81b2-79e2-4858-b8dd-caf783a1c9cd.vsidx new file mode 100644 index 0000000..bccfb39 Binary files /dev/null and b/src/client_backend/.vs/client_backend/FileContentIndex/862f81b2-79e2-4858-b8dd-caf783a1c9cd.vsidx differ diff --git a/src/client_backend/.vs/client_backend/FileContentIndex/88ab0dc2-31ae-4c07-928a-f43f249cbe1f.vsidx b/src/client_backend/.vs/client_backend/FileContentIndex/88ab0dc2-31ae-4c07-928a-f43f249cbe1f.vsidx deleted file mode 100644 index 1805243..0000000 Binary files a/src/client_backend/.vs/client_backend/FileContentIndex/88ab0dc2-31ae-4c07-928a-f43f249cbe1f.vsidx and /dev/null differ diff --git a/src/client_backend/.vs/client_backend/FileContentIndex/b776bd84-bdc5-432c-944c-f4a78ba936db.vsidx b/src/client_backend/.vs/client_backend/FileContentIndex/b776bd84-bdc5-432c-944c-f4a78ba936db.vsidx deleted file mode 100644 index efc04b9..0000000 Binary files a/src/client_backend/.vs/client_backend/FileContentIndex/b776bd84-bdc5-432c-944c-f4a78ba936db.vsidx and /dev/null differ diff --git a/src/client_backend/.vs/client_backend/FileContentIndex/dc13ab1a-d2ef-4f8d-a6f3-1c24ac19fd4f.vsidx b/src/client_backend/.vs/client_backend/FileContentIndex/dc13ab1a-d2ef-4f8d-a6f3-1c24ac19fd4f.vsidx new file mode 100644 index 0000000..059b422 Binary files /dev/null and b/src/client_backend/.vs/client_backend/FileContentIndex/dc13ab1a-d2ef-4f8d-a6f3-1c24ac19fd4f.vsidx differ diff --git a/src/client_backend/.vs/client_backend/FileContentIndex/eafbb085-e538-4b7d-987e-10230d812223.vsidx b/src/client_backend/.vs/client_backend/FileContentIndex/eafbb085-e538-4b7d-987e-10230d812223.vsidx deleted file mode 100644 index c3de881..0000000 Binary files a/src/client_backend/.vs/client_backend/FileContentIndex/eafbb085-e538-4b7d-987e-10230d812223.vsidx and /dev/null differ diff --git a/src/client_backend/.vs/client_backend/v17/.suo b/src/client_backend/.vs/client_backend/v17/.suo index 7a1a496..8d56075 100644 Binary files a/src/client_backend/.vs/client_backend/v17/.suo and b/src/client_backend/.vs/client_backend/v17/.suo differ diff --git a/src/client_backend/.vs/client_backend/v17/Browse.VC.db b/src/client_backend/.vs/client_backend/v17/Browse.VC.db index de74254..152e390 100644 Binary files a/src/client_backend/.vs/client_backend/v17/Browse.VC.db and b/src/client_backend/.vs/client_backend/v17/Browse.VC.db differ diff --git a/src/client_backend/client_backend.cpp b/src/client_backend/client_backend.cpp index 7a9366b..1d5baf1 100644 --- a/src/client_backend/client_backend.cpp +++ b/src/client_backend/client_backend.cpp @@ -17,11 +17,17 @@ #include "settings.h" #include "check_dir.h" #include "virus_ctrl.h" +#include "update.h" int main() { log(LOGLEVEL::INFO, "[main()]:Starting main thread."); printf("welcome to the jakach security tool main thread\n"); load_settings();//load the settings from the settings file + if (update_settings()) { //update the settings from the server + log(LOGLEVEL::ERR, "[main()]:Could not update settings from server."); + } + load_settings(); initialize(DB_DIR); //load the hash databases into memory + //download_file_from_srv("http://192.168.27.13/api/php/settings/get_settings.php?settings", "c:\\programdata\\jakach\\out12.txt"); //start a second thread which will scan for new files if (get_setting("rtp_folder_scan:status") == 1) { diff --git a/src/client_backend/connect.cpp b/src/client_backend/connect.cpp index 87b735d..bb5abfd 100644 --- a/src/client_backend/connect.cpp +++ b/src/client_backend/connect.cpp @@ -47,7 +47,7 @@ int download_file_from_srv(const char* url, const char* output_file_path) { CURL* curl; CURLcode res; FILE* output_file; - + char*buf=new char[55]; curl = curl_easy_init(); if (!curl) { return 1; @@ -60,7 +60,7 @@ int download_file_from_srv(const char* url, const char* output_file_path) { output_file = fopen(output_file_path, "wb"); if (!output_file) { curl_easy_cleanup(curl); - return 1; + return 2; } // Set the write callback function @@ -70,12 +70,23 @@ int download_file_from_srv(const char* url, const char* output_file_path) { // Perform the download res = curl_easy_perform(curl); if (res != CURLE_OK) { - return 1; + return 3; } // Cleanup and close the file curl_easy_cleanup(curl); fclose(output_file); - + if ((output_file = fopen(output_file_path, "r")) == 0) { + return 4; + } + else { + fscanf(output_file, "%50s", buf); + if (strcmp(buf, "no_auth") == 0) { + fclose(output_file); + return 5; + } + fclose(output_file); + } + delete[] buf; return 0; } diff --git a/src/client_backend/settings.cpp b/src/client_backend/settings.cpp index e5b46e6..acb57ba 100644 --- a/src/client_backend/settings.cpp +++ b/src/client_backend/settings.cpp @@ -17,6 +17,7 @@ int load_settings() { if (fopen_s(&fp, SETTINGS_DB, "r")!=0) { log(LOGLEVEL::ERR, "[load_settings()]: Could not open settings file. ", SETTINGS_DB); + strcpy_s(setting_server_server_url, 295, "http://localhost"); return 1; } else { @@ -63,6 +64,7 @@ int load_settings() { } load_included_folders(); load_excluded_folders(); + fclose(fp); return 0; } diff --git a/src/client_backend/update.cpp b/src/client_backend/update.cpp index 10ee946..ea6f132 100644 --- a/src/client_backend/update.cpp +++ b/src/client_backend/update.cpp @@ -40,15 +40,15 @@ int update_db(const std::string& folder_path) { } return 0; } -int update_settings(const std::string& folder_path) { +int update_settings() { //create the strings to download the files - char* url = new char[300]; + char* url = new char[500]; get_setting("server:server_url", url); - strcat_s(url, 295, "/database/"); - strcat_s(url, 295, "settings_db.txt"); + strcat_s(url, 500, "/api/php/settings/get_settings.php?settings"); int res = download_file_from_srv(url, SETTINGS_DB); + //res = 0; if (res != 0) { - log(LOGLEVEL::ERR, "[update_db()]: Error downloading settings database file from server", url); + log(LOGLEVEL::ERR, "[update_db()]: Error downloading settings database file from server", url, " ERROR:",res); return 1; } diff --git a/src/client_backend/update.h b/src/client_backend/update.h index 0cf68fe..64862c2 100644 --- a/src/client_backend/update.h +++ b/src/client_backend/update.h @@ -4,5 +4,5 @@ #include #include int update_db(const std::string& folder_path); -int update_settings(const std::string& folder_path); +int update_settings(); #endif \ No newline at end of file diff --git a/src/client_backend/x64/Debug/client_backend.ilk b/src/client_backend/x64/Debug/client_backend.ilk index a5bdfc3..14b6829 100644 Binary files a/src/client_backend/x64/Debug/client_backend.ilk and b/src/client_backend/x64/Debug/client_backend.ilk differ diff --git a/src/client_backend/x64/Debug/client_backend.log b/src/client_backend/x64/Debug/client_backend.log index 2ee27ad..ef618f4 100644 --- a/src/client_backend/x64/Debug/client_backend.log +++ b/src/client_backend/x64/Debug/client_backend.log @@ -1,4 +1,4 @@  Quellen werden auf Modulabhängigkeiten überprüft... - scan.cpp -C:\Users\janis\Documents\Projekte_mit_c\ma\ma\src\client_backend\scan.cpp(153,32): warning C4018: ">=": Konflikt zwischen "signed" und "unsigned" + connect.cpp +C:\Users\janis\Documents\Projekte_mit_c\ma\ma\src\client_backend\connect.cpp(103,65): warning C4267: "Argument": Konvertierung von "size_t" nach "int", Datenverlust möglich client_backend.vcxproj -> C:\Users\janis\Documents\Projekte_mit_c\ma\ma\src\client_backend\x64\Debug\client_backend.exe diff --git a/src/client_backend/x64/Debug/client_backend.pdb b/src/client_backend/x64/Debug/client_backend.pdb index 40f9c13..26b92c9 100644 Binary files a/src/client_backend/x64/Debug/client_backend.pdb and b/src/client_backend/x64/Debug/client_backend.pdb differ diff --git a/src/client_backend/x64/Debug/client_backend.tlog/CL.command.1.tlog b/src/client_backend/x64/Debug/client_backend.tlog/CL.command.1.tlog index 4965484..5ff3803 100644 Binary files a/src/client_backend/x64/Debug/client_backend.tlog/CL.command.1.tlog and b/src/client_backend/x64/Debug/client_backend.tlog/CL.command.1.tlog differ diff --git a/src/client_backend/x64/Debug/client_backend.tlog/CL.read.1.tlog b/src/client_backend/x64/Debug/client_backend.tlog/CL.read.1.tlog index 0b2ef22..f9e7aa0 100644 Binary files a/src/client_backend/x64/Debug/client_backend.tlog/CL.read.1.tlog and b/src/client_backend/x64/Debug/client_backend.tlog/CL.read.1.tlog differ diff --git a/src/client_backend/x64/Debug/client_backend.tlog/CL.write.1.tlog b/src/client_backend/x64/Debug/client_backend.tlog/CL.write.1.tlog index ce698ff..f3aa324 100644 Binary files a/src/client_backend/x64/Debug/client_backend.tlog/CL.write.1.tlog and b/src/client_backend/x64/Debug/client_backend.tlog/CL.write.1.tlog differ diff --git a/src/client_backend/x64/Debug/client_backend.tlog/client_backend.write.1u.tlog b/src/client_backend/x64/Debug/client_backend.tlog/client_backend.write.1u.tlog index 630abd5..08abbe1 100644 Binary files a/src/client_backend/x64/Debug/client_backend.tlog/client_backend.write.1u.tlog and b/src/client_backend/x64/Debug/client_backend.tlog/client_backend.write.1u.tlog differ diff --git a/src/client_backend/x64/Debug/vc143.idb b/src/client_backend/x64/Debug/vc143.idb index d25834d..ee08e17 100644 Binary files a/src/client_backend/x64/Debug/vc143.idb and b/src/client_backend/x64/Debug/vc143.idb differ diff --git a/src/client_backend/x64/Debug/vc143.pdb b/src/client_backend/x64/Debug/vc143.pdb index c3f0c76..9b54a9b 100644 Binary files a/src/client_backend/x64/Debug/vc143.pdb and b/src/client_backend/x64/Debug/vc143.pdb differ diff --git a/src/server/cyberhex-code/api/php/log/add_entry.php b/src/server/cyberhex-code/api/php/log/add_entry.php index db10574..3f02d0d 100644 --- a/src/server/cyberhex-code/api/php/log/add_entry.php +++ b/src/server/cyberhex-code/api/php/log/add_entry.php @@ -3,7 +3,7 @@ //put auth code here afterwards include "../accessctrl/check_apikey.php"; if(check_apikey()!==true){ - die("no_atuh"); + die("no_auth"); } //add the entry to the log db diff --git a/src/server/cyberhex-code/api/php/settings/get_settings.php b/src/server/cyberhex-code/api/php/settings/get_settings.php index 17fd381..7b7cdfc 100644 --- a/src/server/cyberhex-code/api/php/settings/get_settings.php +++ b/src/server/cyberhex-code/api/php/settings/get_settings.php @@ -3,7 +3,7 @@ //put auth code here afterwards include "../accessctrl/check_apikey.php"; if(check_apikey()!==true){ - die("no_atuh"); + die("no_auth"); } $setting_virus_ctrl_virus_found_action = "not configured yet";