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

Support for web socket console over HTTPS

Browse Source
This commit is contained in:
grossmj 2023-11-03 14:40:40 +10:00
parent 1624c7d6ad
commit 2bbb560b8e
No known key found for this signature in database
GPG Key ID: 0A2D76AC45EA25CD
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gns3server/handlers/api/controller/node_handler.py
View File

@ -487,11 +487,18 @@ class NodeHandler:
except ValueError: except ValueError:
pass pass
ws_console_compute_url = "ws://{compute_host}:{compute_port}/v2/compute/projects/{project_id}/{node_type}/nodes/{node_id}/console/ws".format(compute_host=compute_host, ws_protocol = "ws"
if request.scheme == "https":
ws_protocol = "wss"
ws_console_compute_url = "{protocol}://{compute_host}:{compute_port}/v2/compute/projects/{project_id}/{node_type}/nodes/{node_id}/console/ws".format(
protocol=ws_protocol,
compute_host=compute_host,
compute_port=compute.port, compute_port=compute.port,
project_id=project.id, project_id=project.id,
node_type=node.node_type, node_type=node.node_type,
node_id=node.id) node_id=node.id
)
async def ws_forward(ws_client): async def ws_forward(ws_client):
async for msg in ws: async for msg in ws:
@ -504,7 +511,7 @@ class NodeHandler:
try: try:
async with aiohttp.ClientSession(connector=aiohttp.TCPConnector(limit=None, force_close=True)) as session: async with aiohttp.ClientSession(connector=aiohttp.TCPConnector(limit=None, force_close=True)) as session:
async with session.ws_connect(ws_console_compute_url) as ws_client: async with session.ws_connect(ws_console_compute_url, ssl=False) as ws_client:
asyncio.ensure_future(ws_forward(ws_client)) asyncio.ensure_future(ws_forward(ws_client))
async for msg in ws_client: async for msg in ws_client:
if msg.type == aiohttp.WSMsgType.TEXT: if msg.type == aiohttp.WSMsgType.TEXT:
@ -515,6 +522,8 @@ class NodeHandler:
break break
except ConnectionResetError: except ConnectionResetError:
log.info("Websocket console connection with compute disconnected") log.info("Websocket console connection with compute disconnected")
except aiohttp.ClientError as e:
log.error("Websocket console connection with compute failed: {}".format(e))
finally: finally:
if not ws.closed: if not ws.closed:
await ws.close() await ws.close()