Skip to content
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

Fix the issues in DefaultCertValidator::doVerifyCertChain and ContextImpl::verifyCertChain #16982

Merged
merged 11 commits into from
Jul 15, 2021
Merged

Fix the issues in DefaultCertValidator::doVerifyCertChain and ContextImpl::verifyCertChain #16982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1b15c1b
Several fixes
tyxia Jun 15, 2021
1b82cd7
Fix format
tyxia Jun 15, 2021
31c9761
Merge branch 'main' of https://github.com/envoyproxy/envoy into piper
tyxia Jun 16, 2021
158a69f
Merge branch 'main' of https://github.com/envoyproxy/envoy into piper
tyxia Jun 23, 2021
df0d54b
add unit test
tyxia Jun 23, 2021
289030a
Add more checks
tyxia Jun 24, 2021
232aad6
Add comment
tyxia Jun 24, 2021
41997b1
tweak the code
tyxia Jun 25, 2021
4ec840d
formatting
tyxia Jun 25, 2021
2ac2d78
add const
tyxia Jun 26, 2021
102a70d
Merge branch 'main' of https://github.com/envoyproxy/envoy into piper
tyxia Jul 9, 2021
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
11 changes: 9 additions & 2 deletions source/extensions/transport_sockets/tls/cert_validator/default_validator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,8 +215,15 @@ int DefaultCertValidator::doVerifyCertChain(
}
}

return allow_untrusted_certificate_ ? 1
: (validated != Envoy::Ssl::ClientValidationStatus::Failed);
// If `trusted_ca` exists, it is already verified in the code above. Thus, we just need to make
// sure the verification for other validation context configurations doesn't fail (i.e. either
// `NotValidated` or `Validated`). If `trusted_ca` doesn't exist, we will need to make sure other
// configurations are verified and the verification succeed.
int validation_status = verify_trusted_ca_
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bool?

Copy link
Member Author

@tyxia tyxia Jul 13, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for review! I think either bool or int will work here as bool <-> int implicit conversion will be triggered, and it will be triggered in either way.
The reason I used int here is to align with value 1 in ternary operator in line 226 and the return type of this function (which is int).

Please let me know what do you think.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think int is fine given that the function returns the same error code as X509_verify_cert

? validated != Envoy::Ssl::ClientValidationStatus::Failed
: validated == Envoy::Ssl::ClientValidationStatus::Validated;

return allow_untrusted_certificate_ ? 1 : validation_status;
}

Envoy::Ssl::ClientValidationStatus DefaultCertValidator::verifyCertificate(
Expand Down
8 changes: 6 additions & 2 deletions source/extensions/transport_sockets/tls/context_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1168,16 +1168,20 @@ bool TlsContext::isCipherEnabled(uint16_t cipher_id, uint16_t client_version) {
bool ContextImpl::verifyCertChain(X509& leaf_cert, STACK_OF(X509) & intermediates,
std::string& error_details) {
bssl::UniquePtr<X509_STORE_CTX> ctx(X509_STORE_CTX_new());

ASSERT(!tls_contexts_.empty());
// It doesn't matter which SSL context is used, because they share the same
// cert validation config.
X509_STORE* store = SSL_CTX_get_cert_store(tls_contexts_[0].ssl_ctx_.get());
const SSL_CTX* ssl_ctx = tls_contexts_[0].ssl_ctx_.get();
X509_STORE* store = SSL_CTX_get_cert_store(ssl_ctx);
if (!X509_STORE_CTX_init(ctx.get(), store, &leaf_cert, &intermediates)) {
error_details = "Failed to verify certificate chain: X509_STORE_CTX_init";
return false;
}

int res = cert_validator_->doVerifyCertChain(ctx.get(), nullptr, leaf_cert, nullptr);
if (res <= 0) {
// If |SSL_VERIFY_NONE|, the error is non-fatal, but we keep the error details.
if (res <= 0 && SSL_CTX_get_verify_mode(ssl_ctx) != SSL_VERIFY_NONE) {
const int n = X509_STORE_CTX_get_error(ctx.get());
const int depth = X509_STORE_CTX_get_error_depth(ctx.get());
error_details = absl::StrCat("X509_verify_cert: certificate verification error at depth ",
Expand Down
19 changes: 19 additions & 0 deletions test/extensions/transport_sockets/tls/cert_validator/default_validator_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,25 @@ TEST(DefaultCertValidatorTest, TestCertificateVerificationWithSANMatcher) {
EXPECT_EQ(stats.fail_verify_san_.value(), 1);
}

TEST(DefaultCertValidatorTest, TestCertificateVerificationWithNoValidationContext) {
Stats::TestUtil::TestStore test_store;
SslStats stats = generateSslStats(test_store);
// Create the default validator object.
auto default_validator =
std::make_unique<Extensions::TransportSockets::Tls::DefaultCertValidator>(
/*CertificateValidationContextConfig=*/nullptr, stats,
Event::GlobalTimeSystem().timeSystem());

EXPECT_EQ(default_validator->verifyCertificate(/*cert=*/nullptr, /*verify_san_list=*/{},
/*subject_alt_name_matchers=*/{}),
Envoy::Ssl::ClientValidationStatus::NotValidated);
X509 cert = {};
EXPECT_EQ(default_validator->doVerifyCertChain(/*store_ctx=*/nullptr,
/*ssl_extended_info=*/nullptr, /*leaf_cert=*/cert,
/*transport_socket_options=*/nullptr),
0);
}

} // namespace Tls
} // namespace TransportSockets
} // namespace Extensions
Expand Down