mirror of
https://github.com/GNS3/gns3-server
synced 2024-11-24 17:28:08 +00:00
Support wireshark remote capture
This commit is contained in:
parent
cf0adf56a8
commit
8b879c0614
@ -27,6 +27,7 @@ from gns3server.handlers.api.virtualbox_handler import VirtualBoxHandler
|
|||||||
from gns3server.handlers.api.vpcs_handler import VPCSHandler
|
from gns3server.handlers.api.vpcs_handler import VPCSHandler
|
||||||
from gns3server.handlers.api.config_handler import ConfigHandler
|
from gns3server.handlers.api.config_handler import ConfigHandler
|
||||||
from gns3server.handlers.api.server_handler import ServerHandler
|
from gns3server.handlers.api.server_handler import ServerHandler
|
||||||
|
from gns3server.handlers.api.file_handler import FileHandler
|
||||||
from gns3server.handlers.upload_handler import UploadHandler
|
from gns3server.handlers.upload_handler import UploadHandler
|
||||||
from gns3server.handlers.index_handler import IndexHandler
|
from gns3server.handlers.index_handler import IndexHandler
|
||||||
|
|
||||||
|
54
gns3server/handlers/api/file_handler.py
Normal file
54
gns3server/handlers/api/file_handler.py
Normal file
@ -0,0 +1,54 @@
|
|||||||
|
#
|
||||||
|
# Copyright (C) 2015 GNS3 Technologies Inc.
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
import asyncio
|
||||||
|
|
||||||
|
from ...web.route import Route
|
||||||
|
from ...schemas.file import FILE_STREAM_SCHEMA
|
||||||
|
|
||||||
|
|
||||||
|
class FileHandler:
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
@Route.get(
|
||||||
|
r"/files/stream",
|
||||||
|
description="Stream a file from the server",
|
||||||
|
status_codes={
|
||||||
|
200: "File retrieved",
|
||||||
|
404: "File doesn't exist"
|
||||||
|
},
|
||||||
|
input=FILE_STREAM_SCHEMA
|
||||||
|
)
|
||||||
|
def read(request, response):
|
||||||
|
try:
|
||||||
|
with open(request.json.get("location"), "rb") as f:
|
||||||
|
loop = asyncio.get_event_loop()
|
||||||
|
response.content_type = "application/octet-stream"
|
||||||
|
response.set_status(200)
|
||||||
|
response.enable_chunked_encoding()
|
||||||
|
# Very important: do not send a content lenght otherwise QT close the connection but curl can consume the Feed
|
||||||
|
response.content_length = None
|
||||||
|
|
||||||
|
response.start(request)
|
||||||
|
|
||||||
|
while True:
|
||||||
|
data = yield from loop.run_in_executor(None, f.read, 16)
|
||||||
|
if len(data) == 0:
|
||||||
|
yield from asyncio.sleep(0.1)
|
||||||
|
else:
|
||||||
|
response.write(data)
|
||||||
|
except FileNotFoundError:
|
||||||
|
response.set_status(404)
|
32
gns3server/schemas/file.py
Normal file
32
gns3server/schemas/file.py
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
#
|
||||||
|
# Copyright (C) 2015 GNS3 Technologies Inc.
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
|
||||||
|
FILE_STREAM_SCHEMA = {
|
||||||
|
"$schema": "http://json-schema.org/draft-04/schema#",
|
||||||
|
"description": "Request validation retrieval of a file stream",
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"location": {
|
||||||
|
"description": "File path",
|
||||||
|
"type": ["string"],
|
||||||
|
"minLength": 1
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"additionalProperties": False,
|
||||||
|
"required": ["location"]
|
||||||
|
}
|
@ -44,7 +44,7 @@ class Query:
|
|||||||
def delete(self, path, **kwargs):
|
def delete(self, path, **kwargs):
|
||||||
return self._fetch("DELETE", path, **kwargs)
|
return self._fetch("DELETE", path, **kwargs)
|
||||||
|
|
||||||
def _get_url(self, path, version):
|
def get_url(self, path, version):
|
||||||
if version is None:
|
if version is None:
|
||||||
return "http://{}:{}{}".format(self._host, self._port, path)
|
return "http://{}:{}{}".format(self._host, self._port, path)
|
||||||
return "http://{}:{}/v{}{}".format(self._host, self._port, version, path)
|
return "http://{}:{}/v{}{}".format(self._host, self._port, version, path)
|
||||||
@ -62,7 +62,7 @@ class Query:
|
|||||||
|
|
||||||
@asyncio.coroutine
|
@asyncio.coroutine
|
||||||
def go(future):
|
def go(future):
|
||||||
response = yield from aiohttp.request(method, self._get_url(path, api_version), data=body)
|
response = yield from aiohttp.request(method, self.get_url(path, api_version), data=body)
|
||||||
future.set_result(response)
|
future.set_result(response)
|
||||||
future = asyncio.Future()
|
future = asyncio.Future()
|
||||||
asyncio.async(go(future))
|
asyncio.async(go(future))
|
||||||
|
62
tests/handlers/api/test_file.py
Normal file
62
tests/handlers/api/test_file.py
Normal file
@ -0,0 +1,62 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
#
|
||||||
|
# Copyright (C) 2015 GNS3 Technologies Inc.
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
"""
|
||||||
|
This test suite check /files endpoint
|
||||||
|
"""
|
||||||
|
|
||||||
|
import json
|
||||||
|
import asyncio
|
||||||
|
import aiohttp
|
||||||
|
|
||||||
|
from gns3server.version import __version__
|
||||||
|
|
||||||
|
|
||||||
|
def test_stream(server, tmpdir, loop):
|
||||||
|
with open(str(tmpdir / "test"), 'w+') as f:
|
||||||
|
f.write("hello")
|
||||||
|
|
||||||
|
def go(future):
|
||||||
|
query = json.dumps({"location": str(tmpdir / "test")})
|
||||||
|
headers = {'content-type': 'application/json'}
|
||||||
|
response = yield from aiohttp.request("GET", server.get_url("/files/stream", 1), data=query, headers=headers)
|
||||||
|
response.body = yield from response.content.read(5)
|
||||||
|
with open(str(tmpdir / "test"), 'a') as f:
|
||||||
|
f.write("world")
|
||||||
|
response.body += yield from response.content.read(5)
|
||||||
|
response.close()
|
||||||
|
future.set_result(response)
|
||||||
|
|
||||||
|
future = asyncio.Future()
|
||||||
|
asyncio.async(go(future))
|
||||||
|
response = loop.run_until_complete(future)
|
||||||
|
assert response.status == 200
|
||||||
|
assert response.body == b'helloworld'
|
||||||
|
|
||||||
|
|
||||||
|
def test_stream_file_not_found(server, tmpdir, loop):
|
||||||
|
def go(future):
|
||||||
|
query = json.dumps({"location": str(tmpdir / "test")})
|
||||||
|
headers = {'content-type': 'application/json'}
|
||||||
|
response = yield from aiohttp.request("GET", server.get_url("/files/stream", 1), data=query, headers=headers)
|
||||||
|
response.close()
|
||||||
|
future.set_result(response)
|
||||||
|
|
||||||
|
future = asyncio.Future()
|
||||||
|
asyncio.async(go(future))
|
||||||
|
response = loop.run_until_complete(future)
|
||||||
|
assert response.status == 404
|
Loading…
Reference in New Issue
Block a user