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

Fix cert match pattern #2466

Merged
merged 2 commits into from
Jun 19, 2019
Merged

Conversation

summerwind
Copy link
Contributor

@summerwind summerwind commented Jun 19, 2019

Which issue(s) this PR fixes:
Fixes #2458

What this PR does / why we need it:
This PR fixes regex pattern for PEM encoded certificate files to allow parsing files that do not ended with newline. This will also add a test for the fix.

Docs Changes:
No.

Release Note:

  • Allow parsing of certificate files that do not ended with newline.

Signed-off-by: Moto Ishizawa <summerwind.jp@gmail.com>
Signed-off-by: Moto Ishizawa <summerwind.jp@gmail.com>
@@ -0,0 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
Copy link
Member

Choose a reason for hiding this comment

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

Is this file used?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No. Should I remove this? I put this file for future use due to the certificate file is always pair with the key file.

Copy link
Member

Choose a reason for hiding this comment

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

I think no problem.

Copy link
Member

Choose a reason for hiding this comment

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

My bad. no problem.
I thought that other cert files already existed for the test. So this patch's cert files are only used for checking regex.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No problem. Thank you for your review!

@repeatedly repeatedly merged commit 0e5d11b into fluent:master Jun 19, 2019
@repeatedly
Copy link
Member

Thanks!

@summerwind summerwind deleted the fix-cert-match-pattern branch June 20, 2019 00:55
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.

Start even if failed to parse certificate file
3 participants