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

Allow cors for static files (#25468)

Browse Source
This commit is contained in:
Paulus Schoutsen 2019-07-25 04:52:27 -07:00 committed by Pascal Vizeli
parent b230562c76
commit fae3546910
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
homeassistant/components/http/cors.py
View File

@ -1,5 +1,5 @@
"""Provide CORS support for the HTTP component.""" """Provide CORS support for the HTTP component."""
from aiohttp.web_urldispatcher import Resource, ResourceRoute from aiohttp.web_urldispatcher import Resource, ResourceRoute, StaticResource
from aiohttp.hdrs import ACCEPT, CONTENT_TYPE, ORIGIN, AUTHORIZATION from aiohttp.hdrs import ACCEPT, CONTENT_TYPE, ORIGIN, AUTHORIZATION
from homeassistant.const import ( from homeassistant.const import (
@ -9,7 +9,7 @@ from homeassistant.core import callback
ALLOWED_CORS_HEADERS = [ ALLOWED_CORS_HEADERS = [
ORIGIN, ACCEPT, HTTP_HEADER_X_REQUESTED_WITH, CONTENT_TYPE, ORIGIN, ACCEPT, HTTP_HEADER_X_REQUESTED_WITH, CONTENT_TYPE,
HTTP_HEADER_HA_AUTH, AUTHORIZATION] HTTP_HEADER_HA_AUTH, AUTHORIZATION]
VALID_CORS_TYPES = (Resource, ResourceRoute) VALID_CORS_TYPES = (Resource, ResourceRoute, StaticResource)
@callback @callback
@ -56,7 +56,7 @@ def setup_cors(app, origins):
async def cors_startup(app): async def cors_startup(app):
"""Initialize CORS when app starts up.""" """Initialize CORS when app starts up."""
for route in list(app.router.routes()): for resource in list(app.router.resources()):
_allow_cors(route) _allow_cors(resource)
app.on_startup.append(cors_startup) app.on_startup.append(cors_startup)

20
tests/components/http/test_cors.py
View File

@ -1,4 +1,5 @@
"""Test cors for the HTTP component.""" """Test cors for the HTTP component."""
from pathlib import Path
from unittest.mock import patch from unittest.mock import patch
from aiohttp import web from aiohttp import web
@ -152,3 +153,22 @@ async def test_cors_works_with_frontend(hass, hass_client):
client = await hass_client() client = await hass_client()
resp = await client.get('/') resp = await client.get('/')
assert resp.status == 200 assert resp.status == 200
async def test_cors_on_static_files(hass, hass_client):
"""Test that we enable CORS for static files."""
assert await async_setup_component(hass, 'frontend', {
'http': {
'cors_allowed_origins': ['http://www.example.com']
}
})
hass.http.register_static_path('/something', Path(__file__).parent)
client = await hass_client()
resp = await client.options('/something/__init__.py', headers={
'origin': 'http://www.example.com',
ACCESS_CONTROL_REQUEST_METHOD: 'GET',
})
assert resp.status == 200
assert resp.headers[ACCESS_CONTROL_ALLOW_ORIGIN] == \
'http://www.example.com'