Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@Anilm3
Anilm3 committed Aug 1, 2023
1 parent 5d39aab commit e9d6f49
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 25 deletions.
40 changes: 20 additions & 20 deletions tests/context_test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -911,7 +911,7 @@ TEST(TestContext, MultipleRuleFiltersNonOverlappingRules)
{"type", "type"}, {"category", "category"}};

rules.emplace_back(std::make_shared<ddwaf::rule>("id" + std::to_string(i), "name",
std::move(tags), std::make_shared<expression>(), std::vector<std::string>{}));
std::move(tags), expression::ptr{}, std::vector<std::string>{}));

ruleset->insert_rule(rules.back());
}
Expand All @@ -925,7 +925,7 @@ TEST(TestContext, MultipleRuleFiltersNonOverlappingRules)
}

{
auto filter = std::make_shared<rule_filter>("1", std::make_shared<expression>(),
auto filter = std::make_shared<rule_filter>("1", expression::ptr{},
std::set<ddwaf::rule *>{rules[0].get(), rules[1].get(), rules[2].get()});
ruleset->rule_filters.emplace(filter->get_id(), filter);

Expand All @@ -937,7 +937,7 @@ TEST(TestContext, MultipleRuleFiltersNonOverlappingRules)
}

{
auto filter = std::make_shared<rule_filter>("2", std::make_shared<expression>(),
auto filter = std::make_shared<rule_filter>("2", expression::ptr{},
std::set<ddwaf::rule *>{rules[3].get(), rules[4].get(), rules[5].get()});
ruleset->rule_filters.emplace(filter->get_id(), filter);

Expand All @@ -952,7 +952,7 @@ TEST(TestContext, MultipleRuleFiltersNonOverlappingRules)
}

{
auto filter = std::make_shared<rule_filter>("3", std::make_shared<expression>(),
auto filter = std::make_shared<rule_filter>("3", expression::ptr{},
std::set<ddwaf::rule *>{rules[6].get(), rules[7].get(), rules[8].get()});
ruleset->rule_filters.emplace(filter->get_id(), filter);

Expand Down Expand Up @@ -985,7 +985,7 @@ TEST(TestContext, MultipleRuleFiltersOverlappingRules)
{"type", "type"}, {"category", "category"}};

rules.emplace_back(std::make_shared<ddwaf::rule>(std::string(id), "name", std::move(tags),
std::make_shared<expression>(), std::vector<std::string>{}));
expression::ptr{}, std::vector<std::string>{}));

ruleset->insert_rule(rules.back());
}
Expand All @@ -999,7 +999,7 @@ TEST(TestContext, MultipleRuleFiltersOverlappingRules)
}

{
auto filter = std::make_shared<rule_filter>("1", std::make_shared<expression>(),
auto filter = std::make_shared<rule_filter>("1", expression::ptr{},
std::set<ddwaf::rule *>{
rules[0].get(), rules[1].get(), rules[2].get(), rules[3].get()});
ruleset->rule_filters.emplace(filter->get_id(), filter);
Expand All @@ -1013,7 +1013,7 @@ TEST(TestContext, MultipleRuleFiltersOverlappingRules)
}

{
auto filter = std::make_shared<rule_filter>("2", std::make_shared<expression>(),
auto filter = std::make_shared<rule_filter>("2", expression::ptr{},
std::set<ddwaf::rule *>{rules[2].get(), rules[3].get(), rules[4].get()});
ruleset->rule_filters.emplace(filter->get_id(), filter);

Expand All @@ -1027,7 +1027,7 @@ TEST(TestContext, MultipleRuleFiltersOverlappingRules)
}

{
auto filter = std::make_shared<rule_filter>("3", std::make_shared<expression>(),
auto filter = std::make_shared<rule_filter>("3", expression::ptr{},
std::set<ddwaf::rule *>{rules[0].get(), rules[5].get(), rules[6].get()});
ruleset->rule_filters.emplace(filter->get_id(), filter);

Expand All @@ -1043,7 +1043,7 @@ TEST(TestContext, MultipleRuleFiltersOverlappingRules)
}

{
auto filter = std::make_shared<rule_filter>("4", std::make_shared<expression>(),
auto filter = std::make_shared<rule_filter>("4", expression::ptr{},
std::set<ddwaf::rule *>{rules[7].get(), rules[8].get(), rules[6].get()});
ruleset->rule_filters.emplace(filter->get_id(), filter);

Expand All @@ -1061,7 +1061,7 @@ TEST(TestContext, MultipleRuleFiltersOverlappingRules)
}

{
auto filter = std::make_shared<rule_filter>("5", std::make_shared<expression>(),
auto filter = std::make_shared<rule_filter>("5", expression::ptr{},
std::set<ddwaf::rule *>{rules[0].get(), rules[1].get(), rules[2].get(), rules[3].get(),
rules[4].get(), rules[5].get(), rules[6].get(), rules[7].get(), rules[8].get()});
ruleset->rule_filters.emplace(filter->get_id(), filter);
Expand Down Expand Up @@ -1095,7 +1095,7 @@ TEST(TestContext, MultipleRuleFiltersNonOverlappingRulesWithConditions)
{"type", "type"}, {"category", "category"}};

rules.emplace_back(std::make_shared<ddwaf::rule>(std::string(id), "name", std::move(tags),
std::make_shared<expression>(), std::vector<std::string>{}));
expression::ptr{}, std::vector<std::string>{}));

ruleset->insert_rule(rules.back());
}
Expand Down Expand Up @@ -1178,7 +1178,7 @@ TEST(TestContext, MultipleRuleFiltersOverlappingRulesWithConditions)
{"type", "type"}, {"category", "category"}};

rules.emplace_back(std::make_shared<ddwaf::rule>(std::string(id), "name", std::move(tags),
std::make_shared<expression>(), std::vector<std::string>{}));
expression::ptr{}, std::vector<std::string>{}));

