gns3-server 3.0.0rc1__py3-none-any.whl → 3.0.1__py3-none-any.whl

gns3server/utils/__init__.py

@@ -23,6 +23,7 @@ import textwrap
 import posixpath
 import socket
 import errno
+import hashlib
 
 
 def force_unix_path(path):
@@ -109,3 +110,14 @@ def is_ipv6_enabled() -> bool:
         if e.errno == errno.EADDRINUSE:
             return True
         raise
+
+def md5sum(filename):
+    """
+    Calculate the MD5 checksum of a file.
+    """
+
+    hash_md5 = hashlib.md5()
+    with open(filename, "rb") as f:
+        for chunk in iter(lambda: f.read(4096), b""):
+            hash_md5.update(chunk)
+    return hash_md5.hexdigest()

gns3server/utils/asyncio/aiozipstream.py

@@ -195,14 +195,17 @@ class ZipFile(zipfile.ZipFile):
         self._comment = comment
         self._didModify = True
 
-    async def data_generator(self, path):
-
-        async with aiofiles.open(path, "rb") as f:
-            while True:
-                part = await f.read(self._chunksize)
-                if not part:
-                    break
-                yield part
+    async def data_generator(self, path, islink=False):
+
+        if islink:
+            yield os.readlink(path).encode()
+        else:
+            async with aiofiles.open(path, "rb") as f:
+                while True:
+                    part = await f.read(self._chunksize)
+                    if not part:
+                        break
+                    yield part
         return
 
     async def _run_in_executor(self, task, *args, **kwargs):
@@ -268,12 +271,13 @@ class ZipFile(zipfile.ZipFile):
             raise ValueError("either (exclusively) filename or iterable shall be not None")
 
         if filename:
-            st = os.stat(filename)
+            st = os.stat(filename, follow_symlinks=False)
             isdir = stat.S_ISDIR(st.st_mode)
+            islink = stat.S_ISLNK(st.st_mode)
             mtime = time.localtime(st.st_mtime)
             date_time = mtime[0:6]
         else:
-            st, isdir, date_time = None, False, time.localtime()[0:6]
+            st, isdir, islink, date_time = None, False, False, time.localtime()[0:6]
         # Create ZipInfo instance to store file information
         if arcname is None:
             arcname = filename
@@ -331,7 +335,7 @@ class ZipFile(zipfile.ZipFile):
 
         file_size = 0
         if filename:
-            async for buf in self.data_generator(filename):
+            async for buf in self.data_generator(filename, islink):
                 file_size = file_size + len(buf)
                 CRC = zipfile.crc32(buf, CRC) & 0xFFFFFFFF
                 if cmpr:

gns3server/utils/images.py

@@ -62,42 +62,52 @@ async def list_images(image_type):
         directory = os.path.normpath(directory)
         for root, _, filenames in _os_walk(directory, recurse=recurse):
             for filename in filenames:
-                if filename not in files:
-                    if filename.endswith(".md5sum") or filename.startswith("."):
+                if filename in files:
+                    log.debug("File {} has already been found, skipping...".format(filename))
+                    continue
+                if filename.endswith(".md5sum") or filename.startswith("."):
+                    continue
+
+                files.add(filename)
+
+                # It the image is located in the standard directory the path is relative
+                if os.path.commonprefix([root, default_directory]) != default_directory:
+                    path = os.path.join(root, filename)
+                else:
+                    path = os.path.relpath(os.path.join(root, filename), default_directory)
+
+                filesize = os.stat(os.path.join(root, filename)).st_size
+                if filesize < 7:
+                    log.debug(f"File {filename} is too small to be an image, skipping...")
+                    continue
+
+                try:
+                    with open(os.path.join(root, filename), "rb") as f:
+                        # read the first 7 bytes of the file.
+                        elf_header_start = f.read(7)
+                    if image_type == "dynamips" and elf_header_start != b'\x7fELF\x01\x02\x01':
+                        # IOS images must start with the ELF magic number, be 32-bit, big endian and have an ELF version of 1
+                        log.warning(f"IOS image {filename} does not start with a valid ELF magic number, skipping...")
+                        continue
+                    elif image_type == "iou" and elf_header_start != b'\x7fELF\x02\x01\x01' and elf_header_start != b'\x7fELF\x01\x01\x01':
+                        # IOU images must start with the ELF magic number, be 32-bit or 64-bit, little endian and have an ELF version of 1
+                        log.warning(f"IOU image {filename} does not start with a valid ELF magic number, skipping...")
                         continue
-                    elif (
-                        ((filename.endswith(".image") or filename.endswith(".bin")) and image_type == "dynamips")
-                        or ((filename.endswith(".bin") or filename.startswith("i86bi")) and image_type == "iou")
-                        or (not filename.endswith(".bin") and not filename.endswith(".image") and image_type == "qemu")
-                    ):
-                        files.add(filename)
-
-                        # It the image is located in the standard directory the path is relative
-                        if os.path.commonprefix([root, default_directory]) != default_directory:
-                            path = os.path.join(root, filename)
-                        else:
-                            path = os.path.relpath(os.path.join(root, filename), default_directory)
-
-                        try:
-                            if image_type in ["dynamips", "iou"]:
-                                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 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(
-                                {
-                                    "filename": filename,
-                                    "path": force_unix_path(path),
-                                    "md5sum": await wait_run_in_executor(md5sum, os.path.join(root, filename)),
-                                    "filesize": os.stat(os.path.join(root, filename)).st_size,
-                                }
-                            )
-                        except OSError as e:
-                            log.warning(f"Can't add image {path}: {str(e)}")
+                    elif image_type == "qemu" and elf_header_start[:4] == b'\x7fELF':
+                        # QEMU images should not start with an ELF magic number
+                        log.warning(f"QEMU image {filename} starts with an ELF magic number, skipping...")
+                        continue
+
+                    images.append(
+                        {
+                            "filename": filename,
+                            "path": force_unix_path(path),
+                            "md5sum": await wait_run_in_executor(md5sum, os.path.join(root, filename)),
+                            "filesize": filesize,
+                        }
+                    )
+                except OSError as e:
+                    log.warning(f"Can't add image {path}: {str(e)}")
     return images
 
 

gns3server/version.py

@@ -22,8 +22,8 @@
 # or negative for a release candidate or beta (after the base version
 # number has been incremented)
 
-__version__ = "3.0.0rc1"
-__version_info__ = (3, 0, 0, -99)
+__version__ = "3.0.1"
+__version_info__ = (3, 0, 1, 0)
 
 if "dev" in __version__:
     try: