gns3-server 3.0.0rc1__tar.gz → 3.0.1__tar.gz

{gns3_server-3.0.0rc1 → gns3_server-3.0.1}/CHANGELOG

@@ -1,5 +1,70 @@
 # Change Log
 
+## 3.0.1 27/12/2024
+
+* Bundle web-ui v3.0.1
+* Allow for upgrading built-in disks
+* Fix config parsing when configuring server protocol. Fixes https://github.com/GNS3/gns3-gui/issues/3681
+* Update empty Qemu disks with correct MD5 checksums
+* Increase timeout to run compute HTTP queries. Fixes #3453
+
+## 3.0.0 20/12/2024
+
+* Bundle web-ui v3.0.0
+* Use static favicon for API docs. Ref #3674
+* Configure self-hosting JavaScript and CSS for docs
+* Fix project auto open feature. Fixes #2455
+* Store IOU licence in the secrets directory and disable the check by default
+* Require "Project.Audit" permission to duplicate a project and check if "Project.Allocate" permission for the destination.
+
+## 2.2.52 02/12/2024
+
+* Bundle web-ui v2.2.52
+* Sync appliances
+* Remove restrictions based on file extension when listing images and fix ELF header checks
+* Fix use project name instead of ID for fast duplication when running local server. Fixes #2446
+* Overwrite user resources when the originals have changed.
+* Relax setuptools requirement to allow for easier Debian packaging on Ubuntu Focal & Jammy
+
+## 3.0.0rc2 20/11/2024
+
+* Bundle web-ui v3.0.0rc2
+* Fix error 500 on PUT for cloud, nat, vmware and vpcs nodes. Fixes #2426
+* Add a duplicated project in the same resource pools as the original project if it is in any
+* Upgrade FastAPI to v0.115.5
+* Overwrite user resources when the originals have changed.
+* Relax setuptools requirement to allow for easier Debian packaging on Ubuntu Focal & Jammy
+* Increase SQLite timeout. Ref #2422
+* Fix test user with wrong creds
+* Upgrade dependencies and fix Pydantic warnings
+* Upgrade aiohttp to v3.10.10. Fixes #2411
+* Replace aiohttp.web.HTTPConflict()
+* Python 3.13 support
+
+## 2.2.51 07/11/2024
+
+* Catch error when cannot resize Docker container TTY.
+* Do not use "ide" if there is a disk image and no interface type has been explicitly configured.
+* Use @locking when sending uBridge commands. Ref https://github.com/GNS3/gns3-gui/issues/3651
+* Fix run Docker containers with user namespaces enabled. Fixes #2414
+* Python 3.13 support
+* Upgrade dependencies
+* Fix errors in init.sh. Fixes #2431
+
+## 2.2.50 21/10/2024
+
+* Bundle web-ui v2.2.50
+* Symbolic links support for project export/import
+* Add comment to indicate sentry-sdk is optional. Ref https://github.com/GNS3/gns3-server/issues/2423
+* Fix issues with recent busybox versions
+* Support to reset MAC addresses for Docker nodes and some adjustments for fast duplication.
+* Update README.md to change the minimum required Python version.
+* Faster project duplication for local projects (no remote compute)
+* Improve error message when a project cannot be parsed.
+* Fix for running Docker containers with user namespaces enabled
+* Support for configuring MAC address in Docker containers
+* Upgrade aiohttp to v3.10.3
+
 ## 3.0.0rc1 11/08/2024
 
 * Bundle web-ui v3.0.0rc1