ruleset->insert_rule(rules.back());
}
Expand Down Expand Up @@ -1263,7 +1263,7 @@ TEST(TestContext, InputFilterExclude)

std::set<ddwaf::rule *> filter_rules{rule.get()};
auto filter = std::make_shared<input_filter>(
"1", std::make_shared<expression>(), std::move(filter_rules), std::move(obj_filter));
"1", expression::ptr{}, std::move(filter_rules), std::move(obj_filter));

auto ruleset = std::make_shared<ddwaf::ruleset>();
ruleset->insert_rule(rule);
Expand Down Expand Up @@ -1299,7 +1299,7 @@ TEST(TestContext, InputFilterExcludeRule)

std::set<ddwaf::rule *> filter_rules{rule.get()};
auto filter = std::make_shared<input_filter>(
"1", std::make_shared<expression>(), std::move(filter_rules), std::move(obj_filter));
"1", expression::ptr{}, std::move(filter_rules), std::move(obj_filter));

auto ruleset = std::make_shared<ddwaf::ruleset>();
ruleset->insert_rule(rule);
Expand Down Expand Up @@ -1446,7 +1446,7 @@ TEST(TestContext, InputFilterMultipleRules)

std::set<ddwaf::rule *> filter_rules{ruleset->rules[0].get(), ruleset->rules[1].get()};
auto filter = std::make_shared<input_filter>(
"1", std::make_shared<expression>(), std::move(filter_rules), std::move(obj_filter));
"1", expression::ptr{}, std::move(filter_rules), std::move(obj_filter));

ruleset->input_filters.emplace(filter->get_id(), filter);
}
Expand Down Expand Up @@ -1548,7 +1548,7 @@ TEST(TestContext, InputFilterMultipleRulesMultipleFilters)

std::set<ddwaf::rule *> filter_rules{ruleset->rules[0].get()};
auto filter = std::make_shared<input_filter>(
"1", std::make_shared<expression>(), std::move(filter_rules), std::move(obj_filter));
"1", expression::ptr{}, std::move(filter_rules), std::move(obj_filter));

ruleset->input_filters.emplace(filter->get_id(), filter);
}
Expand All @@ -1559,7 +1559,7 @@ TEST(TestContext, InputFilterMultipleRulesMultipleFilters)

std::set<ddwaf::rule *> filter_rules{ruleset->rules[1].get()};
auto filter = std::make_shared<input_filter>(
"2", std::make_shared<expression>(), std::move(filter_rules), std::move(obj_filter));
"2", expression::ptr{}, std::move(filter_rules), std::move(obj_filter));

