gns3-server 3.0.0b1__py3-none-any.whl → 3.0.0b3__py3-none-any.whl

gns3server/compute/dynamips/__init__.py

@@ -252,6 +252,9 @@ class Dynamips(BaseManager):
         # look for Dynamips
         dynamips_path = self.config.settings.Dynamips.dynamips_path
         if not os.path.isabs(dynamips_path):
+            if sys.platform.startswith("win") and hasattr(sys, "frozen"):
+                dynamips_dir = os.path.normpath(os.path.join(os.path.dirname(os.path.abspath(sys.executable)), "dynamips"))
+                os.environ["PATH"] = os.pathsep.join(dynamips_dir) + os.pathsep + os.environ.get("PATH", "")
             dynamips_path = shutil.which(dynamips_path)
 
         if not dynamips_path:
@@ -518,6 +521,10 @@ class Dynamips(BaseManager):
         if usage is not None and usage != vm.usage:
             vm.usage = usage
 
+        aux_type = settings.get("aux_type")
+        if aux_type is not None and aux_type != vm.aux_type:
+            vm.aux_type = aux_type
+
         # update the configs if needed
         await self.set_vm_configs(vm, settings)
 

gns3server/compute/iou/iou_vm.py

@@ -661,7 +661,8 @@ class IOUVM(BaseNode):
             self._telnet_server.close()
             await self._telnet_server.wait_closed()
             self._telnet_server = None
-        await self.start_console()
+        if self.is_running():
+            await self.start_console()
 
     @locking
     async def _networking(self):

gns3server/compute/qemu/__init__.py

@@ -149,13 +149,20 @@ class Qemu(BaseManager):
                             for arch in archs:
                                 if f.endswith(arch) or f.endswith(f"{arch}.exe") or f.endswith(f"{arch}w.exe"):
                                     qemu_path = os.path.join(path, f)
-                                    version = await Qemu.get_qemu_version(qemu_path)
+                                    try:
+                                        version = await Qemu.get_qemu_version(qemu_path)
+                                    except QemuError as e:
+                                        log.warning(str(e))
+                                        continue
                                     qemus.append({"path": qemu_path, "version": version})
                         else:
                             qemu_path = os.path.join(path, f)
-                            version = await Qemu.get_qemu_version(qemu_path)
+                            try:
+                                version = await Qemu.get_qemu_version(qemu_path)
+                            except QemuError as e:
+                                log.warning(str(e))
+                                continue
                             qemus.append({"path": qemu_path, "version": version})
-
             except OSError:
                 continue
 

gns3server/compute/qemu/qemu_vm.py

@@ -124,6 +124,8 @@ class QemuVM(BaseNode):
             except QemuError:
                 # If the binary is not found for topologies 1.4 and later
                 # search via the platform otherwise use the binary name
+                log.warning(f"Could not find the QEMU binary {qemu_path} on this system, "
+                            f"trying to find one using platform {platform}")
                 if platform:
                     self.platform = platform
                 else:
@@ -242,7 +244,7 @@ class QemuVM(BaseNode):
         if qemu_path and os.pathsep not in qemu_path:
             new_qemu_path = shutil.which(qemu_path, path=os.pathsep.join(self._manager.paths_list()))
             if new_qemu_path is None:
-                raise QemuError(f"QEMU binary path {qemu_path} is not found in the path")
+                raise QemuError(f"QEMU binary '{qemu_path}' cannot be found on the system")
             qemu_path = new_qemu_path
 
         self._check_qemu_path(qemu_path)
@@ -289,6 +291,7 @@ class QemuVM(BaseNode):
     def platform(self, platform):
 
         self._platform = platform
+        log.info(f"QEMU VM '{self._name}' [{self._id}] has set the platform {platform}")
         self.qemu_path = f"qemu-system-{platform}"
 
     def _disk_setter(self, variable, value):
@@ -2640,6 +2643,9 @@ class QemuVM(BaseNode):
                 command.extend(shlex.split(additional_options))
             except ValueError as e:
                 raise QemuError(f"Invalid additional options: {additional_options} error {e}")
