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

sync code

Browse Source
This commit is contained in:
Ned Wright
2024-09-15 02:49:26 +00:00
parent f4bad4c4d9
commit eddd250409
48 changed files with 368 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/intelligence_is_v2/intelligence_is_v2_ut/intelligence_comp_v2_ut.cc
View File

@@ -1,3 +1,7 @@
#include <sstream>
namespace Intelligence { class Response; }
std::ostream & operator<<(std::ostream &os, const Intelligence::Response &);
#include "intelligence_comp_v2.h"
#include "config.h"
@@ -642,7 +646,7 @@ TEST_F(IntelligenceComponentTestV2, multiAssetsIntelligenceTest)
auto maybe_ans = intell->queryIntelligence<Profile>(request);
EXPECT_TRUE(maybe_ans.ok());
auto vec = maybe_ans.unpack();
EXPECT_EQ(vec.size(), 3);
EXPECT_EQ(vec.size(), 3u);
auto iter = vec.begin();
@@ -962,11 +966,11 @@ TEST_F(IntelligenceComponentTestV2, pagingQueryTest)
).WillOnce(Return(HTTPResponse(HTTPStatusCode::HTTP_OK, paging_in_progress_response_str1)));
request.setAssetsLimit(2);
EXPECT_EQ(request.getAssetsLimit(), 2);
EXPECT_EQ(request.getAssetsLimit(), 2u);
auto maybe_ans1 = intell->queryIntelligence<Profile>(request);
EXPECT_TRUE(maybe_ans1.ok());
auto vec1 = maybe_ans1.unpack();
EXPECT_EQ(vec1.size(), 1);
EXPECT_EQ(vec1.size(), 1u);
EXPECT_EQ(request.isPagingFinished(), false);
EXPECT_CALL(messaging_mock, sendSyncMessage(HTTPMethod::POST, _, _, MessageCategory::INTELLIGENCE, _)
@@ -975,7 +979,7 @@ TEST_F(IntelligenceComponentTestV2, pagingQueryTest)
auto maybe_ans2 = intell->queryIntelligence<Profile>(request);
EXPECT_TRUE(maybe_ans2.ok());
auto vec2 = maybe_ans2.unpack();
EXPECT_EQ(vec2.size(), 2);
EXPECT_EQ(vec2.size(), 2u);
EXPECT_EQ(request.isPagingFinished(), false);
EXPECT_CALL(messaging_mock, sendSyncMessage(HTTPMethod::POST, _, _, MessageCategory::INTELLIGENCE, _)
@@ -985,7 +989,7 @@ TEST_F(IntelligenceComponentTestV2, pagingQueryTest)
if (!maybe_ans3.ok()) cout << maybe_ans3.getErr() + "\n";
EXPECT_TRUE(maybe_ans3.ok());
auto vec3 = maybe_ans3.unpack();
EXPECT_EQ(vec3.size(), 1);
EXPECT_EQ(vec3.size(), 1u);
EXPECT_EQ(request.isPagingFinished(), true);
vector<AssetReply<Profile>>::iterator assets_iter = vec3.begin();
@@ -1316,7 +1320,6 @@ TEST_F(IntelligenceComponentTestV2, ignoreInProgressQueryTest_2)
QueryRequest request(Condition::EQUALS, "category", "cloud", true, AttributeKeyType::NONE);
request.activatePaging();
request.setAssetsLimit(10);
vector<AssetReply<Profile>> objects_reply;
vector<string> objects_ids;
do {
auto object_result = intell->queryIntelligence<Profile>(request, true);
@@ -1325,10 +1328,9 @@ TEST_F(IntelligenceComponentTestV2, ignoreInProgressQueryTest_2)
break;
}
objects_reply = object_result.unpack();
if (objects_reply.empty()) break;
if ((*object_result).empty()) break;
for (const AssetReply<Profile> &current_object : objects_reply) {
for (const AssetReply<Profile> &current_object : *object_result) {
if (current_object.getMainAttributes().empty()) {
continue;
}
@@ -1337,5 +1339,5 @@ TEST_F(IntelligenceComponentTestV2, ignoreInProgressQueryTest_2)
}
} while (!request.isPagingFinished());
EXPECT_EQ(objects_ids.size(), 2);
EXPECT_EQ(objects_ids.size(), 2u);
}

14
core/intelligence_is_v2/intelligence_is_v2_ut/invalidation_ut.cc
View File

@@ -609,7 +609,7 @@ TEST_F(IntelligenceInvalidation, invalidation_callback)
json << invalidation2.genObject();
mock_invalidation->performRestCall(json);
EXPECT_EQ(recieved_invalidations.size(), 1);
EXPECT_EQ(recieved_invalidations.size(), 1u);
EXPECT_EQ(recieved_invalidations[0].getMainAttributes().begin()->getStringSetAttr("attr2").unpack(), vals);
}
@@ -653,7 +653,7 @@ TEST_F(IntelligenceInvalidation, delete_invalidation_callback)
json << invalidation2.genObject();
mock_invalidation->performRestCall(json);
EXPECT_EQ(recieved_invalidations.size(), 0);
EXPECT_EQ(recieved_invalidations.size(), 0u);
}
TEST_F(IntelligenceInvalidation, invalidation_short_handling)
@@ -697,7 +697,7 @@ TEST_F(IntelligenceInvalidation, invalidation_short_handling)
json << invalidation2.genObject();
mock_invalidation->performRestCall(json);
EXPECT_EQ(recieved_invalidations.size(), 0);
EXPECT_EQ(recieved_invalidations.size(), 0u);
}
TEST_F(IntelligenceInvalidation, routine_registration)
@@ -792,7 +792,7 @@ TEST_F(IntelligenceInvalidation, invalidation_flow_with_multiple_assets)
json1 << not_matching_invalidation.genObject();
mock_invalidation->performRestCall(json1);
EXPECT_EQ(recieved_invalidations.size(), 0);
EXPECT_EQ(recieved_invalidations.size(), 0u);
auto matching_second_main_attribute = StrAttributes()
.addStringAttr("attr3", "3");
@@ -808,7 +808,7 @@ TEST_F(IntelligenceInvalidation, invalidation_flow_with_multiple_assets)
json2 << matching_invalidation.genObject();
mock_invalidation->performRestCall(json2);
EXPECT_EQ(recieved_invalidations.size(), 1);
EXPECT_EQ(recieved_invalidations.size(), 1u);
}
TEST_F(IntelligenceInvalidation, invalidation_cb_match_2_registred_assets)
@@ -868,7 +868,7 @@ TEST_F(IntelligenceInvalidation, invalidation_cb_match_2_registred_assets)
json << matching_invalidation.genObject();
mock_invalidation->performRestCall(json);
EXPECT_EQ(recieved_invalidations.size(), 2);
EXPECT_EQ(recieved_invalidations.size(), 2u);
}
TEST_F(IntelligenceInvalidation, invalidation_cb_match_by_registration_id)
@@ -931,5 +931,5 @@ TEST_F(IntelligenceInvalidation, invalidation_cb_match_by_registration_id)
cout << json.str() << endl;
mock_invalidation->performRestCall(json);
EXPECT_EQ(recieved_invalidations.size(), 1);
EXPECT_EQ(recieved_invalidations.size(), 1u);
}

