jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-09 14:27:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add SSL peer certificate support to HTTP server (#15043)

Browse Source 
* adding SSL peer certificate support to HTTP server

* remove unnecessary exception block
This commit is contained in:
Robert Kiss 2018-06-26 17:44:08 +02:00 committed by Paulus Schoutsen
parent 0094fd5c34
commit 3921dc77a6
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
homeassistant/components/emulated_hue/__init__.py
View File

@ -91,6 +91,7 @@ def setup(hass, yaml_config):
server_port=config.listen_port, server_port=config.listen_port,
api_password=None, api_password=None,
ssl_certificate=None, ssl_certificate=None,
ssl_peer_certificate=None,
ssl_key=None, ssl_key=None,
cors_origins=None, cors_origins=None,
use_x_forwarded_for=False, use_x_forwarded_for=False,

14
homeassistant/components/http/__init__.py
View File

@ -40,6 +40,7 @@ CONF_SERVER_HOST = 'server_host'
CONF_SERVER_PORT = 'server_port' CONF_SERVER_PORT = 'server_port'
CONF_BASE_URL = 'base_url' CONF_BASE_URL = 'base_url'
CONF_SSL_CERTIFICATE = 'ssl_certificate' CONF_SSL_CERTIFICATE = 'ssl_certificate'
CONF_SSL_PEER_CERTIFICATE = 'ssl_peer_certificate'
CONF_SSL_KEY = 'ssl_key' CONF_SSL_KEY = 'ssl_key'
CONF_CORS_ORIGINS = 'cors_allowed_origins' CONF_CORS_ORIGINS = 'cors_allowed_origins'
CONF_USE_X_FORWARDED_FOR = 'use_x_forwarded_for' CONF_USE_X_FORWARDED_FOR = 'use_x_forwarded_for'
@ -80,6 +81,7 @@ HTTP_SCHEMA = vol.Schema({
vol.Optional(CONF_SERVER_PORT, default=SERVER_PORT): cv.port, vol.Optional(CONF_SERVER_PORT, default=SERVER_PORT): cv.port,
vol.Optional(CONF_BASE_URL): cv.string, vol.Optional(CONF_BASE_URL): cv.string,
vol.Optional(CONF_SSL_CERTIFICATE): cv.isfile, vol.Optional(CONF_SSL_CERTIFICATE): cv.isfile,
vol.Optional(CONF_SSL_PEER_CERTIFICATE): cv.isfile,
vol.Optional(CONF_SSL_KEY): cv.isfile, vol.Optional(CONF_SSL_KEY): cv.isfile,
vol.Optional(CONF_CORS_ORIGINS, default=[]): vol.Optional(CONF_CORS_ORIGINS, default=[]):
vol.All(cv.ensure_list, [cv.string]), vol.All(cv.ensure_list, [cv.string]),
@ -108,6 +110,7 @@ async def async_setup(hass, config):
server_host = conf[CONF_SERVER_HOST] server_host = conf[CONF_SERVER_HOST]
server_port = conf[CONF_SERVER_PORT] server_port = conf[CONF_SERVER_PORT]
ssl_certificate = conf.get(CONF_SSL_CERTIFICATE) ssl_certificate = conf.get(CONF_SSL_CERTIFICATE)
ssl_peer_certificate = conf.get(CONF_SSL_PEER_CERTIFICATE)
ssl_key = conf.get(CONF_SSL_KEY) ssl_key = conf.get(CONF_SSL_KEY)
cors_origins = conf[CONF_CORS_ORIGINS] cors_origins = conf[CONF_CORS_ORIGINS]
use_x_forwarded_for = conf[CONF_USE_X_FORWARDED_FOR] use_x_forwarded_for = conf[CONF_USE_X_FORWARDED_FOR]
@ -125,6 +128,7 @@ async def async_setup(hass, config):
server_port=server_port, server_port=server_port,
api_password=api_password, api_password=api_password,
ssl_certificate=ssl_certificate, ssl_certificate=ssl_certificate,
ssl_peer_certificate=ssl_peer_certificate,
ssl_key=ssl_key, ssl_key=ssl_key,
cors_origins=cors_origins, cors_origins=cors_origins,
use_x_forwarded_for=use_x_forwarded_for, use_x_forwarded_for=use_x_forwarded_for,
@ -166,7 +170,8 @@ async def async_setup(hass, config):
class HomeAssistantHTTP(object): class HomeAssistantHTTP(object):
"""HTTP server for Home Assistant.""" """HTTP server for Home Assistant."""
def __init__(self, hass, api_password, ssl_certificate, def __init__(self, hass, api_password,
ssl_certificate, ssl_peer_certificate,
ssl_key, server_host, server_port, cors_origins, ssl_key, server_host, server_port, cors_origins,
use_x_forwarded_for, trusted_networks, use_x_forwarded_for, trusted_networks,
login_threshold, is_ban_enabled): login_threshold, is_ban_enabled):
@ -190,6 +195,7 @@ class HomeAssistantHTTP(object):
self.hass = hass self.hass = hass
self.api_password = api_password self.api_password = api_password
self.ssl_certificate = ssl_certificate self.ssl_certificate = ssl_certificate
self.ssl_peer_certificate = ssl_peer_certificate
self.ssl_key = ssl_key self.ssl_key = ssl_key
self.server_host = server_host self.server_host = server_host
self.server_port = server_port self.server_port = server_port
@ -287,8 +293,12 @@ class HomeAssistantHTTP(object):
except OSError as error: except OSError as error:
_LOGGER.error("Could not read SSL certificate from %s: %s", _LOGGER.error("Could not read SSL certificate from %s: %s",
self.ssl_certificate, error) self.ssl_certificate, error)
context = None
return return
if self.ssl_peer_certificate:
context.verify_mode = ssl.CERT_REQUIRED
context.load_verify_locations(cafile=self.ssl_peer_certificate)
else: else:
context = None context = None