+        # avoiding mouse offset (see https://github.com/GNS3/gns3-server/issues/2335)
+        if self._console_type == "vnc":
+            command.extend(['-machine', 'usb=on', '-device', 'usb-tablet'])
         return command
 
     def asdict(self):

gns3server/compute/vpcs/vpcs_vm.py

@@ -142,6 +142,9 @@ class VPCSVM(BaseNode):
 
         vpcs_path = self._manager.config.settings.VPCS.vpcs_path
         if not os.path.isabs(vpcs_path):
+            if sys.platform.startswith("win") and hasattr(sys, "frozen"):
+                vpcs_dir = os.path.normpath(os.path.join(os.path.dirname(os.path.abspath(sys.executable)), "vpcs"))
+                os.environ["PATH"] = os.pathsep.join(vpcs_dir) + os.pathsep + os.environ.get("PATH", "")
             vpcs_path = shutil.which(vpcs_path)
         return vpcs_path
 

gns3server/controller/__init__.py

@@ -317,12 +317,12 @@ class Controller:
         else:
             for entry in importlib_resources.files('gns3server').joinpath(resource_name).iterdir():
                 full_path = os.path.join(dst_path, entry.name)
-                if not os.path.exists(full_path):
-                    if entry.is_file():
-                        log.debug(f'Installing {resource_name} resource file "{entry.name}" to "{full_path}"')
-                        shutil.copy(str(entry), os.path.join(dst_path, entry.name))
-                    elif entry.is_dir():
-                        os.makedirs(full_path, exist_ok=True)
+                if entry.is_file() and not os.path.exists(full_path):
+                    log.debug(f'Installing {resource_name} resource file "{entry.name}" to "{full_path}"')
+                    shutil.copy(str(entry), os.path.join(dst_path, entry.name))
+                elif entry.is_dir():
+                    os.makedirs(full_path, exist_ok=True)
+                    Controller.install_resource_files(full_path, os.path.join(resource_name, entry.name))
 
     def _install_base_configs(self):
         """

gns3server/controller/export_project.py

@@ -102,6 +102,11 @@ async def export_project(
                     continue
                 _patch_mtime(path)
                 zstream.write(path, os.path.relpath(path, project._path))
+            # save empty directories
+            for directory in dirs:
+                path = os.path.join(root, directory)
+                if not os.listdir(path):
+                    zstream.write(path, os.path.relpath(path, project._path))
         except FileNotFoundError as e:
             log.warning(f"Cannot export local file: {e}")
             continue

gns3server/controller/project.py

@@ -152,16 +152,27 @@ class Project:
 
         self._iou_id_lock = asyncio.Lock()
         log.debug(f'Project "{self.name}" [{self._id}] loaded')
+        self.emit_controller_notification("project.created", self.asdict())
 
     def emit_notification(self, action, event):
         """
-        Emit a notification to all clients using this project.
+        Emit a project notification to all clients using this project.
 
         :param action: Action name
         :param event: Event to send
         """
 
-        self.controller.notification.project_emit(action, event, project_id=self.id)
+        self._controller.notification.project_emit(action, event, project_id=self.id)
+
+    def emit_controller_notification(self, action, event):
+        """
+        Emit a controller notification, all clients will see it.
+
+        :param action: Action name
+        :param event: Event to send
+        """
+
+        self._controller.notification.controller_emit(action, event)
 
     async def update(self, **kwargs):
         """
@@ -176,7 +187,7 @@ class Project:
 
         # We send notif only if object has changed
         if old_json != self.asdict():
-            self.emit_notification("project.updated", self.asdict())
+            self.emit_controller_notification("project.updated", self.asdict())
             self.dump()
 
             # update on computes
@@ -812,7 +823,8 @@ class Project:
         self._clean_pictures()
         self._status = "closed"
         if not ignore_notification:
-            self.emit_notification("project.closed", self.asdict())
+            self.emit_controller_notification("project.closed", self.asdict())
+
         self.reset()
         self._closing = False
 
@@ -868,6 +880,7 @@ class Project:
             shutil.rmtree(self.path)
         except OSError as e:
             raise ControllerError(f"Cannot delete project directory {self.path}: {str(e)}")
