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

Raise an error if user send a non local path to remote server

Browse Source
This commit is contained in:
Julien Duponchelle 2015-11-09 19:02:10 +01:00
parent 669295131b
commit 390c88d7cd
2 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gns3server/modules/base_manager.py
View File

@ -39,6 +39,7 @@ from .nios.nio_tap import NIOTAP
from .nios.nio_nat import NIONAT from .nios.nio_nat import NIONAT
from .nios.nio_generic_ethernet import NIOGenericEthernet from .nios.nio_generic_ethernet import NIOGenericEthernet
from ..utils.images import md5sum, remove_checksum from ..utils.images import md5sum, remove_checksum
from .vm_error import VMError
class BaseManager: class BaseManager:
@ -413,6 +414,13 @@ class BaseManager:
return force_unix_path(old_path) return force_unix_path(old_path)
return force_unix_path(path) return force_unix_path(path)
else:
# For non local server we disallow using absolute path outside image directory
if Config.instance().get_section_config("Server").get("local", False) is False:
img_directory = self.config.get_section_config("Server").get("images_path", "~/GNS3/images")
if len(os.path.commonprefix([img_directory, path])) < len(img_directory):
raise VMError("%s is not allowed on this remote server. Please use only the image filename.".format(path))
return force_unix_path(path) return force_unix_path(path)
def get_relative_image_path(self, path): def get_relative_image_path(self, path):

25
tests/modules/test_manager.py
View File

@ -23,6 +23,7 @@ from unittest.mock import patch
from gns3server.modules.vpcs import VPCS from gns3server.modules.vpcs import VPCS
from gns3server.modules.qemu import Qemu from gns3server.modules.qemu import Qemu
from gns3server.modules.vm_error import VMError
@pytest.fixture(scope="function") @pytest.fixture(scope="function")
@ -101,10 +102,26 @@ def test_get_abs_image_path(qemu, tmpdir):
assert qemu.get_abs_image_path("test2.bin") == path2 assert qemu.get_abs_image_path("test2.bin") == path2
assert qemu.get_abs_image_path("../test1.bin") == path1 assert qemu.get_abs_image_path("../test1.bin") == path1
# We look at first in new location
path2 = str(tmpdir / "QEMU" / "test1.bin") def test_get_abs_image_path_non_local(qemu, tmpdir):
open(path2, 'w+').close() path1 = tmpdir / "images" / "QEMU" / "test1.bin"
assert qemu.get_abs_image_path("test1.bin") == path2 path1.write("1", ensure=True)
path1 = str(path1)
path2 = tmpdir / "private" / "QEMU" / "test2.bin"
path2.write("1", ensure=True)
path2 = str(path2)
# If non local we can't use path outside images directory
with patch("gns3server.config.Config.get_section_config", return_value={"images_path": str(tmpdir / "images"), "local": False}):
assert qemu.get_abs_image_path(path1) == path1
with pytest.raises(VMError):
qemu.get_abs_image_path(path2)
# with pytest.raises(VMError):
# qemu.get_abs_image_path("C:\\test2.bin")
with patch("gns3server.config.Config.get_section_config", return_value={"images_path": str(tmpdir / "images"), "local": True}):
assert qemu.get_abs_image_path(path2) == path2
def test_get_relative_image_path(qemu, tmpdir): def test_get_relative_image_path(qemu, tmpdir):