2
core/intelligence_is_v2/intelligence_is_v2_ut/json_stream_ut.cc
View File

@@ -42,7 +42,7 @@ addSlashesToSpecialChars(const string &input)
case '\"':
case '\\':
output += '\\';
//no break
// fallthrough
default:
output += c;
break;

4
core/intelligence_is_v2/intelligence_is_v2_ut/query_request_v2_ut.cc
View File

@@ -136,12 +136,12 @@ TEST(QueryRequestTestV2, AttributesTest)
request.setRequestedAttr("countryName");
SerializableAttributesMap request_attributes_map2 = request.getRequestedAttributes();
EXPECT_EQ(request_attributes_map2.getAttributeByKey("attributes.countryName"), 500);
EXPECT_EQ(request_attributes_map2.getAttributeByKey("attributes.countryName"), 500u);
request.setRequestedAttr("reputationSeverity", 30);
SerializableAttributesMap request_attributes_map3 = request.getRequestedAttributes();
EXPECT_EQ(request_attributes_map3.getAttributeByKey("attributes.reputationSeverity"), 30);
EXPECT_EQ(request_attributes_map3.getAttributeByKey("attributes.reputationSeverity"), 30u);
string output_json =
"{\n"

16
core/intelligence_is_v2/intelligence_is_v2_ut/query_response_v2_ut.cc
View File

