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

April 21th 2024 update

Browse Source
This commit is contained in:
Ned Wright
2024-04-21 12:38:24 +00:00
parent 189c9209c9
commit 66ed4a8d81
73 changed files with 994 additions and 1166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/include/attachments/attachment_types.h
View File

@@ -24,6 +24,7 @@ enum AttachmentType
NGINX_ATT_ID,
PRELOAD_ATT_ID,
SQUID_ATT_ID,
ENVOY_ATT_ID,
#ifdef __cplusplus
COUNT
#endif

2
core/include/services_sdk/interfaces/i_env_details.h
View File

@@ -17,7 +17,7 @@
#include <string>
#include <stdbool.h>
enum class EnvType { LINUX, K8S, COUNT };
enum class EnvType { LINUX, DOCKER, K8S, NON_CRD_K8S, COUNT };
class I_EnvDetails
{

21
core/include/services_sdk/interfaces/i_intelligence_is_v2.h
View File

@@ -21,6 +21,8 @@
#include "intelligence_is_v2/intelligence_response.h"
#include "intelligence_is_v2/intelligence_types_v2.h"
#include "intelligence_is_v2/query_request_v2.h"
#include "messaging/messaging_enums.h"
#include "messaging/messaging_metadata.h"
#include "maybe_res.h"
namespace Intelligence {
@@ -43,18 +45,29 @@ public:
getResponse(
const std::vector<QueryRequest> &query_requests,
bool is_pretty,
bool is_bulk
bool is_bulk,
const MessageMetadata &req_md
) const = 0;
virtual Maybe<Intelligence::Response> getResponse(const QueryRequest &query_request, bool is_pretty) const = 0;
virtual Maybe<Intelligence::Response>
getResponse(const QueryRequest &query_request, bool is_pretty, const MessageMetadata &req_md) const = 0;
template<typename Data>
Maybe<std::vector<AssetReply<Data>>>
queryIntelligence(QueryRequest &query_request, bool ignore_in_progress = false, bool is_pretty = true);
queryIntelligence(
QueryRequest &query_request,
bool ignore_in_progress = false,
bool is_pretty = true,
MessageMetadata req_md = MessageMetadata("", 0)
);
template<typename Data>
Maybe<std::vector<Maybe<std::vector<AssetReply<Data>>>>>
queryIntelligence(std::vector<QueryRequest> &query_requests, bool is_pretty = true);
queryIntelligence(
std::vector<QueryRequest> &query_requests,
bool is_pretty = true,
MessageMetadata req_md = MessageMetadata("", 0)
);
protected:
virtual ~I_Intelligence_IS_V2() {}

4
core/include/services_sdk/interfaces/i_messaging.h
View File

@@ -76,7 +76,7 @@ public:
MessageMetadata message_metadata = MessageMetadata()
) = 0;
virtual Maybe<HTTPStatusCode, HTTPResponse> downloadFile(
virtual Maybe<void, HTTPResponse> downloadFile(
const HTTPMethod method,
const std::string &uri,
const std::string &download_file_path,
@@ -84,7 +84,7 @@ public:
MessageMetadata message_metadata = MessageMetadata()
) = 0;
virtual Maybe<HTTPStatusCode, HTTPResponse> uploadFile(
virtual Maybe<void, HTTPResponse> uploadFile(
const std::string & uri,
const std::string & upload_file_path,
const MessageCategory category = MessageCategory::GENERIC,

17
core/include/services_sdk/interfaces/intelligence_is_v2/intelligence_interface_impl.h
View File

@@ -20,9 +20,14 @@
template <typename Data>
Maybe<std::vector<AssetReply<Data>>>
I_Intelligence_IS_V2::queryIntelligence(QueryRequest &query_request, bool ignore_in_progress, bool is_pretty)
I_Intelligence_IS_V2::queryIntelligence(
QueryRequest &query_request,
bool ignore_in_progress,
bool is_pretty,
MessageMetadata req_md
)
{
auto response = getResponse(query_request, is_pretty);
auto response = getResponse(query_request, is_pretty, req_md);
if (!response.ok()) return response.passErr();
auto serializable_response = response->getSerializableResponse<Data>();
@@ -39,9 +44,13 @@ I_Intelligence_IS_V2::queryIntelligence(QueryRequest &query_request, bool ignore
template<typename Data>
Maybe<std::vector<Maybe<std::vector<AssetReply<Data>>>>>
I_Intelligence_IS_V2::queryIntelligence(std::vector<QueryRequest> &query_requests, bool is_pretty)
I_Intelligence_IS_V2::queryIntelligence(
std::vector<QueryRequest> &query_requests,
bool is_pretty,
MessageMetadata req_md
)
{
auto res = getResponse(query_requests, is_pretty, true);
auto res = getResponse(query_requests, is_pretty, true, req_md);
if (!res.ok()) return res.passErr();
return res->getBulkData<Data>();

12
core/include/services_sdk/interfaces/mock/mock_intelligence.h
View File

@@ -26,11 +26,19 @@ public:
MOCK_CONST_METHOD1(sendInvalidation, bool(const Invalidation &invalidation));
MOCK_METHOD2(registerInvalidation, Maybe<uint>(const Invalidation &invalidation, const InvalidationCb &callback));
MOCK_METHOD1(unregisterInvalidation, void(uint id));
MOCK_CONST_METHOD4(
getResponse,
Maybe<Response>(
const std::vector<QueryRequest> &query_requests,
bool is_pretty,
bool is_bulk,
const MessageMetadata &req_md
)
);
MOCK_CONST_METHOD3(
getResponse,
Maybe<Response>(const std::vector<QueryRequest> &query_requests, bool is_pretty, bool is_bulk)
Maybe<Response>(const QueryRequest &query_request, bool is_pretty, const MessageMetadata &req_md)
);
MOCK_CONST_METHOD2(getResponse, Maybe<Response>(const QueryRequest &query_request, bool is_pretty));
MOCK_CONST_METHOD0(getIsOfflineOnly, bool(void));
MOCK_CONST_METHOD1(getOfflineInfoString, Maybe<std::string>(const SerializableQueryFilter &query));
};

10
core/include/services_sdk/interfaces/mock/mock_messaging.h
View File

@@ -32,7 +32,7 @@ public:
MOCK_METHOD5(
downloadFile,
Maybe<HTTPStatusCode, HTTPResponse> (
Maybe<void, HTTPResponse> (
HTTPMethod,
const string &,
const string &,
@@ -43,7 +43,7 @@ public:
MOCK_METHOD4(
uploadFile,
Maybe<HTTPStatusCode, HTTPResponse> (
Maybe<void, HTTPResponse> (
const string &,
const string &,
MessageCategory,
@@ -62,10 +62,4 @@ operator<<(std::ostream &os, const HTTPResponse &)
return os;
}
static std::ostream &
operator<<(std::ostream &os, const HTTPStatusCode &)
{
return os;
}
#endif // __MOCK_MESSAGING_H__

2
core/include/services_sdk/resources/debug_flags.h
View File

@@ -149,7 +149,7 @@ DEFINE_FLAG(D_COMPONENT, D_ALL)
DEFINE_FLAG(D_UPSTREAM_KEEPALIVE, D_REVERSE_PROXY)
DEFINE_FLAG(D_FORWARD_PROXY, D_REVERSE_PROXY)
DEFINE_FLAG(D_IDA_SAML, D_COMPONENT)
DEFINE_FLAG(D_IDA, D_COMPONENT)
DEFINE_FLAG(D_IOT_NEXT, D_COMPONENT)
DEFINE_FLAG(D_IOT_AUXILIARY, D_IOT_NEXT)

4
core/include/services_sdk/resources/intelligence_invalidation.h
View File

@@ -70,7 +70,7 @@ public:
std::vector<StrAttributes> getAttributes() const { return attributes; }
const Maybe<std::string, void> & getSourceId() const { return source_id; }
const Maybe<ObjectType, void> & getObjectType() const { return object_type; }
InvalidationType getInvalidationType() const { return invalidation_type; }
const Maybe<InvalidationType, void> & getInvalidationType() const { return invalidation_type; }
Maybe<std::string, void> getRegistrationID() const;
bool report(I_Intelligence_IS_V2 *interface) const;
@@ -92,7 +92,7 @@ private:
std::vector<StrAttributes> attributes;
Maybe<std::string, void> source_id;
Maybe<ObjectType, void> object_type;
InvalidationType invalidation_type = InvalidationType::ADD;
Maybe<InvalidationType, void> invalidation_type;
Maybe<uint, void> listening_id;
Maybe<std::string, void> registration_id;
};

1
core/include/services_sdk/resources/report/report_enums.h
View File

@@ -68,6 +68,7 @@ enum class Tags {
API_DISCOVERY,
NGINX_PROXY_MANAGER,
WEB_SERVER_APISIX,
DEPLOYMENT_DOCKER,
COUNT
};