Skip to content

ignore verification if peer/origin optional fields are set #1660

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
quanjielin merged 3 commits into from
May 1, 2018
Merged

ignore verification if peer/origin optional fields are set #1660

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
21ad3df
ignore verfication if peer/origin optional fields are set
quanjielin Apr 28, 2018
58c6507
get rid of set_allocated_policy
quanjielin May 1, 2018
65c58da
Merge branch 'release-0.8' into quanlinign1
quanjielin May 1, 2018
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
4 changes: 3 additions & 1 deletion src/envoy/http/authn/http_filter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,14 @@ FilterHeadersStatus AuthenticationFilter::decodeHeaders(HeaderMap& headers,

Payload payload;

if (!createPeerAuthenticator(filter_context_.get())->run(&payload)) {
if (!filter_config_.policy().peer_is_optional() &&
!createPeerAuthenticator(filter_context_.get())->run(&payload)) {
rejectRequest("Peer authentication failed.");
return FilterHeadersStatus::StopIteration;
}

bool success =
filter_config_.policy().origin_is_optional() ||
createOriginAuthenticator(filter_context_.get())->run(&payload);

// After Istio authn, the JWT headers consumed by Istio authn should be
Expand Down
27 changes: 23 additions & 4 deletions src/envoy/http/authn/http_filter_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,19 @@ using testing::NiceMock;
using testing::StrictMock;
using testing::_;

namespace iaapi = istio::authentication::v1alpha1;

namespace Envoy {
namespace Http {
namespace Istio {
namespace AuthN {
namespace {

const char ingoreBothPolicy[] = R"(
peer_is_optional: true
origin_is_optional: true
)";

// Create a fake authenticator for test. This authenticator do nothing except
// making the authentication fail.
std::unique_ptr<AuthenticatorBase> createAlwaysFailAuthenticator(
Expand Down Expand Up @@ -74,8 +81,9 @@ class MockAuthenticationFilter : public AuthenticationFilter {
public:
// We'll use fake authenticator for test, so policy is not really needed. Use
// default config for simplicity.
MockAuthenticationFilter()
: AuthenticationFilter(FilterConfig::default_instance()) {}
MockAuthenticationFilter(const FilterConfig& filter_config)
: AuthenticationFilter(filter_config) {}

~MockAuthenticationFilter(){};

MOCK_METHOD1(createPeerAuthenticator,
Expand All @@ -95,9 +103,11 @@ class AuthenticationFilterTest : public testing::Test {
}

protected:
StrictMock<MockAuthenticationFilter> filter_;
NiceMock<Http::MockStreamDecoderFilterCallbacks> decoder_callbacks_;
FilterConfig filter_config_ = FilterConfig::default_instance();

Http::TestHeaderMapImpl request_headers_;
StrictMock<MockAuthenticationFilter> filter_{filter_config_};
NiceMock<Http::MockStreamDecoderFilterCallbacks> decoder_callbacks_;
};

TEST_F(AuthenticationFilterTest, PeerFail) {
Expand Down Expand Up @@ -151,6 +161,15 @@ TEST_F(AuthenticationFilterTest, AllPass) {
TestUtilities::AuthNResultFromString(R"(peer_user: "foo")"), authn));
}

TEST_F(AuthenticationFilterTest, IgnoreBothFail) {
iaapi::Policy policy_;
ASSERT_TRUE(
Protobuf::TextFormat::ParseFromString(ingoreBothPolicy, &policy_));
*filter_config_.mutable_policy() = policy_;
EXPECT_EQ(Http::FilterHeadersStatus::Continue,
filter_.decodeHeaders(request_headers_, true));
}

} // namespace
} // namespace AuthN
} // namespace Istio
Expand Down