github_mirrors/openappsec
3
0
Fork 1
mirror of https://github.com/openappsec/openappsec.git synced 2025-09-29 19:24:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

Jun 16th update

Browse Source
This commit is contained in:
noam
2023-01-17 11:34:09 +02:00
parent 90bcc544a2
commit ad04b8d063
168 changed files with 64034 additions and 932 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/include/i_downloader.h
View File

@@ -28,7 +28,7 @@ public:
const GetResourceFile &resourse_file
) const = 0;
virtual Maybe<std::map<std::string, std::string>>downloadVirtualFileFromFog(
virtual Maybe<std::map<std::pair<std::string, std::string>, std::string>>downloadVirtualFileFromFog(
const GetResourceFile &resourse_file,
Package::ChecksumTypes checksum_type
) const = 0;

1
components/include/i_local_policy_mgmt_gen.h
View File

@@ -19,7 +19,6 @@ class I_LocalPolicyMgmtGen
public:
enum class LocalPolicyEnv { LINUX, K8S, COUNT };
virtual std::string parsePolicy(const std::string &policy_version) = 0;
virtual const std::string & getPolicyPath(void) const = 0;
virtual LocalPolicyEnv getEnvType() const = 0;

3
components/include/i_orchestration_tools.h
View File

@@ -102,7 +102,8 @@ public:
virtual Maybe<std::map<packageName, packageDetails>> jsonObjectSplitter(
const std::string &json,
const std::string &tenant_id = "") const = 0;
const std::string &tenant_id = "",
const std::string &profile_id = "") const = 0;
virtual bool isNonEmptyFile(const std::string &path) const = 0;
virtual Maybe<std::string> readFile(const std::string &path) const = 0;

3
components/include/i_service_controller.h
View File

@@ -41,7 +41,8 @@ public:
const std::string &new_policy_path,
const std::string &new_settings_path,
const std::vector<std::string> &new_data_files = {},
const std::string &tenant_id = ""
const std::string &tenant_id = "",
const std::string &profile_id = ""
) = 0;
virtual bool isServiceInstalled(const std::string &service_name) = 0;

25
components/include/orchestrator/rest_api/get_resource_file.h
View File

@@ -24,24 +24,39 @@ class GetResourceFile : public ClientRest
class TenantResource : public ClientRest
{
public:
TenantResource(const std::string &_tenant_id, const std::string &_version, const std::string &_checksum)
TenantResource(
const std::string &_tenant_id,
const std::string &_profile_id,
const std::string &_version,
const std::string &_checksum)
:
tenant_id(_tenant_id),
profile_id(_profile_id),
version(_version),
checksum(_checksum)
{
}
TenantResource(const TenantResource &other)
{
tenant_id = other.tenant_id;
profile_id = other.profile_id;
version = other.version;
checksum = other.checksum;
}
bool
operator==(const TenantResource &other) const
{
return
tenant_id.get() == other.tenant_id.get() &&
profile_id.get() == other.profile_id.get() &&
version.get() == other.version.get() &&
checksum.get() == other.checksum.get();
}
C2S_LABEL_PARAM(std::string, tenant_id, "tenantId");
C2S_LABEL_PARAM(std::string, profile_id, "profileId");
C2S_LABEL_PARAM(std::string, version, "version");
C2S_LABEL_PARAM(std::string, checksum, "checksum");
};
@@ -76,12 +91,16 @@ public:
}
void
addTenant(const std::string &tenant_id, const std::string &version, const std::string &checksum)
addTenant(
const std::string &tenant_id,
const std::string &profile_id,
const std::string &version,
const std::string &checksum)
{
if (!isVirtual()) return;
if (!tenants.isActive()) tenants = std::vector<TenantResource>();
tenants.get().emplace_back(tenant_id, version, checksum);
tenants.get().emplace_back(tenant_id, profile_id, version, checksum);
}
std::string

80
components/include/orchestrator/rest_api/orchestration_check_update.h
View File

