arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-24 17:28:08 +00:00
Code Issues Releases Wiki Activity

Fix packet capture with HTTPS remote server. Fixes #1882

Browse Source
This commit is contained in:
grossmj 2021-04-07 12:40:15 +09:30
parent 360a819e91
commit 082206a7db
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gns3server/controller/__init__.py
View File

@ -53,6 +53,7 @@ class Controller:
self._notification = Notification(self) self._notification = Notification(self)
self.gns3vm = GNS3VM(self) self.gns3vm = GNS3VM(self)
self.symbols = Symbols() self.symbols = Symbols()
self._ssl_context = None
self._appliance_manager = ApplianceManager() self._appliance_manager = ApplianceManager()
self._template_manager = TemplateManager() self._template_manager = TemplateManager()
self._iou_license_settings = {"iourc_content": "", self._iou_license_settings = {"iourc_content": "",
@ -82,9 +83,9 @@ class Controller:
computes = self._load_controller_settings() computes = self._load_controller_settings()
from gns3server.web.web_server import WebServer from gns3server.web.web_server import WebServer
ssl_context = WebServer.instance(host=host, port=port).ssl_context() self._ssl_context = WebServer.instance(host=host, port=port).ssl_context()
protocol = server_config.get("protocol", "http") protocol = server_config.get("protocol", "http")
if ssl_context and protocol != "https": if self._ssl_context and protocol != "https":
log.warning("Protocol changed to 'https' for local compute because SSL is enabled".format(port)) log.warning("Protocol changed to 'https' for local compute because SSL is enabled".format(port))
protocol = "https" protocol = "https"
try: try:
@ -97,7 +98,7 @@ class Controller:
user=server_config.get("user", ""), user=server_config.get("user", ""),
password=server_config.get("password", ""), password=server_config.get("password", ""),
force=True, force=True,
ssl_context=ssl_context) ssl_context=self._ssl_context)
except aiohttp.web.HTTPConflict: except aiohttp.web.HTTPConflict:
log.fatal("Cannot access to the local server, make sure something else is not running on the TCP port {}".format(port)) log.fatal("Cannot access to the local server, make sure something else is not running on the TCP port {}".format(port))
sys.exit(1) sys.exit(1)
@ -115,6 +116,13 @@ class Controller:
await self.load_projects() await self.load_projects()
await self._project_auto_open() await self._project_auto_open()
def ssl_context(self):
"""
Returns the SSL context for the server.
"""
return self._ssl_context
def _update_config(self): def _update_config(self):
""" """
Call this when the server configuration file changes. Call this when the server configuration file changes.

4
gns3server/controller/topology.py
View File

@ -63,13 +63,13 @@ def _check_topology_schema(topo):
error = "Invalid data in topology file: {} in schema: {}".format( error = "Invalid data in topology file: {} in schema: {}".format(
e.message, e.message,
json.dumps(e.schema)) json.dumps(e.schema))
log.critical(error) log.debug(error)
raise aiohttp.web.HTTPConflict(text=error) raise aiohttp.web.HTTPConflict(text=error)
def project_to_topology(project): def project_to_topology(project):
""" """
:return: A dictionnary with the topology ready to dump to a .gns3 :return: A dictionary with the topology ready to dump to a .gns3
""" """
data = { data = {
"project_id": project.id, "project_id": project.id,

3
gns3server/handlers/api/controller/link_handler.py
View File

@ -215,6 +215,7 @@ class LinkHandler:
async def pcap(request, response): async def pcap(request, response):
project = await Controller.instance().get_loaded_project(request.match_info["project_id"]) project = await Controller.instance().get_loaded_project(request.match_info["project_id"])
ssl_context = Controller.instance().ssl_context()
link = project.get_link(request.match_info["link_id"]) link = project.get_link(request.match_info["link_id"])
if not link.capturing: if not link.capturing:
raise aiohttp.web.HTTPConflict(text="This link has no active packet capture") raise aiohttp.web.HTTPConflict(text="This link has no active packet capture")
@ -226,7 +227,7 @@ class LinkHandler:
headers['Router-Host'] = request.host headers['Router-Host'] = request.host
body = await request.read() body = await request.read()
connector = aiohttp.TCPConnector(limit=None, force_close=True) connector = aiohttp.TCPConnector(limit=None, force_close=True, ssl_context=ssl_context)
async with aiohttp.ClientSession(connector=connector, headers=headers) as session: async with aiohttp.ClientSession(connector=connector, headers=headers) as session:
async with session.request(request.method, pcap_streaming_url, timeout=None, data=body) as response: async with session.request(request.method, pcap_streaming_url, timeout=None, data=body) as response:
proxied_response = aiohttp.web.Response(headers=response.headers, status=response.status) proxied_response = aiohttp.web.Response(headers=response.headers, status=response.status)