Merge branch 'master' into 1.5

This commit is contained in:
Julien Duponchelle committed 2016-04-26 11:49:24 +02:00
commit 1d08d4a5fa
8 files changed
+102 -13

No files matched your search

+3
View File
@@ -37,6 +37,9 @@ class FileHandler:
def read(request, response):
response.enable_chunked_encoding()
if not request.json.get("location").endswith(".pcap"):
raise aiohttp.web.HTTPForbidden(text="Only .pcap file are allowed")
try:
with open(request.json.get("location"), "rb") as f:
loop = asyncio.get_event_loop()