(PUP-672) TrustedInformation handles a nil certificate.#2220
Merged
jpartlow merged 1 commit intopuppetlabs:masterfrom Jan 6, 2014
Merged
Conversation
Contributor
There was a problem hiding this comment.
Is this something that should be part of this test? It seems like leaving it as it was is fine.
Contributor
Author
There was a problem hiding this comment.
It will work again without +ExportCertData, so I'm fine backing that out; I was considering it a flaw of the external ca setup.
|
CLA signed by all contributors. |
Acceptance caught an issue with an external ca not passing the certificate info in the request (the acceptance/tests/external_ca_support/apache_external_root_ca.rb does this because its SSLOptions does not have +ExportCertData in acceptance/tests/external_ca_support/fixtures/httpd.conf). So we are modifying the TrustedInformation class to handle a nil certificate without failure, but issue an info level warning in the logs. This also modifies the acceptance test to ensure a teardown, as failure to reach the clean up code is breaking following tests when the httpd server gets left up as master.
jpartlow
added a commit
that referenced
this pull request
Jan 6, 2014
…nformation-and-external-ca (PUP-672) TrustedInformation handles a nil certificate.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Acceptance caught an issue with an external ca not passing the
certificate info (the
acceptance/tests/external_ca_support/apache_external_root_ca.rb had this
issue prior to +ExportCertData being added to the SSLOptions in
acceptance/tests/external_ca_support/fixtures/httpd.conf).
Modifying the TrustedInformation class to handle a nil certificate
without failure, but issue an info level warning in the logs.
This also modifies the acceptance test to add the +ExportCertData, and
to ensure a teardown, as failure to reach the teardown is breaking
following tests when the httpd server was left up as master.