From d6e1ee5dbb0c21badc48666042104e6593b7233f Mon Sep 17 00:00:00 2001 From: grossmj Date: Sun, 27 Aug 2023 18:30:37 +1000 Subject: [PATCH 1/2] Prevent X11 socket file to be modified by Docker container --- gns3server/compute/docker/docker_vm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gns3server/compute/docker/docker_vm.py b/gns3server/compute/docker/docker_vm.py index a10312e3..500e526d 100644 --- a/gns3server/compute/docker/docker_vm.py +++ b/gns3server/compute/docker/docker_vm.py @@ -406,7 +406,7 @@ class DockerVM(BaseNode): await self._start_vnc() params["Env"].append("QT_GRAPHICSSYSTEM=native") # To fix a Qt issue: https://github.com/GNS3/gns3-server/issues/556 params["Env"].append("DISPLAY=:{}".format(self._display)) - params["HostConfig"]["Binds"].append("/tmp/.X11-unix/:/tmp/.X11-unix/") + params["HostConfig"]["Binds"].append("/tmp/.X11-unix/X{0}:/tmp/.X11-unix/X{0}:ro".format(self._display)) if self._extra_hosts: extra_hosts = self._format_extra_hosts(self._extra_hosts) From c2783d355f638d0ae2a1678f0d9a1242a208e50a Mon Sep 17 00:00:00 2001 From: grossmj Date: Sun, 27 Aug 2023 18:41:25 +1000 Subject: [PATCH 2/2] Fix test_create_vnc test --- tests/compute/docker/test_docker_vm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/compute/docker/test_docker_vm.py b/tests/compute/docker/test_docker_vm.py index 9396cc89..3a395a56 100644 --- a/tests/compute/docker/test_docker_vm.py +++ b/tests/compute/docker/test_docker_vm.py @@ -182,7 +182,7 @@ async def test_create_vnc(compute_project, manager): "Binds": [ "{}:/gns3:ro".format(get_resource("compute/docker/resources")), "{}:/gns3volumes/etc/network".format(os.path.join(vm.working_dir, "etc", "network")), - '/tmp/.X11-unix/:/tmp/.X11-unix/' + "/tmp/.X11-unix/X{0}:/tmp/.X11-unix/X{0}:ro".format(vm._display) ], "Privileged": True },