Skip to content

GCP Authentication Filter: Update the API proto for audience. #20831

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
yanavlasov merged 3 commits into from
Apr 26, 2022
Merged

GCP Authentication Filter: Update the API proto for audience. #20831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8454491
GCP Authentication Filter: Update the API proto for audience.
tyxia Apr 14, 2022
05a8f85
remove redundant variable
tyxia Apr 14, 2022
4c61378
Merge branch 'main' of https://github.com/envoyproxy/envoy into audience
tyxia Apr 15, 2022
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
7 changes: 3 additions & 4 deletions api/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,8 @@ message GcpAuthnFilterConfig {
config.core.v3.RetryPolicy retry_policy = 2;
}

// Audience is the URL of the receiving service that performs token authentication.
// It will be provided to the filter through cluster's typed_filter_metadata.
message Audience {
// The map of audience key to audience value.
// The key is defined as the contract with control plane in the configuration. It is fixed string "audience_key".
// The value is URL of the receiving service that performs token authentication.
map<string, string> audience_map = 1;
string url = 1 [(validate.rules).string = {min_len: 1}];
}
5 changes: 1 addition & 4 deletions source/extensions/filters/http/gcp_authn/gcp_authn_filter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,7 @@ Http::FilterHeadersStatus GcpAuthnFilter::decodeHeaders(Http::RequestHeaderMap&
if (filter_it != filter_metadata.end()) {
envoy::extensions::filters::http::gcp_authn::v3::Audience audience;
MessageUtil::unpackTo(filter_it->second, audience);
auto it = audience.audience_map().find(std::string(AudienceKey));
if (it != audience.audience_map().end()) {
audience_str = it->second;
}
audience_str = audience.url();
}
}

Expand Down
1 change: 0 additions & 1 deletion source/extensions/filters/http/gcp_authn/gcp_authn_filter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ namespace HttpFilters {
namespace GcpAuthn {

inline constexpr absl::string_view FilterName = "envoy.filters.http.gcp_authn";
inline constexpr absl::string_view AudienceKey = "audience_key";
inline const Envoy::Http::LowerCaseString& authorizationHeaderKey() {
CONSTRUCT_ON_FIRST_USE(Envoy::Http::LowerCaseString, "Authorization");
}
Expand Down
4 changes: 1 addition & 3 deletions test/extensions/filters/http/gcp_authn/gcp_authn_filter_integration_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,7 @@ class GcpAuthnFilterIntegrationTest : public testing::TestWithParam<Network::Add
auto cluster_0 = bootstrap.mutable_static_resources()->mutable_clusters(0);
envoy::config::core::v3::Metadata* cluster_metadata = cluster_0->mutable_metadata();
envoy::extensions::filters::http::gcp_authn::v3::Audience audience;
audience.mutable_audience_map()->insert(
{std::string(AudienceKey), std::string(AudienceValue)});

audience.set_url(std::string(AudienceValue));
(*cluster_metadata->mutable_typed_filter_metadata())
[std::string(Envoy::Extensions::HttpFilters::GcpAuthn::FilterName)]
.PackFrom(audience);
Expand Down
3 changes: 1 addition & 2 deletions test/extensions/filters/http/gcp_authn/gcp_authn_filter_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,7 @@ class GcpAuthnFilterTest : public testing::Test {
EXPECT_CALL(thread_local_cluster_, info()).WillRepeatedly(Return(cluster_info_));
if (valid) {
envoy::extensions::filters::http::gcp_authn::v3::Audience audience;
audience.mutable_audience_map()->insert(
{std::string(Envoy::Extensions::HttpFilters::GcpAuthn::AudienceKey), "test"});
audience.set_url("test");

(*metadata_.mutable_typed_filter_metadata())
[std::string(Envoy::Extensions::HttpFilters::GcpAuthn::FilterName)]
Expand Down