+        self.emit_controller_notification("project.deleted", self.asdict())
 
     async def delete_on_computes(self):
         """
@@ -1001,7 +1014,7 @@ class Project:
                 await self.add_drawing(dump=False, **drawing_data)
 
             self.dump()
-        # We catch all error to be able to rollback the .gns3 to the previous state
+        # We catch all error to be able to roll back the .gns3 to the previous state
         except Exception as e:
             for compute in list(self._project_created_on_compute):
                 try:
@@ -1026,6 +1039,7 @@ class Project:
             pass
 
         self._loading = False
+        self.emit_controller_notification("project.opened", self.asdict())
         # Should we start the nodes when project is open
         if self._auto_start:
             # Start all in the background without waiting for completion

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

gns3server/controller/symbol_themes.py

@@ -18,6 +18,7 @@
 
 CLASSIC_SYMBOL_THEME = {
     "cloud": ":/symbols/classic/cloud.svg",
+    "nat": ":/symbols/classic/nat.svg",
     "ethernet_switch": ":/symbols/classic/ethernet_switch.svg",
     "hub": ":/symbols/classic/hub.svg",
     "frame_relay_switch": ":/symbols/classic/frame_relay_switch.svg",
@@ -35,6 +36,7 @@ CLASSIC_SYMBOL_THEME = {
 
 AFFINITY_SQUARE_BLUE_SYMBOL_THEME = {
     "cloud": ":/symbols/affinity/square/blue/cloud.svg",
+    "nat": ":/symbols/affinity/square/blue/nat.svg",
     "ethernet_switch": ":/symbols/affinity/square/blue/switch.svg",
     "hub": ":/symbols/affinity/square/blue/hub.svg",
     "frame_relay_switch": ":/symbols/affinity/square/blue/isdn.svg",
@@ -52,6 +54,7 @@ AFFINITY_SQUARE_BLUE_SYMBOL_THEME = {
 
 AFFINITY_SQUARE_RED_SYMBOL_THEME = {
     "cloud": ":/symbols/affinity/square/red/cloud.svg",
+    "nat": ":/symbols/affinity/square/red/nat.svg",
     "ethernet_switch": ":/symbols/affinity/square/red/switch.svg",
     "hub": ":/symbols/affinity/square/red/hub.svg",
     "frame_relay_switch": ":/symbols/affinity/square/red/isdn.svg",
@@ -69,6 +72,7 @@ AFFINITY_SQUARE_RED_SYMBOL_THEME = {
 
 AFFINITY_SQUARE_GRAY_SYMBOL_THEME = {
     "cloud": ":/symbols/affinity/square/gray/cloud.svg",
+    "nat": ":/symbols/affinity/square/gray/nat.svg",
     "ethernet_switch": ":/symbols/affinity/square/gray/switch.svg",
     "hub": ":/symbols/affinity/square/gray/hub.svg",
     "frame_relay_switch": ":/symbols/affinity/square/gray/isdn.svg",
@@ -86,6 +90,7 @@ AFFINITY_SQUARE_GRAY_SYMBOL_THEME = {
 
 AFFINITY_CIRCLE_BLUE_SYMBOL_THEME = {
     "cloud": ":/symbols/affinity/circle/blue/cloud.svg",
+    "nat": ":/symbols/affinity/circle/blue/nat.svg",
     "ethernet_switch": ":/symbols/affinity/circle/blue/switch.svg",
     "hub": ":/symbols/affinity/circle/blue/hub.svg",
     "frame_relay_switch": ":/symbols/affinity/circle/blue/isdn.svg",
@@ -103,6 +108,7 @@ AFFINITY_CIRCLE_BLUE_SYMBOL_THEME = {
 
 AFFINITY_CIRCLE_RED_SYMBOL_THEME = {
     "cloud": ":/symbols/affinity/circle/red/cloud.svg",
+    "nat": ":/symbols/affinity/circle/red/nat.svg",
     "ethernet_switch": ":/symbols/affinity/circle/red/switch.svg",
     "hub": ":/symbols/affinity/circle/red/hub.svg",
     "frame_relay_switch": ":/symbols/affinity/circle/red/isdn.svg",
@@ -120,6 +126,7 @@ AFFINITY_CIRCLE_RED_SYMBOL_THEME = {
 
 AFFINITY_CIRCLE_GRAY_SYMBOL_THEME = {
     "cloud": ":/symbols/affinity/circle/gray/cloud.svg",
+    "nat": ":/symbols/affinity/circle/gray/nat.svg",
     "ethernet_switch": ":/symbols/affinity/circle/gray/switch.svg",
     "hub": ":/symbols/affinity/circle/gray/hub.svg",
     "frame_relay_switch": ":/symbols/affinity/circle/gray/isdn.svg",

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 (

gns3server/crash_report.py

@@ -58,7 +58,7 @@ class CrashReport:
     Report crash to a third party service
     """
 
