automatically use bundled certificate it set to auto #6707
Merged
Conversation
This file contains 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
… to 'auto' and seperate this from which port is specified
|
@printzlau, thanks for your PR! By analyzing the history of the files in this pull request, we identified @pvizeli, @balloob and @fabaff to be potential reviewers. |
|
Hi @printzlau, It seems you haven't yet signed a CLA. Please do so here. Once you do that we will be able to review and accept this pull request. Thanks! |
houndci-bot
reviewed
Mar 19, 2017
tests/components/mqtt/test_init.py
Outdated
| def test_setup_uses_certificate_not_on_mqtts_port(hass): | ||
| """Test setup doesn't use bundled certificates when not mqtts port.""" | ||
| def test_setup_does_not_use_certificate_on_mqtts_port(hass): | ||
| """Test setup doesn't use bundled certificates when certificate is not set.""" |
There was a problem hiding this comment.
line too long (82 > 79 characters)
| @@ -317,8 +317,8 @@ def async_setup(hass, config): | |||
| certificate = os.path.join(os.path.dirname(__file__), | |||
| 'addtrustexternalcaroot.crt') | |||
|
|
|||
| # When the port indicates mqtts, use bundled certificates from requests | |||
| if certificate is None and port == 8883: | |||
| # When the certificate is set to auto, use bundled certificates from requests | |||
There was a problem hiding this comment.
line too long (81 > 79 characters)
| @@ -119,7 +119,7 @@ def valid_discovery_topic(value): | |||
| vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port, | |||
| vol.Optional(CONF_USERNAME): cv.string, | |||
| vol.Optional(CONF_PASSWORD): cv.string, | |||
| vol.Optional(CONF_CERTIFICATE): cv.isfile, | |||
| vol.Optional(CONF_CERTIFICATE): vol.Any('auto',cv.isfile), | |||
Merged
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Description:
Change the way that bundled certificates is automatically used.
From now on it will be specified by setting certificate to 'auto'.
The previous method of using the port set to 8883, will no longer effect the certificate.
Related issue (if applicable): fixes #6596
Pull request in home-assistant.github.io with documentation (if applicable): home-assistant/home-assistant.io#2295
Example entry for
configuration.yaml(if applicable):Checklist:
toxrun successfully. Your PR cannot be merged unless tests pass