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

Cherry-pick #9566 to 6.x: [Heartbeat] Handle TLS certs missing notBefore/notAfter #9758

Merged
merged 1 commit into from
Jan 2, 2019

Conversation

andrewvc
Copy link
Contributor

Cherry-pick of PR #9566 to 6.x branch. Original message:

Some certs in the wild don't set these standard fields and can cause an NPE. I left a long comment in the code, this is sort of a bizarre situation.

Fixes #9556

@andrewvc
Copy link
Contributor Author

This backport also includes the commit from #8984 to make the cherry pick possible. Since that was a test-only change I think it's very safe.

Copy link
Member

@ruflin ruflin left a comment

Choose a reason for hiding this comment

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

Code LGTM but Changelog needs cleanup.


*Affecting all Beats*

- Enforce validation for the Central Management access token. {issue}9621[9621]
Copy link
Member

Choose a reason for hiding this comment

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

Sounds like this cahngelog contains quite a bit more then expected.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yep, argh. I'll switch to changelog.next . Changelog merges never work right

* [Heartbeat] Handle TLS certs missing notBefore/notAfter

Some certs in the wild don't set these standard fields and can cause an NPE

Fixes elastic#9556

* Add changelog entry

(cherry picked from commit 337113e)
@andrewvc
Copy link
Contributor Author

@ruflin rebased and fixed the changelog

Copy link
Member

@ruflin ruflin left a comment

Choose a reason for hiding this comment

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

@ph X-pack Libbeat tests failed here. Should we backport your fix?

@andrewvc andrewvc merged commit 1bf7558 into elastic:6.x Jan 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants