Merge branch '2.2' into 3.0

# Conflicts: # CHANGELOG # dev-requirements.txt # gns3server/compute/qemu/__init__.py # gns3server/compute/vmware/__init__.py # gns3server/controller/snapshot.py # gns3server/crash_report.py # gns3server/handlers/api/compute/atm_switch_handler.py # gns3server/run.py # gns3server/static/web-ui/26.77d4bfd104f37c42e028.js # gns3server/static/web-ui/index.html # gns3server/static/web-ui/runtime.415291667f70565cd8ef.js # gns3server/utils/__init__.py # gns3server/utils/images.py # gns3server/utils/interfaces.py # gns3server/version.py # gns3server/web/web_server.py # pytest.ini # requirements.txt # scripts/update-bundled-web-ui.sh # setup.py # tests/api/routes/compute/test_dynamips_nodes.py # tests/compute/builtin/nodes/test_cloud.py # tests/compute/docker/test_docker.py # tests/compute/docker/test_docker_vm.py # tests/compute/dynamips/test_dynamips_manager.py # tests/compute/dynamips/test_dynamips_router.py # tests/compute/iou/test_iou_vm.py # tests/compute/qemu/test_qcow2.py # tests/compute/qemu/test_qemu_manager.py # tests/compute/qemu/test_qemu_vm.py # tests/compute/test_base_node.py # tests/compute/test_manager.py # tests/compute/test_project.py # tests/compute/traceng/test_traceng_vm.py # tests/compute/virtualbox/test_virtualbox_manager.py # tests/compute/virtualbox/test_virtualbox_vm.py # tests/compute/vmware/test_vmware_manager.py # tests/compute/vmware/test_vmware_vm.py # tests/compute/vpcs/test_vpcs_vm.py # tests/conftest.py # tests/controller/gns3vm/test_remote_gns3_vm.py # tests/controller/gns3vm/test_virtualbox_gns3_vm.py # tests/controller/gns3vm/test_vmware_gns3_vm.py # tests/controller/test_export_project.py # tests/controller/test_gns3vm.py # tests/controller/test_import_project.py # tests/test_config.py # tests/utils/test_asyncio.py # tests/utils/test_images.py # tests/web/test_response.py
1 month ago · d3860ba84b
parent 3e133eda44 0561aba927
commit d3860ba84b
11 changed files with 46 additions and 25 deletions
--- a/22
+++ b/22
@ -1,5 +1,27 @@
 # Change Log

+## 2.2.47 15/05/2024
+
+* Fix update-bundled-web-ui.sh script
+* Bundle web-ui v2.2.47
+* Change sentry-sdk version
+* Upgrade aiohttp, sentry-sdk and truststore
+* Upgrade jsonschema and aiohttp
+* Drop Python 3.7
+* Remove dev requirements for Python 3.6
+* Do not run Docker VM tests on Windows
+* Do not wait for the server to close when shutting down.
+* Fix test create image with not supported characters by filesystem. Fixes #2375
+* Allow listing x86_64 IOU images. Fixes #2376
+* Upgrade Jinja2 to version 3.1.4. Fixes #2378
+* Fix link capture for ATM switch. Fixes https://github.com/GNS3/gns3-gui/issues/3570
+* Fix tests after updating error message when busybox is not installed.
+* Add more details to error message when busybox is not installed. Fixes https://github.com/GNS3/gns3-gui/issues/3569
+* Fix invalid escape sequences
+* Add NAT symbols
+* Fix cannot stop Docker VM while console connection is still active.
+* Upgrade sentry-sdk to version 1.40.6
+
 ## 3.0.0b2 07/04/2024

 * Bundle web-ui v3.0.0b2
--- a/gns3server/compute/docker/init.py
+++ b/gns3server/compute/docker/init.py
@ -87,7 +87,7 @@ class Docker(BaseManager):
                                    f"{stdout.decode('utf-8', errors='ignore').strip()}")
                except OSError as e:
                    raise DockerError(f"Could not install busybox: {e}")
-        raise DockerError("No busybox executable could be found")
+        raise DockerError("No busybox executable could be found, please install busybox (apt install busybox-static on Debian/Ubuntu) and make sure it is in your PATH")

    @staticmethod
    def resources_path():