@@ -155,13 +155,13 @@ TEST(QueryResponseTestV2, QueryResponseTestV2)
obj2.loadFromJson(ss.str());
}
EXPECT_EQ(obj.getAmountOfAssets(), 2);
EXPECT_EQ(obj2.getAmountOfAssets(), 2);
EXPECT_EQ(obj.getAmountOfAssets(), 2u);
EXPECT_EQ(obj2.getAmountOfAssets(), 2u);
EXPECT_EQ(obj.getResponseStatus(), ResponseStatus::DONE);
EXPECT_EQ(obj2.getResponseStatus(), ResponseStatus::DONE);
EXPECT_EQ(obj.getData().begin()->getAssetSchemaVersion(), 1);
EXPECT_EQ(obj.getData().begin()->getAssetSchemaVersion(), 1u);
EXPECT_EQ(obj.getData().begin()->getAssetType(), "workload-cloud-ip");
EXPECT_EQ(obj.getData().begin()->getAssetTypeSchemaVersion(), 1);
EXPECT_EQ(obj.getData().begin()->getAssetTypeSchemaVersion(), 1u);
EXPECT_EQ(obj.getData().begin()->getAssetPermissionGroupId(), "some-group-id");
EXPECT_EQ(obj.getData().begin()->getAssetName(), "[1.1.1.1]");
EXPECT_EQ(obj.getData().begin()->getAssetClass(), "workload");
@@ -188,7 +188,7 @@ TEST(QueryResponseTestV2, QueryResponseTestV2)
EXPECT_EQ(soucres_it->getAssetId(), "50255c3172b4fb7fda93025f0bfaa7abefd1");
EXPECT_EQ(soucres_it->getTTL(), chrono::seconds(120));
EXPECT_EQ(soucres_it->getExpirationTime(), "2020-07-29T11:21:12.253Z");
EXPECT_EQ(soucres_it->getConfidence(), 500);
EXPECT_EQ(soucres_it->getConfidence(), 500u);
EXPECT_EQ(soucres_it->getAttributes().begin()->getData().toString(), "red");
EXPECT_EQ(soucres_it->getAttributes().begin()->getData1().toString(), "Omry");
@@ -198,15 +198,15 @@ TEST(QueryResponseTestV2, QueryResponseTestV2)
EXPECT_EQ(soucres_it->getAssetId(), "cb068860528cb6bfb000cc35e79f11aeefed2");
EXPECT_EQ(soucres_it->getTTL(), chrono::seconds(120));
EXPECT_EQ(soucres_it->getExpirationTime(), "2020-07-29T11:21:12.253Z");
EXPECT_EQ(soucres_it->getConfidence(), 600);
EXPECT_EQ(soucres_it->getConfidence(), 600u);
EXPECT_EQ(soucres_it->getAttributes().begin()->getData().toString(), "white");
EXPECT_EQ(soucres_it->getAttributes().begin()->getData1().toString(), "Max");
vector<AssetReply<stringData1>> asset_collections = obj.getData();
EXPECT_EQ(asset_collections.size(), 1);
EXPECT_EQ(asset_collections.size(), 1u);
vector<AssetReply<stringData1>>::const_iterator asset_collections_it = asset_collections.begin();
vector<stringData1> asset_sources = asset_collections_it->getData();
EXPECT_EQ(asset_sources.size(), 2);
EXPECT_EQ(asset_sources.size(), 2u);
vector<stringData1>::iterator asset_sources_it = asset_sources.begin();
EXPECT_EQ(asset_sources_it->getData().toString(), "red");