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

updating small things

Browse Source
This commit is contained in:
jakani24
2024-06-05 22:21:19 +02:00
parent 05004c97e4
commit bb2c884c09
16 changed files with 47 additions and 51 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.

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

@@ -2,6 +2,14 @@
"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\\settings.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}",
"RelativeMoniker": "D:0:0:{56E65283-AAC9-43F6-9613-72BE8D648AC4}|client_backend.vcxproj|solutionrelative:settings.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\\scan.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}",
"RelativeMoniker": "D:0:0:{56E65283-AAC9-43F6-9613-72BE8D648AC4}|client_backend.vcxproj|solutionrelative:scan.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}"
@@ -66,14 +74,6 @@
"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}"
},
{
"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\\settings.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}",
"RelativeMoniker": "D:0:0:{56E65283-AAC9-43F6-9613-72BE8D648AC4}|client_backend.vcxproj|solutionrelative:settings.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_dir.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}",
"RelativeMoniker": "D:0:0:{56E65283-AAC9-43F6-9613-72BE8D648AC4}|client_backend.vcxproj|solutionrelative:check_dir.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}"
@@ -138,7 +138,7 @@
"DocumentGroups": [
{
"DockedWidth": 200,
"SelectedChildIndex": 22,
"SelectedChildIndex": 2,
"Children": [
{
"$type": "Document",
@@ -154,31 +154,32 @@
},
{
"$type": "Document",
"DocumentIndex": 17,
"DocumentIndex": 1,
"Title": "settings.cpp",
"DocumentMoniker": "C:\\Users\\janis\\Documents\\Projekte_mit_c\\ma\\ma\\src\\client_backend\\settings.cpp",
"RelativeDocumentMoniker": "settings.cpp",
"ToolTip": "C:\\Users\\janis\\Documents\\Projekte_mit_c\\ma\\ma\\src\\client_backend\\settings.cpp",
"RelativeToolTip": "settings.cpp",
"ViewState": "AQIAAAUBAAAAAAAAAAAAACMBAABNAAAA",
"ViewState": "AQIAALQAAAAAAAAAAAAvwM4AAAAmAAAA",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|",
"WhenOpened": "2024-03-13T06:48:40.364Z"
},
{
"$type": "Document",
"DocumentIndex": 16,
"DocumentIndex": 0,
"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": "AQIAAGkAAAAAAAAAAAAAAD0AAAAAAAAA",
"ViewState": "AQIAABEAAAAAAAAAAAAswCEAAAAAAAAA",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|",
"WhenOpened": "2024-01-28T20:40:06.279Z"
"WhenOpened": "2024-01-28T20:40:06.279Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 15,
"DocumentIndex": 17,
"Title": "update.cpp",
"DocumentMoniker": "C:\\Users\\janis\\Documents\\Projekte_mit_c\\ma\\ma\\src\\client_backend\\update.cpp",
"RelativeDocumentMoniker": "update.cpp",
@@ -190,7 +191,7 @@
},
{
"$type": "Document",
"DocumentIndex": 2,
"DocumentIndex": 4,
"Title": "utils.cpp",
"DocumentMoniker": "C:\\Users\\janis\\Documents\\Projekte_mit_c\\ma\\ma\\src\\client_backend\\utils.cpp",
"RelativeDocumentMoniker": "utils.cpp",
@@ -198,12 +199,11 @@
"RelativeToolTip": "utils.cpp",
"ViewState": "AQIAABYAAAAAAAAAAAAvwDAAAAAxAAAA",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|",
"WhenOpened": "2024-03-14T15:55:22.469Z",
"EditorCaption": ""
"WhenOpened": "2024-03-14T15:55:22.469Z"
},
{
"$type": "Document",
"DocumentIndex": 14,
"DocumentIndex": 16,
"Title": "log.h",
"DocumentMoniker": "C:\\Users\\janis\\Documents\\Projekte_mit_c\\ma\\ma\\src\\client_backend\\log.h",
"RelativeDocumentMoniker": "log.h",
@@ -215,7 +215,7 @@
},
{
"$type": "Document",
"DocumentIndex": 13,
"DocumentIndex": 15,
"Title": "well_known.h",
"DocumentMoniker": "C:\\Users\\janis\\Documents\\Projekte_mit_c\\ma\\ma\\src\\client_backend\\well_known.h",
"RelativeDocumentMoniker": "well_known.h",
@@ -227,7 +227,7 @@
},
{
"$type": "Document",
"DocumentIndex": 12,
"DocumentIndex": 14,
"Title": "thread_ctrl.cpp",
"DocumentMoniker": "C:\\Users\\janis\\Documents\\Projekte_mit_c\\ma\\ma\\src\\client_backend\\thread_ctrl.cpp",
"RelativeDocumentMoniker": "thread_ctrl.cpp",
@@ -251,7 +251,7 @@
},
{
"$type": "Document",
"DocumentIndex": 11,
"DocumentIndex": 13,
"Title": "md5hash.cpp",
"DocumentMoniker": "C:\\Users\\janis\\Documents\\Projekte_mit_c\\ma\\ma\\src\\client_backend\\md5hash.cpp",
"RelativeDocumentMoniker": "md5hash.cpp",
@@ -263,7 +263,7 @@
},
{
"$type": "Document",
"DocumentIndex": 10,
"DocumentIndex": 12,
"Title": "deepscan.cpp",
"DocumentMoniker": "C:\\Users\\janis\\Documents\\Projekte_mit_c\\ma\\ma\\src\\client_backend\\deepscan.cpp",
"RelativeDocumentMoniker": "deepscan.cpp",
@@ -275,7 +275,7 @@
},
{
"$type": "Document",
"DocumentIndex": 9,
"DocumentIndex": 11,
"Title": "virus_ctrl.cpp",
"DocumentMoniker": "C:\\Users\\janis\\Documents\\Projekte_mit_c\\ma\\ma\\src\\client_backend\\virus_ctrl.cpp",
"RelativeDocumentMoniker": "virus_ctrl.cpp",
@@ -287,7 +287,7 @@
},
{
"$type": "Document",
"DocumentIndex": 8,
"DocumentIndex": 10,
"Title": "security.cpp",
"DocumentMoniker": "C:\\Users\\janis\\Documents\\Projekte_mit_c\\ma\\ma\\src\\client_backend\\security.cpp",
"RelativeDocumentMoniker": "security.cpp",
@@ -299,7 +299,7 @@
},
{
"$type": "Document",
"DocumentIndex": 7,
"DocumentIndex": 9,
"Title": "security.h",
"DocumentMoniker": "C:\\Users\\janis\\Documents\\Projekte_mit_c\\ma\\ma\\src\\client_backend\\security.h",
"RelativeDocumentMoniker": "security.h",
@@ -311,7 +311,7 @@
},
{
"$type": "Document",
"DocumentIndex": 6,
"DocumentIndex": 8,
"Title": "zip.cpp",
"DocumentMoniker": "C:\\Users\\janis\\Documents\\Projekte_mit_c\\ma\\ma\\src\\client_backend\\zip.cpp",
"RelativeDocumentMoniker": "zip.cpp",
@@ -359,7 +359,7 @@
},
{
"$type": "Document",
"DocumentIndex": 5,
"DocumentIndex": 7,
"Title": "queue _ctrl.cpp",
"DocumentMoniker": "C:\\Users\\janis\\Documents\\Projekte_mit_c\\ma\\ma\\src\\client_backend\\queue _ctrl.cpp",
"RelativeDocumentMoniker": "queue _ctrl.cpp",
@@ -395,7 +395,7 @@
},
{
"$type": "Document",
"DocumentIndex": 1,
"DocumentIndex": 3,
"Title": "check_process.cpp",
"DocumentMoniker": "C:\\Users\\janis\\Documents\\Projekte_mit_c\\ma\\ma\\src\\client_backend\\check_process.cpp",
"RelativeDocumentMoniker": "check_process.cpp",
@@ -403,12 +403,11 @@
"RelativeToolTip": "check_process.cpp",
"ViewState": "AQIAAB4AAAAAAAAAAAAAAD8AAAAxAAAA",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|",
"WhenOpened": "2024-03-14T13:35:33.369Z",
"EditorCaption": ""
"WhenOpened": "2024-03-14T13:35:33.369Z"
},
{
"$type": "Document",
"DocumentIndex": 0,
"DocumentIndex": 2,
"Title": "scan.cpp",
"DocumentMoniker": "C:\\Users\\janis\\Documents\\Projekte_mit_c\\ma\\ma\\src\\client_backend\\scan.cpp",
"RelativeDocumentMoniker": "scan.cpp",
@@ -416,12 +415,11 @@
"RelativeToolTip": "scan.cpp",
"ViewState": "AQIAACEBAAAAAAAAAAAvwDQBAAAfAAAA",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|",
"WhenOpened": "2024-01-28T20:40:06.248Z",
"EditorCaption": ""
"WhenOpened": "2024-01-28T20:40:06.248Z"
},
{
"$type": "Document",
"DocumentIndex": 4,
"DocumentIndex": 6,
"Title": "connect.cpp",
"DocumentMoniker": "C:\\Users\\janis\\Documents\\Projekte_mit_c\\ma\\ma\\src\\client_backend\\connect.cpp",
"RelativeDocumentMoniker": "connect.cpp",
@@ -457,7 +455,7 @@
},
{
"$type": "Document",
"DocumentIndex": 3,
"DocumentIndex": 5,
"Title": "permissions.cpp",
"DocumentMoniker": "C:\\Users\\janis\\Documents\\Projekte_mit_c\\ma\\ma\\src\\client_backend\\permissions.cpp",
"RelativeDocumentMoniker": "permissions.cpp",
@@ -465,8 +463,7 @@
"RelativeToolTip": "permissions.cpp",
"ViewState": "AQIAAAAAAAAAAAAAAAAAABMAAAAVAAAA",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|",
"WhenOpened": "2024-05-10T11:48:55.871Z",
"EditorCaption": ""
"WhenOpened": "2024-05-10T11:48:55.871Z"
},
{
"$type": "Document",

6
src/client_backend/client_backend.cpp
View File

@@ -28,8 +28,10 @@ Functions:
#include "check_process.h"
#include "utils.h"
#include "deepscan.h"
int main(int argc, char* argv[]) {
;
log(LOGLEVEL::INFO_NOSEND, "[main()]:Starting main thread.");
int err = 0;
printf("welcome to the jakach security tool main thread\n");
@@ -141,5 +143,7 @@ int main(int argc, char* argv[]) {
Sleep(1000 - duration.count());
}
yr_finalize();
return 0;
}

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

Binary file not shown.

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

@@ -1,5 +1,2 @@
 Quellen werden auf Modulabhängigkeiten überprüft...
scan.cpp
C:\Users\janis\Documents\Projekte_mit_c\ma\ma\src\client_backend\scan.cpp(264,46): warning C4018: ">=": Konflikt zwischen "signed" und "unsigned"
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/vc143.idb
View File

Binary file not shown.

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

Binary file not shown.

4
src/client_backend/settings.cpp
View File

@@ -234,7 +234,7 @@ bool is_folder_included(const std::string& path) {
std::lock_guard<std::mutex> lock(settingsMutex); // Lock access to settings variables
std::string lower_path=to_lower(path);
for (int i = 0; i < included_folders_size; i++) {
if (lower_path.find(included_folders[i]) != std::string::npos) {
if (lower_path.find(included_folders[i]) != std::string::npos or matches_pattern(lower_path, disallowed_start_folders[i])) {
return true;
}
}
@@ -246,7 +246,7 @@ bool is_folder_excluded(const std::string& path) {
std::lock_guard<std::mutex> lock(settingsMutex); // Lock access to settings variables
std::string lower_path = to_lower(path);
for (int i = 0; i < excluded_folders_size; i++) {
if (lower_path.find(excluded_folders[i]) != std::string::npos) {
if (lower_path.find(excluded_folders[i]) != std::string::npos or matches_pattern(lower_path, disallowed_start_folders[i])) {
return true;
}
}

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

Binary file not shown.

2
src/server/cyberhex-code/system/insecure_zone/php/login.php
View File

@@ -296,7 +296,7 @@ async function checkRegistration() {
$row = $result->fetch_assoc();
if($row["allow_pw_login"]==1){
if (password_verify($password, $row['password'])) {
$_SESSION["username"]=$username;
$_SESSION["username"]=htmlspecialchars($username);
$_SESSION["login"]=true;
$_SESSION["perms"]=$row["perms"];
$_SESSION["email"]=$row["email"];

3
src/server/cyberhex-code/system/insecure_zone/php/login_backend.php
View File

@@ -2,7 +2,6 @@
//with db:
require_once 'WebAuthn.php';
// Assuming you've already established a database connection here
include "../../../config.php";
$conn = new mysqli($DB_SERVERNAME, $DB_USERNAME, $DB_PASSWORD,$DB_DATABASE);
if ($conn->connect_error) {
@@ -170,7 +169,7 @@ try {
// Authentication success
//set sessionso user is authenticated
$_SESSION["username"]=$row["username"];
$_SESSION["username"]=htmlspecialchars($row["username"]);
$_SESSION["login"]=true;
$_SESSION["perms"]=$row["perms"];
$_SESSION["email"]=$row["email"];

5
src/server/cyberhex-code/system/secure_zone/php/index.php
View File

@@ -8,7 +8,7 @@ if (!isset($_SESSION['username']) or !isset($_SESSION["login"])) {
exit();
}
$username = $_SESSION['username'];
$username = htmlspecialchars($_SESSION['username']);
$perms = $_SESSION["perms"];
if(isset($_GET["page"])){
$page=htmlspecialchars($_GET["page"]);
@@ -24,7 +24,7 @@ if(isset($_GET["page"])){
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous">
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/js/bootstrap.bundle.min.js" integrity="sha384-MrcW6ZMFYlzcLA8Nl+NtUVF0sA7MsXsP1UyJoMp4YLEuNSfAP+JcXn/tWtIaxVXM" crossorigin="anonymous"></script>
<title>Cyberhex</title>
<title>Cyberhex (<?php echo(str_replace("_"," ",explode(".",$page))[0]); ?>)</title>
</head>
<body>
<!-- navbar -->
@@ -98,7 +98,6 @@ if(isset($_GET["page"])){
echo("<p>Clients</p>");
?>
<ul>
<!-- <li><a href="index.php?page=mass_add_clients.php">Mass Add CLients</a></li> -->
<?php
if($perms[7]=="1")
echo('<li><a href="index.php?page=add_client.php">Add Client</a></li>');

2
src/server/cyberhex-code/system/secure_zone/php/welcome.php
View File

@@ -27,7 +27,7 @@ $filter_query = "&hash=$hash&path=$path&machine_id=$machine_id&action=$action&ma
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous">
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/js/bootstrap.bundle.min.js" integrity="sha384-MrcW6ZMFYlzcLA8Nl+NtUVF0sA7MsXsP1UyJoMp4YLEuNSfAP+JcXn/tWtIaxVXM" crossorigin="anonymous"></script>
<title>Change Password</title>
<title>Cyberhex</title>
</head>
<body>
<br><br>