-    DSN = "https://1608802d5d3109b6533e8b270cc8c9b6@o19455.ingest.sentry.io/38482"
+    DSN = "https://99870c759d1c1d62ceb091d59dbcfa78@o19455.ingest.us.sentry.io/38482"
     _instance = None
 
     def __init__(self):

gns3server/db/models/templates.py

@@ -16,7 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-from sqlalchemy import Boolean, Column, String, Integer, ForeignKey, PickleType
+from sqlalchemy import Boolean, Column, String, Integer, Float, ForeignKey, PickleType
 from sqlalchemy.orm import relationship
 
 from .base import BaseTable, generate_uuid, GUID
@@ -77,7 +77,7 @@ class DockerTemplate(Template):
     extra_hosts = Column(String)
     extra_volumes = Column(PickleType)
     memory = Column(Integer)
-    cpus = Column(Integer)
+    cpus = Column(Float)
     custom_adapters = Column(PickleType)
 
     __mapper_args__ = {"polymorphic_identity": "docker", "polymorphic_load": "selectin"}

gns3server/db_migrations/README

@@ -1,4 +1,5 @@
 Generic single-database configuration with an async dbapi.
 
 # Command to generate a revision
+alembic upgrade head
 alembic revision --autogenerate -m "add fields in table"

gns3server/main.py

@@ -29,6 +29,7 @@ import gns3server.utils.get_resource
 
 import os
 import sys
+import asyncio
 
 
 def daemonize():
@@ -70,7 +71,10 @@ def main():
         daemonize()
     from gns3server.server import Server
 
-    Server().run()
+    try:
+        asyncio.run(Server().run())
+    except KeyboardInterrupt:
+        pass
 
 
 if __name__ == "__main__":

gns3server/schemas/compute/docker_nodes.py

@@ -43,7 +43,7 @@ class DockerBase(BaseModel):
     extra_hosts: Optional[str] = Field(None, description="Docker extra hosts (added to /etc/hosts)")
     extra_volumes: Optional[List[str]] = Field(None, description="Additional directories to make persistent")
     memory: Optional[int] = Field(None, description="Maximum amount of memory the container can use in MB")
-    cpus: Optional[int] = Field(None, description="Maximum amount of CPU resources the container can use")
+    cpus: Optional[float] = Field(None, description="Maximum amount of CPU resources the container can use")
     custom_adapters: Optional[List[CustomAdapter]] = Field(None, description="Custom adapters")
 
 

gns3server/schemas/controller/templates/__init__.py

@@ -45,7 +45,6 @@ class TemplateBase(BaseModel):
     category: Optional[Category] = None
     default_name_format: Optional[str] = None
     symbol: Optional[str] = None
-    builtin: Optional[bool] = None
     template_type: Optional[NodeType] = None
     compute_id: Optional[str] = None
     usage: Optional[str] = ""

gns3server/schemas/controller/templates/docker_templates.py

@@ -49,7 +49,7 @@ class DockerTemplate(TemplateBase):
     extra_hosts: Optional[str] = Field("", description="Docker extra hosts (added to /etc/hosts)")
     extra_volumes: Optional[List] = Field([], description="Additional directories to make persistent")
     memory: Optional[int] = Field(0, description="Maximum amount of memory the container can use in MB")
