Skip to content

ext_authz: removed unnecessary assert from onSuccess gRPC client #6505

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

Merged
mattklein123 merged 4 commits into from
Apr 11, 2019
Merged

ext_authz: removed unnecessary assert from onSuccess gRPC client #6505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9684e80
removed unecessary assert from onSuccess gRPC client
Apr 7, 2019
53d51ac
edited version history
Apr 7, 2019
3a8fa6d
code review changes
Apr 11, 2019
4300b26
Merge branch 'master' of https://github.com/envoyproxy/envoy into rem…
Apr 11, 2019
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
2 changes: 0 additions & 2 deletions source/extensions/filters/common/ext_authz/ext_authz_grpc_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,7 @@ void GrpcClientImpl::check(RequestCallbacks& callbacks,

void GrpcClientImpl::onSuccess(std::unique_ptr<envoy::service::auth::v2::CheckResponse>&& response,
Tracing::Span& span) {
ASSERT(response->status().code() != Grpc::Status::GrpcStatus::Unknown);
ResponsePtr authz_response = std::make_unique<Response>(Response{});

if (response->status().code() == Grpc::Status::GrpcStatus::Ok) {
span.setTag(Constants::get().TraceStatus, Constants::get().TraceOk);
authz_response->status = CheckStatus::OK;
Expand Down
24 changes: 24 additions & 0 deletions test/extensions/filters/common/ext_authz/ext_authz_grpc_impl_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,30 @@ TEST_P(ExtAuthzGrpcClientTest, AuthorizationDenied) {
client_->onSuccess(std::move(check_response), span_);
}

// Test the client when a gRPC status code unknown is received from the authorization server.
TEST_P(ExtAuthzGrpcClientTest, AuthorizationDeniedGrpcUnknownStatus) {
initialize(GetParam());

auto check_response = std::make_unique<envoy::service::auth::v2::CheckResponse>();
auto status = check_response->mutable_status();
status->set_code(Grpc::Status::GrpcStatus::Unknown);
auto authz_response = Response{};
authz_response.status = CheckStatus::Denied;

envoy::service::auth::v2::CheckRequest request;
expectCallSend(request);
client_->check(request_callbacks_, request, Tracing::NullSpan::instance());

Http::HeaderMapImpl headers;
client_->onCreateInitialMetadata(headers);
EXPECT_EQ(nullptr, headers.RequestId());
EXPECT_CALL(span_, setTag("ext_authz_status", "ext_authz_unauthorized"));
EXPECT_CALL(request_callbacks_, onComplete_(WhenDynamicCastTo<ResponsePtr&>(
AuthzResponseNoAttributes(authz_response))));

client_->onSuccess(std::move(check_response), span_);
}

// Test the client when a denied response with additional HTTP attributes is received.
TEST_P(ExtAuthzGrpcClientTest, AuthorizationDeniedWithAllAttributes) {
initialize(GetParam());
Expand Down