Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions test/config_test/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ envoy_cc_test_library(
envoy_cc_test(
name = "config_test",
size = "large",
coverage = False,
data = [
"configs_test_setup.sh",
":configs",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ envoy_extension_cc_test(
"//source/extensions/filters/http/alternate_protocols_cache:config",
"//test/mocks/event:event_mocks",
"//test/mocks/server:factory_context_mocks",
"//test/test_common:logging_lib",
"@envoy_api//envoy/extensions/filters/http/alternate_protocols_cache/v3:pkg_cc_proto",
],
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,17 @@ TEST(AlternateProtocolsCacheFilterConfigTest, AlternateProtocolsCacheFilterWithS
cb(filter_callback);
}

TEST(AlternateProtocolsCacheFilterConfigTest, AlternateProtocolsCacheFilterLogging) {
NiceMock<Server::Configuration::MockFactoryContext> context;
AlternateProtocolsCacheFilterFactory factory;
envoy::extensions::filters::http::alternate_protocols_cache::v3::FilterConfig proto_config;
proto_config.mutable_alternate_protocols_cache_options()->set_name("foo");
EXPECT_LOG_CONTAINS("warn",
"Using deprecated and ignored alternate_protocols_cache_options in "
"alternate_protocols_cache config.",
(void)factory.createFilterFactoryFromProto(proto_config, "stats", context));
}

} // namespace
} // namespace AlternateProtocolsCache
} // namespace HttpFilters
Expand Down
2 changes: 2 additions & 0 deletions test/extensions/filters/http/csrf/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ envoy_extension_cc_test(
rbe_pool = "6gig",
deps = [
"//source/extensions/filters/http/csrf:config",
"//test/mocks/protobuf:protobuf_mocks",
"//test/mocks/server:factory_context_mocks",
"//test/test_common:status_utility_lib",
"@envoy_api//envoy/extensions/filters/http/csrf/v3:pkg_cc_proto",
],
)
Expand Down
30 changes: 30 additions & 0 deletions test/extensions/filters/http/csrf/csrf_config_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,17 @@

#include "source/extensions/filters/http/csrf/config.h"

#include "test/mocks/protobuf/mocks.h"
#include "test/mocks/server/server_factory_context.h"
#include "test/test_common/status_utility.h"
#include "test/test_common/utility.h"

#include "gmock/gmock.h"
#include "gtest/gtest.h"

using Envoy::StatusHelpers::IsOkAndHolds;
using testing::NiceMock;
using testing::NotNull;

namespace Envoy {
namespace Extensions {
Expand All @@ -35,6 +39,32 @@ TEST(CsrfFilterConfigTest, ServerContextOnlyFactory) {

auto cb = factory.createFilterFactoryFromProtoWithServerContext(proto_config, "stats", context);
EXPECT_NE(cb, nullptr);

Http::MockFilterChainFactoryCallbacks filter_callback;
EXPECT_CALL(filter_callback, addStreamDecoderFilter(_));
cb(filter_callback);
}

TEST(CsrfFilterConfigTest, RouteSpecificConfig) {
const std::string yaml_string = R"EOF(
filter_enabled:
default_value:
numerator: 100
denominator: HUNDRED
shadow_enabled:
default_value:
numerator: 100
denominator: HUNDRED
)EOF";

envoy::extensions::filters::http::csrf::v3::CsrfPolicy proto_config;
TestUtility::loadFromYaml(yaml_string, proto_config);
CsrfFilterFactory factory;
NiceMock<Server::Configuration::MockServerFactoryContext> context;
NiceMock<ProtobufMessage::MockValidationVisitor> validation_visitor;

auto result = factory.createRouteSpecificFilterConfig(proto_config, context, validation_visitor);
ASSERT_THAT(result, IsOkAndHolds(NotNull()));
}

} // namespace
Expand Down
53 changes: 53 additions & 0 deletions test/extensions/filters/http/jwt_authn/filter_config_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,59 @@ TEST(HttpJwtAuthnFilterConfigTest, RemoteJwksAsyncFetchRefetchDurationVeryBig) {
HasSubstr("Duration out-of-range"));
}

TEST(HttpJwtAuthnFilterConfigTest, RemoteJwksWithRetryPolicy) {
const char config[] = R"(
providers:
provider1:
issuer: issuer1
remote_jwks:
http_uri:
uri: http://www.valid.com/resource
cluster: pubkey_cluster
timeout: 1s
retry_policy:
retry_back_off:
base_interval: 1s
max_interval: 10s
num_retries: 5
)";

JwtAuthentication proto_config;
TestUtility::loadFromYaml(config, proto_config);

NiceMock<Server::Configuration::MockFactoryContext> context;
auto filter_conf = std::make_unique<FilterConfigImpl>(proto_config, "", context);
auto* jwks_data = filter_conf->getJwksCache().findByIssuer("issuer1");
EXPECT_NE(nullptr, jwks_data);
EXPECT_NE(nullptr, jwks_data->retryPolicy());
EXPECT_EQ(5, jwks_data->retryPolicy()->numRetries());
}

TEST(HttpJwtAuthnFilterConfigTest, RemoteJwksWithInvalidRetryPolicy) {
const char config[] = R"(
providers:
provider1:
issuer: issuer1
remote_jwks:
http_uri:
uri: http://www.valid.com/resource
cluster: pubkey_cluster
timeout: 1s
retry_policy:
retry_back_off:
base_interval: 10s
max_interval: 1s
)";

JwtAuthentication proto_config;
TestUtility::loadFromYaml(config, proto_config);

NiceMock<Server::Configuration::MockFactoryContext> context;
EXPECT_THAT_THROWS_MESSAGE(
FilterConfigImpl(proto_config, "", context), EnvoyException,
HasSubstr("max_interval must be greater than or equal to the base_interval"));
}

} // namespace
} // namespace JwtAuthn
} // namespace HttpFilters
Expand Down
Loading