-    cpus: Optional[int] = Field(0, description="Maximum amount of CPU resources the container can use")
+    cpus: Optional[float] = Field(0, description="Maximum amount of CPU resources the container can use")
     custom_adapters: Optional[List[CustomAdapter]] = Field(default_factory=list, description="Custom adapters")
 
 

gns3server/server.py

@@ -182,7 +182,7 @@ class Server:
                     asyncio.ensure_future(Controller.instance().reload())
                 else:
                     log.info(f"Server has got signal {signame}, exiting...")
-                    # send SIGTERM to the server PID so uvicorn can shutdown the process
+                    # send SIGTERM to the server PID so uvicorn can shut down the process
                     os.kill(os.getpid(), signal.SIGTERM)
             except asyncio.CancelledError:
                 pass
@@ -239,7 +239,7 @@ class Server:
             log.critical("Can't write pid file %s: %s", path, str(e))
             sys.exit(1)
 
-    def run(self):
+    async def run(self):
 
         args = self._parse_arguments(sys.argv[1:])
 
@@ -333,8 +333,7 @@ class Server:
                 uvicorn_logger.propagate = False
 
             server = uvicorn.Server(config)
-            loop = asyncio.get_event_loop()
-            loop.run_until_complete(server.serve())
+            await server.serve()
 
         except Exception as e:
             log.critical(f"Critical error while running the server: {e}", exc_info=1)

gns3server/services/authentication.py

@@ -16,8 +16,8 @@
 
 
 from jose import JWTError, jwt
-from datetime import datetime, timedelta
-from passlib.context import CryptContext
+from datetime import datetime, timedelta, timezone
+import bcrypt
 
 from typing import Optional
 from fastapi import HTTPException, status
@@ -29,8 +29,6 @@ import logging
 
 log = logging.getLogger(__name__)
 
-pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
-
 DEFAULT_JWT_SECRET_KEY = "efd08eccec3bd0a1be2e086670e5efa90969c68d07e072d7354a76cea5e33d4e"
 
 
@@ -38,17 +36,19 @@ class AuthService:
 
     def hash_password(self, password: str) -> str:
 
-        return pwd_context.hash(password)
+        salt = bcrypt.gensalt()
+        hashed_password = bcrypt.hashpw(password=password.encode('utf-8'), salt=salt)
+        return hashed_password.decode('utf-8')
 
     def verify_password(self, password, hashed_password) -> bool:
 
-        return pwd_context.verify(password, hashed_password)
+        return bcrypt.checkpw(password=password.encode('utf-8'), hashed_password=hashed_password.encode('utf-8'))
 
     def create_access_token(self, username, secret_key: str = None, expires_in: int = 0) -> str:
 
         if not expires_in:
             expires_in = Config.instance().settings.Controller.jwt_access_token_expire_minutes
-        expire = datetime.utcnow() + timedelta(minutes=expires_in)
+        expire = datetime.now(timezone.utc) + timedelta(minutes=expires_in)
         to_encode = {"sub": username, "exp": expire}
         if secret_key is None:
             secret_key = Config.instance().settings.Controller.jwt_secret_key

gns3server/services/templates.py

@@ -96,7 +96,7 @@ BUILTIN_TEMPLATES = [
         "name": "NAT",
         "default_name_format": "NAT{0}",
         "category": "guest",
-        "symbol": "cloud",
+        "symbol": "nat",
         "compute_id": None,
         "builtin": True,
     },

gns3server/static/web-ui/3rdpartylicenses.txt

@@ -1493,6 +1493,29 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+ipaddr.js
+MIT
+Copyright (C) 2011-2017 whitequark <whitequark@whitequark.org>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
 marked
 MIT
 # License information

gns3server/static/web-ui/index.html

@@ -46,6 +46,6 @@
 
       gtag('config', 'G-5D6FZL9923');
     </script>
-  <script src="runtime.53e0b4d68251ad21.js" type="module"></script><script src="polyfills.319c79dd175e50d0.js" type="module"></script><script src="main.fa00b32e7c90ea1c.js" type="module"></script>
+  <script src="runtime.24fa95b7061d7056.js" type="module"></script><script src="polyfills.319c79dd175e50d0.js" type="module"></script><script src="main.f3840f9b1c0240e6.js" type="module"></script>
 
 </body></html>