diff --git a/src/client_backend/.vs/client_backend/v17/.suo b/src/client_backend/.vs/client_backend/v17/.suo index 1325092..f2e13be 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 8373e30..3cd26be 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/.vs/client_backend/v17/DocumentLayout.json b/src/client_backend/.vs/client_backend/v17/DocumentLayout.json index 999a405..3b3f4d3 100644 --- a/src/client_backend/.vs/client_backend/v17/DocumentLayout.json +++ b/src/client_backend/.vs/client_backend/v17/DocumentLayout.json @@ -2,10 +2,6 @@ "Version": 1, "WorkspaceRootPath": "C:\\Users\\janis\\Documents\\Projekte_mit_c\\ma\\ma\\src\\client_backend\\", "Documents": [ - { - "AbsoluteMoniker": "D:0:0:{56E65283-AAC9-43F6-9613-72BE8D648AC4}|client_backend.vcxproj|C:\\Users\\janis\\Documents\\Projekte_mit_c\\ma\\ma\\src\\client_backend\\client_backend.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}", - "RelativeMoniker": "D:0:0:{56E65283-AAC9-43F6-9613-72BE8D648AC4}|client_backend.vcxproj|solutionrelative:client_backend.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}" - }, { "AbsoluteMoniker": "D:0:0:{56E65283-AAC9-43F6-9613-72BE8D648AC4}|client_backend.vcxproj|C:\\Users\\janis\\Documents\\Projekte_mit_c\\ma\\ma\\src\\client_backend\\update.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}", "RelativeMoniker": "D:0:0:{56E65283-AAC9-43F6-9613-72BE8D648AC4}|client_backend.vcxproj|solutionrelative:update.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}" @@ -14,6 +10,10 @@ "AbsoluteMoniker": "D:0:0:{56E65283-AAC9-43F6-9613-72BE8D648AC4}|client_backend.vcxproj|C:\\Users\\janis\\Documents\\Projekte_mit_c\\ma\\ma\\src\\client_backend\\well_known.h||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}", "RelativeMoniker": "D:0:0:{56E65283-AAC9-43F6-9613-72BE8D648AC4}|client_backend.vcxproj|solutionrelative:well_known.h||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}" }, + { + "AbsoluteMoniker": "D:0:0:{56E65283-AAC9-43F6-9613-72BE8D648AC4}|client_backend.vcxproj|C:\\Users\\janis\\Documents\\Projekte_mit_c\\ma\\ma\\src\\client_backend\\client_backend.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}", + "RelativeMoniker": "D:0:0:{56E65283-AAC9-43F6-9613-72BE8D648AC4}|client_backend.vcxproj|solutionrelative:client_backend.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}" + }, { "AbsoluteMoniker": "D:0:0:{56E65283-AAC9-43F6-9613-72BE8D648AC4}|client_backend.vcxproj|C:\\Users\\janis\\Documents\\Projekte_mit_c\\ma\\ma\\src\\client_backend\\check_process.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}", "RelativeMoniker": "D:0:0:{56E65283-AAC9-43F6-9613-72BE8D648AC4}|client_backend.vcxproj|solutionrelative:check_process.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}" @@ -138,7 +138,7 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 2, + "SelectedChildIndex": 4, "Children": [ { "$type": "Document", @@ -166,13 +166,13 @@ }, { "$type": "Document", - "DocumentIndex": 0, + "DocumentIndex": 2, "Title": "client_backend.cpp", "DocumentMoniker": "C:\\Users\\janis\\Documents\\Projekte_mit_c\\ma\\ma\\src\\client_backend\\client_backend.cpp", "RelativeDocumentMoniker": "client_backend.cpp", "ToolTip": "C:\\Users\\janis\\Documents\\Projekte_mit_c\\ma\\ma\\src\\client_backend\\client_backend.cpp", "RelativeToolTip": "client_backend.cpp", - "ViewState": "AQIAABIAAAAAAAAAAAAlwDQAAAANAAAA", + "ViewState": "AQIAABIAAAAAAAAAAAAlwDgAAAAfAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|", "WhenOpened": "2024-01-28T20:40:06.279Z", "EditorCaption": "" @@ -191,13 +191,13 @@ }, { "$type": "Document", - "DocumentIndex": 1, + "DocumentIndex": 0, "Title": "update.cpp", "DocumentMoniker": "C:\\Users\\janis\\Documents\\Projekte_mit_c\\ma\\ma\\src\\client_backend\\update.cpp", "RelativeDocumentMoniker": "update.cpp", "ToolTip": "C:\\Users\\janis\\Documents\\Projekte_mit_c\\ma\\ma\\src\\client_backend\\update.cpp", "RelativeToolTip": "update.cpp", - "ViewState": "AQIAAH8AAAAAAAAAAAAvwKUAAAAwAAAA", + "ViewState": "AQIAAHkAAAAAAAAAAAAvwKUAAAAxAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|", "WhenOpened": "2024-01-28T20:40:06.248Z", "EditorCaption": "" @@ -228,13 +228,13 @@ }, { "$type": "Document", - "DocumentIndex": 2, + "DocumentIndex": 1, "Title": "well_known.h", "DocumentMoniker": "C:\\Users\\janis\\Documents\\Projekte_mit_c\\ma\\ma\\src\\client_backend\\well_known.h", "RelativeDocumentMoniker": "well_known.h", "ToolTip": "C:\\Users\\janis\\Documents\\Projekte_mit_c\\ma\\ma\\src\\client_backend\\well_known.h", "RelativeToolTip": "well_known.h", - "ViewState": "AQIAAAAAAAAAAAAAAAAAACQAAAAAAAAA", + "ViewState": "AQIAABIAAAAAAAAAAAAvwCwAAAAgAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000680|", "WhenOpened": "2024-03-14T13:20:06.953Z", "EditorCaption": "" diff --git a/src/client_backend/client_backend.cpp b/src/client_backend/client_backend.cpp index 1b0deaf..694e7ce 100644 --- a/src/client_backend/client_backend.cpp +++ b/src/client_backend/client_backend.cpp @@ -54,7 +54,7 @@ int main(int argc, char* argv[]) { if (update_settings("sched") != 0) { //update the settings from the server log(LOGLEVEL::ERR_NOSEND, "[main()]:Could not update settings (scheduled_tasks) from server."); } - if (update_settings("disalowed_start") != 0) { //update the settings from the server + if (update_settings("disallowed_start") != 0) { //update the settings from the server log(LOGLEVEL::ERR_NOSEND, "[main()]:Could not update settings (scheduled_tasks) from server."); } load_settings(); //load the updated settings from the settings file diff --git a/src/client_backend/client_backend/x64/Debug/client_backend.ilk b/src/client_backend/client_backend/x64/Debug/client_backend.ilk index acfefb5..c93df53 100644 Binary files a/src/client_backend/client_backend/x64/Debug/client_backend.ilk and b/src/client_backend/client_backend/x64/Debug/client_backend.ilk differ diff --git a/src/client_backend/client_backend/x64/Debug/client_backend.log b/src/client_backend/client_backend/x64/Debug/client_backend.log index f41202d..a8a3a40 100644 --- a/src/client_backend/client_backend/x64/Debug/client_backend.log +++ b/src/client_backend/client_backend/x64/Debug/client_backend.log @@ -1,4 +1,71 @@  Quellen werden auf Modulabhängigkeiten überprüft... + check_dir.cpp check_process.cpp +C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.39.33519\include\xutility(4537,18): warning C4244: "=": Konvertierung von "wchar_t" in "char", möglicher Datenverlust + (Quelldatei „check_dir.cpp“ wird kompiliert) + C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.39.33519\include\xutility(4537,18): + der Vorlageninstanziierungskontext (der älteste zuerst) ist + C:\Users\janis\Documents\Projekte_mit_c\ma\ma\src\client_backend\check_dir.cpp(38,29): + Siehe Verweis auf die gerade kompilierte Instanziierung "std::basic_string,std::allocator>::basic_string>>,0>(_Iter,_Iter,const _Alloc &)" der Funktions-Vorlage. + with + [ + _Elem=wchar_t, + _Iter=std::_String_iterator>>, + _Alloc=std::allocator + ] + C:\Users\janis\Documents\Projekte_mit_c\ma\ma\src\client_backend\check_dir.cpp(38,29): + Ersten Verweis auf "std::basic_string,std::allocator>::basic_string" in "process_changes" anzeigen + C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.39.33519\include\xstring(2600,17): + Siehe Verweis auf die gerade kompilierte Instanziierung "void std::basic_string,std::allocator>::_Construct_from_iter(_Iter,const _Sent,_Size)" der Funktions-Vorlage. + with + [ + _Size_type=unsigned __int64, + _Iter=wchar_t *, + _Sent=wchar_t *, + _Size=unsigned __int64 + ] + C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.39.33519\include\xstring(2756,18): + Siehe Verweis auf die gerade kompilierte Instanziierung "_OutIt *std::_Copy_n_unchecked4(_InIt,_SizeTy,_OutIt)" der Funktions-Vorlage. + with + [ + _OutIt=char *, + _Size=unsigned __int64, + _InIt=wchar_t *, + _SizeTy=unsigned __int64 + ] + + client_backend.cpp +C:\Users\janis\Documents\Projekte_mit_c\ma\ma\src\client_backend\client_backend.cpp(155,24): warning C4244: "Argument": Konvertierung von "_Rep" in "DWORD", möglicher Datenverlust +C:\Users\janis\Documents\Projekte_mit_c\ma\ma\src\client_backend\client_backend.cpp(155,24): warning C4244: with +C:\Users\janis\Documents\Projekte_mit_c\ma\ma\src\client_backend\client_backend.cpp(155,24): warning C4244: [ +C:\Users\janis\Documents\Projekte_mit_c\ma\ma\src\client_backend\client_backend.cpp(155,24): warning C4244: _Rep=__int64 +C:\Users\janis\Documents\Projekte_mit_c\ma\ma\src\client_backend\client_backend.cpp(155,24): warning C4244: ] + connect.cpp +C:\Users\janis\Documents\Projekte_mit_c\ma\ma\src\client_backend\connect.cpp(212,37): warning C4267: "Argument": Konvertierung von "size_t" nach "DWORD", Datenverlust möglich +C:\Users\janis\Documents\Projekte_mit_c\ma\ma\src\client_backend\connect.cpp(198,11): warning C4101: "dwRead": Unreferenzierte lokale Variable + deepscan.cpp +C:\Users\janis\Documents\Projekte_mit_c\ma\ma\src\client_backend\deepscan.cpp(134,46): warning C4018: ">=": Konflikt zwischen "signed" und "unsigned" + local_com.cpp + local_schedule.cpp + log.cpp + md5hash.cpp + scan.cpp +C:\Users\janis\Documents\Projekte_mit_c\ma\ma\src\client_backend\scan.cpp(255,46): warning C4018: ">=": Konflikt zwischen "signed" und "unsigned" + security.cpp +C:\Users\janis\Documents\Projekte_mit_c\ma\ma\src\client_backend\security.cpp(85,16): warning C4305: "return": Verkürzung von "int" in "bool" +C:\Users\janis\Documents\Projekte_mit_c\ma\ma\src\client_backend\security.cpp(87,16): warning C4305: "return": Verkürzung von "int" in "bool" +C:\Users\janis\Documents\Projekte_mit_c\ma\ma\src\client_backend\security.cpp(89,16): warning C4305: "return": Verkürzung von "int" in "bool" +C:\Users\janis\Documents\Projekte_mit_c\ma\ma\src\client_backend\security.cpp(91,16): warning C4305: "return": Verkürzung von "int" in "bool" +C:\Users\janis\Documents\Projekte_mit_c\ma\ma\src\client_backend\security.cpp(93,16): warning C4305: "return": Verkürzung von "int" in "bool" +C:\Users\janis\Documents\Projekte_mit_c\ma\ma\src\client_backend\security.cpp(95,16): warning C4305: "return": Verkürzung von "int" in "bool" +C:\Users\janis\Documents\Projekte_mit_c\ma\ma\src\client_backend\security.cpp(97,16): warning C4305: "return": Verkürzung von "int" in "bool" +C:\Users\janis\Documents\Projekte_mit_c\ma\ma\src\client_backend\security.cpp(99,16): warning C4305: "return": Verkürzung von "int" in "bool" + settings.cpp + thread_ctrl.cpp + update.cpp + utils.cpp +C:\Users\janis\Documents\Projekte_mit_c\ma\ma\src\client_backend\utils.cpp(167,42): warning C4101: "e": Unreferenzierte lokale Variable + virus_ctrl.cpp + Code wird generiert... client_backend.vcxproj -> C:\Users\janis\Documents\Projekte_mit_c\ma\ma\src\client_backend\x64\Debug\client_backend.exe C:\vcpkg\vcpkg-2023.08.09\scripts\buildsystems\msbuild\vcpkg.targets(228,5): warning : [vcpkg] Failed to gather app local DLL dependencies, program may not run. Set VcpkgApplocalDeps to false in your project file to suppress this warning. PowerShell arguments: -ExecutionPolicy Bypass -noprofile -File "C:\vcpkg\vcpkg-2023.08.09\scripts\buildsystems\msbuild\applocal.ps1" "C:\Users\janis\Documents\Projekte_mit_c\ma\ma\src\client_backend\x64\Debug\client_backend.exe" "C:\vcpkg\vcpkg-2023.08.09\installed\x64-windows\debug\bin" "client_backend\x64\Debug\client_backend.tlog\client_backend.write.1u.tlog" "client_backend\x64\Debug\vcpkg.applocal.log" diff --git a/src/client_backend/client_backend/x64/Debug/client_backend.tlog/CL.command.1.tlog b/src/client_backend/client_backend/x64/Debug/client_backend.tlog/CL.command.1.tlog index 423ffa2..ab68344 100644 Binary files a/src/client_backend/client_backend/x64/Debug/client_backend.tlog/CL.command.1.tlog and b/src/client_backend/client_backend/x64/Debug/client_backend.tlog/CL.command.1.tlog differ diff --git a/src/client_backend/client_backend/x64/Debug/client_backend.tlog/CL.read.1.tlog b/src/client_backend/client_backend/x64/Debug/client_backend.tlog/CL.read.1.tlog index f9e9c6a..1858949 100644 Binary files a/src/client_backend/client_backend/x64/Debug/client_backend.tlog/CL.read.1.tlog and b/src/client_backend/client_backend/x64/Debug/client_backend.tlog/CL.read.1.tlog differ diff --git a/src/client_backend/client_backend/x64/Debug/client_backend.tlog/CL.write.1.tlog b/src/client_backend/client_backend/x64/Debug/client_backend.tlog/CL.write.1.tlog index 8ea7452..c3fd199 100644 Binary files a/src/client_backend/client_backend/x64/Debug/client_backend.tlog/CL.write.1.tlog and b/src/client_backend/client_backend/x64/Debug/client_backend.tlog/CL.write.1.tlog differ diff --git a/src/client_backend/client_backend/x64/Debug/client_backend.tlog/link.read.1.tlog b/src/client_backend/client_backend/x64/Debug/client_backend.tlog/link.read.1.tlog index 873ac9e..926494f 100644 Binary files a/src/client_backend/client_backend/x64/Debug/client_backend.tlog/link.read.1.tlog and b/src/client_backend/client_backend/x64/Debug/client_backend.tlog/link.read.1.tlog differ diff --git a/src/client_backend/client_backend/x64/Debug/vc143.idb b/src/client_backend/client_backend/x64/Debug/vc143.idb index f4ed2b5..6ab4e3f 100644 Binary files a/src/client_backend/client_backend/x64/Debug/vc143.idb and b/src/client_backend/client_backend/x64/Debug/vc143.idb differ diff --git a/src/client_backend/client_backend/x64/Debug/vc143.pdb b/src/client_backend/client_backend/x64/Debug/vc143.pdb index d374698..b730782 100644 Binary files a/src/client_backend/client_backend/x64/Debug/vc143.pdb and b/src/client_backend/client_backend/x64/Debug/vc143.pdb differ diff --git a/src/client_backend/update.cpp b/src/client_backend/update.cpp index c7e4ed4..e03cbe5 100644 --- a/src/client_backend/update.cpp +++ b/src/client_backend/update.cpp @@ -163,7 +163,7 @@ int update_settings(const std::string& settings_type) { res = download_file_from_srv(url, EXCLUDED_FOLDERS, get_setting("communication:unsafe_tls"),0); else if (settings_type == "sched") res = download_file_from_srv(url, SCHED_PATH, get_setting("communication:unsafe_tls"),0); - else if (settings_type == "disalowed_start") + else if (settings_type == "disallowed_start") res = download_file_from_srv(url, DISALLOWED_START_FOLDERS, get_setting("communication:unsafe_tls"), 0); if (res != 0) { diff --git a/src/client_backend/x64/Debug/client_backend.pdb b/src/client_backend/x64/Debug/client_backend.pdb index 99db9cf..3500fb3 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/ma_installer/.vs/ma_installer/v17/.suo b/src/ma_installer/.vs/ma_installer/v17/.suo index 032e5ea..68470ac 100644 Binary files a/src/ma_installer/.vs/ma_installer/v17/.suo and b/src/ma_installer/.vs/ma_installer/v17/.suo differ diff --git a/src/ma_installer/.vs/ma_installer/v17/Browse.VC.db b/src/ma_installer/.vs/ma_installer/v17/Browse.VC.db index da18bc7..2647523 100644 Binary files a/src/ma_installer/.vs/ma_installer/v17/Browse.VC.db and b/src/ma_installer/.vs/ma_installer/v17/Browse.VC.db differ diff --git a/src/ma_installer/.vs/ma_installer/v17/DocumentLayout.json b/src/ma_installer/.vs/ma_installer/v17/DocumentLayout.json index 0933f7f..7905769 100644 --- a/src/ma_installer/.vs/ma_installer/v17/DocumentLayout.json +++ b/src/ma_installer/.vs/ma_installer/v17/DocumentLayout.json @@ -78,8 +78,7 @@ "RelativeToolTip": "create_folder.cpp", "ViewState": "AQIAAGEAAAAAAAAAAAAAANQAAAAtAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|", - "WhenOpened": "2024-04-04T15:28:38.27Z", - "EditorCaption": "" + "WhenOpened": "2024-04-04T15:28:38.27Z" }, { "$type": "Document", @@ -149,7 +148,7 @@ "RelativeDocumentMoniker": "update.cpp", "ToolTip": "C:\\Users\\janis\\Documents\\Projekte_mit_c\\ma\\ma\\src\\ma_installer\\update.cpp", "RelativeToolTip": "update.cpp", - "ViewState": "AQIAADEAAAAAAAAAAAAvwEoAAAA8AAAA", + "ViewState": "AQIAAEAAAAAAAAAAAAAvwGMAAAAcAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|", "WhenOpened": "2024-04-04T15:21:28.758Z", "EditorCaption": "" @@ -188,8 +187,7 @@ "RelativeToolTip": "well_known.h", "ViewState": "AQIAABAAAAAAAAAAAAAqwCwAAAAgAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000680|", - "WhenOpened": "2024-02-17T10:06:35.859Z", - "EditorCaption": "" + "WhenOpened": "2024-02-17T10:06:35.859Z" }, { "$type": "Document", @@ -225,8 +223,7 @@ "RelativeToolTip": "ma_installer.cpp", "ViewState": "AQIAAJMAAAAAAAAAAAAAALEAAAAqAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|", - "WhenOpened": "2023-12-22T18:52:51.74Z", - "EditorCaption": "" + "WhenOpened": "2023-12-22T18:52:51.74Z" }, { "$type": "Document", diff --git a/src/ma_installer/update.cpp b/src/ma_installer/update.cpp index f58d917..9e8daff 100644 --- a/src/ma_installer/update.cpp +++ b/src/ma_installer/update.cpp @@ -72,7 +72,7 @@ int update_settings(const char* settings_type) { res = download_file_from_srv(url, EXCLUDED_FOLDERS); else if (strcmp(settings_type, "sched") == 0) res = download_file_from_srv(url, SCHED_PATH); - else if (strcmp(settings_type, "dissalowed_start") == 0) + else if (strcmp(settings_type, "disallowed_start") == 0) res = download_file_from_srv(url, DISALLOWED_START_FOLDERS); //int res = 0; if (res != 0) { @@ -97,7 +97,7 @@ int action_update_settings() { err = 9; } //update the disallowed start folders - if (update_settings("dissalowed_start") != 0) { + if (update_settings("disallowed_start") != 0) { err = 9; } //update the schedule 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 de650a4..76521e6 100644 --- a/src/server/cyberhex-code/api/php/settings/get_settings.php +++ b/src/server/cyberhex-code/api/php/settings/get_settings.php @@ -64,10 +64,10 @@ if(isset($_GET["rtp_excluded"])){ $stmt -> close(); } -if(isset($_GET["dissalowed_start"])){ +if(isset($_GET["disallowed_start"])){ echo(load_secret()."\n"); //load all the entrys from a db table - $sql = "SELECT path,id FROM dissalowed_start ORDER BY id"; + $sql = "SELECT path,id FROM disallowed_start ORDER BY id"; $stmt = $conn->prepare($sql); // Execute the statement $stmt->execute(); diff --git a/src/server/cyberhex-code/system/secure_zone/php/client_settings.php b/src/server/cyberhex-code/system/secure_zone/php/client_settings.php index 20f38a0..cd0b58f 100644 --- a/src/server/cyberhex-code/system/secure_zone/php/client_settings.php +++ b/src/server/cyberhex-code/system/secure_zone/php/client_settings.php @@ -140,7 +140,7 @@ load_settings(); Task Settings
  • - Application Control + Application Control
    • @@ -470,7 +470,7 @@ load_settings(); -