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

Revert "Support PKCS#12 encoded certificates (#17261)" #17801

Merged
merged 2 commits into from
Apr 19, 2018

Conversation

kobelb
Copy link
Contributor

@kobelb kobelb commented Apr 19, 2018

This reverts commit de91bd0.

The PKCS#12 certificate includes the equivalent of the cert/key and cas in a single file, which made it rather difficult to only use the certificate authorities for connections that we proxy through the kibana server for end-user request (callWithRequest, elasticsearch plugin proxy)

We still want support for PKCS#12, but we need to think through how to reliably extract only the certification authorities when that's necessary.

@kobelb kobelb requested a review from legrego April 19, 2018 17:16
const { error } = validate(config);
expect(error).toBe(null);
expect(error).to.be.an(Object);
Copy link
Member

Choose a reason for hiding this comment

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

This revert might fail - I think this file was converted to use jest's expect outside of this PR, so calls like .to.be.an(...) may break.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Great catch

@elasticmachine
Copy link
Contributor

💚 Build Succeeded

@kobelb kobelb requested a review from jbudz April 19, 2018 18:18
Copy link
Member

@legrego legrego left a comment

Choose a reason for hiding this comment

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

LGTM!

Copy link
Member

@jbudz jbudz left a comment

Choose a reason for hiding this comment

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

LGTM, tested smoke tested with certs and checked the diff.

@kobelb kobelb merged commit 97df91f into elastic:master Apr 19, 2018
@kobelb kobelb deleted the pkcs12-rollback branch April 19, 2018 18:35
kobelb added a commit to kobelb/kibana that referenced this pull request Apr 19, 2018
…c#17801)

* Revert "Support PKCS#12 encoded certificates (elastic#17261)"

This reverts commit de91bd0.

* Fixing tests
kobelb added a commit that referenced this pull request Apr 19, 2018
* Revert "Support PKCS#12 encoded certificates (#17261)"

This reverts commit de91bd0.

* Fixing tests
@elasticmachine
Copy link
Contributor

💚 Build Succeeded

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.

4 participants