github/ha-core
1
Fork 0
mirror of https://github.com/home-assistant/core synced 2024-07-18 12:02:20 +02:00
Code Releases Activity

Add verify_ssl option to Splunk component (#19112)

Browse Source 
* added verify_ssl option to Splunk component

* update Splunk tests

* fix typo in Splunk tests

* Update test
This commit is contained in:
FieldofClay 2018-12-27 21:23:04 +08:00 committed by Fabian Affolter
parent cd0da4ed0e
commit bf8b201bb3
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
homeassistant/components/splunk.py
View File

@ -12,7 +12,8 @@ import requests
import voluptuous as vol
from homeassistant.const import (
CONF_SSL, CONF_HOST, CONF_NAME, CONF_PORT, CONF_TOKEN, EVENT_STATE_CHANGED)
CONF_SSL, CONF_VERIFY_SSL, CONF_HOST, CONF_NAME,
CONF_PORT, CONF_TOKEN, EVENT_STATE_CHANGED)
from homeassistant.helpers import state as state_helper
import homeassistant.helpers.config_validation as cv
from homeassistant.helpers.json import JSONEncoder
@ -32,6 +33,7 @@ CONFIG_SCHEMA = vol.Schema({
vol.Optional(CONF_HOST, default=DEFAULT_HOST): cv.string,
vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
vol.Optional(CONF_SSL, default=False): cv.boolean,
vol.Optional(CONF_VERIFY_SSL, default=True): cv.boolean,
vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
}),
}, extra=vol.ALLOW_EXTRA)
@ -44,6 +46,7 @@ def setup(hass, config):
port = conf.get(CONF_PORT)
token = conf.get(CONF_TOKEN)
use_ssl = conf.get(CONF_SSL)
verify_ssl = conf.get(CONF_VERIFY_SSL)
name = conf.get(CONF_NAME)
if use_ssl:
@ -85,7 +88,7 @@ def setup(hass, config):
}
requests.post(event_collector,
data=json.dumps(payload, cls=JSONEncoder),
headers=headers, timeout=10)
headers=headers, timeout=10, verify=verify_ssl)
except requests.exceptions.RequestException as error:
_LOGGER.exception("Error saving event to Splunk: %s", error)

11
tests/components/test_splunk.py
View File

@ -31,6 +31,7 @@ class TestSplunk(unittest.TestCase):
'port': 123,
'token': 'secret',
'ssl': 'False',
'verify_ssl': 'True',
'name': 'hostname',
}
}
@ -88,10 +89,9 @@ class TestSplunk(unittest.TestCase):
}
for in_, out in valid.items():
state = mock.MagicMock(state=in_,
domain='fake',
object_id='entity',
attributes={'datetime_attr': now})
state = mock.MagicMock(
state=in_, domain='fake', object_id='entity',
attributes={'datetime_attr': now})
event = mock.MagicMock(data={'new_state': state}, time_fired=12345)
try:
@ -118,6 +118,5 @@ class TestSplunk(unittest.TestCase):
mock.call(
payload['host'], data=json.dumps(payload),
headers={'Authorization': 'Splunk secret'},
timeout=10
)
timeout=10, verify=True)
self.mock_post.reset_mock()