@@ -17,8 +17,40 @@
#include <string>
#include "rest.h"
#include "debug.h"
#include "maybe_res.h"
USE_DEBUG_FLAG(D_ORCHESTRATOR);
class TenantError : public ClientRest
{
public:
TenantError() = default;
bool
operator==(const TenantError &other) const
{
return
messageId.get() == other.messageId.get() &&
message.get() == other.message.get() &&
referenceId.get() == other.referenceId.get() &&
severity.get() == other.severity.get();
}
const std::string & getMessageID() const { return messageId.get(); }
const std::string & getMessage() const { return message.get(); }
// LCOV_EXCL_START Reason: Will be covered in INXT-33277
const std::string & getReferenceID() const { return referenceId.get(); }
// LCOV_EXCL_STOP
const std::string & getSeverity() const { return severity.get(); }
private:
BOTH_LABEL_PARAM(std::string, messageId, "messageId");
BOTH_LABEL_PARAM(std::string, message, "message");
BOTH_LABEL_PARAM(std::string, referenceId, "referenceId");
BOTH_LABEL_PARAM(std::string, severity, "severity");
};
class CheckUpdateRequest : public ClientRest
{
public:
@@ -30,13 +62,20 @@ public:
Tenants(const Tenants &other)
{
tenant_id = other.tenant_id;
profile_id = other.profile_id;
checksum = other.checksum;
version = other.version;
error = other.error;
}
Tenants(const std::string &_tenant_id, const std::string &_checksum, const std::string &_version)
Tenants(
const std::string &_tenant_id,
const std::string &_profile_id,
const std::string &_checksum,
const std::string &_version)
:
tenant_id(_tenant_id),
profile_id(_profile_id),
checksum(_checksum),
version(_version)
{
@@ -47,18 +86,24 @@ public:
{
return
tenant_id.get() == other.tenant_id.get() &&
profile_id.get() == other.profile_id.get() &&
checksum.get() == other.checksum.get() &&
version.get() == other.version.get();
version.get() == other.version.get() &&
error.get() == other.error.get();
}
const std::string & getTenantID() const { return tenant_id.get(); }
const std::string & getChecksum() const { return checksum.get(); }
const std::string & getVersion() const { return version.get(); }
const std::string & getProfileID() const { return profile_id.get(); }
const std::string & getChecksum() const { return checksum.get(); }
const std::string & getVersion() const { return version.get(); }
const TenantError & getError() const { return error.get(); }
private:
BOTH_LABEL_PARAM(std::string, tenant_id, "tenantId");
BOTH_LABEL_PARAM(std::string, checksum, "checksum");
BOTH_LABEL_PARAM(std::string, version, "version");
BOTH_LABEL_OPTIONAL_PARAM(std::string, tenant_id, "tenantId");
BOTH_LABEL_OPTIONAL_PARAM(std::string, profile_id, "profileId");
BOTH_LABEL_OPTIONAL_PARAM(std::string, checksum, "checksum");
BOTH_LABEL_OPTIONAL_PARAM(std::string, version, "version");
BOTH_LABEL_OPTIONAL_PARAM(TenantError, error, "error");
};
CheckUpdateRequest(
@@ -157,7 +202,26 @@ private:
tenants.get().emplace_back(std::forward<Args>(args)...);
}
const std::vector<Tenants> & getTenants() const { return tenants.get(); }
const std::vector<Tenants>
getTenants() const
{
std::vector<Tenants> tenants_to_return;
for (const auto &tenant : tenants.get()) {
if (tenant.getError().getMessage().empty()) {
tenants_to_return.push_back(tenant);
continue;
}
dbgError(D_ORCHESTRATOR)
<< "Error getting the tenant information. Tenant ID: "
<< tenant.getTenantID()
<< ", Error message: "
<< tenant.getError().getMessage()
<< ", Reference ID: "
<< tenant.getError().getReferenceID();
}
return tenants_to_return;
}
private:
BOTH_LABEL_PARAM(std::vector<Tenants>, tenants, "tenants");

1
components/include/waap.h
View File

@@ -29,6 +29,7 @@
class I_Telemetry;
class I_DeepAnalyzer;
class I_WaapAssetStatesManager;
class I_Messaging;
class I_AgentDetails;
class I_Encryptor;