Skip to content

[NetKAT] Make (PacketSetHandle|PacketTransformer)Handle separate targets. #106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
copybara-service wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[NetKAT] Make (PacketSetHandle|PacketTransformer)Handle separate targets. #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 31 additions & 22 deletions netkat/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,26 +119,9 @@ cc_test(
],
)

cc_library(
alias(
name = "packet_set",
srcs = ["packet_set.cc"],
hdrs = ["packet_set.h"],
deps = [
":netkat_cc_proto",
":packet",
":packet_field",
":paged_stable_vector",
"@com_google_absl//absl/algorithm:container",
"@com_google_absl//absl/container:fixed_array",
"@com_google_absl//absl/container:flat_hash_map",
"@com_google_absl//absl/container:flat_hash_set",
"@com_google_absl//absl/log",
"@com_google_absl//absl/log:check",
"@com_google_absl//absl/status",
"@com_google_absl//absl/strings",
"@com_google_absl//absl/strings:str_format",
"@com_google_gutil//gutil:status",
],
actual = ":packet_transformer",
)

cc_test(
Expand All @@ -147,6 +130,7 @@ cc_test(
shard_count = 8,
deps = [
":evaluator",
":gtest_utils",
":netkat_proto_constructors",
":packet",
":packet_set",
Expand Down Expand Up @@ -229,6 +213,7 @@ cc_test(
shard_count = 8,
deps = [
":evaluator",
":gtest_utils",
":netkat_cc_proto",
":netkat_proto_constructors",
":packet",
Expand Down Expand Up @@ -360,15 +345,38 @@ cc_test(
],
)

cc_library(
name = "packet_transformer_handle",
hdrs = ["packet_transformer_handle.h"],
deps = [
"@com_google_absl//absl/strings:str_format",
],
)

cc_library(
name = "packet_set_handle",
hdrs = ["packet_set_handle.h"],
deps = [
"@com_google_absl//absl/strings:str_format",
],
)

cc_library(
name = "packet_transformer",
srcs = ["packet_transformer.cc"],
hdrs = ["packet_transformer.h"],
srcs = [
"packet_set.cc",
"packet_transformer.cc",
],
hdrs = [
"packet_set.h",
"packet_transformer.h",
],
deps = [
":netkat_cc_proto",
":packet",
":packet_field",
":packet_set",
":packet_set_handle",
":packet_transformer_handle",
":paged_stable_vector",
"@com_google_absl//absl/algorithm:container",
"@com_google_absl//absl/container:btree",
Expand Down Expand Up @@ -403,6 +411,7 @@ cc_test(
shard_count = 5,
deps = [
":evaluator",
":gtest_utils",
":netkat_cc_proto",
":netkat_proto_constructors",
":packet",
Expand Down
10 changes: 7 additions & 3 deletions netkat/analysis_engine_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ namespace {
using ::gutil::IsOk;
using ::testing::Not;

// TODO: anthonyroy - Revert to ArbitraryValidPredicateProto once Pull is
// implemented.
using ::netkat::netkat_test::ArbitraryValidPredicateProtoWithoutPull;

// We include only a single `CheckEquivalent` test as a smoke test since the
// function is implemented in terms of `PacketSetManager`, which is tested
// thoroughly in its own unit tests.
Expand Down Expand Up @@ -167,7 +171,7 @@ void DenyPacketsAreAlwaysDropped(PredicateProto predicate_proto) {
EXPECT_TRUE(analyzer.ProgramDropsAllPackets(Policy::Accept(), predicate));
}
FUZZ_TEST(AnalysisEngineTest, DenyPacketsAreAlwaysDropped)
.WithDomains(netkat_test::ArbitraryValidPredicateProto());
.WithDomains(ArbitraryValidPredicateProtoWithoutPull());

void DenyProgramProgramDropsAllPackets(PredicateProto predicate_proto) {
AnalysisEngine analyzer;
Expand All @@ -178,7 +182,7 @@ void DenyProgramProgramDropsAllPackets(PredicateProto predicate_proto) {
EXPECT_TRUE(analyzer.ProgramDropsAllPackets(Policy::Deny(), predicate));
}
FUZZ_TEST(AnalysisEngineTest, DenyProgramProgramDropsAllPackets)
.WithDomains(netkat_test::ArbitraryValidPredicateProto());
.WithDomains(ArbitraryValidPredicateProtoWithoutPull());

TEST(AnalysisEngineTest, PartialMatchingProgramForwardsSomePackets) {
AnalysisEngine analyzer;
Expand Down Expand Up @@ -216,7 +220,7 @@ void DenyProgramAlwaysProducesNoOutput(PredicateProto predicate_proto) {
/*output_packets=*/Predicate::False()));
}
FUZZ_TEST(AnalysisEngineTest, DenyProgramAlwaysProducesNoOutput)
.WithDomains(netkat_test::ArbitraryValidPredicateProto());
.WithDomains(ArbitraryValidPredicateProtoWithoutPull());

TEST(CheckInputProducesExactOutputTest, AcceptProgramReflectsInputPacket) {
AnalysisEngine analyzer;
Expand Down
3 changes: 3 additions & 0 deletions netkat/evaluator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ namespace netkat {

bool Evaluate(const PredicateProto& predicate, const Packet& packet) {
switch (predicate.predicate_case()) {
case PredicateProto::kPullOp:
// TODO: anthonyroy - Implement Pull in the evaluator.
LOG(FATAL) << "Pull evaluation not implemented";
case PredicateProto::kBoolConstant:
return predicate.bool_constant().value();
case PredicateProto::kNotOp:
Expand Down
Loading
Loading