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

More API clean up

Browse Source
This commit is contained in:
Paulus Schoutsen 2014-10-21 23:52:24 -07:00
parent e71efb3b68
commit a0c12fe685
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -331,7 +331,7 @@ optional parameter: attributes - JSON encoded object
**/api/events/&lt;event_type>** - POST<br> **/api/events/&lt;event_type>** - POST<br>
Fires an event with event_type<br> Fires an event with event_type<br>
optional parameter: event_data - JSON encoded object optional body: JSON encoded object that represents event_data
```json ```json
{ {
@ -341,7 +341,7 @@ optional parameter: event_data - JSON encoded object
**/api/services/&lt;domain>/&lt;service>** - POST<br> **/api/services/&lt;domain>/&lt;service>** - POST<br>
Calls a service within a specific domain.<br> Calls a service within a specific domain.<br>
optional parameter: service_data - JSON encoded object optional body: JSON encoded object that represents service_data
```json ```json
{ {

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

@ -383,7 +383,7 @@ class RequestHandler(BaseHTTPRequestHandler):
"<link rel='icon' type='image/png' " "<link rel='icon' type='image/png' "
" href='/static/favicon-192x192.png' sizes='192x192'>" " href='/static/favicon-192x192.png' sizes='192x192'>"
"<script data-main='static/javascripts/app'" "<script data-main='static/javascripts/app'"
"src='/static/javascripts/require.js'></script>" "src='/static/javascripts/require.js'></script>"
"</head>" "</head>"
"<body>" "<body>"
"<div class='container'>" "<div class='container'>"
@ -637,9 +637,11 @@ class RequestHandler(BaseHTTPRequestHandler):
def _handle_get_api_events(self, path_match, data): def _handle_get_api_events(self, path_match, data):
""" Handles getting overview of event listeners. """ """ Handles getting overview of event listeners. """
self._write_json(self.server.hass.bus.listeners) self._write_json([{"event": key, "listener_count": value}
for key, value
in self.server.hass.bus.listeners.items()])
def _handle_api_post_events_event(self, path_match, data): def _handle_api_post_events_event(self, path_match, event_data):
""" Handles firing of an event. """ Handles firing of an event.
This handles the following paths: This handles the following paths:
@ -648,7 +650,6 @@ class RequestHandler(BaseHTTPRequestHandler):
Events from /api are threated as remote events. Events from /api are threated as remote events.
""" """
event_type = path_match.group('event_type') event_type = path_match.group('event_type')
event_data = data.get('event_data')
if event_data is not None and not isinstance(event_data, dict): if event_data is not None and not isinstance(event_data, dict):
self._message("event_data should be an object", self._message("event_data should be an object",
@ -671,7 +672,10 @@ class RequestHandler(BaseHTTPRequestHandler):
def _handle_get_api_services(self, path_match, data): def _handle_get_api_services(self, path_match, data):
""" Handles getting overview of services. """ """ Handles getting overview of services. """
self._write_json(self.server.hass.services.services) self._write_json(
[{"domain": key, "services": value}
for key, value
in self.server.hass.services.services.items()])
# pylint: disable=invalid-name # pylint: disable=invalid-name
def _handle_post_api_services_domain_service(self, path_match, data): def _handle_post_api_services_domain_service(self, path_match, data):
@ -742,9 +746,7 @@ class RequestHandler(BaseHTTPRequestHandler):
def _handle_get_static(self, path_match, data): def _handle_get_static(self, path_match, data):
""" Returns a static file. """ """ Returns a static file. """
# req_file = util.sanitize_filename(path_match.group('file')) req_file = util.sanitize_path(path_match.group('file'))
# TODO make safe
req_file = path_match.group('file')
path = os.path.join(os.path.dirname(__file__), 'www_static', req_file) path = os.path.join(os.path.dirname(__file__), 'www_static', req_file)

6
homeassistant/util.py
View File

@ -12,6 +12,7 @@ import enum
import socket import socket
RE_SANITIZE_FILENAME = re.compile(r'(~|\.\.|/|\\)') RE_SANITIZE_FILENAME = re.compile(r'(~|\.\.|/|\\)')
RE_SANITIZE_PATH = re.compile(r'(~|\.(\.)+)')
RE_SLUGIFY = re.compile(r'[^A-Za-z0-9_]+') RE_SLUGIFY = re.compile(r'[^A-Za-z0-9_]+')
DATE_STR_FORMAT = "%H:%M:%S %d-%m-%Y" DATE_STR_FORMAT = "%H:%M:%S %d-%m-%Y"
@ -22,6 +23,11 @@ def sanitize_filename(filename):
return RE_SANITIZE_FILENAME.sub("", filename) return RE_SANITIZE_FILENAME.sub("", filename)
def sanitize_path(path):
""" Sanitizes a path by removing .. / and \\. """
return RE_SANITIZE_PATH.sub("", path)
def slugify(text): def slugify(text):
""" Slugifies a given text. """ """ Slugifies a given text. """
text = text.strip().replace(" ", "_") text = text.strip().replace(" ", "_")