--- a/gns3server/controller/snapshot.py
+++ b/gns3server/controller/snapshot.py
@ -51,11 +51,11 @@ class Snapshot:
        self._project = project
        if name:
            self._name = name
-            self._created_at = datetime.now().timestamp()
+            self._created_at = datetime.now(timezone.utc).timestamp()
            filename = (
                self._name
                + "_"
-                + datetime.utcfromtimestamp(self._created_at).replace(tzinfo=None).strftime("%d%m%y_%H%M%S")
+                + datetime.fromtimestamp(self._created_at, tz=timezone.utc).replace(tzinfo=None).strftime("%d%m%y_%H%M%S")
                + ".gns3project"
            )
        else:
@ -66,7 +66,7 @@ class Snapshot:
                    datetime.strptime(datestring, "%d%m%y_%H%M%S").replace(tzinfo=timezone.utc).timestamp()
                )
            except ValueError:
-                self._created_at = datetime.utcnow().timestamp()
+                self._created_at = datetime.now(timezone.utc)
        self._path = os.path.join(project.path, "snapshots", filename)

    @property
--- a/gns3server/controller/udp_link.py
+++ b/gns3server/controller/udp_link.py
@ -213,7 +213,7 @@ class UDPLink(Link):
        :returns: Node where the capture should run
        """

-        ALWAYS_RUNNING_NODES_TYPE = ("cloud", "nat", "ethernet_switch", "ethernet_hub")
+        ALWAYS_RUNNING_NODES_TYPE = ("cloud", "nat", "ethernet_switch", "ethernet_hub", "frame_relay_switch", "atm_switch")

        for node in self._nodes:
            if (
--- a/gns3server/static/web-ui/main.0e7dc9152b2aa567227c.js
+++ b/gns3server/static/web-ui/main.0e7dc9152b2aa567227c.js
--- a/gns3server/utils/images.py
+++ b/gns3server/utils/images.py
@ -83,11 +83,9 @@ async def list_images(image_type):
                                with open(os.path.join(root, filename), "rb") as f:
                                    # read the first 7 bytes of the file.
                                    elf_header_start = f.read(7)
-                                # valid IOS images must start with the ELF magic number, be 32-bit, big endian and have an ELF version of 1
-                                if (
-                                    not elf_header_start == b"\x7fELF\x01\x02\x01"
-                                    and not elf_header_start == b"\x7fELF\x01\x01\x01"
-                                ):
+                                # valid IOU or IOS images must start with the ELF magic number, be 32-bit or 64-bit,
+                                # little endian and have an ELF version of 1
+                                if elf_header_start != b'\x7fELF\x02\x01\x01' and elf_header_start != b'\x7fELF\x01\x01\x01':
                                    continue

                            images.append(
--- a/requirements.txt
+++ b/requirements.txt
@ -5,8 +5,8 @@ websockets==12.0
 aiohttp==3.9.3
 async-timeout==4.0.3
 aiofiles==23.2.1
-Jinja2>=3.1.3,<3.2
-sentry-sdk==1.40.6,<1.41
+Jinja2>=3.1.4,<3.2
+sentry-sdk==2.1.1,<2.2
 psutil==5.9.8
 distro>=1.9.0
 py-cpuinfo==9.0.0
@ -20,4 +20,4 @@ watchfiles==0.21.0
 zstandard==0.22.0
 platformdirs==4.2.1
 importlib-resources>=1.3; python_version <= '3.9'
-truststore>=0.8.0; python_version >= '3.10'
+truststore>=0.9.1; python_version >= '3.10'
--- a/tests/api/routes/compute/test_dynamips_nodes.py
+++ b/tests/api/routes/compute/test_dynamips_nodes.py
@ -146,7 +146,7 @@ def fake_image(tmpdir) -> str:

    path = str(tmpdir / "7200.bin")
    with open(path, "wb+") as f:
-        f.write(b'\x7fELF\x01\x02\x01')
+        f.write(b'\x7fELF\x01\x01\x01')
    os.chmod(path, stat.S_IREAD)
    return path

@ -170,7 +170,7 @@ async def test_images(app: FastAPI, compute_client: AsyncClient, tmpdir, fake_im
    assert response.json() == [{"filename": "7200.bin",
                                "path": "7200.bin",
                                "filesize": 7,
-                                "md5sum": "b0d5aa897d937aced5a6b1046e8f7e2e"}]
+                                "md5sum": "e573e8f5c93c6c00783f20c7a170aa6c"}]


 async def test_upload_image(app: FastAPI, compute_client: AsyncClient, images_dir: str) -> None:
--- a/tests/compute/docker/test_docker.py
+++ b/tests/compute/docker/test_docker.py
@ -247,7 +247,7 @@ async def test_install_busybox_dynamic_linked():
                with pytest.raises(DockerError) as e:
                    dst_dir = Docker.resources_path()
                    await Docker.install_busybox(dst_dir)
-                assert str(e.value) == "No busybox executable could be found"
+                assert str(e.value) == "No busybox executable could be found, please install busybox (apt install busybox-static on Debian/Ubuntu) and make sure it is in your PATH"


@pytest.mark.asyncio
@ -258,4 +258,4 @@ async def test_install_busybox_no_executables():
            with pytest.raises(DockerError) as e:
                dst_dir = Docker.resources_path()
                await Docker.install_busybox(dst_dir)
-            assert str(e.value) == "No busybox executable could be found"
+            assert str(e.value) == "No busybox executable could be found, please install busybox (apt install busybox-static on Debian/Ubuntu) and make sure it is in your PATH"
--- a/tests/utils.py
+++ b/tests/utils.py
@ -105,5 +105,5 @@ class AsyncioBytesIO(io.BytesIO):
    async def write(self, data):
        return super().write(data)

-    async def close(self):
-        return super().close()
+    # async def close(self):
+    #     return super().close()
--- a/tests/utils/test_images.py
+++ b/tests/utils/test_images.py
@ -115,11 +115,11 @@ def test_remove_checksum(tmpdir):
 async def test_list_images(tmpdir, config):

    path1 = tmpdir / "images1" / "IOS" / "test1.image"
-    path1.write(b'\x7fELF\x01\x02\x01', ensure=True)
+    path1.write(b'\x7fELF\x01\x01\x01', ensure=True)
    path1 = force_unix_path(str(path1))

    path2 = tmpdir / "images2" / "test2.image"
-    path2.write(b'\x7fELF\x01\x02\x01', ensure=True)
+    path2.write(b'\x7fELF\x01\x01\x01', ensure=True)
    path2 = force_unix_path(str(path2))

    # Invalid image because not a valid elf file
@ -128,7 +128,7 @@ async def test_list_images(tmpdir, config):

    if sys.platform.startswith("linux"):
        path3 = tmpdir / "images1" / "IOU" / "test3.bin"
-        path3.write(b'\x7fELF\x01\x02\x01', ensure=True)
+        path3.write(b'\x7fELF\x02\x01\x01', ensure=True)
        path3 = force_unix_path(str(path3))

    path4 = tmpdir / "images1" / "QEMU" / "test4.qcow2"
@ -146,13 +146,13 @@ async def test_list_images(tmpdir, config):
        {
            'filename': 'test1.image',
            'filesize': 7,
-            'md5sum': 'b0d5aa897d937aced5a6b1046e8f7e2e',
+            'md5sum': 'e573e8f5c93c6c00783f20c7a170aa6c',
            'path': 'test1.image'
        },
        {
            'filename': 'test2.image',
            'filesize': 7,
-            'md5sum': 'b0d5aa897d937aced5a6b1046e8f7e2e',
+            'md5sum': 'e573e8f5c93c6c00783f20c7a170aa6c',
            'path': str(path2)
        }
    ]
@ -162,7 +162,7 @@ async def test_list_images(tmpdir, config):
            {
                'filename': 'test3.bin',
                'filesize': 7,
-                'md5sum': 'b0d5aa897d937aced5a6b1046e8f7e2e',
+                'md5sum': 'c73626d23469519894d58bc98bee9655',
                'path': 'test3.bin'
            }
        ]