ruleset->input_filters.emplace(filter->get_id(), filter);
}
Expand Down Expand Up @@ -1680,7 +1680,7 @@ TEST(TestContext, InputFilterMultipleRulesMultipleFiltersMultipleObjects)

std::set<ddwaf::rule *> filter_rules{ip_rule.get(), cookie_rule.get()};
auto filter = std::make_shared<input_filter>(
"1", std::make_shared<expression>(), std::move(filter_rules), std::move(obj_filter));
"1", expression::ptr{}, std::move(filter_rules), std::move(obj_filter));

ruleset->input_filters.emplace(filter->get_id(), filter);
}
Expand All @@ -1692,7 +1692,7 @@ TEST(TestContext, InputFilterMultipleRulesMultipleFiltersMultipleObjects)

std::set<ddwaf::rule *> filter_rules{usr_rule.get(), ip_rule.get()};
auto filter = std::make_shared<input_filter>(
"2", std::make_shared<expression>(), std::move(filter_rules), std::move(obj_filter));
"2", expression::ptr{}, std::move(filter_rules), std::move(obj_filter));

ruleset->input_filters.emplace(filter->get_id(), filter);
}
Expand All @@ -1704,7 +1704,7 @@ TEST(TestContext, InputFilterMultipleRulesMultipleFiltersMultipleObjects)

std::set<ddwaf::rule *> filter_rules{usr_rule.get(), cookie_rule.get()};
auto filter = std::make_shared<input_filter>(
"3", std::make_shared<expression>(), std::move(filter_rules), std::move(obj_filter));
"3", expression::ptr{}, std::move(filter_rules), std::move(obj_filter));

ruleset->input_filters.emplace(filter->get_id(), filter);
}
Expand Down
4 changes: 2 additions & 2 deletions tests/input_filter_test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ TEST(TestInputFilter, InputExclusionNoConditions)
obj_filter->insert(get_target_index("query"), "query", {});
auto rule = std::make_shared<ddwaf::rule>(ddwaf::rule("", "", {}, {}));
input_filter filter(
"filter", std::make_shared<expression>(), {rule.get()}, std::move(obj_filter));
"filter", expression::ptr{}, {rule.get()}, std::move(obj_filter));

ddwaf::timer deadline{2s};
input_filter::cache_type cache;
Expand Down Expand Up @@ -54,7 +54,7 @@ TEST(TestInputFilter, ObjectExclusionNoConditions)
obj_filter->insert(get_target_index("query"), "query", {"params"});
auto rule = std::make_shared<ddwaf::rule>(ddwaf::rule("", "", {}, {}));
input_filter filter(
"filter", std::make_shared<expression>(), {rule.get()}, std::move(obj_filter));
"filter", expression::ptr{}, {rule.get()}, std::move(obj_filter));

ddwaf::timer deadline{2s};
input_filter::cache_type cache;
Expand Down
4 changes: 2 additions & 2 deletions tests/mkmap_test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ TEST(TestMultiKeyMap, Find)
tags.emplace("category", spec.category);

auto rule_ptr = std::make_shared<ddwaf::rule>(
std::string(spec.id), "name", decltype(tags)(tags), std::make_shared<expression>());
std::string(spec.id), "name", decltype(tags)(tags), expression::ptr{});
rules.emplace_back(rule_ptr);
ruledb.insert(rule_ptr->get_tags(), rule_ptr.get());
}
Expand Down Expand Up @@ -98,7 +98,7 @@ TEST(TestMultiKeyMap, Multifind)
tags.emplace("category", spec.category);

auto rule_ptr = std::make_shared<ddwaf::rule>(
std::string(spec.id), "name", decltype(tags)(tags), std::make_shared<expression>());
std::string(spec.id), "name", decltype(tags)(tags), expression::ptr{});
rules.emplace_back(rule_ptr);
ruledb.insert(rule_ptr->get_tags(), rule_ptr.get());
}
Expand Down
2 changes: 1 addition & 1 deletion tests/ruleset_test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ rule::ptr make_rule(std::string id, std::string name,
rule::source_type source = rule::source_type::base)
{
return std::make_shared<ddwaf::rule>(std::move(id), std::move(name), std::move(tags),
std::make_shared<expression>(), std::move(actions), true, source);
expression::ptr{}, std::move(actions), true, source);
}

} // namespace
Expand Down

0 comments on commit e9d6f49

Please sign in to comment.