From 3f503199907cce4a3f0bb11fbabcdec4bb32e131 Mon Sep 17 00:00:00 2001 From: grossmj Date: Thu, 26 Oct 2023 15:05:10 +1000 Subject: [PATCH 1/2] Fix L2IOU "failed code signing checks" when IOU base file name is >= 63 characters --- gns3server/compute/iou/iou_vm.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gns3server/compute/iou/iou_vm.py b/gns3server/compute/iou/iou_vm.py index 617b247e..4f9ddb2c 100644 --- a/gns3server/compute/iou/iou_vm.py +++ b/gns3server/compute/iou/iou_vm.py @@ -539,7 +539,12 @@ class IOUVM(BaseNode): # create a symbolic link to the image to avoid IOU error "failed code signing checks" # on newer images, see https://github.com/GNS3/gns3-server/issues/1484 try: - symlink = os.path.join(self.working_dir, os.path.basename(self.path)) + iou_image_path = os.path.basename(self.path) + if len(iou_image_path) > 63: + # IOU file basename length must be <= 63 chars + iou_file_name, iou_file_ext = os.path.splitext(iou_image_path) + iou_image_path = iou_file_name[:63 - len(iou_file_ext)] + iou_file_ext + symlink = os.path.join(self.working_dir, iou_image_path) if os.path.islink(symlink): os.unlink(symlink) os.symlink(self.path, symlink) From ed99a98fe1d30737d0835a979be7be537dd1865d Mon Sep 17 00:00:00 2001 From: grossmj Date: Fri, 27 Oct 2023 13:20:15 +1000 Subject: [PATCH 2/2] Sync appliances --- gns3server/appliances/fortianalyzer.gns3a | 65 +++++++++++++++++++++-- gns3server/appliances/fortigate.gns3a | 62 +++++++++++++++++++-- gns3server/appliances/fortimanager.gns3a | 65 +++++++++++++++++++++-- 3 files changed, 181 insertions(+), 11 deletions(-) diff --git a/gns3server/appliances/fortianalyzer.gns3a b/gns3server/appliances/fortianalyzer.gns3a index 58486e57..fb0aed44 100644 --- a/gns3server/appliances/fortianalyzer.gns3a +++ b/gns3server/appliances/fortianalyzer.gns3a @@ -11,15 +11,16 @@ "product_url": "https://www.fortinet.com/products-services/products/management-reporting/fortianalyzer.html", "registry_version": 4, "status": "stable", - "maintainer": "GNS3 Team", - "maintainer_email": "developers@gns3.net", - "usage": "Default username is admin, no password is set.\n\n- Versions 7.0 and higher require:\n--RAM: 8192 MB\n--CPU:4", + "maintainer": "Ean Towne", + "maintainer_email": "ean.fortinet@gmail.com", + "usage": "Default username is admin, no password is set.\n\n- Versions lower than 7.0.x can reduce CPU/RAM", "symbol": "fortinet.svg", "port_name_format": "Port{port1}", "qemu": { "adapter_type": "e1000", "adapters": 4, - "ram": 4096, + "ram": 16384, + "cpus": 4, "hda_disk_interface": "virtio", "hdb_disk_interface": "virtio", "arch": "x86_64", @@ -28,6 +29,20 @@ "kvm": "allow" }, "images": [ + { + "filename": "FAZ_VM64_KVM-v7.4.1-build2308-FORTINET.out.kvm.qcow2", + "version": "7.4.1", + "md5sum": "f30caac36854c2a0cc1e35c4ab5f310d", + "filesize": 435310592, + "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx" + }, + { + "filename": "FAZ_VM64_KVM-v7.2.4-build1460-FORTINET.out.kvm.qcow2", + "version": "7.2.4", + "md5sum": "d53bd5c61cc3f5e387557dfcfe9bc530", + "filesize": 363327488, + "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx" + }, { "filename": "FAZ_VM64_KVM-v7.2.2-build1334-FORTINET.out.kvm.qcow2", "version": "7.2.2", @@ -42,6 +57,13 @@ "filesize": 340631552, "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx" }, + { + "filename": "FAZ_VM64_KVM-v7.0.9-build0489-FORTINET.out.kvm.qcow2", + "version": "7.0.9", + "md5sum": "3f69c9bc4fa7776476edf0ce9728ebd7", + "filesize": 347889664, + "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx" + }, { "filename": "FAZ_VM64_KVM-v7.0.6-build0372-FORTINET.out.kvm.qcow2", "version": "7.0.6", @@ -56,6 +78,13 @@ "filesize": 334184448, "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx" }, + { + "filename": "FAZ_VM64_KVM-v6.4.12-build2610-FORTINET.out.kvm.qcow2", + "version": "6.4.12", + "md5sum": "b9e164c2d4e778348a6a7107d375abf3", + "filesize": 300691456, + "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx" + }, { "filename": "FAZ_VM64_KVM-v6-build2288-FORTINET.out.kvm.qcow2", "version": "6.4.5", @@ -206,6 +235,20 @@ } ], "versions": [ + { + "name": "7.4.1", + "images": { + "hda_disk_image": "FAZ_VM64_KVM-v7.4.1-build2308-FORTINET.out.kvm.qcow2", + "hdb_disk_image": "empty30G.qcow2" + } + }, + { + "name": "7.2.4", + "images": { + "hda_disk_image": "FAZ_VM64_KVM-v7.2.4-build1460-FORTINET.out.kvm.qcow2", + "hdb_disk_image": "empty30G.qcow2" + } + }, { "name": "7.2.2", "images": { @@ -220,6 +263,13 @@ "hdb_disk_image": "empty30G.qcow2" } }, + { + "name": "7.0.9", + "images": { + "hda_disk_image": "FAZ_VM64_KVM-v7.0.9-build0489-FORTINET.out.kvm.qcow2", + "hdb_disk_image": "empty30G.qcow2" + } + }, { "name": "7.0.6", "images": { @@ -234,6 +284,13 @@ "hdb_disk_image": "empty30G.qcow2" } }, + { + "name": "6.4.12", + "images": { + "hda_disk_image": "FAZ_VM64_KVM-v6.4.12-build2610-FORTINET.out.kvm.qcow2", + "hdb_disk_image": "empty30G.qcow2" + } + }, { "name": "6.4.5", "images": { diff --git a/gns3server/appliances/fortigate.gns3a b/gns3server/appliances/fortigate.gns3a index 9f85fd5e..f3efb72c 100644 --- a/gns3server/appliances/fortigate.gns3a +++ b/gns3server/appliances/fortigate.gns3a @@ -11,15 +11,15 @@ "product_url": "http://www.fortinet.com/products/fortigate/virtual-appliances.html", "registry_version": 4, "status": "stable", - "maintainer": "GNS3 Team", - "maintainer_email": "developers@gns3.net", + "maintainer": "Ean Towne", + "maintainer_email": "ean.fortinet@gmail.com", "usage": "Default username is admin, no password is set.\n\n- FortiGate version 7.0.0 and above require 2GB RAM.\n\n- FortiGate versions higher than 7.2.0 trial license is VERY restrictive, not recommended for use.", "symbol": "fortinet.svg", "port_name_format": "Port{port1}", "qemu": { "adapter_type": "e1000", "adapters": 10, - "ram": 1024, + "ram": 2048, "hda_disk_interface": "virtio", "hdb_disk_interface": "virtio", "arch": "x86_64", @@ -28,6 +28,20 @@ "kvm": "allow" }, "images": [ + { + "filename": "FGT_VM64_KVM-v7.4.1.F-build2463-FORTINET.out.kvm.qcow2", + "version": "7.4.1", + "md5sum": "362a2f3d4ca842aaabd87191d4446584", + "filesize": 116064256, + "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx" + }, + { + "filename": "FGT_VM64_KVM-v7.2.6.F-build1575-FORTINET.out.kvm.qcow2", + "version": "7.2.6", + "md5sum": "b5ef3c844abb4947f98b88ae0048660b", + "filesize": 103022592, + "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx" + }, { "filename": "FGT_VM64_KVM-v7.2.4.F-build1396-FORTINET.out.kvm.qcow2", "version": "7.2.4", @@ -49,6 +63,13 @@ "filesize": 86704128, "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx" }, + { + "filename": "FGT_VM64_KVM-v7.0.12.M-build0523-FORTINET.out.kvm.qcow2", + "version": "7.0.12", + "md5sum": "7cd2452dde489c80f48c40a7f8a48c8e", + "filesize": 88997888, + "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx" + }, { "filename": "FGT_VM64_KVM-v7.0.10.M-build0450-FORTINET.out.kvm.qcow2", "version": "7.0.10", @@ -63,6 +84,13 @@ "filesize": 77135872, "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx" }, + { + "filename": "FGT_VM64_KVM-v6.4.14.M-build2093-FORTINET.out.kvm.qcow2", + "version": "6.4.14", + "md5sum": "5758340f9d3e1a03139176ab46e63e8d", + "filesize": 81461248, + "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx" + }, { "filename": "FGT_VM64_KVM-v6.4.12.M-build2060-FORTINET.out.kvm.qcow2", "version": "6.4.12", @@ -304,6 +332,20 @@ } ], "versions": [ + { + "name": "7.4.1", + "images": { + "hda_disk_image": "FGT_VM64_KVM-v7.4.1.F-build2463-FORTINET.out.kvm.qcow2", + "hdb_disk_image": "empty30G.qcow2" + } + }, + { + "name": "7.2.6", + "images": { + "hda_disk_image": "FGT_VM64_KVM-v7.2.6.F-build1575-FORTINET.out.kvm.qcow2", + "hdb_disk_image": "empty30G.qcow2" + } + }, { "name": "7.2.4", "images": { @@ -325,6 +367,13 @@ "hdb_disk_image": "empty30G.qcow2" } }, + { + "name": "7.0.12", + "images": { + "hda_disk_image": "FGT_VM64_KVM-v7.0.12.M-build0523-FORTINET.out.kvm.qcow2", + "hdb_disk_image": "empty30G.qcow2" + } + }, { "name": "7.0.10", "images": { @@ -339,6 +388,13 @@ "hdb_disk_image": "empty30G.qcow2" } }, + { + "name": "6.4.14", + "images": { + "hda_disk_image": "FGT_VM64_KVM-v6.4.14.M-build2093-FORTINET.out.kvm.qcow2", + "hdb_disk_image": "empty30G.qcow2" + } + }, { "name": "6.4.12", "images": { diff --git a/gns3server/appliances/fortimanager.gns3a b/gns3server/appliances/fortimanager.gns3a index 636bb14d..cc35e900 100644 --- a/gns3server/appliances/fortimanager.gns3a +++ b/gns3server/appliances/fortimanager.gns3a @@ -11,15 +11,16 @@ "product_url": "http://www.fortinet.com/products/fortimanager/virtual-security-management.html", "registry_version": 4, "status": "stable", - "maintainer": "GNS3 Team", - "maintainer_email": "developers@gns3.net", - "usage": "Default username is admin, no password is set.\n\n- Versions 7.0 and higher require:\n--RAM: 8192 MB\n--CPU:4", + "maintainer": "Ean Towne", + "maintainer_email": "ean.fortinet@gmail.com", + "usage": "Default username is admin, no password is set.\n\n- Versions lower than 7.0.x require less CPU/RAM", "symbol": "fortinet.svg", "port_name_format": "Port{port1}", "qemu": { "adapter_type": "virtio-net-pci", "adapters": 4, - "ram": 2048, + "ram": 8192, + "cpus": 4, "hda_disk_interface": "virtio", "hdb_disk_interface": "virtio", "arch": "x86_64", @@ -28,6 +29,20 @@ "kvm": "allow" }, "images": [ + { + "filename": "FMG_VM64_KVM-v7.4.1-build2308-FORTINET.out.kvm.qcow2", + "version": "7.4.1", + "md5sum": "e542cc8f2d8f46e9c32b783bf31bef39", + "filesize": 309387264, + "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx" + }, + { + "filename": "FMG_VM64_KVM-v7.2.4-build1460-FORTINET.out.kvm.qcow2", + "version": "7.2.4", + "md5sum": "98fa9830d9ecb5911a703d03b80026b6", + "filesize": 261992448, + "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx" + }, { "filename": "FMG_VM64_KVM-v7.2.2-build1334-FORTINET.out.kvm.qcow2", "version": "7.2.2", @@ -42,6 +57,13 @@ "filesize": 242814976, "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx" }, + { + "filename": "FMG_VM64_KVM-v7.0.9-build0489-FORTINET.out.kvm.qcow2", + "version": "7.0.9", + "md5sum": "dbeb6a79b6e421000573dbbbdb50b8b5", + "filesize": 247955456, + "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx" + }, { "filename": "FMG_VM64_KVM-v7.0.6-build0372-FORTINET.out.kvm.qcow2", "version": "7.0.6", @@ -56,6 +78,13 @@ "filesize": 237535232, "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx" }, + { + "filename": "FMG_VM64_KVM-v6.4.12-build2610-FORTINET.out.kvm.qcow2", + "version": "6.4.12", + "md5sum": "36c0dc531d921e5f1e1e09b030f7c813", + "filesize": 219455488, + "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx" + }, { "filename": "FMG_VM64_KVM-v6-build2288-FORTINET.out.kvm.qcow2", "version": "6.4.5", @@ -206,6 +235,20 @@ } ], "versions": [ + { + "name": "7.4.1", + "images": { + "hda_disk_image": "FMG_VM64_KVM-v7.4.1-build2308-FORTINET.out.kvm.qcow2", + "hdb_disk_image": "empty30G.qcow2" + } + }, + { + "name": "7.2.4", + "images": { + "hda_disk_image": "FMG_VM64_KVM-v7.2.4-build1460-FORTINET.out.kvm.qcow2", + "hdb_disk_image": "empty30G.qcow2" + } + }, { "name": "7.2.2", "images": { @@ -220,6 +263,13 @@ "hdb_disk_image": "empty30G.qcow2" } }, + { + "name": "7.0.9", + "images": { + "hda_disk_image": "FMG_VM64_KVM-v7.0.9-build0489-FORTINET.out.kvm.qcow2", + "hdb_disk_image": "empty30G.qcow2" + } + }, { "name": "7.0.6", "images": { @@ -234,6 +284,13 @@ "hdb_disk_image": "empty30G.qcow2" } }, + { + "name": "6.4.12", + "images": { + "hda_disk_image": "FMG_VM64_KVM-v6.4.12-build2610-FORTINET.out.kvm.qcow2", + "hdb_disk_image": "empty30G.qcow2" + } + }, { "name": "6.4.5", "images": {