{gns3_server-3.0.0rc1/gns3_server.egg-info → gns3_server-3.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gns3-server
-Version: 3.0.0rc1
+Version: 3.0.1
 Summary: GNS3 graphical interface for the GNS3 server.
 Author-email: Jeremy Grossmann <developers@gns3.com>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -699,37 +699,38 @@ Classifier: Programming Language :: Python :: Implementation :: CPython
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: uvicorn==0.29.0
-Requires-Dist: fastapi==0.112.0
-Requires-Dist: python-multipart==0.0.9
-Requires-Dist: websockets==12.0
-Requires-Dist: aiohttp<3.10,>=3.9.5
+Requires-Dist: uvicorn==0.32.0
+Requires-Dist: pydantic==2.9.2
+Requires-Dist: fastapi==0.115.5
+Requires-Dist: python-multipart==0.0.16
+Requires-Dist: websockets==13.1
+Requires-Dist: aiohttp<3.11,>=3.10.10
 Requires-Dist: async-timeout==4.0.3
 Requires-Dist: aiofiles<25.0,>=24.1.0
 Requires-Dist: Jinja2<3.2,>=3.1.4
-Requires-Dist: sentry-sdk<2.13,==2.12
-Requires-Dist: psutil==6.0.0
+Requires-Dist: sentry-sdk<2.18,>=2.17
+Requires-Dist: psutil>=6.1.0
 Requires-Dist: distro>=1.9.0
-Requires-Dist: py-cpuinfo==9.0.0
-Requires-Dist: sqlalchemy==2.0.31
+Requires-Dist: py-cpuinfo<10.0,>=9.0.0
+Requires-Dist: sqlalchemy==2.0.36
 Requires-Dist: aiosqlite==0.20.0
-Requires-Dist: alembic==1.12.1
+Requires-Dist: alembic==1.13.3
 Requires-Dist: bcrypt==4.2.0
 Requires-Dist: python-jose[cryptography]==3.3.0
 Requires-Dist: email-validator==2.2.0
-Requires-Dist: watchfiles==0.22.0
+Requires-Dist: watchfiles==0.24.0
 Requires-Dist: zstandard==0.23.0
-Requires-Dist: platformdirs==4.2.2
+Requires-Dist: platformdirs<3,>=2.4.0
 Requires-Dist: importlib-resources>=1.3; python_version <= "3.9"
-Requires-Dist: truststore>=0.9.1; python_version >= "3.10"
+Requires-Dist: truststore>=0.10.0; python_version >= "3.10"
 Provides-Extra: dev
-Requires-Dist: pytest==8.3.2; extra == "dev"
-Requires-Dist: flake8==7.1.0; extra == "dev"
+Requires-Dist: pytest==8.3.3; extra == "dev"
+Requires-Dist: flake8==7.1.1; extra == "dev"
 Requires-Dist: pytest-timeout==2.3.1; extra == "dev"
 Requires-Dist: pytest-asyncio==0.21.2; extra == "dev"
 Requires-Dist: requests==2.32.3; extra == "dev"
-Requires-Dist: httpx==0.24.1; extra == "dev"
-Requires-Dist: httpx_ws==0.4.2; extra == "dev"
+Requires-Dist: httpx==0.27.2; extra == "dev"
+Requires-Dist: httpx_ws==0.6.2; extra == "dev"
 
 # GNS3 server repository
 

gns3_server-3.0.1/dev-requirements.txt

@@ -0,0 +1,7 @@
+pytest==8.3.3
+flake8==7.1.1
+pytest-timeout==2.3.1
+pytest-asyncio==0.21.2
+requests==2.32.3
+httpx==0.27.2 # version 0.24.1 is required by httpx_ws
+httpx_ws==0.6.2

{gns3_server-3.0.0rc1 → gns3_server-3.0.1/gns3_server.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gns3-server
-Version: 3.0.0rc1
+Version: 3.0.1
 Summary: GNS3 graphical interface for the GNS3 server.
 Author-email: Jeremy Grossmann <developers@gns3.com>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -699,37 +699,38 @@ Classifier: Programming Language :: Python :: Implementation :: CPython
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: uvicorn==0.29.0
-Requires-Dist: fastapi==0.112.0
-Requires-Dist: python-multipart==0.0.9
-Requires-Dist: websockets==12.0
-Requires-Dist: aiohttp<3.10,>=3.9.5
+Requires-Dist: uvicorn==0.32.0
+Requires-Dist: pydantic==2.9.2
+Requires-Dist: fastapi==0.115.5
+Requires-Dist: python-multipart==0.0.16
+Requires-Dist: websockets==13.1
+Requires-Dist: aiohttp<3.11,>=3.10.10
 Requires-Dist: async-timeout==4.0.3
 Requires-Dist: aiofiles<25.0,>=24.1.0
 Requires-Dist: Jinja2<3.2,>=3.1.4
-Requires-Dist: sentry-sdk<2.13,==2.12
-Requires-Dist: psutil==6.0.0
+Requires-Dist: sentry-sdk<2.18,>=2.17
+Requires-Dist: psutil>=6.1.0
 Requires-Dist: distro>=1.9.0
-Requires-Dist: py-cpuinfo==9.0.0
-Requires-Dist: sqlalchemy==2.0.31
+Requires-Dist: py-cpuinfo<10.0,>=9.0.0
+Requires-Dist: sqlalchemy==2.0.36
 Requires-Dist: aiosqlite==0.20.0
-Requires-Dist: alembic==1.12.1
+Requires-Dist: alembic==1.13.3
 Requires-Dist: bcrypt==4.2.0
 Requires-Dist: python-jose[cryptography]==3.3.0
 Requires-Dist: email-validator==2.2.0
-Requires-Dist: watchfiles==0.22.0
+Requires-Dist: watchfiles==0.24.0
 Requires-Dist: zstandard==0.23.0
-Requires-Dist: platformdirs==4.2.2
+Requires-Dist: platformdirs<3,>=2.4.0
 Requires-Dist: importlib-resources>=1.3; python_version <= "3.9"
-Requires-Dist: truststore>=0.9.1; python_version >= "3.10"
+Requires-Dist: truststore>=0.10.0; python_version >= "3.10"
 Provides-Extra: dev
-Requires-Dist: pytest==8.3.2; extra == "dev"
-Requires-Dist: flake8==7.1.0; extra == "dev"
+Requires-Dist: pytest==8.3.3; extra == "dev"
+Requires-Dist: flake8==7.1.1; extra == "dev"
 Requires-Dist: pytest-timeout==2.3.1; extra == "dev"
 Requires-Dist: pytest-asyncio==0.21.2; extra == "dev"
 Requires-Dist: requests==2.32.3; extra == "dev"
-Requires-Dist: httpx==0.24.1; extra == "dev"
-Requires-Dist: httpx_ws==0.4.2; extra == "dev"
+Requires-Dist: httpx==0.27.2; extra == "dev"
+Requires-Dist: httpx_ws==0.6.2; extra == "dev"
 
 # GNS3 server repository
 

{gns3_server-3.0.0rc1 → gns3_server-3.0.1}/gns3_server.egg-info/SOURCES.txt

@@ -167,11 +167,14 @@ gns3server/appliances/freebsd.gns3a
 gns3server/appliances/freenas.gns3a
 gns3server/appliances/frr.gns3a
 gns3server/appliances/haproxy.gns3a
+gns3server/appliances/hbcd-pe.gns3a
 gns3server/appliances/hp-vsr1001.gns3a
 gns3server/appliances/huawei-ar1kv.gns3a
 gns3server/appliances/huawei-ce12800.gns3a
 gns3server/appliances/huawei-ne40e.gns3a
 gns3server/appliances/huawei-usg6kv.gns3a
+gns3server/appliances/innovaphone-app.gns3a
+gns3server/appliances/innovaphone-ipva.gns3a
 gns3server/appliances/ipfire.gns3a
 gns3server/appliances/ipterm.gns3a
 gns3server/appliances/ipxe.gns3a
@@ -213,6 +216,7 @@ gns3server/appliances/net_toolbox.gns3a
 gns3server/appliances/netapp-ontapsim.gns3a
 gns3server/appliances/netem.gns3a
 gns3server/appliances/network_automation.gns3a
+gns3server/appliances/nixos.gns3a
 gns3server/appliances/nokia-vsim.gns3a
 gns3server/appliances/ntopng.gns3a
 gns3server/appliances/onos.gns3a
@@ -252,6 +256,7 @@ gns3server/appliances/tacacs-gui.gns3a
 gns3server/appliances/tinycore-linux.gns3a
 gns3server/appliances/trendmicro-imsva.gns3a
 gns3server/appliances/trendmicro-iwsva.gns3a
+gns3server/appliances/truenas.gns3a
 gns3server/appliances/turnkey-wordpress.gns3a
 gns3server/appliances/ubuntu-cloud.gns3a
 gns3server/appliances/ubuntu-docker.gns3a
@@ -457,6 +462,7 @@ gns3server/db_migrations/README
 gns3server/db_migrations/env.py
 gns3server/db_migrations/script.py.mako
 gns3server/db_migrations/versions/7ceeddd9c9a8_init.py
+gns3server/db_migrations/versions/9a5292aa4389_add_mac_address_field_in_docker_.py
 gns3server/disks/OVMF.fd
 gns3server/disks/OVMF_CODE.fd
 gns3server/disks/OVMF_VARS.fd
@@ -535,6 +541,10 @@ gns3server/services/authentication.py
 gns3server/services/computes.py
 gns3server/services/templates.py
 gns3server/static/.gitkeep
+gns3server/static/favicon.ico
+gns3server/static/redoc.standalone.js
+gns3server/static/swagger-ui-bundle.js
+gns3server/static/swagger-ui.css
 gns3server/static/web-ui/3rdpartylicenses.txt
 gns3server/static/web-ui/465.92c7ab880f2504d3.js
 gns3server/static/web-ui/MaterialIcons-Regular.196fa4a92dd6fa73.ttf
@@ -564,7 +574,7 @@ gns3server/static/web-ui/NotoSans-Regular.e6139cb1663a1c57.ttf
 gns3server/static/web-ui/ReleaseNotes.txt
 gns3server/static/web-ui/favicon.ico
 gns3server/static/web-ui/index.html
-gns3server/static/web-ui/main.4185a8e61824af0d.js
+gns3server/static/web-ui/main.e55eeff5c0ba1cf4.js
 gns3server/static/web-ui/polyfills.319c79dd175e50d0.js
 gns3server/static/web-ui/roboto-latin-100.539f0a96b40596f7.woff2
 gns3server/static/web-ui/roboto-latin-100.5ba994dac3e79ea8.woff

{gns3_server-3.0.0rc1 → gns3_server-3.0.1}/gns3_server.egg-info/requires.txt

@@ -1,36 +1,37 @@
-uvicorn==0.29.0
-fastapi==0.112.0
-python-multipart==0.0.9
-websockets==12.0
-aiohttp<3.10,>=3.9.5
+uvicorn==0.32.0
+pydantic==2.9.2
+fastapi==0.115.5
+python-multipart==0.0.16
+websockets==13.1
+aiohttp<3.11,>=3.10.10
 async-timeout==4.0.3
 aiofiles<25.0,>=24.1.0
 Jinja2<3.2,>=3.1.4
-sentry-sdk<2.13,==2.12
-psutil==6.0.0
+sentry-sdk<2.18,>=2.17
+psutil>=6.1.0
 distro>=1.9.0
-py-cpuinfo==9.0.0
-sqlalchemy==2.0.31
+py-cpuinfo<10.0,>=9.0.0
+sqlalchemy==2.0.36
 aiosqlite==0.20.0
-alembic==1.12.1
+alembic==1.13.3
 bcrypt==4.2.0
 python-jose[cryptography]==3.3.0
 email-validator==2.2.0
-watchfiles==0.22.0
+watchfiles==0.24.0
 zstandard==0.23.0
-platformdirs==4.2.2
+platformdirs<3,>=2.4.0
 
 [:python_version <= "3.9"]
 importlib-resources>=1.3
 
 [:python_version >= "3.10"]
-truststore>=0.9.1
+truststore>=0.10.0
 
 [dev]
-pytest==8.3.2
-flake8==7.1.0
+pytest==8.3.3
+flake8==7.1.1
 pytest-timeout==2.3.1
 pytest-asyncio==0.21.2
 requests==2.32.3
-httpx==0.24.1
-httpx_ws==0.4.2
+httpx==0.27.2
+httpx_ws==0.6.2

{gns3_server-3.0.0rc1 → gns3_server-3.0.1}/gns3server/api/routes/compute/cloud_nodes.py

@@ -85,7 +85,7 @@ def get_cloud(node: Cloud = Depends(dep_node)) -> schemas.Cloud:
 
 
 @router.put("/{node_id}", response_model=schemas.Cloud)
-def update_cloud(node_data: schemas.CloudUpdate, node: Cloud = Depends(dep_node)) -> schemas.Cloud:
+async def update_cloud(node_data: schemas.CloudUpdate, node: Cloud = Depends(dep_node)) -> schemas.Cloud:
     """
     Update a cloud node.
     """

{gns3_server-3.0.0rc1 → gns3_server-3.0.1}/gns3server/api/routes/compute/docker_nodes.py

@@ -69,6 +69,7 @@ async def create_docker_node(project_id: UUID, node_data: schemas.DockerCreate)
         start_command=node_data.get("start_command"),
         environment=node_data.get("environment"),
         adapters=node_data.get("adapters"),
+        mac_address=node_data.get("mac_address"),
         console=node_data.get("console"),
         console_type=node_data.get("console_type"),
         console_resolution=node_data.get("console_resolution", "1024x768"),
@@ -124,6 +125,8 @@ async def update_docker_node(node_data: schemas.DockerUpdate, node: DockerVM = D
         "start_command",
         "environment",
         "adapters",
+        "mac_address",
+        "custom_adapters",
         "extra_hosts",
         "extra_volumes",
         "memory",

{gns3_server-3.0.0rc1 → gns3_server-3.0.1}/gns3server/api/routes/compute/nat_nodes.py

@@ -80,7 +80,7 @@ def get_nat_node(node: Nat = Depends(dep_node)) -> schemas.NAT:
 
 
 @router.put("/{node_id}", response_model=schemas.NAT)
-def update_nat_node(node_data: schemas.NATUpdate, node: Nat = Depends(dep_node)) -> schemas.NAT:
+async def update_nat_node(node_data: schemas.NATUpdate, node: Nat = Depends(dep_node)) -> schemas.NAT:
     """
     Update a NAT node.
     """

{gns3_server-3.0.0rc1 → gns3_server-3.0.1}/gns3server/api/routes/compute/vmware_nodes.py

@@ -97,7 +97,7 @@ def get_vmware_node(node: VMwareVM = Depends(dep_node)) -> schemas.VMware:
     response_model=schemas.VMware,
     dependencies=[Depends(compute_authentication)]
 )
-def update_vmware_node(node_data: schemas.VMwareUpdate, node: VMwareVM = Depends(dep_node)) -> schemas.VMware:
+async def update_vmware_node(node_data: schemas.VMwareUpdate, node: VMwareVM = Depends(dep_node)) -> schemas.VMware:
     """
     Update a VMware node.
     """

{gns3_server-3.0.0rc1 → gns3_server-3.0.1}/gns3server/api/routes/compute/vpcs_nodes.py

@@ -91,15 +91,21 @@ def get_vpcs_node(node: VPCSVM = Depends(dep_node)) -> schemas.VPCS:
     response_model=schemas.VPCS,
     dependencies=[Depends(compute_authentication)]
 )
-def update_vpcs_node(node_data: schemas.VPCSUpdate, node: VPCSVM = Depends(dep_node)) -> schemas.VPCS:
+async def update_vpcs_node(node_data: schemas.VPCSUpdate, node: VPCSVM = Depends(dep_node)) -> schemas.VPCS:
     """
     Update a VPCS node.
     """
 
     node_data = jsonable_encoder(node_data, exclude_unset=True)
-    node.name = node_data.get("name", node.name)
-    node.console = node_data.get("console", node.console)
-    node.console_type = node_data.get("console_type", node.console_type)
+    name = node_data.get("name", node.name)
+    if node.name != name:
+        node.name = name
+    console = node_data.get("console", node.console)
+    if node.console != console:
+        node.console = console
+    console_type = node_data.get("console_type", node.console_type)
+    if node.console_type != console_type:
+        node.console_type = console_type
     node.updated()
     return node.asdict()
 

{gns3_server-3.0.0rc1 → gns3_server-3.0.1}/gns3server/api/routes/controller/projects.py

@@ -426,22 +426,48 @@ async def import_project(
     status_code=status.HTTP_201_CREATED,
     response_model=schemas.Project,
     responses={**responses, 409: {"model": schemas.ErrorMessage, "description": "Could not duplicate project"}},
-    dependencies=[Depends(has_privilege("Project.Allocate"))]
+    dependencies=[Depends(has_privilege("Project.Audit"))]
 )
 async def duplicate_project(
         project_data: schemas.ProjectDuplicate,
-        project: Project = Depends(dep_project)
+        project: Project = Depends(dep_project),
+        current_user: schemas.User = Depends(get_current_active_user),
+        rbac_repo: RbacRepository = Depends(get_repository(RbacRepository)),
+        pools_repo: ResourcePoolsRepository = Depends(get_repository(ResourcePoolsRepository))
 ) -> schemas.Project:
     """
     Duplicate a project.
 
-    Required privilege: Project.Allocate
+    Required privilege: Project.Audit
     """
 
+    pool_memberships = await pools_repo.get_resource_memberships(project.id)
+
+    # check if the project can be duplicated somewhere (either in a pool or in the root)
+    if not current_user.is_superadmin:
+        can_be_duplicated_somewhere = False
+        if pool_memberships:
+            for pool in pool_memberships:
+                if await rbac_repo.check_user_has_privilege(current_user.user_id, f"/pools/{pool.resource_pool_id}", "Project.Allocate"):
+                    can_be_duplicated_somewhere = True
+                    break
+
+        if not can_be_duplicated_somewhere and not await rbac_repo.check_user_has_privilege(current_user.user_id, "/projects", "Project.Allocate"):
+            log.warning(f"Project {project.name} cannot be duplicated anywhere")
+            raise HTTPException(status_code=status.HTTP_403_FORBIDDEN)
+
     reset_mac_addresses = project_data.reset_mac_addresses
     new_project = await project.duplicate(
         name=project_data.name, reset_mac_addresses=reset_mac_addresses
     )
+
+    # Add the new project in the same resource pools if the duplicated project belongs to any
+    if pool_memberships:
+        resource_create = schemas.ResourceCreate(resource_id=new_project.id, resource_type="project", name=new_project.name)
+        resource = await pools_repo.create_resource(resource_create)
+        for pool in pool_memberships:
+            await pools_repo.add_resource_to_pool(pool.resource_pool_id, resource)
+
     return new_project.asdict()
 
 

{gns3_server-3.0.0rc1 → gns3_server-3.0.1}/gns3server/api/routes/controller/users.py

@@ -54,7 +54,7 @@ async def login(
 ) -> schemas.Token:
     """
     Default user login method using forms (x-www-form-urlencoded).
-    Example: curl http://host:port/v3/users/login -H "Content-Type: application/x-www-form-urlencoded" -d "username=admin&password=admin"
+    Example: curl -X POST http://host:port/v3/access/users/login -H "Content-Type: application/x-www-form-urlencoded" -d "username=admin&password=admin"
     """
 
     user = await users_repo.authenticate_user(username=form_data.username, password=form_data.password)
@@ -76,7 +76,7 @@ async def authenticate(
 ) -> schemas.Token:
     """
     Alternative authentication method using json.
-    Example: curl http://host:port/v3/users/authenticate -d '{"username": "admin", "password": "admin"}' -H "Content-Type: application/json"
+    Example: curl -X POST http://host:port/v3/access/users/authenticate -d '{"username": "admin", "password": "admin"}' -H "Content-Type: application/json"
     """
 
     user = await users_repo.authenticate_user(username=user_credentials.username, password=user_credentials.password)

{gns3_server-3.0.0rc1 → gns3_server-3.0.1}/gns3server/api/routes/index.py

@@ -27,20 +27,20 @@ router = APIRouter()
 templates = Jinja2Templates(directory=os.path.join("gns3server", "templates"))
 
 
-@router.get("/")
+@router.get("/", include_in_schema=False)
 async def root():
 
     return RedirectResponse("/static/web-ui/bundled", status_code=308)  # permanent redirect
 
 
-@router.get("/debug", response_class=HTMLResponse, deprecated=True)
+@router.get("/debug", response_class=HTMLResponse, deprecated=True, include_in_schema=False)
 def debug(request: Request):
 
     kwargs = {"request": request, "gns3_version": __version__, "gns3_host": request.client.host}
     return templates.TemplateResponse("index.html", kwargs)
 
 
-@router.get("/static/web-ui/{file_path:path}", description="Web user interface")
+@router.get("/static/web-ui/{file_path:path}", description="Web user interface", include_in_schema=False)
 async def web_ui(file_path: str):
 
     file_path = os.path.normpath(file_path).strip("/")

{gns3_server-3.0.0rc1 → gns3_server-3.0.1}/gns3server/api/server.py

@@ -19,15 +19,20 @@
 FastAPI app
 """
 
-import time
-
 from fastapi import FastAPI, Request, HTTPException, status
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import JSONResponse
 from fastapi.exceptions import RequestValidationError
+from fastapi.staticfiles import StaticFiles
 from sqlalchemy.exc import SQLAlchemyError
 from uvicorn.main import Server as UvicornServer
 
+from fastapi.openapi.docs import (
+    get_redoc_html,
+    get_swagger_ui_html,
+    get_swagger_ui_oauth2_redirect_html,
+)
+
 from gns3server.controller.controller_error import (
     ControllerError,
     ControllerNotFoundError,
@@ -51,7 +56,11 @@ log = logging.getLogger(__name__)
 def get_application() -> FastAPI:
 
     application = FastAPI(
-        title="GNS3 controller API", description="This page describes the public controller API for GNS3", version="v3"
+        title="GNS3 controller API",
+        description="This page describes the public controller API for GNS3",
+        version="v3",
+        docs_url=None,
+        redoc_url=None
     )
 
     application.add_middleware(
@@ -66,6 +75,7 @@ def get_application() -> FastAPI:
     application.add_event_handler("shutdown", tasks.create_shutdown_handler(application))
     application.include_router(index.router, tags=["Index"])
     application.include_router(controller.router, prefix="/v3")
+    application.mount("/static", StaticFiles(packages=[('gns3server', 'static')]), name="static")
     application.mount("/v3/compute", compute_api, name="compute")
 
     return application
@@ -85,6 +95,31 @@ def handle_exit(*args, **kwargs):
 
 UvicornServer.handle_exit = handle_exit
 
+# Configure self-hosting JavaScript and CSS for docs
+@app.get("/docs", include_in_schema=False)
+async def custom_swagger_ui_html():
+    return get_swagger_ui_html(
+        openapi_url=app.openapi_url,
+        title=app.title + " - Swagger UI",
+        oauth2_redirect_url=app.swagger_ui_oauth2_redirect_url,
+        swagger_js_url="/static/swagger-ui-bundle.js",
+        swagger_css_url="/static/swagger-ui.css",
+        swagger_favicon_url="/static/favicon.ico"
+    )
+
+@app.get(app.swagger_ui_oauth2_redirect_url, include_in_schema=False)
+async def swagger_ui_redirect():
+    return get_swagger_ui_oauth2_redirect_html()
+
+
+@app.get("/redoc", include_in_schema=False)
+async def redoc_html():
+    return get_redoc_html(
+        openapi_url=app.openapi_url,
+        title=app.title + " - ReDoc",
+        redoc_js_url="/static/redoc.standalone.js",
+        redoc_favicon_url="/static/favicon.ico"
+    )
 
 @app.exception_handler(ControllerError)
 async def controller_error_handler(request: Request, exc: ControllerError):

{gns3_server-3.0.0rc1 → gns3_server-3.0.1}/gns3server/appliances/almalinux.gns3a

@@ -30,24 +30,24 @@
             "version": "9.2",
             "md5sum": "c5bc76e8c95ac9f810a3482c80a54cc7",
             "filesize": 563347456,
-            "download_url": "https://repo.almalinux.org/almalinux/9/cloud/x86_64/images/",
-            "direct_download_url": "https://repo.almalinux.org/almalinux/9/cloud/x86_64/images/AlmaLinux-9-GenericCloud-9.2-20230513.x86_64.qcow2"
+            "download_url": "https://vault.almalinux.org/9.2/cloud/x86_64/images/",
+            "direct_download_url": "https://vault.almalinux.org/9.2/cloud/x86_64/images/AlmaLinux-9-GenericCloud-9.2-20230513.x86_64.qcow2"
         },
         {
             "filename": "AlmaLinux-8-GenericCloud-8.8-20230524.x86_64.qcow2",
             "version": "8.8",
             "md5sum": "3958c5fc25770ef63cf97aa5d93f0a0b",
             "filesize": 565444608,
-            "download_url": "https://repo.almalinux.org/almalinux/8/cloud/x86_64/images/",
-            "direct_download_url": "https://repo.almalinux.org/almalinux/8/cloud/x86_64/images/AlmaLinux-8-GenericCloud-8.8-20230524.x86_64.qcow2"
+            "download_url": "https://vault.almalinux.org/8.8/cloud/x86_64/images/",
+            "direct_download_url": "https://vault.almalinux.org/8.8/cloud/x86_64/images/AlmaLinux-8-GenericCloud-8.8-20230524.x86_64.qcow2"
         },
         {
             "filename": "AlmaLinux-8-GenericCloud-8.7-20221111.x86_64.qcow2",
             "version": "8.7",
             "md5sum": "b2b8c7fd3b6869362f3f8ed47549c804",
             "filesize": 566231040,
-            "download_url": "https://repo.almalinux.org/almalinux/8/cloud/x86_64/images/",
-            "direct_download_url": "https://repo.almalinux.org/almalinux/8/cloud/x86_64/images/AlmaLinux-8-GenericCloud-8.7-20221111.x86_64.qcow2"
+            "download_url": "https://vault.almalinux.org/8.7/cloud/x86_64/images/",
+            "direct_download_url": "https://vault.almalinux.org/8.7/cloud/x86_64/images/AlmaLinux-8-GenericCloud-8.7-20221111.x86_64.qcow2"
         },
         {
             "filename": "almalinux-cloud-init-data.iso",