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

u

Browse Source
This commit is contained in:
jakani24
2024-05-10 11:43:06 +02:00
parent 9af6b5e06a
commit 6443e78c0c
20 changed files with 90 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/client_backend/.vs/client_backend/v17/.suo
View File

Binary file not shown.

BIN
src/client_backend/.vs/client_backend/v17/Browse.VC.db
View File

Binary file not shown.

22
src/client_backend/.vs/client_backend/v17/DocumentLayout.json
View File

@@ -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": ""

2
src/client_backend/client_backend.cpp
View File

@@ -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

BIN
src/client_backend/client_backend/x64/Debug/client_backend.ilk
View File

Binary file not shown.

67
src/client_backend/client_backend/x64/Debug/client_backend.log
View File

@@ -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<char,std::char_traits<char>,std::allocator<char>>::basic_string<std::_String_iterator<std::_String_val<std::_Simple_types<_Elem>>>,0>(_Iter,_Iter,const _Alloc &)" der Funktions-Vorlage.
with
[
_Elem=wchar_t,
_Iter=std::_String_iterator<std::_String_val<std::_Simple_types<wchar_t>>>,
_Alloc=std::allocator<char>
]
C:\Users\janis\Documents\Projekte_mit_c\ma\ma\src\client_backend\check_dir.cpp(38,29):
Ersten Verweis auf "std::basic_string<char,std::char_traits<char>,std::allocator<char>>::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<char,std::char_traits<char>,std::allocator<char>>::_Construct_from_iter<wchar_t*,wchar_t*,_Size_type>(_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<wchar_t*,_Size,char*>(_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"

BIN
src/client_backend/client_backend/x64/Debug/client_backend.tlog/CL.command.1.tlog
View File

Binary file not shown.

BIN
src/client_backend/client_backend/x64/Debug/client_backend.tlog/CL.read.1.tlog
View File

Binary file not shown.

BIN
src/client_backend/client_backend/x64/Debug/client_backend.tlog/CL.write.1.tlog
View File

Binary file not shown.

BIN
src/client_backend/client_backend/x64/Debug/client_backend.tlog/link.read.1.tlog
View File

Binary file not shown.

BIN
src/client_backend/client_backend/x64/Debug/vc143.idb
View File

Binary file not shown.

BIN
src/client_backend/client_backend/x64/Debug/vc143.pdb
View File

Binary file not shown.

2
src/client_backend/update.cpp
View File

@@ -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) {

BIN
src/client_backend/x64/Debug/client_backend.pdb
View File

Binary file not shown.

BIN
src/ma_installer/.vs/ma_installer/v17/.suo
View File

Binary file not shown.

BIN
src/ma_installer/.vs/ma_installer/v17/Browse.VC.db
View File

Binary file not shown.

11
src/ma_installer/.vs/ma_installer/v17/DocumentLayout.json
View File

@@ -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",

4
src/ma_installer/update.cpp
View File

@@ -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

4
src/server/cyberhex-code/api/php/settings/get_settings.php
View File

@@ -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();

4
src/server/cyberhex-code/system/secure_zone/php/client_settings.php
View File

@@ -140,7 +140,7 @@ load_settings();
<a class="nav-link" href="client_settings.php?show=task" id="task_tab">Task Settings</a>
</li>
<li class="nav-item">
<a class="nav-link" href="client_settings.php?show=disallowed_start" id="disallowed_start_tab">Application Control</a>
<a class="nav-link" href="client_settings.php?show=application_control" id="application_control_tab">Application Control</a>
</li>
</ul>
@@ -470,7 +470,7 @@ load_settings();
</tbody>
</table>
</div>
<div id="disallowed_start" style="display:none">
<div id="application_control" style="display:none">
<h4>Application control</h4>
<h7>AC: on/off</h7>
<div class="form-check form-switch">