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.

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

Require peer certificate to be present when ca_cert_file is set #648

Merged
merged 2 commits into from
Mar 29, 2017

Conversation

lookuptable
Copy link
Contributor

Fixes #615

@lookuptable
Copy link
Contributor Author

@mattklein123 PTAL

Copy link
Member

@mattklein123 mattklein123 left a comment

Choose a reason for hiding this comment

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

Looks good from code perspective, 1 small nit.

For docs, please add a small note to https://lyft.github.io/envoy/docs/configuration/listeners/ssl.html and https://lyft.github.io/envoy/docs/configuration/cluster_manager/cluster_ssl.html about how setting ca_cert_file requires that a certificate be presented or the connection will be failed.

@@ -229,6 +229,12 @@ bool ContextImpl::verifyPeer(SSL* ssl) const {

if (!cert.get()) {
stats_.no_certificate_.inc();

if (ca_cert_) {
// In case that ca_cert_ exists, reject the connection when peer
Copy link
Member

Choose a reason for hiding this comment

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

nit: please flow comment out to 100 col

@mattklein123 mattklein123 merged commit 1687644 into envoyproxy:master Mar 29, 2017
lookuptable added a commit to lookuptable/proxy that referenced this pull request Mar 29, 2017
mattklein123 added a commit that referenced this pull request Apr 1, 2017
mattklein123 added a commit that referenced this pull request Apr 1, 2017
vijayendrabvs pushed a commit to vijayendrabvs/envoy that referenced this pull request Apr 4, 2017
jplevyak pushed a commit to jplevyak/envoy that referenced this pull request Sep 29, 2020
jpsim pushed a commit that referenced this pull request Nov 28, 2022
Signed-off-by: Jose Nino [email protected]
Description: #9618 broke the iOS build due to missing symbols. #9875 fixes. However, in order to expedite a clean master branch this PR moves the Envoy ref back to a stable place. Note that Android logging is reverted. Also note that CI for iOS was not testing for liveliness, which is how the breakage went through in the first place. This PR also fixes that.
Risk Level: low
Testing: CI

Fixes #646

Signed-off-by: Jose Nino <[email protected]>
Signed-off-by: JP Simard <[email protected]>
jpsim pushed a commit that referenced this pull request Nov 29, 2022
Signed-off-by: Jose Nino [email protected]
Description: #9618 broke the iOS build due to missing symbols. #9875 fixes. However, in order to expedite a clean master branch this PR moves the Envoy ref back to a stable place. Note that Android logging is reverted. Also note that CI for iOS was not testing for liveliness, which is how the breakage went through in the first place. This PR also fixes that.
Risk Level: low
Testing: CI

Fixes #646

Signed-off-by: Jose Nino <[email protected]>
Signed-off-by: JP Simard <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants