mirror of
https://github.com/GNS3/gns3-server.git
synced 2024-12-30 09:38:53 +00:00
Prevent connect a node to himself
Fix https://github.com/GNS3/gns3-gui/issues/1553
This commit is contained in:
parent
420168015c
commit
99bdf37ec3
@ -463,6 +463,7 @@ class BaseNode:
|
|||||||
:param command: command to send
|
:param command: command to send
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
print(self._ubridge_hypervisor)
|
||||||
if not self._ubridge_hypervisor or not self._ubridge_hypervisor.is_running():
|
if not self._ubridge_hypervisor or not self._ubridge_hypervisor.is_running():
|
||||||
raise NodeError("Cannot send command '{}': uBridge is not running".format(command))
|
raise NodeError("Cannot send command '{}': uBridge is not running".format(command))
|
||||||
try:
|
try:
|
||||||
@ -498,6 +499,7 @@ class BaseNode:
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
if self._ubridge_hypervisor and self._ubridge_hypervisor.is_running():
|
if self._ubridge_hypervisor and self._ubridge_hypervisor.is_running():
|
||||||
|
log.info("Stopping uBridge hypervisor {}:{}".format(self._ubridge_hypervisor.host, self._ubridge_hypervisor.port))
|
||||||
yield from self._ubridge_hypervisor.stop()
|
yield from self._ubridge_hypervisor.stop()
|
||||||
|
|
||||||
@asyncio.coroutine
|
@asyncio.coroutine
|
||||||
|
@ -259,6 +259,9 @@ class Cloud(BaseNode):
|
|||||||
self._nios[port_number] = nio
|
self._nios[port_number] = nio
|
||||||
try:
|
try:
|
||||||
yield from self._add_ubridge_connection(nio, port_number)
|
yield from self._add_ubridge_connection(nio, port_number)
|
||||||
|
except NodeError as e:
|
||||||
|
del self._nios[port_number]
|
||||||
|
raise e
|
||||||
# Cleanup stuff
|
# Cleanup stuff
|
||||||
except UbridgeError as e:
|
except UbridgeError as e:
|
||||||
try:
|
try:
|
||||||
|
@ -61,6 +61,9 @@ class Link:
|
|||||||
self._link_type = port.link_type
|
self._link_type = port.link_type
|
||||||
|
|
||||||
for other_node in self._nodes:
|
for other_node in self._nodes:
|
||||||
|
if other_node["node"] == node:
|
||||||
|
raise aiohttp.web.HTTPConflict(text="Cannot connect to itself")
|
||||||
|
|
||||||
if node.node_type in ["nat", "cloud"]:
|
if node.node_type in ["nat", "cloud"]:
|
||||||
if other_node["node"].node_type in ["nat", "cloud"]:
|
if other_node["node"].node_type in ["nat", "cloud"]:
|
||||||
raise aiohttp.web.HTTPConflict(text="It's not allowed to connect a {} to a {}".format(other_node["node"].node_type, node.node_type))
|
raise aiohttp.web.HTTPConflict(text="It's not allowed to connect a {} to a {}".format(other_node["node"].node_type, node.node_type))
|
||||||
|
@ -64,11 +64,15 @@ class LinkHandler:
|
|||||||
controller = Controller.instance()
|
controller = Controller.instance()
|
||||||
project = controller.get_project(request.match_info["project_id"])
|
project = controller.get_project(request.match_info["project_id"])
|
||||||
link = yield from project.add_link()
|
link = yield from project.add_link()
|
||||||
|
try:
|
||||||
for node in request.json["nodes"]:
|
for node in request.json["nodes"]:
|
||||||
yield from link.add_node(project.get_node(node["node_id"]),
|
yield from link.add_node(project.get_node(node["node_id"]),
|
||||||
node.get("adapter_number", 0),
|
node.get("adapter_number", 0),
|
||||||
node.get("port_number", 0),
|
node.get("port_number", 0),
|
||||||
label=node.get("label"))
|
label=node.get("label"))
|
||||||
|
except aiohttp.web_exceptions.HTTPException as e:
|
||||||
|
yield from project.delete_link(link.id)
|
||||||
|
raise e
|
||||||
response.set_status(201)
|
response.set_status(201)
|
||||||
response.json(link)
|
response.json(link)
|
||||||
|
|
||||||
|
@ -131,6 +131,22 @@ def test_add_node_cloud_to_cloud(async_run, project, compute):
|
|||||||
async_run(link.add_node(node2, 0, 4))
|
async_run(link.add_node(node2, 0, 4))
|
||||||
|
|
||||||
|
|
||||||
|
def test_add_node_same_node(async_run, project, compute):
|
||||||
|
"""
|
||||||
|
Connection to the same node is not allowed
|
||||||
|
"""
|
||||||
|
node1 = Node(project, compute, "node1", node_type="qemu")
|
||||||
|
node1._ports = [EthernetPort("E0", 0, 0, 4), EthernetPort("E1", 0, 0, 5)]
|
||||||
|
|
||||||
|
link = Link(project)
|
||||||
|
link.create = AsyncioMagicMock()
|
||||||
|
link._project.controller.notification.emit = MagicMock()
|
||||||
|
|
||||||
|
async_run(link.add_node(node1, 0, 4))
|
||||||
|
with pytest.raises(aiohttp.web.HTTPConflict):
|
||||||
|
async_run(link.add_node(node1, 0, 5))
|
||||||
|
|
||||||
|
|
||||||
def test_add_node_serial_to_ethernet(async_run, project, compute):
|
def test_add_node_serial_to_ethernet(async_run, project, compute):
|
||||||
"""
|
"""
|
||||||
Serial to ethernet connection is not allowed
|
Serial to ethernet connection is not allowed
|
||||||
|
@ -187,10 +187,15 @@ def test_capture(async_run, project):
|
|||||||
def test_read_pcap_from_source(project, async_run):
|
def test_read_pcap_from_source(project, async_run):
|
||||||
compute1 = MagicMock()
|
compute1 = MagicMock()
|
||||||
|
|
||||||
|
node_vpcs = Node(project, compute1, "V1", node_type="vpcs")
|
||||||
|
node_vpcs._ports = [EthernetPort("E0", 0, 0, 4)]
|
||||||
|
node_iou = Node(project, compute1, "I1", node_type="iou")
|
||||||
|
node_iou._ports = [EthernetPort("E0", 0, 3, 1)]
|
||||||
|
|
||||||
link = UDPLink(project)
|
link = UDPLink(project)
|
||||||
link.create = AsyncioMagicMock()
|
link.create = AsyncioMagicMock()
|
||||||
async_run(link.add_node(compute1, 0, 4))
|
async_run(link.add_node(node_vpcs, 0, 4))
|
||||||
async_run(link.add_node(compute1, 3, 1))
|
async_run(link.add_node(node_iou, 3, 1))
|
||||||
|
|
||||||
capture = async_run(link.start_capture())
|
capture = async_run(link.start_capture())
|
||||||
assert link._capture_node is not None
|
assert link._capture_node is not None
|
||||||
|
@ -84,6 +84,45 @@ def test_create_link(http_controller, tmpdir, project, compute, async_run):
|
|||||||
assert response.json["link_id"] is not None
|
assert response.json["link_id"] is not None
|
||||||
assert len(response.json["nodes"]) == 2
|
assert len(response.json["nodes"]) == 2
|
||||||
assert response.json["nodes"][0]["label"]["x"] == 42
|
assert response.json["nodes"][0]["label"]["x"] == 42
|
||||||
|
assert len(project.links) == 1
|
||||||
|
|
||||||
|
|
||||||
|
def test_create_link_failure(http_controller, tmpdir, project, compute, async_run):
|
||||||
|
"""
|
||||||
|
Make sure the link is deleted if we failed to create the link.
|
||||||
|
|
||||||
|
The failure is trigger by connecting the link to himself
|
||||||
|
"""
|
||||||
|
response = MagicMock()
|
||||||
|
response.json = {"console": 2048}
|
||||||
|
compute.post = AsyncioMagicMock(return_value=response)
|
||||||
|
|
||||||
|
node1 = async_run(project.add_node(compute, "node1", None, node_type="qemu"))
|
||||||
|
node1._ports = [EthernetPort("E0", 0, 0, 3), EthernetPort("E0", 0, 0, 4)]
|
||||||
|
|
||||||
|
with asyncio_patch("gns3server.controller.udp_link.UDPLink.create") as mock:
|
||||||
|
response = http_controller.post("/projects/{}/links".format(project.id), {
|
||||||
|
"nodes": [
|
||||||
|
{
|
||||||
|
"node_id": node1.id,
|
||||||
|
"adapter_number": 0,
|
||||||
|
"port_number": 3,
|
||||||
|
"label": {
|
||||||
|
"text": "Text",
|
||||||
|
"x": 42,
|
||||||
|
"y": 0
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"node_id": node1.id,
|
||||||
|
"adapter_number": 0,
|
||||||
|
"port_number": 4
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}, example=True)
|
||||||
|
#assert mock.called
|
||||||
|
assert response.status == 409
|
||||||
|
assert len(project.links) == 0
|
||||||
|
|
||||||
|
|
||||||
def test_update_link(http_controller, tmpdir, project, compute, async_run):
|
def test_update_link(http_controller, tmpdir, project, compute, async_run):
|
||||||
|
Loading…
Reference in New Issue
Block a user